Source-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS import: src/external/bsd/flex/dist
Module Name: src
Committed By: christos
Date: Sun Dec 23 15:57:57 UTC 2018
Update of /cvsroot/src/external/bsd/flex/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv105
Log Message:
2017-05-06 Will Estes <westes575%gmail.com@localhost>
* po/ca.po, po/da.po, po/de.po, po/eo.po, po/es.po, po/fi.po,
po/fr.po, po/ga.po, po/hr.po, po/ko.po, po/nl.po, po/pl.po,
po/pt_BR.po, po/ro.po, po/ru.po, po/sr.po, po/sv.po, po/tr.po,
po/vi.po, po/zh_CN.po, po/zh_TW.po: gettext: pulled latest
translations; recompiled against current sources
2017-05-06 Will Estes <westes575%gmail.com@localhost>
* NEWS: version 2.6.4 * NEWS: Record release date.
2017-05-06 Will Estes <westes575%gmail.com@localhost>
* .prev-version: note previous version
2017-05-06 Will Estes <westes575%gmail.com@localhost>
* NEWS: doc: update NEWS for upcoming release
2017-05-04 viktor.shepel <shepelvictor%bigmir.net@localhost>
* doc/flex.texi: doc: Correct typo in C code sample in manual
2017-05-04 Explorer09 <explorer09%gmail.com@localhost>
* src/flex.skl: scanner: Mention %# comments are removed when
building skel.c
2017-05-02 Demi Obenour <demiobenour%gmail.com@localhost>
* src/flex.skl: Honor user definitions of yy_* macros The user may have defined the yy_* macros themselves. In that case,
don't clobber them.
2017-05-02 Demi Obenour <demiobenour%gmail.com@localhost>
* src/flex.skl, src/main.c: Don't leak macro definitions into header
files This allowed unnamespaced definitions to leak into header files,
breaking client code. Fixes #142
2017-05-03 Demi Obenour <demiobenour%gmail.com@localhost>
* src/scan.l: scanner: Check for 0 bracecount when EOL ends quoted
literal. This can happen in the case of // comments (which Flex doesn't
handle specially).
2017-05-03 Demi Obenour <demiobenour%gmail.com@localhost>
* src/scan.l: scanner: when bracelevel is negative, treat as zero. This really should never happen, but this at least fixes the
breakage on Verilator.
2017-04-02 Jeff Smith <whydoubt%gmail.com@localhost>
* tests/Makefile.am, tests/tableopts.am, tests/tableopts.sh: test:
enable more silent building of tests. When running 'make V=0 check', some compile and link steps are made
less verbose and some are not. This cleans up most steps that are
not. These have no effect if V=0 is not specified.
2017-05-03 Demi Obenour <demiobenour%gmail.com@localhost>
* src/Makefile.am, src/misc.c, src/mkskel.sh: build: Delete comments
from skeleton file. Since the comments in flex.skl are, by hypothesis, not needed in
skel.c, we remove them. THis reduces the size of the resulting
executable somewhat.
2017-05-03 Explorer09 <explorer09%gmail.com@localhost>
* Makefile.am, configure.ac, lib/Makefile.am: build: do not generate
lib/Makefile.in. Files in lib/ are picked up and built using makefile directives in
src/Makefile.am. Remove the need to generate lib/Makefile.in and the
stub lib/Makefile.am.
2017-05-02 Will Estes <westes575%gmail.com@localhost>
* po/POTFILES.in: gettext: revert listing generated .c files
2017-04-10 Jeff Smith <whydoubt%gmail.com@localhost>
* src/filter.c: FLEX_EXIT() is the preferred way to exit flex
2017-04-11 Explorer09 <explorer09%gmail.com@localhost>
* src/misc.c: Fix myesc() 'sptr' conditionals * Don't call isascii() here. It's deprecated in POSIX and not needed for myesc's case. * The check of the character class and range here
should match
what's defined as {ESCSEQ} in scan.l, so for [[:xdigit:]] we use
isxdigit(); for [0-7] we check '0' <= c <= '7' (not isdigit(c)
because isdigit is locale-dependant in standard's sense) * Add missing length limit for "\x<hex>" (<hex> is at most 2 digits)
2017-04-11 Explorer09 <explorer09%gmail.com@localhost>
* src/flexdef.h, src/misc.c: Obsolete htoui() and otoui(); use
strtoul(). No sense to keep these two function when libc's strtoul() can do the
same job, but better.
2017-04-12 Todd C. Miller <Todd.Miller%courtesan.com@localhost>
* src/flex.skl: scanner: update yy_buf_size after yyrealloc()
2017-05-02 Simon Sobisch <simonsobisch%web.de@localhost>
* configure.ac: build: use lowest versions for gettext, automake.
2017-05-02 Simon Sobisch <simonsobisch%web.de@localhost>
* po/Makevars, po/Rules-getpo, po/update_linguas.sh: gettext: more
recent makevars; new script to update po files. Previously, "make dist" and similar commands would cause the po
files to be updated, which is incorrect. The more recent version now
used should not do this. Replaced Rules-getpo by extra script to manually update and rebuild
all po files.
2017-05-02 Simon Sobisch <simonsobisch%web.de@localhost>
* po/POTFILES.in: gettext: list generated files instead of flex,
bison sources in POTFILES.in. Listing the flex and bison sources -- as the gettext manual suggests
-- causes warnings. Listing the generated C files for the lexer and
parser removes the warnings. Since both files contain line
directives, any translator who needs to refer back to those files
should be able to find the context in which strings are needed.
2017-05-02 Simon Sobisch <simonsobisch%web.de@localhost>
* autogen.sh: build: only touch ChangeLog if it does not exist
2017-05-02 Simon Sobisch <simonsobisch%web.de@localhost>
* configure.ac, doc/Makefile.am: build: list earliest useable
versions for automake
2017-05-02 Simon Sobisch <simonsobisch%web.de@localhost>
* autogen.sh: build: check for how to call libtoolize. Previously, we would call libtoolize and if that failed, we would
call glibtoolize since some platforms have the libtoolize program
under that name. Instead, we check to see if the environment variable LIBTOOLIZE is
set and use that if so. Otherwise, we try to find a program
"libtoolize" on the path and failing that glibtoolize. We alert the
user if no suitable program can be found.
2017-01-06 Alastair Hughes <hobbitalastair%gmail.com@localhost>
* configure.ac, m4/ax_prog_cc_for_build.m4, src/Makefile.am: build:
support cross compiling. Check for cross compiling. If cross compiling, build stage1flex
using a custom link command. We also override LDADD since that adds
the replacement implementations that are cross compiled, and instead
always use the replacement library implementations. We don't use BUILD_OBJEXT and BUILD_EXEEXT since it seems that
automake does not support these. Fixes #78.
2017-02-17 Explorer09 <explorer09%gmail.com@localhost>
* configure.ac, src/flexdef.h: build: Include <strings.h>; add
strcasecmp() check to configure. strings.h (not string.h) is the standard-defined include header for
strcasecmp(). Include <strings.h> for portability (even though glibc
exposes strcasecmp() declaration also in <string.h> by default).
2017-02-17 Explorer09 <explorer09%gmail.com@localhost>
* configure.ac, src/flexdef.h: build: Let configure error if missing
required functions, headers.. `configure` will now error if a required header or function is not
found on the system. Also add comments on optional functions checks. Add sys/stats.h and sys/wait.h to list of required headers in
configure. This fixes issue #180.
2017-02-12 Explorer09 <explorer09%gmail.com@localhost>
* src/dfa.c, src/flexdef.h: scanner: compute powers of two faster. Replace the naive "for" loop in determining power of two with a
clever bitwise solution. This code is around the Internet already
and is in Public Domain.
2017-02-07 Explorer09 <explorer09%gmail.com@localhost>
* configure.ac, tests/Makefile.am, tests/pthread.l: test: skip
pthread test when needed files missing. "Unlisting" the pthread test when libpthread is not available is
never a good idea. Should let it compile into a stub program that
returns the "skip" status. configure.ac and tests/Makefile.am are edited so that pthread test
can be built anyway, but only works (not as the stub) when both
pthread.h and libpthread are detected on the system. Also fix a small typo in tests/pthread.l comments.
2017-02-16 Will Estes <westes575%gmail.com@localhost>
* src/Makefile.am: build: mv scan.c when building dist. Revert change to copy scan.c when building the distribution archive.
Move it instead. This satisfies automake's notions of what should be
clean and ensures that the distribution archive contains a
just-built copy of scan.c. Fixes #186
2017-02-06 Will Estes <westes575%gmail.com@localhost>
* src/Makefile.am: build: don't assume distdir/scan.c is writeable
2017-01-02 Explorer09 <explorer09%gmail.com@localhost>
* src/Makefile.am: build: Add dist-hook to force remake scan.c. This will ensure the flex scanner included in release tarball being
generated by exactly the flex version to be released. Here's one catch after this change: You may not run "make dist" or
"make distdir" if you configure the flex source to be
cross-compiled.
2017-01-02 Explorer09 <explorer09%gmail.com@localhost>
* src/Makefile.am: build: respect '--localedir' from configure. Makefile shouldn't overwrite the 'localedir' variable, because
that's what '--localedir' option in 'configure' is for.
2017-01-02 Explorer09 <explorer09%gmail.com@localhost>
* src/Makefile.am: build: Remove "-I$(top_srcdir)/intl" from
CPPFLAGS. Revert commit e02c3d27eeb6b53ec82532ab080c23ce26813fd4 ("include the intl/ subdirectory when searching for include files") Flex doesn't come with libintl source code, so inclusion
of
$(top_srcdir)/intl subdirectory during compiling is unnecessary. This flag seems to be left after "remove intl from dist" (commit
8f45da06adbd7dbcdfdbdd5c20ff4c47fc504f35) without someone cleaning
this up. Users who need to build with gettext functionality from libintl
would use the '--with-libintl-prefix' configure option.
2017-02-03 Explorer09 <explorer09%gmail.com@localhost>
* src/regex.c: scanner: fix regcomp's error reporting, double
malloc. Fix unneeded double malloc - let regerror(). Write its message after
our "regcomp for (regex) failed: " string. Also, errbuf cannot be free()'d because of flexfatal containing a
longjmp.
2017-01-03 Explorer09 <explorer09%gmail.com@localhost>
* tests/Makefile.am, tests/no_bison_stub.c: test: Skip bison tests
if bison is not available
2017-01-03 Explorer09 <explorer09%gmail.com@localhost>
* configure.ac: build: remove repeated bison detection from
configure. AC_PROG_YACC already detects the bison program. We can just use it,
and make notice if [ $YACC != 'bison -y' ] Remove unused AC_SUBST([BISON], ...). Add AM_CONDITIONAL([HAVE_BISON], ...) so that we can skip bison
tests in testsuite when bison is absent. We don't make any attempt to detect other yacc implementations since
flex is developed with bison. While it would be possible, the need
isn't there right now. It would be possible to add a --with-parser
option that defaulted to bison if such a need cropped up.
2017-01-01 Explorer09 <explorer09%gmail.com@localhost>
* src/Makefile.am: build: fix Makefile parse.h dependency clauses. The current clauses stating "main.c: parse.h" and "yylex.c: parse.h"
do not work as expected. Make did not try to build parse.h upon
building flex-main.o as it would think main.c exist already and
ignore the clause. Fix this by explicitly stating that the .o files
depend on parse.h instead. This dependency bug only happens if user builds flex from a
checked-out repository.
2017-01-03 Explorer09 <explorer09%gmail.com@localhost>
* tests/Makefile.am: test: Remake *_scanner.c if *_scanner.h is
missing. If a ${foo}_scanner.c exists but the respective ${foo}_scanner.h is
missing, then 'make' can halt. Fix this by deleting the
${foo}_scanner.c file and then remake it. This rule is the same as
the automake-generated rule for .c files that require LEX or YACC
(except automake will use ylwrap).
2016-12-31 Explorer09 <explorer09%gmail.com@localhost>
* tests/Makefile.am: test: remove BUILT_SOURCES; add missing
dependencies. Without BUILT_SOURCES in Makefile, no test sources in tests/ will be
built when using the default "make all" target. This is desireable
for people who are just building flex but who do not want to run,
and therefore, build any part of the test suite. Also fix missing sources dependencies: bison_nr_scanner.$(OBJEXT): bison_nr_parser.h bison_yylloc_scanner.$(OBJEXT):
bison_yylloc_parser.h bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h
2017-01-19 Explorer09 <explorer09%gmail.com@localhost>
* configure.ac, lib/reallocarray.c, src/flexint.h, src/misc.c:
build: detect overflow for [re]allocate_array. Use reallocarray() when we have it (i.e. in OpenBSD system). When we
don't, use equivalent overflow detection for our allocate_array and
reallocate_array functions. Remove lib/reallocarray.c from our LIBOBJS as we no longer need it. Provide a fallback SIZE_MAX macro definition in flexint.h (not
preprocessor friendly, but enough for our reallocate_array use
case).
2017-01-23 Will Estes <westes575%gmail.com@localhost>
* NEWS, configure.ac: doc: v2.6.4
2017-01-23 Thomas Klausner <wiz%NetBSD.org@localhost>
* src/Makefile.am: build: more BSD make and vpath build fixes. BSD make doesn't like $< with more than one source specified.
Additionally, make sure to specify srcdir when referring to source
files since vpath builds depend on this.
2017-01-22 Thomas Klausner <wiz%NetBSD.org@localhost>
* src/Makefile.am: build: Fix skel.c generation with BSD make
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/flex.skl: Add more defines in the non-reentrant part. Fix the reentrant part; don't "#define yyfoo yyfoo" because it
breaks code that does #ifndef yywrap ..
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/flexdef.h: scanner: Add yyparse prototype
2017-01-22 Thomas Klausner <wiz%NetBSD.org@localhost>
* src/flex.skl: scanner: move comment for consistency
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/misc.c: scanner: Use array instead of pointer
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/main.c: scanner: manage path to m4 better. Avoid alloca() for SSP; it is better anyway; since we don't need to
strdup the path.
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/gen.c: scanner: Avoid creating unused label
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/buf.c: Cast argument to avoid arithmetic on void *.
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/scan.l: scanner: Use strncpy
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/main.c: scanner: Use prefix when defining yywrap to avoid
redefinition. Fixes regression introduced in v2.6.3.
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/flexdef.h, src/misc.c: scanner: Include stdarg.h for va_list
2017-01-22 Christos Zoulas <christos%zoulas.com@localhost>
* src/flexdef.h, src/main.c, src/parse.y: scanner: Rename warn to
lwarn. This avoids a naming conflict in NetBSD's libc.
2017-01-01 Explorer09 <explorer09%gmail.com@localhost>
* tests/README: test: document automake convention for skipped exit
status.
2017-01-03 Explorer09 <explorer09%gmail.com@localhost>
* tests/Makefile.am: test: let testwrapper scripts be run by
${SHELL}. This allows user to use a different shell if /bin/sh has problems.
The use of $SHELL (variable) to run scripts is already an Automake
convention. All shell scripts in build-aux are run by $SHELL.
2017-01-02 Explorer09 <explorer09%gmail.com@localhost>
* tests/options.cn, tests/tableopts.sh,
tests/testwrapper-direct.sh, tests/testwrapper.sh: test: Remove test
scripts bashisms. They now all work under a POSIX compliant sh. Specifically, 'dash'
can now be used for running "make check" tests. Note that none of these scripts has ever been using a pipe, so `set
-o pipefail` is unnecessary and removed.
2017-01-02 Explorer09 <explorer09%gmail.com@localhost>
* tests/testwrapper.sh: test: exit on '-1' test non-zero status. If a '-1' test program returns a non-zero status, don't go further
and compare it's (numeric) output values. This allows a '-1' test to
indicate a "skip" status or an otherwise error. (Currently no such
'-1' test would skip like this, though.) Shell syntax note: `set -e` will not exit with the syntax like this
`test $(false) = $(false);`. The exit statuses of `false` in the
example will be ignored instead. But putting the output in a
variable, such as `VAR=$(false)`, DOES exit.
2017-01-02 Explorer09 <explorer09%gmail.com@localhost>
* Makefile.am, src/Makefile.am: build: Fix 'make indent' target This 'make indent' target has not been working since the directories
reorganization in flex 2.6.0. Now make it work again. Note that the current indent profile breaks many styles of existing
code. The indent target should not be used until the .indent.pro
options are reviewed for desireability.
2017-01-01 Explorer09 <explorer09%gmail.com@localhost>
* configure.ac: build: Simplify indent program detection
2017-01-12 Tobias Klauser <tklauser%distanz.ch@localhost>
* src/filter.c: filter: Don't emit #line if %option noline set One place emitting a #line directive to the generated header was
missed in commit 647a92b9f4 when resolving #55. Fix it to respect
gen_line_dirs as well.
2017-01-12 Will Estes <westes575%gmail.com@localhost>
* po/ca.po, po/da.po, po/de.po, po/eo.po, po/es.po, po/fi.po,
po/fr.po, po/ga.po, po/hr.po, po/ko.po, po/nl.po, po/pl.po,
po/pt_BR.po, po/ro.po, po/ru.po, po/sr.po, po/sv.po, po/tr.po,
po/vi.po, po/zh_CN.po, po/zh_TW.po: translation: refresh po files
from translation project
2017-01-10 Harald van Dijk <harald%gigawatt.nl@localhost>
* src/flex.skl: c++: Fix yyrestart(NULL) SEGV. Binding a reference to a dereferenced null pointer is invalid and
compilers optimise away the &file == 0 check. We need a real stream. yyin is available already, and yyrestart(NULL) is only supported
when yyin will not be used, so there is no harm in just passing in
that. Since we now always have a valid stream, we can skip the null
check too. Fixes #98.
2017-01-09 luistung <dongliang1986%gmail.com@localhost>
* src/scan.l: scanner: join symbol list. Removed a newline that caused a problem building the scanner in some
circumstances. Specifically: 'bad character' error when executing /bin/sh ../build-aux/ylwrap scan.l lex.yy.c scan.c -- flex
2017-01-11 Will Estes <westes575%gmail.com@localhost>
* src/flex.skl: scanner: remove void cast before fprintf
Status:
Vendor Tag: FLEX
Release Tags: flex-2-6-4
U src/external/bsd/flex/dist/autogen.sh
U src/external/bsd/flex/dist/COPYING
U src/external/bsd/flex/dist/AUTHORS
U src/external/bsd/flex/dist/README.md
U src/external/bsd/flex/dist/ONEWS
U src/external/bsd/flex/dist/ChangeLog
U src/external/bsd/flex/dist/configure.ac
U src/external/bsd/flex/dist/ABOUT-NLS
U src/external/bsd/flex/dist/NEWS
U src/external/bsd/flex/dist/THANKS
U src/external/bsd/flex/dist/configure
U src/external/bsd/flex/dist/aclocal.m4
U src/external/bsd/flex/dist/Makefile.in
U src/external/bsd/flex/dist/Makefile.am
U src/external/bsd/flex/dist/.indent.pro
U src/external/bsd/flex/dist/build-aux/config.guess
U src/external/bsd/flex/dist/build-aux/mdate-sh
U src/external/bsd/flex/dist/build-aux/config.rpath
U src/external/bsd/flex/dist/build-aux/ltmain.sh
U src/external/bsd/flex/dist/build-aux/depcomp
U src/external/bsd/flex/dist/build-aux/ylwrap
U src/external/bsd/flex/dist/build-aux/missing
U src/external/bsd/flex/dist/build-aux/compile
U src/external/bsd/flex/dist/build-aux/install-sh
U src/external/bsd/flex/dist/build-aux/test-driver
U src/external/bsd/flex/dist/build-aux/config.sub
U src/external/bsd/flex/dist/build-aux/texinfo.tex
U src/external/bsd/flex/dist/examples/debflex.awk
U src/external/bsd/flex/dist/examples/testxxLexer.l
U src/external/bsd/flex/dist/examples/Makefile.in
U src/external/bsd/flex/dist/examples/Makefile.am
U src/external/bsd/flex/dist/examples/README
U src/external/bsd/flex/dist/examples/fastwc/Makefile.in
U src/external/bsd/flex/dist/examples/fastwc/wc2.l
U src/external/bsd/flex/dist/examples/fastwc/wc3.l
U src/external/bsd/flex/dist/examples/fastwc/Makefile.am
U src/external/bsd/flex/dist/examples/fastwc/wc1.l
U src/external/bsd/flex/dist/examples/fastwc/wc5.l
U src/external/bsd/flex/dist/examples/fastwc/mywc.c
U src/external/bsd/flex/dist/examples/fastwc/wc4.l
U src/external/bsd/flex/dist/examples/fastwc/README
U src/external/bsd/flex/dist/examples/manual/datetest.dat
U src/external/bsd/flex/dist/examples/manual/cat.lex
U src/external/bsd/flex/dist/examples/manual/Makefile.examples
U src/external/bsd/flex/dist/examples/manual/yymoretest.dat
U src/external/bsd/flex/dist/examples/manual/myname.txt
U src/external/bsd/flex/dist/examples/manual/eof_test02.txt
U src/external/bsd/flex/dist/examples/manual/front.y
U src/external/bsd/flex/dist/examples/manual/myname.lex
U src/external/bsd/flex/dist/examples/manual/userinit.lex
U src/external/bsd/flex/dist/examples/manual/ChangeLog
U src/external/bsd/flex/dist/examples/manual/eof_rules.lex
U src/external/bsd/flex/dist/examples/manual/string2.lex
U src/external/bsd/flex/dist/examples/manual/yymore.lex
U src/external/bsd/flex/dist/examples/manual/expr.lex
U src/external/bsd/flex/dist/examples/manual/front.lex
U src/external/bsd/flex/dist/examples/manual/user_act.lex
U src/external/bsd/flex/dist/examples/manual/numbers.lex
U src/external/bsd/flex/dist/examples/manual/wc.lex
U src/external/bsd/flex/dist/examples/manual/pascal.lex
U src/external/bsd/flex/dist/examples/manual/dates.lex
U src/external/bsd/flex/dist/examples/manual/replace.lex
U src/external/bsd/flex/dist/examples/manual/pas_include.lex
U src/external/bsd/flex/dist/examples/manual/expr.y
U src/external/bsd/flex/dist/examples/manual/Makefile.in
U src/external/bsd/flex/dist/examples/manual/strtest.dat
U src/external/bsd/flex/dist/examples/manual/j2t.lex
U src/external/bsd/flex/dist/examples/manual/eof_test01.txt
U src/external/bsd/flex/dist/examples/manual/eof_test03.txt
U src/external/bsd/flex/dist/examples/manual/unput.lex
U src/external/bsd/flex/dist/examples/manual/myname2.lex
U src/external/bsd/flex/dist/examples/manual/Makefile.am
U src/external/bsd/flex/dist/examples/manual/string1.lex
U src/external/bsd/flex/dist/examples/manual/reject.lex
U src/external/bsd/flex/dist/examples/manual/README
U src/external/bsd/flex/dist/examples/manual/yymore2.lex
U src/external/bsd/flex/dist/tests/cxx_yywrap.ll
U src/external/bsd/flex/dist/tests/c_cxx_r.lll
U src/external/bsd/flex/dist/tests/mem_nr.txt
U src/external/bsd/flex/dist/tests/posix.l
U src/external/bsd/flex/dist/tests/include_by_buffer.direct.txt
U src/external/bsd/flex/dist/tests/cxx_basic.ll
U src/external/bsd/flex/dist/tests/include_by_buffer.direct.l
U src/external/bsd/flex/dist/tests/lineno_nr.l
U src/external/bsd/flex/dist/tests/include_by_reentrant.direct_2.txt
U src/external/bsd/flex/dist/tests/basic_nr.txt
U src/external/bsd/flex/dist/tests/c_cxx_nr.lll
U src/external/bsd/flex/dist/tests/array_r.txt
U src/external/bsd/flex/dist/tests/string_nr.l
U src/external/bsd/flex/dist/tests/lineno_r.l
U src/external/bsd/flex/dist/tests/options.cn
U src/external/bsd/flex/dist/tests/tableopts.am
U src/external/bsd/flex/dist/tests/reject.txt
U src/external/bsd/flex/dist/tests/mem_r.l
U src/external/bsd/flex/dist/tests/bison_yylval_scanner.l
U src/external/bsd/flex/dist/tests/quotes.txt
U src/external/bsd/flex/dist/tests/testwrapper-direct.sh
U src/external/bsd/flex/dist/tests/debug_nr.txt
U src/external/bsd/flex/dist/tests/cxx_multiple_scanners_main.cc
U src/external/bsd/flex/dist/tests/include_by_push.direct_3.txt
U src/external/bsd/flex/dist/tests/bison_yylval.txt
U src/external/bsd/flex/dist/tests/multiple_scanners_r_2.l
U src/external/bsd/flex/dist/tests/header_r_scanner.l
U src/external/bsd/flex/dist/tests/posixly_correct.l
U src/external/bsd/flex/dist/tests/array_nr.l
U src/external/bsd/flex/dist/tests/prefix_r.txt
U src/external/bsd/flex/dist/tests/tableopts.txt
U src/external/bsd/flex/dist/tests/quotes.l
U src/external/bsd/flex/dist/tests/bison_yylloc_main.c
U src/external/bsd/flex/dist/tests/basic_r.l
U src/external/bsd/flex/dist/tests/debug_r.txt
U src/external/bsd/flex/dist/tests/top.txt
U src/external/bsd/flex/dist/tests/bison_yylval_parser.y
U src/external/bsd/flex/dist/tests/debug_r.l
U src/external/bsd/flex/dist/tests/bison_yylloc_scanner.l
U src/external/bsd/flex/dist/tests/header_r.txt
U src/external/bsd/flex/dist/tests/bison_yylloc_parser.y
U src/external/bsd/flex/dist/tests/rescan_nr.direct.l
U src/external/bsd/flex/dist/tests/top_main.c
U src/external/bsd/flex/dist/tests/cxx_restart.txt
U src/external/bsd/flex/dist/tests/extended.l
U src/external/bsd/flex/dist/tests/prefix_r.l
U src/external/bsd/flex/dist/tests/reject.l4
U src/external/bsd/flex/dist/tests/ccl.l
U src/external/bsd/flex/dist/tests/tableopts.l4
U src/external/bsd/flex/dist/tests/include_by_reentrant.direct.txt
U src/external/bsd/flex/dist/tests/lineno_trailing.l
U src/external/bsd/flex/dist/tests/yyextra.txt
U src/external/bsd/flex/dist/tests/include_by_buffer.direct_3.txt
U src/external/bsd/flex/dist/tests/bison_nr_parser.y
U src/external/bsd/flex/dist/tests/prefix_nr.txt
U src/external/bsd/flex/dist/tests/string_r.l
U src/external/bsd/flex/dist/tests/mem_r.txt
U src/external/bsd/flex/dist/tests/quote_in_comment.l
U src/external/bsd/flex/dist/tests/cxx_yywrap.txt
U src/external/bsd/flex/dist/tests/include_by_reentrant.direct_3.txt
U src/external/bsd/flex/dist/tests/multiple_scanners_nr_main.c
U src/external/bsd/flex/dist/tests/pthread_5.txt
U src/external/bsd/flex/dist/tests/basic_r.txt
U src/external/bsd/flex/dist/tests/include_by_reentrant.direct.l
U src/external/bsd/flex/dist/tests/lineno_nr.one.txt
U src/external/bsd/flex/dist/tests/tableopts.sh
U src/external/bsd/flex/dist/tests/quote_in_comment.txt
U src/external/bsd/flex/dist/tests/alloc_extra.txt
U src/external/bsd/flex/dist/tests/pthread_4.txt
U src/external/bsd/flex/dist/tests/array_nr.txt
U src/external/bsd/flex/dist/tests/bison_nr.txt
U src/external/bsd/flex/dist/tests/top.l
U src/external/bsd/flex/dist/tests/lineno_trailing.one.txt
U src/external/bsd/flex/dist/tests/header_nr_scanner.l
U src/external/bsd/flex/dist/tests/bison_nr_main.c
U src/external/bsd/flex/dist/tests/header_nr.txt
U src/external/bsd/flex/dist/tests/prefix_nr.l
U src/external/bsd/flex/dist/tests/array_r.l
U src/external/bsd/flex/dist/tests/pthread_3.txt
U src/external/bsd/flex/dist/tests/cxx_basic.txt
U src/external/bsd/flex/dist/tests/mem_nr.l
U src/external/bsd/flex/dist/tests/include_by_push.direct.txt
U src/external/bsd/flex/dist/tests/lineno_r.one.txt
U src/external/bsd/flex/dist/tests/debug_nr.l
U src/external/bsd/flex/dist/tests/ccl.txt
U src/external/bsd/flex/dist/tests/include_by_push.direct_2.txt
U src/external/bsd/flex/dist/tests/bison_nr_scanner.l
U src/external/bsd/flex/dist/tests/Makefile.in
U src/external/bsd/flex/dist/tests/multiple_scanners_nr_1.l
U src/external/bsd/flex/dist/tests/cxx_multiple_scanners_1.ll
U src/external/bsd/flex/dist/tests/yyextra.l
U src/external/bsd/flex/dist/tests/multiple_scanners_r_1.l
U src/external/bsd/flex/dist/tests/rescan_r.direct.l
U src/external/bsd/flex/dist/tests/include_by_push.direct.l
U src/external/bsd/flex/dist/tests/cxx_multiple_scanners.txt
U src/external/bsd/flex/dist/tests/bison_yylval_main.c
U src/external/bsd/flex/dist/tests/pthread_2.txt
U src/external/bsd/flex/dist/tests/c_cxx_nr.txt
U src/external/bsd/flex/dist/tests/c_cxx_r.txt
U src/external/bsd/flex/dist/tests/multiple_scanners_r_main.c
U src/external/bsd/flex/dist/tests/testwrapper.sh
U src/external/bsd/flex/dist/tests/basic_nr.l
U src/external/bsd/flex/dist/tests/cxx_multiple_scanners_2.ll
U src/external/bsd/flex/dist/tests/header_nr_main.c
U src/external/bsd/flex/dist/tests/bison_yylloc.txt
U src/external/bsd/flex/dist/tests/alloc_extra.l
U src/external/bsd/flex/dist/tests/Makefile.am
U src/external/bsd/flex/dist/tests/pthread.l
N src/external/bsd/flex/dist/tests/no_bison_stub.c
U src/external/bsd/flex/dist/tests/cxx_restart.ll
U src/external/bsd/flex/dist/tests/include_by_buffer.direct_2.txt
U src/external/bsd/flex/dist/tests/multiple_scanners_nr_2.l
U src/external/bsd/flex/dist/tests/extended.txt
U src/external/bsd/flex/dist/tests/header_r_main.c
U src/external/bsd/flex/dist/tests/rescan_nr.direct.txt
U src/external/bsd/flex/dist/tests/rescan_r.direct.txt
U src/external/bsd/flex/dist/tests/pthread_1.txt
U src/external/bsd/flex/dist/tests/README
U src/external/bsd/flex/dist/src/tables_shared.c
U src/external/bsd/flex/dist/src/options.c
C src/external/bsd/flex/dist/src/gen.c
U src/external/bsd/flex/dist/src/options.h
C src/external/bsd/flex/dist/src/parse.c
U src/external/bsd/flex/dist/src/scanflags.c
U src/external/bsd/flex/dist/src/tables.c
U src/external/bsd/flex/dist/src/tables.h
C src/external/bsd/flex/dist/src/skel.c
C src/external/bsd/flex/dist/src/scan.l
U src/external/bsd/flex/dist/src/ecs.c
C src/external/bsd/flex/dist/src/flexdef.h
C src/external/bsd/flex/dist/src/filter.c
C src/external/bsd/flex/dist/src/scan.c
U src/external/bsd/flex/dist/src/mkskel.sh
U src/external/bsd/flex/dist/src/nfa.c
U src/external/bsd/flex/dist/src/config.h.in
U src/external/bsd/flex/dist/src/scanopt.c
C src/external/bsd/flex/dist/src/parse.y
U src/external/bsd/flex/dist/src/FlexLexer.h
C src/external/bsd/flex/dist/src/buf.c
U src/external/bsd/flex/dist/src/sym.c
U src/external/bsd/flex/dist/src/tblcmp.c
C src/external/bsd/flex/dist/src/regex.c
C src/external/bsd/flex/dist/src/misc.c
U src/external/bsd/flex/dist/src/libyywrap.c
U src/external/bsd/flex/dist/src/scanopt.h
U src/external/bsd/flex/dist/src/Makefile.in
C src/external/bsd/flex/dist/src/flexint.h
U src/external/bsd/flex/dist/src/ccl.c
U src/external/bsd/flex/dist/src/libmain.c
U src/external/bsd/flex/dist/src/yylex.c
C src/external/bsd/flex/dist/src/dfa.c
U src/external/bsd/flex/dist/src/parse.h
U src/external/bsd/flex/dist/src/Makefile.am
C src/external/bsd/flex/dist/src/flex.skl
U src/external/bsd/flex/dist/src/gettext.h
C src/external/bsd/flex/dist/src/main.c
U src/external/bsd/flex/dist/src/version.h
U src/external/bsd/flex/dist/src/tables_shared.h
U src/external/bsd/flex/dist/lib/realloc.c
U src/external/bsd/flex/dist/lib/malloc.c
C src/external/bsd/flex/dist/tools/Makefile.in
U src/external/bsd/flex/dist/tools/git2cl
U src/external/bsd/flex/dist/tools/Makefile.am
U src/external/bsd/flex/dist/doc/version.texi
U src/external/bsd/flex/dist/doc/flex.info
U src/external/bsd/flex/dist/doc/flex.texi
U src/external/bsd/flex/dist/doc/stamp-vti
U src/external/bsd/flex/dist/doc/Makefile.in
U src/external/bsd/flex/dist/doc/flex.info-2
U src/external/bsd/flex/dist/doc/Makefile.am
U src/external/bsd/flex/dist/doc/flex.1
U src/external/bsd/flex/dist/doc/flex.info-1
U src/external/bsd/flex/dist/po/en%boldquot.po@localhost
U src/external/bsd/flex/dist/po/pl.po
C src/external/bsd/flex/dist/po/nl.gmo
U src/external/bsd/flex/dist/po/ru.po
U src/external/bsd/flex/dist/po/quot.sed
C src/external/bsd/flex/dist/po/de.gmo
U src/external/bsd/flex/dist/po/en@boldquot.header
C src/external/bsd/flex/dist/po/sv.gmo
U src/external/bsd/flex/dist/po/eo.po
U src/external/bsd/flex/dist/po/fi.gmo
U src/external/bsd/flex/dist/po/ko.po
U src/external/bsd/flex/dist/po/zh_TW.gmo
U src/external/bsd/flex/dist/po/LINGUAS
U src/external/bsd/flex/dist/po/Makevars
U src/external/bsd/flex/dist/po/ro.po
U src/external/bsd/flex/dist/po/vi.po
U src/external/bsd/flex/dist/po/nl.po
C src/external/bsd/flex/dist/po/ga.gmo
U src/external/bsd/flex/dist/po/de.po
C src/external/bsd/flex/dist/po/tr.gmo
C src/external/bsd/flex/dist/po/da.gmo
C src/external/bsd/flex/dist/po/ro.gmo
U src/external/bsd/flex/dist/po/tr.po
U src/external/bsd/flex/dist/po/en@quot.header
U src/external/bsd/flex/dist/po/en%quot.gmo@localhost
C src/external/bsd/flex/dist/po/ca.gmo
U src/external/bsd/flex/dist/po/sv.po
U src/external/bsd/flex/dist/po/eo.gmo
U src/external/bsd/flex/dist/po/POTFILES.in
C src/external/bsd/flex/dist/po/ru.gmo
U src/external/bsd/flex/dist/po/insert-header.sin
U src/external/bsd/flex/dist/po/en%quot.po@localhost
U src/external/bsd/flex/dist/po/zh_TW.po
C src/external/bsd/flex/dist/po/pt_BR.gmo
U src/external/bsd/flex/dist/po/es.po
C src/external/bsd/flex/dist/po/zh_CN.gmo
U src/external/bsd/flex/dist/po/en%boldquot.gmo@localhost
C src/external/bsd/flex/dist/po/ko.gmo
U src/external/bsd/flex/dist/po/sr.po
U src/external/bsd/flex/dist/po/boldquot.sed
U src/external/bsd/flex/dist/po/hr.po
U src/external/bsd/flex/dist/po/stamp-po
U src/external/bsd/flex/dist/po/hr.gmo
U src/external/bsd/flex/dist/po/fi.po
U src/external/bsd/flex/dist/po/remove-potcdate.sin
U src/external/bsd/flex/dist/po/Rules-quot
U src/external/bsd/flex/dist/po/Makefile.in.in
C src/external/bsd/flex/dist/po/es.gmo
U src/external/bsd/flex/dist/po/flex.pot
U src/external/bsd/flex/dist/po/fr.po
U src/external/bsd/flex/dist/po/pt_BR.po
U src/external/bsd/flex/dist/po/da.po
C src/external/bsd/flex/dist/po/pl.gmo
U src/external/bsd/flex/dist/po/ga.po
U src/external/bsd/flex/dist/po/ca.po
C src/external/bsd/flex/dist/po/vi.gmo
C src/external/bsd/flex/dist/po/fr.gmo
U src/external/bsd/flex/dist/po/zh_CN.po
U src/external/bsd/flex/dist/po/sr.gmo
U src/external/bsd/flex/dist/m4/intlmacosx.m4
U src/external/bsd/flex/dist/m4/libtool.m4
U src/external/bsd/flex/dist/m4/progtest.m4
U src/external/bsd/flex/dist/m4/ltsugar.m4
U src/external/bsd/flex/dist/m4/iconv.m4
U src/external/bsd/flex/dist/m4/lib-link.m4
U src/external/bsd/flex/dist/m4/ltoptions.m4
U src/external/bsd/flex/dist/m4/nls.m4
U src/external/bsd/flex/dist/m4/ltversion.m4
U src/external/bsd/flex/dist/m4/lib-prefix.m4
U src/external/bsd/flex/dist/m4/gettext.m4
U src/external/bsd/flex/dist/m4/lib-ld.m4
U src/external/bsd/flex/dist/m4/po.m4
N src/external/bsd/flex/dist/m4/ax_prog_cc_for_build.m4
U src/external/bsd/flex/dist/m4/lt~obsolete.m4
32 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jFLEX:yesterday -jFLEX src/external/bsd/flex/dist
Home |
Main Index |
Thread Index |
Old Index