diff options
154 files changed, 12005 insertions, 10940 deletions
@@ -171,232 +171,422 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of August -2002. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2003. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files be bg ca cs da de el en eo es et fi fr - +----------------------------------------+ - a2ps | [] [] [] [] | - ap-utils | | - bash | [] [] [] [] | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] [] | - clisp | | - clisp | [] [] [] [] | - clisplow | | - cpio | [] [] [] [] | - darkstat | () | - diffutils | [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] [] | - fetchmail | [] () [] [] [] () | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - gas | [] [] | - gawk | [] [] [] | - gcal | [] [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | [] [] | - gpsdrive | () () () () () | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gthumb | () () () | - hello | [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | () [] [] [] | - jwhois | [] [] | - kbd | [] [] [] | - ld | [] [] | - libc | [] [] [] [] [] [] [] [] | - libiconv | [] [] [] [] | - lifelines | () () | - lilypond | [] [] | - lingoteach | [] [] | - lingoteach_lessons| () () | - lynx | [] [] [] [] [] | - m4 | [] [] [] [] [] | - make | [] [] [] [] | - man-db | [] () () [] () () | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] () [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] | - sharutils | [] [] [] [] [] [] [] | - sketch | () [] () | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] [] | - textutils | [] [] [] [] [] | - util-linux | [] [] [] [] [] [] | - vorbis-tools | [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------+ - be bg ca cs da de el en eo es et fi fr - 0 2 19 10 30 44 9 1 12 44 17 6 53 + Ready PO files am az be bg ca cs da de el en en_GB eo es + +-------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + anubis | | + ap-utils | | + bash | [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] | + clisp | | + clisp | [] [] [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] [] | + gas | [] | + gawk | [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] [] | + gnucash | () [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-calendar | [] | + gpe-conf | [] | + gpe-contacts | [] | + gpe-edit | | + gpe-login | [] | + gpe-ownerinfo | [] | + gpe-sketchbook | [] | + gpe-timesheet | | + gpe-today | [] | + gpe-todo | [] | + gphoto2 | [] [] [] [] | + gprof | [] [] | + gpsdrive | () () () | + grep | [] [] [] [] [] | + gretl | [] | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + jpilot | [] [] [] [] | + jwhois | [] | + kbd | [] [] [] [] [] | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] [] | + screem | | + sed | [] [] [] [] [] | + sh-utils | [] [] [] | + sharutils | [] [] [] [] [] [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] | + tin | () () | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xpad | | + +-------------------------------------------+ + am az be bg ca cs da de el en en_GB eo es + 0 1 4 2 31 17 54 60 14 1 4 12 56 - gl he hr hu id it ja ko lv nb nl nn - +-------------------------------------+ - a2ps | () () [] | - ap-utils | | - bash | [] | - bfd | [] | - binutils | [] | - bison | [] [] [] [] | - clisp | | - clisp | [] | - clisplow | | - cpio | [] [] [] [] | - darkstat | | - diffutils | [] [] [] [] [] | - enscript | [] [] | - error | [] | - fetchmail | [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] | - gas | | - gawk | [] | - gcal | | - gcc | [] | - gettext | [] [] | - gnupg | [] [] [] [] | - gprof | [] | - gpsdrive | [] () () | - grep | [] [] [] [] [] [] [] | - gretl | | - gthumb | () () | - hello | [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - jpilot | () () | - jwhois | [] [] | - kbd | | - ld | | - libc | [] [] [] [] | - libiconv | [] [] [] | - lifelines | | - lilypond | [] | - lingoteach | [] | - lingoteach_lessons| | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - make | [] [] [] [] [] [] | - man-db | () () | - mysecretdiary | [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] | - ptx | [] [] [] [] [] | - python | | - recode | [] [] [] | - sed | [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - sharutils | [] [] [] | - sketch | () | - soundtracker | [] [] | - sp | | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] [] | - util-linux | () [] | - vorbis-tools | [] | - wastesedge | | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] | - +-------------------------------------+ - gl he hr hu id it ja ko lv nb nl nn - 23 9 12 19 16 13 26 9 1 7 19 3 + et fa fi fr ga gl he hr hu id it ja ko + +----------------------------------------+ + a2ps | [] [] [] () () | + aegis | | + anubis | [] | + ap-utils | [] | + bash | [] [] | + batchelor | [] | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] | + clisp | | + clisp | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] [] | + flex | [] [] | + gas | [] | + gawk | [] [] | + gcal | [] | + gcc | [] | + gettext | [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] | + gnucash | [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-calendar | [] | + gpe-conf | | + gpe-contacts | [] | + gpe-edit | [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () [] () () | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] [] [] [] | + jpilot | [] () | + jwhois | [] [] [] [] | + kbd | [] | + ld | [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] [] | + man-db | [] () () | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] [] | + screem | | + sed | [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | + sketch | [] | + soundtracker | [] [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] | + tin | [] () | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + xchat | [] [] [] | + xpad | | + +----------------------------------------+ + et fa fi fr ga gl he hr hu id it ja ko + 20 1 15 73 14 24 8 10 30 31 19 31 9 - no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW - +----------------------------------------------+ - a2ps | () () () [] [] [] [] [] | 10 - ap-utils | () | 0 - bash | [] | 6 - bfd | [] [] | 5 - binutils | [] [] | 5 - bison | [] [] [] [] | 12 - clisp | | 0 - clisp | | 5 - clisplow | | 0 - cpio | [] [] [] [] | 12 - darkstat | [] [] () () | 2 - diffutils | [] [] [] [] [] [] | 17 - enscript | [] [] [] [] | 8 - error | [] [] [] | 7 - fetchmail | () () [] | 6 - fileutils | [] [] [] [] [] [] | 14 - findutils | [] [] [] [] [] [] [] | 21 - flex | [] [] [] | 9 - gas | [] | 3 - gawk | [] [] | 6 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] [] | 13 - gnupg | [] [] [] | 14 - gprof | [] [] | 5 - gpsdrive | [] [] | 3 - grep | [] [] [] [] [] | 20 - gretl | | 1 - gthumb | () () [] | 1 - hello | [] [] [] [] [] [] [] | 28 - id-utils | [] [] [] [] | 9 - indent | [] [] [] [] [] | 14 - jpilot | () () [] [] | 5 - jwhois | [] () () [] [] | 7 - kbd | [] [] | 5 - ld | [] [] | 4 - libc | [] [] [] [] [] [] | 18 - libiconv | [] [] [] [] [] | 12 - lifelines | [] | 1 - lilypond | [] | 4 - lingoteach | [] [] | 5 - lingoteach_lessons| () | 0 - lynx | [] [] [] [] | 13 - m4 | [] [] [] [] | 13 - make | [] [] [] [] [] | 15 - man-db | | 3 - mysecretdiary | [] [] [] | 7 - nano | [] [] [] [] | 13 - nano_1_0 | [] [] [] [] | 14 - opcodes | [] [] [] | 8 - parted | [] [] [] [] | 12 - ptx | [] [] [] [] [] [] [] | 19 - python | | 0 - recode | [] [] [] [] [] [] | 15 - sed | [] [] [] [] [] [] | 24 - sh-utils | [] [] | 9 - sharutils | [] [] [] [] | 14 - sketch | [] () [] | 4 - soundtracker | [] | 6 - sp | | 1 - tar | [] [] [] [] [] [] [] | 19 - texinfo | [] [] | 10 - textutils | [] [] [] [] [] | 14 - util-linux | [] [] [] | 10 - vorbis-tools | [] | 3 - wastesedge | | 0 - wdiff | [] [] [] [] [] | 14 - wget | [] [] [] [] [] [] [] [] | 24 - +----------------------------------------------+ - 37 teams no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW - 68 domains 4 15 2 28 28 12 10 49 43 4 1 9 609 + lg lt lv ms nb nl nn no pl pt pt_BR ro + +----------------------------------------+ + a2ps | [] [] () () () [] [] | + aegis | () | + anubis | [] [] | + ap-utils | () | + bash | [] | + batchelor | | + bfd | | + binutils | | + bison | [] [] [] [] | + bluez-pin | [] | + clisp | | + clisp | [] | + coreutils | [] | + cpio | [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] | + fetchmail | () () | + fileutils | [] | + findutils | [] [] [] [] | + flex | [] | + gas | | + gawk | [] | + gcal | | + gcc | | + gettext | [] | + gettext-runtime | [] | + gettext-tools | | + gimp-print | [] | + gliv | [] | + glunarclock | [] | + gnucash | | + gnucash-glossary | [] [] | + gnupg | | + gpe-calendar | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] | + gpe-edit | [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | () () () | + grep | [] [] [] [] | + gretl | | + hello | [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] | + jpilot | () () | + jwhois | [] [] [] | + kbd | | + ld | | + libc | [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] | + lifelines | | + lilypond | [] | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] | + man-db | [] | + mysecretdiary | [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] | + screem | | + sed | [] [] | + sh-utils | [] | + sharutils | [] | + sketch | [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] | + textutils | [] | + tin | | + util-linux | [] [] | + vorbis-tools | [] [] | + wastesedge | | + wdiff | [] [] [] [] | + wget | [] [] [] | + xchat | [] [] | + xpad | [] | + +----------------------------------------+ + lg lt lv ms nb nl nn no pl pt pt_BR ro + 0 0 2 11 7 26 3 4 18 15 34 34 + + ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + +-------------------------------------------+ + a2ps | [] [] [] [] [] | 16 + aegis | () | 0 + anubis | [] [] | 5 + ap-utils | () | 1 + bash | [] | 7 + batchelor | | 1 + bfd | [] [] [] | 7 + binutils | [] [] [] | 7 + bison | [] [] | 13 + bluez-pin | | 7 + clisp | | 0 + clisp | | 5 + coreutils | [] [] [] [] [] | 14 + cpio | [] [] [] | 13 + darkstat | [] () () | 9 + diffutils | [] [] [] [] | 21 + e2fsprogs | [] | 3 + enscript | [] [] [] | 11 + error | [] [] [] | 14 + fetchmail | [] | 7 + fileutils | [] [] [] [] [] [] | 15 + findutils | [] [] [] [] [] [] | 27 + flex | [] [] [] | 10 + gas | [] | 3 + gawk | [] [] | 9 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] [] | 15 + gettext-runtime | [] [] [] [] [] [] | 16 + gettext-tools | [] [] | 5 + gimp-print | [] [] | 10 + gliv | | 1 + glunarclock | [] [] [] | 11 + gnucash | [] [] | 4 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 16 + gpe-calendar | [] | 5 + gpe-conf | | 3 + gpe-contacts | [] | 4 + gpe-edit | [] | 5 + gpe-login | [] | 5 + gpe-ownerinfo | [] | 7 + gpe-sketchbook | [] | 5 + gpe-timesheet | [] | 6 + gpe-today | [] | 6 + gpe-todo | [] | 6 + gphoto2 | [] [] | 9 + gprof | [] [] | 7 + gpsdrive | [] [] | 3 + grep | [] [] [] [] | 24 + gretl | | 2 + hello | [] [] [] [] [] | 33 + id-utils | [] [] [] | 11 + indent | [] [] [] [] | 19 + jpilot | [] [] [] [] [] | 10 + jwhois | () () [] [] | 10 + kbd | [] [] | 8 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | | 6 + libiconv | [] [] [] [] [] [] | 21 + lifelines | [] | 2 + lilypond | [] | 4 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] [] | 14 + m4 | [] [] [] | 15 + mailutils | | 2 + make | [] [] [] [] | 15 + man-db | [] | 6 + mysecretdiary | [] [] | 8 + nano | [] [] [] | 15 + nano_1_0 | [] [] [] | 15 + opcodes | [] [] | 9 + parted | [] [] | 13 + ptx | [] [] [] | 22 + python | | 0 + radius | | 0 + recode | [] [] [] [] | 19 + screem | [] | 1 + sed | [] [] [] [] [] | 20 + sh-utils | [] [] [] | 13 + sharutils | [] [] [] [] | 16 + sketch | [] | 5 + soundtracker | [] | 7 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] [] | 13 + textutils | [] [] [] [] [] | 15 + tin | | 1 + util-linux | [] [] | 14 + vorbis-tools | [] | 7 + wastesedge | | 0 + wdiff | [] [] [] [] | 17 + wget | [] [] [] [] [] [] [] | 25 + xchat | [] [] [] | 11 + xpad | | 1 + +-------------------------------------------+ + 50 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + 97 domains 32 19 16 0 56 0 48 10 1 1 12 23 913 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -409,7 +599,7 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If August 2002 seems to be old, you may fetch a more recent copy of + If May 2003 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. @@ -426,7 +616,7 @@ library, whereas only free software can use `libintl' as a static library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact @@ -1,6616 +0,0 @@ -2003-04-01 11:17 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.31 - -2003-04-01 11:14 Will Estes <wlestes@uncg.edu> - - * NEWS: remove --enable-maintainer-mode configure option - -2003-04-01 11:08 Will Estes <wlestes@uncg.edu> - - * configure.in: remove AM_MAINTAINER_MODE - -2003-03-31 20:51 John Millaway <millaway@acm.org> - - * flex.skl, flexdef.h, main.c, misc.c, scan.l: Renamed some - internal variables. - -2003-03-31 08:21 Will Estes <wlestes@uncg.edu> - - * NEWS: yylineno is now per-buffer in reentrant scanners - -2003-03-30 21:04 John Millaway <millaway@acm.org> - - * TODO: Added TODO item. - -2003-03-30 14:58 John Millaway <millaway@acm.org> - - * flex.skl, gen.c: yylineno is per-buffer in the reentrant scanner. - support for yycolumn exists, but is not yet developed. - -2003-03-28 16:08 John Millaway <millaway@acm.org> - - * flex.skl: Minor documentation. - -2003-03-28 09:17 Will Estes <wlestes@uncg.edu> - - * NEWS: added %top directive - -2003-03-27 13:02 John Millaway <millaway@acm.org> - - * buf.c, configure.in, flexdef.h, main.c, scan.l, doc/flex.texi, - tests/Makefile.am, tests/descriptions, tests/test-top/.cvsignore, - tests/test-top/Makefile.am, tests/test-top/main.c, - tests/test-top/scanner.l, tests/test-top/test.input: Added %top - block syntax. Added test for %top block. Documented %top block. - -2003-03-26 23:02 John Millaway <millaway@acm.org> - - * TODO, doc/flex.texi: Documented the m4 dependency. - -2003-03-26 16:43 Will Estes <wlestes@uncg.edu> - - * configure.in, flexdef.h: check for sys/wait.h since we use - wait(2) - -2003-03-26 16:35 Will Estes <wlestes@uncg.edu> - - * flexdef.h: reorder include directives so as to catch system - integer types before flex defined values for same - -2003-03-26 14:19 Will Estes <wlestes@uncg.edu> - - * TODO: assign tasks due before major release can happen; remove - --enable-maintainer-mode entry - -2003-03-26 14:15 Will Estes <wlestes@uncg.edu> - - * Makefile.am: only rebuild the ChangeLog if we're inside a cvs - working directory - -2003-03-26 14:05 Will Estes <wlestes@uncg.edu> - - * configure.in, tools/.cvsignore, tools/Makefile.am: add tools/ - subdirectory to distribution - -2003-03-26 14:05 Will Estes <wlestes@uncg.edu> - - * Makefile.am: remove maintainer_mode conditional; add filter.c and - regex.c to indentfiles; reformat and sort indentfiles so it's - easier to add files in the future - -2003-03-26 14:04 Will Estes <wlestes@uncg.edu> - - * doc/Makefile.am: clean up flex.texi processing leftovers with - cleanfiles - -2003-03-26 13:29 Will Estes <wlestes@uncg.edu> - - * tests/test-linedir-r/Makefile.am: an awk script wasn't included - in the distribution - -2003-03-26 11:52 John Millaway <millaway@acm.org> - - * TODO, configure.in, tests/Makefile.am, tests/descriptions, - tests/test-include-by-push/.cvsignore, - tests/test-include-by-push/Makefile.am, - tests/test-include-by-push/scanner.l, - tests/test-include-by-push/test-1.input, - tests/test-include-by-push/test-2.input, - tests/test-include-by-push/test-3.input: Added test for - yypush_buffer_state and yypop_buffer_state. - -2003-03-26 11:19 John Millaway <millaway@acm.org> - - * doc/texinfo.tex: updated texinfo.tex - -2003-03-25 22:27 John Millaway <millaway@acm.org> - - * TODO: Removed items from TODO list. - -2003-03-25 22:26 John Millaway <millaway@acm.org> - - * configure.in, tests/Makefile.am, tests/descriptions, - tests/test-linedir-r/.cvsignore, tests/test-linedir-r/Makefile.am, - tests/test-linedir-r/check-lines.awk, tests/test-linedir-r/main.c, - tests/test-linedir-r/scanner.l, tests/test-linedir-r/test.input: - Added test for #line directives. - -2003-03-25 20:37 John Millaway <millaway@acm.org> - - * configure.in, tests/Makefile.am, tests/test-noansi-nr/.cvsignore, - tests/test-noansi-nr/Makefile.am, tests/test-noansi-nr/scanner.l, - tests/test-noansi-nr/test.input, tests/test-noansi-r/.cvsignore, - tests/test-noansi-r/Makefile.am, tests/test-noansi-r/scanner.l, - tests/test-noansi-r/test.input: Added test for noansi (traditional) - options. Reordered the tests so the basic ones are first. - -2003-03-25 15:51 Will Estes <wlestes@uncg.edu> - - * TODO, doc/Makefile.am: remove maintainer-mode conditional around - rebuilding of manpage - -2003-03-25 15:45 Will Estes <wlestes@uncg.edu> - - * README: mention doc/ for user documentation - -2003-03-25 15:45 Will Estes <wlestes@uncg.edu> - - * TODO: rework distribution items - -2003-03-25 15:45 Will Estes <wlestes@uncg.edu> - - * NEWS: mention m4 processing - -2003-03-25 15:44 Will Estes <wlestes@uncg.edu> - - * tests/README: update instructions for running test suite - -2003-03-25 11:39 Will Estes <wlestes@uncg.edu> - - * FlexLexer.h, Makefile.am, TODO, buf.c, configure.in, filter.c, - flex.skl, flexdef.h, gen.c, main.c, misc.c, options.c, options.h, - regex.c, scan.l, sym.c, doc/flex.texi, - tests/test-bison-nr/scanner.l, tests/test-bison-yylloc/scanner.l, - tests/test-reject/scanner.l, tests/test-table-opts/scanner.l: merge - millaway's m4 branch work - -2003-03-20 15:10 Will Estes <wlestes@uncg.edu> - - * TODO: we want to move the contents of to.do/Wishlist to top level - TODO - -2003-03-20 13:09 John Millaway <millaway@acm.org> - - * to.do/Wish-List: Assessment of every item in Wish-List. - -2003-03-17 04:57 John Millaway <millaway@acm.org> - - * regex.c: file regex.c was initially added on branch m4. - -2003-03-10 15:00 John Millaway <millaway@acm.org> - - * filter.c: file filter.c was initially added on branch m4. - -2003-03-05 14:52 Will Estes <wlestes@uncg.edu> - - * texinfo.tex, doc/.cvsignore, doc/texinfo.tex: move texinfo.tex to - doc/ - -2003-03-05 14:37 Will Estes <wlestes@uncg.edu> - - * TODO: update TODO - -2003-03-05 14:37 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.29 - -2003-03-04 18:43 John Millaway <millaway@acm.org> - - * FlexLexer.h, flex.skl: Added growable buffer stack to C++ scanner - as well. yyensure_buffer_stack is now static. - -2003-03-01 20:45 John Millaway <millaway@acm.org> - - * flex.skl, misc.c: Removed awkward %push %pop syntax from - skeleton. - -2003-03-01 19:34 John Millaway <millaway@acm.org> - - * flex.skl: Renamed YY_CURRENT_BUFFER_FAST to - YY_CURRENT_BUFFER_LVALUE to better reflect its purpose. - -2003-02-28 15:19 John Millaway <millaway@acm.org> - - * NEWS: made entry on input buffer stacks. - -2003-02-28 09:23 Will Estes <wlestes@uncg.edu> - - * Makefile.am, doc/Makefile.am: build on . in top level first; this - will simplify calling help2man - -2003-02-28 06:27 John Millaway <millaway@acm.org> - - * TODO, flex.skl, gen.c, main.c, doc/flex.texi: Removed - yy_current_buffer from the planet. Input buffer states are now in - an internal unbounded stack. Added new internal function, - yyensure_buffer_stack. Added new API function, - yypush_buffer_state. Added new API function, yypop_buffer_state. - Documented the new API calls in the manual. Macro YY_BUFFER_STATE - now refers to top of stack. This revision breaks the C++ scanner - (again.) - -2003-02-28 04:02 John Millaway <millaway@acm.org> - - * main.c: Removed some symbols from the undef list. They are needed - for multiple headers to coexist. - -2003-02-27 10:37 Will Estes <wlestes@uncg.edu> - - * .cvsignore, Makefile.am, NEWS, configure.in, flex.texi, - doc/.cvsignore, doc/Makefile.am, doc/flex.texi: move flex.texi and - flex.1 to new doc/ subdirectory - -2003-02-27 09:44 Will Estes <wlestes@uncg.edu> - - * NEWS: namespace cleanups - -2003-02-26 18:23 John Millaway <millaway@acm.org> - - * main.c: Added a few macros to the undef list. - -2003-02-26 18:17 John Millaway <millaway@acm.org> - - * main.c: Put the undef macros in an array. - -2003-02-12 16:54 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.28 - -2003-02-10 09:11 Will Estes <wlestes@uncg.edu> - - * README, TODO, configure.in, flex.texi: update documentation to - reflect the sourceforge move - -2003-02-06 16:00 Will Estes <wlestes@uncg.edu> - - * TODO: update according to current thinking - -2003-02-06 15:12 Will Estes <wlestes@uncg.edu> - - * TODO: mcvs reviewed - -2003-02-06 09:06 Will Estes <wlestes@uncg.edu> - - * TODO: sourceforge migration tasks - -2003-02-04 09:10 Will Estes <wlestes@uncg.edu> - - * NEWS: Flex now warns if always-interactive is specified with fast - or full; Fixed trailing slash bug in YY_INPUT macro def - -2003-01-31 17:30 John Millaway <millaway@acm.org> - - * scan.l: Flex now warns if always-interactive is specified with - fast or full. - -2003-01-31 12:37 Will Estes <wlestes@uncg.edu> - - * Makefile.am: switch to using cvs2cl.pl to generate the ChangeLog - -2003-01-31 12:12 Will Estes <wlestes@uncg.edu> - - * tools/: cvs2cl.pl, cvsauthors: we're going to be switching how we - handle our ChangeLog - -2003-01-29 15:16 John Millaway <millaway@acm.org> - - * gen.c, misc.c: Fixed trailing slash bug in YY_INPUT macro def. - -2003-01-29 13:09 Will Estes <wlestes@uncg.edu> - - * README.cvs-snapshot: upgrade texinfo to 4.3d - -2003-01-29 13:07 Will Estes <wlestes@uncg.edu> - - * flex.texi: the @copying construct works now; thanks to the - texinfo maintainers for finding the problem - -2003-01-21 08:33 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.27 - -2003-01-21 08:32 Will Estes <wlestes@uncg.edu> - - * NEWS: flex now works with recent bison versions - -2003-01-18 13:54 John Millaway <millaway@acm.org> - - * flex.skl: Check for YYLTYPE_IS_DECLARED. This fixes bison-bridge - with latest bison. - -2003-01-15 08:33 Will Estes <wlestes@uncg.edu> - - * NEWS, po/pt_BR.po: new pt_br translation - -2003-01-14 10:51 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.26 - -2003-01-14 09:12 Will Estes <wlestes@uncg.edu> - - * NEWS: Fixed table deserialization bug on big-endian archs. Patch - sent from Bryce Nichols <bryce@bnichols.org> - -2003-01-11 22:30 John Millaway <millaway@acm.org> - - * tables_shared.h: Fixed table deserialization bug on big-endian - archs. Patch sent from Bryce Nichols <bryce@bnichols.org>. - -2003-01-10 09:05 Will Estes <wlestes@uncg.edu> - - * README.cvs-snapshot: add version numbers for some tools and - explain about version.texi and --enable-maintainer-mode - -2003-01-10 08:59 Will Estes <wlestes@uncg.edu> - - * NEWS: catch news up - -2003-01-09 18:06 John Millaway <millaway@acm.org> - - * tests/: test-mem-nr/scanner.l, test-mem-r/scanner.l: Changed - size_t to yy_size_t in yyalloc() and yyrealloc(). Is this really - what we want? - -2003-01-09 17:20 John Millaway <millaway@acm.org> - - * flex.skl: Changed type of yyleng from size_t to int. This fixes - bug in PostgreSQL compilation. - -2003-01-09 11:15 Will Estes <wlestes@uncg.edu> - - * NEWS: catch news up - -2003-01-09 11:15 Will Estes <wlestes@uncg.edu> - - * flex.skl: more c++ fixes - -2003-01-09 10:43 Will Estes <wlestes@uncg.edu> - - * .cvsignore, Makefile.am, configure.in, flex.spec.in: add a spec - file - -2003-01-09 10:25 Will Estes <wlestes@uncg.edu> - - * flex.skl: type cast to pacify c++ compilers; patch from Bruce - Lilly <blilly@erols.com> - -2003-01-08 12:58 Will Estes <wlestes@uncg.edu> - - * NEWS: new es translation - -2003-01-08 12:57 Will Estes <wlestes@uncg.edu> - - * po/es.po: new spanish translation - -2002-12-18 22:17 John Millaway <millaway@acm.org> - - * gen.c: Fixed bug where YY_G(0) sometimes occurs (created by my - previous commit.) - -2002-12-17 18:53 John Millaway <millaway@acm.org> - - * gen.c: Fixed bug submitted by Bojan Smojver <bojan@rexursive.com> - where the use of yylineno, reentrant, and yymore together caused a - compile-time error. - -2002-12-17 16:57 Will Estes <wlestes@uncg.edu> - - * NEWS: update NEWS - -2002-12-17 15:28 John Millaway <millaway@acm.org> - - * flex.texi: Documented new behavior with character ranges. - -2002-12-16 18:33 John Millaway <millaway@acm.org> - - * parse.y: Fixed bug submitted by Bruce Lilly <blilly@erols.com> - where character ranges would yield unexpected behavior in a - caseless scanner. Also, flex now emits a warning if the range - looks like trouble. - -2002-12-16 18:28 John Millaway <millaway@acm.org> - - * flexdef.h, ccl.c: Added utility functions to deal with character - case. - -2002-12-09 09:14 Will Estes <wlestes@uncg.edu> - - * flexint.h: we don't really need int64 anyway - -2002-12-09 09:13 Will Estes <wlestes@uncg.edu> - - * flex.skl: apparently some lints are happier with fllthrough - without a space - -2002-12-02 15:50 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.25 - -2002-12-02 15:48 Will Estes <wlestes@uncg.edu> - - * Makefile.am: enclose flex.1 target in MAINTERNER_MODE - -2002-12-02 08:39 Will Estes <wlestes@uncg.edu> - - * po/pt_BR.po: new pt_br translation - -2002-12-01 13:31 John Millaway <millaway@acm.org> - - * flex.texi: Indexed some more faqs. - -2002-11-28 22:34 John Millaway <millaway@acm.org> - - * flex.skl: Fixed bug in SECOND yyless definition where argument - was not enclosed in parentheses. - -2002-11-28 22:29 John Millaway <millaway@acm.org> - - * flex.skl: Fixed bug in yyless definition where argument was not - enclosed in parentheses. - -2002-11-27 13:42 Will Estes <wlestes@uncg.edu> - - * NEWS: flex uses flex_int*_t types - -2002-11-27 13:41 Will Estes <wlestes@uncg.edu> - - * flexint.h: integer types for non-C99 systems flexint.h - -2002-11-27 09:43 John Millaway <millaway@acm.org> - - * dfa.c, flexint.h, gen.c, tables.c, tables.h, tables_shared.c, - tables_shared.h: Changed int types to flex_intX_t. The build is now - broken until typedef's are established. - -2002-11-27 09:05 Will Estes <wlestes@uncg.edu> - - * Makefile.am: MAINTAINERCLEANFILES: new variable: try to make it - so that make maintainer-clean erases everything not under version - control - -2002-11-27 08:53 Will Estes <wlestes@uncg.edu> - - * .cvsignore: ignore config.rpath - -2002-11-27 08:53 Will Estes <wlestes@uncg.edu> - - * config.rpath: remove config.rpath - -2002-11-27 08:52 Will Estes <wlestes@uncg.edu> - - * README-alpha: just list location of betas - -2002-11-26 09:46 Will Estes <wlestes@uncg.edu> - - * flexint.h: __STDC_VERSION__ needs an L suffix - -2002-11-26 08:22 Will Estes <wlestes@uncg.edu> - - * NEWS, po/LINGUAS, po/pt_BR.po: new pt_br translation from the - translation project - -2002-11-25 11:19 Will Estes <wlestes@uncg.edu> - - * flexint.h: include inttypes.h for folks who really are C99 - -2002-11-25 09:17 Will Estes <wlestes@uncg.edu> - - * TODO: fix a typo - -2002-11-25 08:53 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.24 - -2002-11-23 12:59 Will Estes <wlestes@uncg.edu> - - * configure.in: try to make sure we have GNU m4 - -2002-11-23 12:56 Will Estes <wlestes@uncg.edu> - - * tests/test-c++-multiple-scanners/Makefile.am: include - tests/test-c++-multipl-scanners/test.input - -2002-11-23 12:28 Will Estes <wlestes@uncg.edu> - - * NEWS: more portability fixes - -2002-11-23 11:50 Will Estes <wlestes@uncg.edu> - - * configure.in, flexdef.h: apparently on some BSD systems, we need - sys/params.h; reported by millaway - -2002-11-22 16:04 Will Estes <wlestes@uncg.edu> - - * NEWS: update NEWS - -2002-11-22 15:38 John Millaway <millaway@acm.org> - - * flex.skl, main.c, tests/test-c++-multiple-scanners/Makefile.am: - Fixed prefix of yyalloc,yyfree,yyrealloc in C++ scanner. Removed - yylex_destroy from C++ scanner. - -2002-11-22 15:05 John Millaway <millaway@acm.org> - - * flex.texi: renamed some faqs. - -2002-11-22 08:20 Will Estes <wlestes@uncg.edu> - - * AUTHORS: update wording about authorship - -2002-11-17 17:17 John Millaway <millaway@acm.org> - - * parse.y: Removed space before line num in error messages to look - more like gcc's errors. - -2002-11-06 10:16 Will Estes <wlestes@uncg.edu> - - * po/tr.po, NEWS: new turkish translation from the translation - project - -2002-10-28 07:21 Will Estes <wlestes@uncg.edu> - - * gen.c: applied c++ from lilypond folks for std:: reasons - -2002-10-25 15:18 Will Estes <wlestes@uncg.edu> - - * flex.texi: proofreading - -2002-10-24 16:07 Will Estes <wlestes@uncg.edu> - - * flex.texi: proofreading - -2002-10-22 10:28 Will Estes <wlestes@uncg.edu> - - * flex.skl: use c-style header names in c++ for now; at some point - we'll have a separate c++ skeleton and we can go whole-hog pure c++ - -2002-10-22 10:01 Will Estes <wlestes@uncg.edu> - - * TODO: c++ rants - -2002-10-22 09:37 Will Estes <wlestes@uncg.edu> - - * flex.texi: more proofreading - -2002-10-22 09:37 Will Estes <wlestes@uncg.edu> - - * Makefile.am: include intent.pro; indent target is MAINTAINER_MODE - conditional - -2002-10-22 08:32 Will Estes <wlestes@uncg.edu> - - * configure.in: When we use AC_PATH_PROG, value-if-not-found is the - name of the program we wanted to find; this will generate more - helpful error messages - -2002-10-21 19:52 John Millaway <millaway@acm.org> - - * tables.c: Added a missing function prototype. - -2002-10-21 13:30 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.23 - -2002-10-21 13:27 Will Estes <wlestes@uncg.edu> - - * NEWS: update NEWS on recent changes - -2002-10-21 13:21 Will Estes <wlestes@uncg.edu> - - * flexint.h: use sys/types.h and not inttypes.h - -2002-10-21 13:20 Will Estes <wlestes@uncg.edu> - - * configure.in: check for limits.h - -2002-10-21 13:19 Will Estes <wlestes@uncg.edu> - - * TODO: update TODO on recent suggestions - -2002-10-21 11:28 Will Estes <wlestes@uncg.edu> - - * flex.texi: titlepage and contents - -2002-10-21 10:45 Will Estes <wlestes@uncg.edu> - - * Makefile.am: typo - -2002-10-21 10:27 Will Estes <wlestes@uncg.edu> - - * Makefile.am, README.cvs-snapshot: include README.cvs-snapshot in - the distribution; in README-cvs-snapshot, mention the need for - enable-maintainer-mode - -2002-10-20 22:26 John Millaway <millaway@acm.org> - - * flex.texi: typo. - -2002-10-18 11:25 Will Estes <wlestes@uncg.edu> - - * flex.texi: report the current version info that flex provides; - reformat a list of non-posix features - -2002-10-18 11:25 Will Estes <wlestes@uncg.edu> - - * NEWS: report the current version info that flex provides - -2002-10-18 11:23 Will Estes <wlestes@uncg.edu> - - * flex.skl: FLEX_BETA defined if flex is beta - -2002-10-16 09:15 Will Estes <wlestes@uncg.edu> - - * flexint.h: if we're doing c++, then we can't use long long - -2002-10-14 11:33 Will Estes <wlestes@uncg.edu> - - * TODO: update TODO on several things - -2002-10-11 16:40 Will Estes <wlestes@uncg.edu> - - * flex.texi: more proofreading - -2002-10-11 11:26 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/Makefile.am, test-array-nr/Makefile.am, - test-array-r/Makefile.am, test-basic-nr/Makefile.am, - test-basic-r/Makefile.am, test-bison-nr/Makefile.am, - test-bison-yylloc/Makefile.am, test-bison-yylval/Makefile.am, - test-c++-basic/Makefile.am, test-c++-multiple-scanners/Makefile.am, - test-c-cpp-nr/Makefile.am, test-c-cpp-r/Makefile.am, - test-debug-nr/Makefile.am, test-debug-r/Makefile.am, - test-header-nr/Makefile.am, test-header-r/Makefile.am, - test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-mem-nr/Makefile.am, - test-mem-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-posix/Makefile.am, - test-posixly-correct/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-reject/Makefile.am, test-string-nr/Makefile.am, - test-string-r/Makefile.am, test-table-opts/Makefile.am, - test-yyextra/Makefile.am: remove BISON assignment as per suggestion - from Akim Demaille - -2002-10-11 11:04 Will Estes <wlestes@uncg.edu> - - * Makefile.am, configure.in: remove intl from dist - -2002-10-11 11:03 Will Estes <wlestes@uncg.edu> - - * .cvsignore: ignore more index files from flex.texi - -2002-10-11 10:33 Will Estes <wlestes@uncg.edu> - - * configure.in: we use maintainer mode now - -2002-10-11 10:33 Will Estes <wlestes@uncg.edu> - - * NEWS: include create-test - -2002-10-11 10:23 Will Estes <wlestes@uncg.edu> - - * tests/Makefile.am: rename test to check-local as per Akim - Demaille; test for failed tests so that make check fails if any - tests do - -2002-10-11 08:46 Will Estes <wlestes@uncg.edu> - - * tests/Makefile.am: use dist_noinst_scripts as per email from Akim - Demaille - -2002-10-10 17:42 John Millaway <millaway@acm.org> - - * flex.texi: Documentation. - -2002-10-10 15:54 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.22; portability fixes and attn to - the test suite - -2002-10-10 15:36 Will Estes <wlestes@uncg.edu> - - * flexint.h: ok, this seems to work - -2002-10-10 15:12 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/Makefile.am, test-bison-nr/Makefile.am, - test-bison-yylloc/Makefile.am, test-bison-yylval/Makefile.am, - test-header-nr/Makefile.am, test-header-r/Makefile.am, - test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am: use builddir in tests that - need it in their include path - -2002-10-10 14:13 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/Makefile.am: sometimes we put header files in the - builddir and so we should account for that - -2002-10-10 14:08 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/Makefile.am: replace the last instance - -2002-10-10 13:02 Will Estes <wlestes@uncg.edu> - - * flex.skl: include unistd.h and not cunistd as cunistd only seems - to be present on very recent systems - -2002-10-10 11:34 Will Estes <wlestes@uncg.edu> - - * Makefile.am, configure.in, flex.skl, flexdef.h, flexint.h: redo - integral types again; add flexint.h; change dependencies caused by - adding flexint.h; remove autoconf wrapper around cunistd; restore - netinet/in.h includes; remove unneded feature checks in - configure.in - -2002-10-08 11:32 Will Estes <wlestes@uncg.edu> - - * configure.in, flex.skl, flexdef.h: current swipe at header magic; - int types be damned - -2002-10-08 11:19 Will Estes <wlestes@uncg.edu> - - * NEWS: change version constant info to reflect change to flex.skl - -2002-10-08 11:15 Will Estes <wlestes@uncg.edu> - - * Makefile.am: remove README-alpha option; add definitions for - FLEX_{MAJOR,MINOR,SUBMINOR}_VERSION - -2002-10-07 11:29 Will Estes <wlestes@uncg.edu> - - * flex.skl, flexdef.h: ok, here goes; try to handle integral - typedefs in one swell foop - -2002-10-07 11:28 Will Estes <wlestes@uncg.edu> - - * configure.in: we check for {u,}int*_t types; maybe this will - simplify things - -2002-10-07 09:12 Will Estes <wlestes@uncg.edu> - - * configure.in: we create the tests/TEMPLATE/Makefile so that we - can build the dist archives - -2002-10-07 08:38 Will Estes <wlestes@uncg.edu> - - * NEWS: more test suite cleanups - -2002-10-07 08:37 Will Estes <wlestes@uncg.edu> - - * tests/test-c++-multiple-scanners/Makefile.am: we don't use header - files... - -2002-10-07 08:26 Will Estes <wlestes@uncg.edu> - - * flexdef.h: remove include of malloc.h - -2002-10-04 15:33 Will Estes <wlestes@uncg.edu> - - * flex.texi: more editing; remove examples index; merge examples - into concept index - -2002-10-04 08:36 Will Estes <wlestes@uncg.edu> - - * flex.texi: edited one more faq; used C-u C-c C-u C-a to update - menus and nodes since the other updating commands are somewhat - broken; unfortunately this means that all nodes have all pointers - filled in - -2002-10-04 08:19 Will Estes <wlestes@uncg.edu> - - * flex.texi: yesterday's proofreading - -2002-10-02 16:07 Will Estes <wlestes@uncg.edu> - - * flex.texi: proofread some more - -2002-10-02 08:38 Will Estes <wlestes@uncg.edu> - - * flex.texi: proofread edit begins - -2002-10-01 11:10 Will Estes <wlestes@uncg.edu> - - * configure.in, tests/Makefile.am, - tests/test-c++-multiple-scanners/.cvsignore, - tests/test-c++-multiple-scanners/Makefile.am, - tests/test-c++-multiple-scanners/main.cpp, - tests/test-c++-multiple-scanners/scanner-1.l, - tests/test-c++-multiple-scanners/scanner-2.l, - tests/test-c++-multiple-scanners/test.input: test c++ with multiple - scanners - -2002-09-27 16:58 Will Estes <wlestes@uncg.edu> - - * tests/: test-array-nr/Makefile.am, test-array-r/Makefile.am, - test-basic-nr/Makefile.am, test-basic-r/Makefile.am, - test-bison-nr/Makefile.am, test-bison-yylloc/Makefile.am, - test-bison-yylval/Makefile.am, test-c++-basic/Makefile.am, - test-c-cpp-nr/Makefile.am, test-c-cpp-r/Makefile.am, - test-debug-nr/Makefile.am, test-debug-r/Makefile.am, - test-header-nr/Makefile.am, test-header-r/Makefile.am, - test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-mem-nr/Makefile.am, - test-mem-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-posix/Makefile.am, - test-posixly-correct/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-reject/Makefile.am, test-string-nr/Makefile.am, - test-string-r/Makefile.am, test-table-opts/Makefile.am, - test-yyextra/Makefile.am: we used INCLUDES in another place in the - Makefile.am files in the test suite - -2002-09-27 16:50 Will Estes <wlestes@uncg.edu> - - * tests/: test-array-nr/Makefile.am, test-array-r/Makefile.am, - test-basic-nr/Makefile.am, test-basic-r/Makefile.am, - test-bison-nr/Makefile.am, test-bison-yylloc/Makefile.am, - test-bison-yylval/Makefile.am, test-c++-basic/Makefile.am, - test-c-cpp-nr/Makefile.am, test-c-cpp-r/Makefile.am, - test-debug-nr/Makefile.am, test-debug-r/Makefile.am, - test-header-nr/Makefile.am, test-header-r/Makefile.am, - test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-mem-nr/Makefile.am, - test-mem-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-posix/Makefile.am, - test-posixly-correct/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-reject/Makefile.am, test-string-nr/Makefile.am, - test-string-r/Makefile.am, test-table-opts/Makefile.am, - test-yyextra/Makefile.am: oops, I typed that last s/// command to - perl way wrong - -2002-09-27 16:46 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/Makefile.am, test-array-nr/Makefile.am, - test-array-r/Makefile.am, test-basic-nr/Makefile.am, - test-basic-r/Makefile.am, test-bison-nr/Makefile.am, - test-bison-yylloc/Makefile.am, test-bison-yylval/Makefile.am, - test-c++-basic/Makefile.am, test-c-cpp-nr/Makefile.am, - test-c-cpp-r/Makefile.am, test-debug-nr/Makefile.am, - test-debug-r/Makefile.am, test-header-nr/Makefile.am, - test-header-r/Makefile.am, test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-mem-nr/Makefile.am, - test-mem-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-posix/Makefile.am, - test-posixly-correct/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-reject/Makefile.am, test-string-nr/Makefile.am, - test-string-r/Makefile.am, test-table-opts/Makefile.am, - test-yyextra/Makefile.am: use AM_CPPFLAGS instead of INCLUDES; - write -I with no space after it for broken compilers - -2002-09-27 16:28 Will Estes <wlestes@uncg.edu> - - * Makefile.am: INCLUDES is obsolete; use AM_CPPFLAGS instead - -2002-09-27 13:02 Will Estes <wlestes@uncg.edu> - - * configure.in: apparently, AM_CONFIG_HEADER is obsolete - -2002-09-27 12:30 Will Estes <wlestes@uncg.edu> - - * TODO: integrate test suite into automake - -2002-09-27 12:18 Will Estes <wlestes@uncg.edu> - - * configure.in: since we dont run the template test, we dont need - to generate its Makefile either - -2002-09-27 12:17 Will Estes <wlestes@uncg.edu> - - * .cvsignore, autogen.sh: use autoreconf instead of calling - individual utilities separately - -2002-09-27 09:20 Will Estes <wlestes@uncg.edu> - - * configure.in: check for c++ compiler - -2002-09-27 09:20 Will Estes <wlestes@uncg.edu> - - * configure.in: re-organize according to suggested layout in - autoconf manual - -2002-09-26 08:54 Will Estes <wlestes@uncg.edu> - - * Makefile.am, NEWS, configure.in: update automake to 1.7 and - autoconf to 2.54 - -2002-09-26 08:48 Will Estes <wlestes@uncg.edu> - - * Makefile.am: use AM_YFLAGS since YFLAGS is a user variable - -2002-09-25 09:40 Will Estes <wlestes@uncg.edu> - - * NEWS: catch NEWS up on things, some of which happened a long time - ago; correct punctuation; try to remove some editorializing - -2002-09-25 09:39 Will Estes <wlestes@uncg.edu> - - * Makefile.am, flex.skl, flex.texi: include a single, automatically - generated version number in flex scanners - -2002-09-23 16:39 Will Estes <wlestes@uncg.edu> - - * tests/create-test: complain audibly when argument not supplied; - echo on stderr when writing error messages - -2002-09-23 12:02 Will Estes <wlestes@uncg.edu> - - * tests/: Makefile.am, create-test: DIST_SUBDIRS so we don't have - to run the TEMPLATE test; so we add new tests to SUBDIRS and - DIST_SUBDIRS - -2002-09-23 11:30 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/Makefile.am: not all compilers support '-I dir' so - we write '-Idir' instead - -2002-09-23 10:00 Will Estes <wlestes@uncg.edu> - - * TODO: reorganize faq entries; proofread the manual - -2002-09-23 09:55 Will Estes <wlestes@uncg.edu> - - * flex.texi: move c++ experimental warning to top of cxx node - -2002-09-20 13:17 Will Estes <wlestes@uncg.edu> - - * flex.skl: move stdint.h include to table-serialization section; - we'll still need to think about stdint.h more though - -2002-09-20 08:30 Will Estes <wlestes@uncg.edu> - - * NEWS: new smarter skeleton/scanner generation - -2002-09-19 20:06 John Millaway <millaway@acm.org> - - * flex.skl, misc.c: bison-bridge skel handled via %if/%endif pairs. - -2002-09-19 19:57 John Millaway <millaway@acm.org> - - * flex.skl, misc.c: reentrant skel handled via %if/%endif pairs. - -2002-09-19 19:20 John Millaway <millaway@acm.org> - - * flex.skl, misc.c: skeleton uses %push/%pop to keep skelout() - scope sane. skel commands are omitted unless --debug enabled. - -2002-09-19 15:46 John Millaway <millaway@acm.org> - - * flex.skl, main.c, misc.c, tables.h: Added %push and %pop - operations to skel processing. - -2002-09-17 08:27 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: flex 2.5.21 - -2002-09-17 00:10 John Millaway <millaway@acm.org> - - * tests/test-reject/Makefile.am: minor fixup for dist. - -2002-09-16 16:26 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.20 - -2002-09-16 16:25 Will Estes <wlestes@uncg.edu> - - * flex.texi: correct typo - -2002-09-16 15:59 Will Estes <wlestes@uncg.edu> - - * NEWS: note the new tables functionality - -2002-09-16 14:40 John Millaway <millaway@acm.org> - - * tests/test-multiple-scanners-r/: .cvsignore, Makefile.am: Fixed - `clean' target and .cvsignore. - -2002-09-16 14:38 John Millaway <millaway@acm.org> - - * TODO, flex.skl, flex.texi, main.c, tables_shared.h, - tests/test-multiple-scanners-r/main.c, - tests/test-multiple-scanners-r/scanner-1.l, - tests/test-multiple-scanners-r/scanner-2.l: Serialization works in - headers (%option headers). Serialization code (Tables API) is - complete. - -2002-09-16 08:41 Will Estes <wlestes@uncg.edu> - - * tests/test-reject/scanner.l: replace yytables_load with - yytables_fload as per millaway's other changes - -2002-09-15 19:13 John Millaway <millaway@acm.org> - - * TODO, flex.texi: Created user API for tables deserialization. - Documented API and --tables-* options in manual. - -2002-09-15 19:12 John Millaway <millaway@acm.org> - - * flex.skl, tests/test-table-opts/scanner.l: Tables deserialization - uses yyalloc/yyfree. Changed yytables_load to yytables_fload. - -2002-09-15 18:09 John Millaway <millaway@acm.org> - - * tests/test-bison-nr/.cvsignore: minor upkeep. - -2002-09-15 15:53 John Millaway <millaway@acm.org> - - * flex.texi: Categorized and indexed scanner options in manual. - -2002-09-15 12:47 John Millaway <millaway@acm.org> - - * flex.skl: Initialization of reject vars and %array vars in - reentrant scanner. - -2002-09-13 17:54 John Millaway <millaway@acm.org> - - * TODO, configure.in, dfa.c, flex.skl, flex.texi, gen.c, tables.c, - tables_shared.c, tables_shared.h, devel/tables.pl, - tests/Makefile.am, tests/test-reject/.cvsignore, - tests/test-reject/Makefile.am, tests/test-reject/scanner.l, - tests/test-reject/test.input, tests/test-table-opts/Makefile.am: - Created test for reject. Handled reject-triggered tables in - serialization. - -2002-09-13 08:28 Will Estes <wlestes@uncg.edu> - - * NEWS: millaway has been very busy - -2002-09-13 03:12 John Millaway <millaway@acm.org> - - * flex.skl, tests/test-table-opts/Makefile.am, - tests/test-table-opts/scanner.l: Added test for multiple tables in - one file. - -2002-09-12 21:19 John Millaway <millaway@acm.org> - - * tests/test-bison-nr/.cvsignore: forgot to add .cvsignore on last - commit. - -2002-09-12 21:18 John Millaway <millaway@acm.org> - - * tests/test-bison-nr/: Makefile.am, main.c, parser.y, scanner.l, - test.input: Added test-bison-bridge. - -2002-09-12 21:17 John Millaway <millaway@acm.org> - - * configure.in, flex.skl, flex.texi, flexdef.h, gen.c, main.c, - misc.c, options.c, options.h, scan.l, tables.h, tests/Makefile.am, - tests/descriptions, tests/test-bison-yylloc/scanner.l, - tests/test-bison-yylval/scanner.l, tests/test-table-opts/scanner.l: - Bison bridge code now works for all C scanners and pure/non-pure - bison parsers. Added %option bison-bridge (--bison-bridge). - Removed %option reentrant-bison/--reentrant-bison/-Rb. Scanner - knows the name of its tables. Tables serialization is OK on EOF. - yylineno is present in all scanners. Modified nasty performance - penalty warning w/ yylineno. test-table-opts is now run last - because it's so fat. Updated manual. - -2002-09-12 11:48 John Millaway <millaway@acm.org> - - * flex.texi: documentation of tabels api in manual - -2002-09-12 10:54 John Millaway <millaway@acm.org> - - * TODO, tables.c: Renamed *_fwrite to *_write to reflect writer - abstraction. - -2002-09-11 17:55 John Millaway <millaway@acm.org> - - * devel/tables.pl: Added perl script to read/dump serialized tables - in devel/ - -2002-09-11 17:22 Will Estes <wlestes@uncg.edu> - - * scan.l: the debian patch used strlen(yytext) and similar - constructs--as millaway points out, this is better known as yyleng - -2002-09-11 16:00 Will Estes <wlestes@uncg.edu> - - * NEWS, po/de.po: new de translation from the translation project - -2002-09-11 08:30 John Millaway <millaway@acm.org> - - * flex.skl: yytbl_load now checks tables set by name. Localized - var scaope in yytbl_load. - -2002-09-10 09:12 Will Estes <wlestes@uncg.edu> - - * tests/Makefile.am: make clean before make test - -2002-09-09 18:06 John Millaway <millaway@acm.org> - - * TODO, flex.skl: Fixed deserialization of --fast tables. - -2002-09-09 16:44 Will Estes <wlestes@uncg.edu> - - * TODO: fix typo; remove the yylineo entry - -2002-09-09 15:25 John Millaway <millaway@acm.org> - - * TODO, buf.c, dfa.c, flex.skl, flexdef.h, gen.c, main.c, misc.c, - options.c, options.h, scan.l, tables.c, tables.h, tables_shared.h, - devel/dump-tables.pl, tests/test-table-opts/.cvsignore, - tests/test-table-opts/Makefile.am, tests/test-table-opts/scanner.l: - Table deserialization works for everything except --fast scanners. - Scanners can auto-verify serialized table integrity via - --tables-verify. Added tables API items to TODO list. - test-table-opts is becoming exhaustive (a good thing). - -2002-09-09 11:54 Will Estes <wlestes@uncg.edu> - - * NEWS: flex has better internal diagnostics - -2002-09-09 11:52 Will Estes <wlestes@uncg.edu> - - * configure.in, flexdef.h: test for presence of __func__ and - compensate if absent - -2002-09-09 09:59 Will Estes <wlestes@uncg.edu> - - * Makefile.am: include the intl/ subdirectory when searching for - include files - -2002-09-09 08:49 Will Estes <wlestes@uncg.edu> - - * NEWS, po/ru.po, po/sv.po: new sv, ru translations from the - translation project - -2002-09-07 18:40 John Millaway <millaway@acm.org> - - * flex.skl, misc.c: Changed cryptic skeleton markers to readable - form. - -2002-09-07 00:18 John Millaway <millaway@acm.org> - - * Makefile.am, dfa.c, flex.skl, flex.texi, flexdef.h, gen.c, - main.c, misc.c, parse.y, tables.c, tables.h, tables_shared.c, - tables_shared.h: Members of struct yy_trans_info are now forced to - be the same size. Added shared file tables_shared.c. Separated - tables.h from flexdef.h Bulk of table deserialization code is done. - -2002-09-06 11:42 Will Estes <wlestes@uncg.edu> - - * NEWS, po/ca.po: new ca translation - -2002-09-06 11:24 Will Estes <wlestes@uncg.edu> - - * NEWS: new fr translation - -2002-09-06 11:22 Will Estes <wlestes@uncg.edu> - - * po/fr.po: new french translation from the translation project - -2002-09-05 14:41 Will Estes <wlestes@uncg.edu> - - * NEWS: c99 function defs by default - -2002-09-05 14:22 John Millaway <millaway@acm.org> - - * flexdef.h, tables.c: Added flex_die macro. May need some autoconf - massaging. Added thorough error checking in tables code. - -2002-09-05 14:21 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi: Flex generates C99 defs now. Documented the - above change in manual. - -2002-09-05 14:12 John Millaway <millaway@acm.org> - - * tests/test-table-opts/: .cvsignore, Makefile.am: Added - serialization test to table-opts test. - -2002-09-05 12:03 Will Estes <wlestes@uncg.edu> - - * configure.in: oops, i made a typo - -2002-09-05 12:01 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.19 - -2002-09-05 10:08 Will Estes <wlestes@uncg.edu> - - * scan.l: use FLEX_EXIT(), not exit() - -2002-09-05 09:53 John Millaway <millaway@acm.org> - - * devel/: 00EXTRACT-ALL-SYMS.sh, README, dump-tables.pl: Added - devel/ directory for junk that we don't want in the distribution, - but that we want in CVS. - -2002-09-05 09:26 Will Estes <wlestes@uncg.edu> - - * scan.l: s/exit(1)/exit(EXIT_FAILURE) - -2002-09-05 09:18 John Millaway <millaway@acm.org> - - * dfa.c, gen.c: Tables are now generated with %option - tables-file=FILE. - -2002-09-05 09:14 Will Estes <wlestes@uncg.edu> - - * NEWS: catch up on a few things - -2002-09-05 09:11 Will Estes <wlestes@uncg.edu> - - * scan.l: prevent segfault on input lines which are longer than the - allocated space (problem report from Manoj Srivastava - <srivasta@golden-gryphon.com>) - -2002-09-05 06:54 John Millaway <millaway@acm.org> - - * flex.texi, main.c, options.c, options.h: Changed option 'header' - to 'header-file'. 'header' still works, though. - -2002-09-05 06:48 John Millaway <millaway@acm.org> - - * flex.texi, flexdef.h, gen.c, main.c, options.c, options.h, - scan.l, tables.c: Tons more work on tables. - -2002-09-05 00:24 John Millaway <millaway@acm.org> - - * flexdef.h, gen.c, tables.c, tables_shared.h: Lots of work on - tables serialization code. - -2002-09-04 08:36 Will Estes <wlestes@uncg.edu> - - * README.cvs-snapshot: mention GNU indent - -2002-09-04 08:33 Will Estes <wlestes@uncg.edu> - - * NEWS: remove the word after from the version line - -2002-09-03 17:02 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.18 - -2002-09-03 09:46 Will Estes <wlestes@uncg.edu> - - * NEWS: catch up on the NEWS - -2002-09-03 09:42 Will Estes <wlestes@uncg.edu> - - * tests/Makefile.am: target test: quote the results echoing so that - the ECHO_C will work on systems where it is used - -2002-09-03 09:08 Will Estes <wlestes@uncg.edu> - - * configure.in: when we don't have GNU indent, the test will - generate output on stderr, so we send that to /dev/null - -2002-09-03 08:56 Will Estes <wlestes@uncg.edu> - - * configure.in: fixed bug whereby bison was reported missing even - when it was found - -2002-09-02 14:44 John Millaway <millaway@acm.org> - - * tables.c: In-code documentation. - -2002-09-02 14:44 John Millaway <millaway@acm.org> - - * flexdef.h: Forgot to indent before previous commit. - -2002-09-02 13:55 John Millaway <millaway@acm.org> - - * flexdef.h: Added known integer limits if undefined. - -2002-08-29 17:12 Will Estes <wlestes@uncg.edu> - - * configure.in: version 2.5.17 - -2002-08-29 17:12 Will Estes <wlestes@uncg.edu> - - * NEWS: more portability fixes; new version number - -2002-08-29 16:30 Will Estes <wlestes@uncg.edu> - - * flexdef.h, main.c, misc.c, scanopt.c: #include fixes; we've - factored out all the system include files and put them in flexdef.h - -2002-08-29 15:02 Will Estes <wlestes@uncg.edu> - - * dfa.c: eat a blank line - -2002-08-29 09:21 Will Estes <wlestes@uncg.edu> - - * NEWS: new config.{sub,guess} files; mention that we use indent on - flex - -2002-08-28 13:12 Will Estes <wlestes@uncg.edu> - - * configure.in: warn if no indent found; version 2.5.16 - -2002-08-28 13:10 Will Estes <wlestes@uncg.edu> - - * NEWS: catch up on recent changes; version 2.5.16 - -2002-08-27 14:07 Will Estes <wlestes@uncg.edu> - - * buf.c, ccl.c, dfa.c, ecs.c, flexdef.h, gen.c, libmain.c, - libyywrap.c, main.c, misc.c, nfa.c, options.c, options.h, - scanopt.c, scanopt.h, sym.c, tables.c, tables_shared.h, tblcmp.c, - yylex.c: ran the indent target; commit the results - -2002-08-27 14:05 Will Estes <wlestes@uncg.edu> - - * Makefile.am: touch up the indent targeet; it's ready for - production use now - -2002-08-27 14:01 Will Estes <wlestes@uncg.edu> - - * configure.in: test for GNU indent; reorder the tests somewhat - -2002-08-27 09:12 Will Estes <wlestes@uncg.edu> - - * .indent.pro: minor changes to indentation style - -2002-08-23 10:29 Will Estes <wlestes@uncg.edu> - - * configure.in: automake is smarter about autoconf's versioning - scheme - -2002-08-23 09:18 Will Estes <wlestes@uncg.edu> - - * NEWS: catch NEWS up on what we've been doing - -2002-08-22 13:18 Will Estes <wlestes@uncg.edu> - - * flexdef.h: do some more conditional including for folks without - standard systems - -2002-08-22 13:15 Will Estes <wlestes@uncg.edu> - - * tests/test-c++-basic/Makefile.am: use CXX to link the test - scanner here - -2002-08-22 01:35 John Millaway <millaway@acm.org> - - * flex.texi: Documentation. - -2002-08-21 21:49 John Millaway <millaway@acm.org> - - * .indent.pro, Makefile.am: Created 'indent' target and added - .indent.pro. - -2002-08-21 21:42 John Millaway <millaway@acm.org> - - * tests/: test-array-nr/Makefile.am, test-array-r/Makefile.am, - test-basic-nr/Makefile.am, test-basic-r/Makefile.am, - test-c-cpp-nr/Makefile.am: Fixed missing 'make clean' files. - -2002-08-21 21:34 John Millaway <millaway@acm.org> - - * tests/: test-bison-yylloc/Makefile.am, - test-bison-yylval/Makefile.am: fixed missing 'clean' file. - -2002-08-21 21:11 John Millaway <millaway@acm.org> - - * flex.skl, tests/test-c++-basic/Makefile.am, - tests/test-c++-basic/scanner.l: Removed core of yylex_destroy from - c++ scanner -- hack! Added -lstdc++ to LDFLAGS (should we have to - do this??) - -2002-08-21 10:15 Will Estes <wlestes@uncg.edu> - - * README: official releases are being hosted by Vern - -2002-08-21 09:42 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: new beta version; more entries in NEWS from - millaway; the top level entry for test-c++-basic - -2002-08-21 09:41 Will Estes <wlestes@uncg.edu> - - * tests/: Makefile.am, test-c++-basic/.cvsignore, - test-c++-basic/Makefile.am, test-c++-basic/scanner.l, - test-c++-basic/test.input: add test-c++-basic - -2002-08-21 02:54 John Millaway <millaway@acm.org> - - * gen.c, nfa.c: More tabels work. - -2002-08-20 21:54 John Millaway <millaway@acm.org> - - * flexdef.h, gen.c, tables.c, tables_shared.h: More work on tables. - -2002-08-20 19:49 John Millaway <millaway@acm.org> - - * dfa.c: Cleaned up macros that took no ';'. - -2002-08-20 19:47 John Millaway <millaway@acm.org> - - * scanopt.c: Fixed oddball '=-'. - -2002-08-20 17:42 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi, gen.c: Dynamically allocate REJECT state - buffer. Mentioned memory usage in docs. Made REJECT buffer - variables reentrant-safe. - -2002-08-20 17:37 John Millaway <millaway@acm.org> - - * tables.c: More work on tables code. - -2002-08-20 10:52 Will Estes <wlestes@uncg.edu> - - * Makefile.am, NEWS, configure.in: we're using m4 so have configure - test for it - -2002-08-20 00:23 John Millaway <millaway@acm.org> - - * Makefile.am, tables.c: Added tables.c and rebuilt dependencies. - -2002-08-19 20:30 John Millaway <millaway@acm.org> - - * TODO, flex.texi: Dicussed prototypes and header in manual. - -2002-08-19 17:56 John Millaway <millaway@acm.org> - - * Makefile.am, configure.in, flex.skl, flexdef.h, tables_shared.h: - More work on tables serialization. - -2002-08-19 17:15 John Millaway <millaway@acm.org> - - * Makefile.am, mkskel.sh: Skeleton is now passed through m4 (before - dist is built). - -2002-08-19 08:51 Will Estes <wlestes@uncg.edu> - - * po/: LINGUAS, zh_CN.po: add zh_cn translation from the - translation project - -2002-08-19 08:51 Will Estes <wlestes@uncg.edu> - - * NEWS: millaway's done a lot of things which need to be mentioned - in NEWS - -2002-08-18 16:32 John Millaway <millaway@acm.org> - - * main.c: Removed #undef of start conditions. - -2002-08-17 18:24 John Millaway <millaway@acm.org> - - * TODO: todo list - -2002-08-17 16:04 John Millaway <millaway@acm.org> - - * flexdef.h, main.c, misc.c: Start conditions now optional in - header. undef's now optional in header. Start conditions are NOT - prefixed. - -2002-08-17 13:05 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi: Working on tables API. - -2002-08-16 18:32 John Millaway <millaway@acm.org> - - * flexdef.h, main.c, misc.c, options.c, options.h, parse.y, scan.l: - Added --tables option. Omitted tables code from generated scanner - when unused. - -2002-08-16 15:54 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi, misc.c: Prelimary work on tables API. - -2002-08-16 15:45 John Millaway <millaway@acm.org> - - * tests/: TEMPLATE/Makefile.am, test-array-nr/Makefile.am, - test-array-r/Makefile.am, test-basic-nr/Makefile.am, - test-basic-r/Makefile.am, test-bison-yylloc/Makefile.am, - test-bison-yylval/Makefile.am, test-c-cpp-nr/Makefile.am, - test-c-cpp-r/Makefile.am, test-debug-nr/Makefile.am, - test-debug-r/Makefile.am, test-header-nr/Makefile.am, - test-header-r/Makefile.am, test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-mem-nr/Makefile.am, - test-mem-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-posix/Makefile.am, - test-posixly-correct/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-string-nr/Makefile.am, test-string-r/Makefile.am, - test-table-opts/Makefile.am, test-yyextra/Makefile.am: Tests now - respect CFLAGS, CPPFLAGS, etc.. - -2002-08-16 15:03 John Millaway <millaway@acm.org> - - * tests/: test-basic-nr/scanner.l, test-basic-r/scanner.l, - test-lineno-nr/scanner.l, test-lineno-r/scanner.l: Got rid of flex - -s warnings in tests. - -2002-08-16 14:51 John Millaway <millaway@acm.org> - - * Makefile.am: Updated dependencies list. - -2002-08-15 17:23 John Millaway <millaway@acm.org> - - * main.c: Fixed seg fault bug in ecs. - -2002-08-15 17:18 Will Estes <wlestes@uncg.edu> - - * tests/: test-c-cpp-nr/.cvsignore, test-c-cpp-r/.cvsignore: ignore - .cpp files since we generate them instead of .c - -2002-08-15 11:37 Will Estes <wlestes@uncg.edu> - - * configure.in: version 2.5.14 - -2002-08-15 11:37 Will Estes <wlestes@uncg.edu> - - * NEWS: c-as-c++ tests reworked - -2002-08-15 11:15 John Millaway <millaway@acm.org> - - * tests/: test-c-cpp-nr/Makefile.am, test-c-cpp-nr/scanner.l, - test-c-cpp-r/Makefile.am, test-c-cpp-r/scanner.l: The c++ tests use - .cpp instead of .c extensions just to be on the safe side. - -2002-08-15 10:50 Will Estes <wlestes@uncg.edu> - - * main.c: conditionally include <locale.h>; include config.h as - well - -2002-08-15 10:49 Will Estes <wlestes@uncg.edu> - - * configure.in, flex.skl: only include <cunistd> if we have it - -2002-08-15 10:48 Will Estes <wlestes@uncg.edu> - - * NEWS: portability fixes; added missing punctuation; de - translation now included - -2002-08-15 10:16 Will Estes <wlestes@uncg.edu> - - * po/LINGUAS: we also translate to german - -2002-08-15 09:17 Will Estes <wlestes@uncg.edu> - - * Makefile.am: require automake at least 1.6 - -2002-08-15 08:32 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.13 - -2002-08-14 10:57 Will Estes <wlestes@uncg.edu> - - * flex.texi: reverted away from the @copying as it breaks the info - reader - -2002-08-13 20:46 John Millaway <millaway@acm.org> - - * flex.texi, flexdef.h, main.c, misc.c: Start condition prefixes - attempts to adjust to user preferences. - -2002-08-13 17:19 John Millaway <millaway@acm.org> - - * main.c: Include start condition symbols in header. - -2002-08-13 15:16 John Millaway <millaway@acm.org> - - * flexdef.h, main.c: Omit user code and tables from generated - header file. - -2002-08-13 09:14 Will Estes <wlestes@uncg.edu> - - * flex.texi: use @copying construct to display the flex license; - move copying and bug reporting to the front of the manual - -2002-08-13 09:00 Will Estes <wlestes@uncg.edu> - - * NEWS: printf fix and yylex_init reports errors - -2002-08-12 19:15 John Millaway <millaway@acm.org> - - * flex.texi: Updated manual for %option header. - -2002-08-12 15:36 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi, gen.c: Fixed type mismatch in printf. - yylex_init now reports errors. - -2002-08-10 13:22 John Millaway <millaway@acm.org> - - * dfa.c, main.c: Added alignment flag for future use. - -2002-08-10 13:17 John Millaway <millaway@acm.org> - - * tests/test-table-opts/: .cvsignore, Makefile.am: Added options to - test-table-opts - -2002-08-10 12:39 John Millaway <millaway@acm.org> - - * configure.in, tests/Makefile.am, tests/descriptions, - tests/test-c-cpp-nr/Makefile.am, tests/test-table-opts/.cvsignore, - tests/test-table-opts/Makefile.am, tests/test-table-opts/scanner.l, - tests/test-table-opts/test.input: Added a test for various DFA - table options. - -2002-08-09 16:36 Will Estes <wlestes@uncg.edu> - - * flex.texi: more faq editing; corrected mistyped nodenames - -2002-08-09 13:41 Will Estes <wlestes@uncg.edu> - - * flex.skl: fix typo which propogates out to generated scanners - -2002-08-09 10:42 Will Estes <wlestes@uncg.edu> - - * flex.texi: edited a few more faqs - -2002-08-09 10:20 Will Estes <wlestes@uncg.edu> - - * Makefile.am, faq.texi: remove faq.texi as it's included in - flex.texi - -2002-08-08 17:12 Will Estes <wlestes@uncg.edu> - - * flex.texi: a few more faq edits; remove faq-89 - -2002-08-08 16:50 Will Estes <wlestes@uncg.edu> - - * flex.texi: cite, not site - -2002-08-08 16:46 Will Estes <wlestes@uncg.edu> - - * flex.texi: and get the faq included - -2002-08-08 16:29 Will Estes <wlestes@uncg.edu> - - * flex.texi: fix some grammer/typography in the top node and add a - detailed menu - -2002-08-08 13:10 Will Estes <wlestes@uncg.edu> - - * TODO: we've updated gettext - -2002-08-08 13:04 Will Estes <wlestes@uncg.edu> - - * po/.cvsignore: we need to ignore a few more gettext files - -2002-08-08 11:42 Will Estes <wlestes@uncg.edu> - - * po/: Rules-quot, boldquot.sed, en@boldquot.header, - en@quot.header, insert-header.sin, quot.sed, remove-potcdate.sin: - more files that we can remove due to autopoint working - -2002-08-08 11:22 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.12 - -2002-08-08 10:53 Will Estes <wlestes@uncg.edu> - - * NEWS: mention gettext; document the non-need for bison/flex in - the build process - -2002-08-08 10:51 Will Estes <wlestes@uncg.edu> - - * Makefile.am, configure.in: include intl in the distribution and - in the build process - -2002-08-08 10:12 Will Estes <wlestes@uncg.edu> - - * Makefile.am: builddir in help2man call needed @-signs around it - -2002-08-08 09:54 Will Estes <wlestes@uncg.edu> - - * po/.cvsignore: we can ignore Makefile.in.in - -2002-08-08 09:48 Will Estes <wlestes@uncg.edu> - - * .cvsignore: no, we cant ignore m4/ - -2002-08-08 09:45 Will Estes <wlestes@uncg.edu> - - * m4/: .cvsignore, Makefile.am: oops, too hasty on deleting this - directory, sigh - -2002-08-08 09:23 Will Estes <wlestes@uncg.edu> - - * autogen.sh: if autopoint is going to run automatically, it's - going to need to be able to update existing files - -2002-08-08 09:22 Will Estes <wlestes@uncg.edu> - - * .cvsignore, ABOUT-NLS, autogen.sh, configure.in, m4/.cvsignore, - m4/Makefile.am, m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, - m4/iconv.m4, m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-ld.m4, - m4/lib-link.m4, m4/lib-prefix.m4, m4/progtest.m4, - po/Makefile.in.in: autopoint now works so let's let it run the - gettext show - -2002-08-07 13:27 Will Estes <wlestes@uncg.edu> - - * TODO: we need to index the faq entries - -2002-08-07 13:26 Will Estes <wlestes@uncg.edu> - - * faq.texi: proofed "Why do flex scanners call fileno if it is not - ANSI compatible?" - -2002-08-07 13:23 Will Estes <wlestes@uncg.edu> - - * faq.texi: proofed "How do I expand \ escape sequences in C-style - quoted strings?" - -2002-08-07 13:19 Will Estes <wlestes@uncg.edu> - - * README: changes to README to align with GNU coding standards - -2002-08-06 09:05 Will Estes <wlestes@uncg.edu> - - * Makefile.am: help2man should look in builddir for the flex binary - -2002-08-02 16:23 John Millaway <millaway@acm.org> - - * flex.skl: Fixed yyunput prototype. - -2002-08-01 11:35 Will Estes <wlestes@uncg.edu> - - * NEWS: new fr translation from the translation project - -2002-08-01 10:02 Will Estes <wlestes@uncg.edu> - - * po/fr.po: new fr.po translation from the translation project - -2002-08-01 10:00 Will Estes <wlestes@uncg.edu> - - * NEWS: yylineno performance hit is fixed - -2002-07-31 17:29 John Millaway <millaway@acm.org> - - * TODO, flex.texi: Updated docs on yylineno. - -2002-07-31 15:19 Will Estes <wlestes@uncg.edu> - - * TODO: discuss yylineno performance - -2002-07-31 13:07 Will Estes <wlestes@uncg.edu> - - * NEWS: forgot to say what the date was that we made the release - -2002-07-31 10:52 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: version 2.5.11 - -2002-07-31 10:45 Will Estes <wlestes@uncg.edu> - - * faq.texi: fixed a menu entry and related problems - -2002-07-31 10:38 Will Estes <wlestes@uncg.edu> - - * configure.in: someday, maybe we can use autopoint - -2002-07-31 09:56 Will Estes <wlestes@uncg.edu> - - * Makefile.am: we need to include texinfo.tex now - -2002-07-31 09:55 Will Estes <wlestes@uncg.edu> - - * texinfo.tex: add texinfo.tex - -2002-07-30 11:59 Will Estes <wlestes@uncg.edu> - - * faq.texi: fix up some fatal bugs in the texinfo of the faq; begin - the clean up; remove trailing and leading white space - -2002-07-30 11:53 Will Estes <wlestes@uncg.edu> - - * TODO: faqs need work - -2002-07-30 11:44 Will Estes <wlestes@uncg.edu> - - * .cvsignore: when making dvi files, we have to ignore a lot of - files - -2002-07-30 09:03 Will Estes <wlestes@uncg.edu> - - * NEWS, TODO: prototypes get airtime these days - -2002-07-28 16:02 John Millaway <millaway@acm.org> - - * flex.skl: Added some comments. - -2002-07-28 14:27 John Millaway <millaway@acm.org> - - * flex.skl: Fixed bug where yyless did not consider yylineno. - -2002-07-28 01:45 John Millaway <millaway@acm.org> - - * scan.l: Fixed bug I created in previous commit. - -2002-07-28 01:38 John Millaway <millaway@acm.org> - - * scan.l: Don't wrap ()s around {NAMEDEFS} at the end of a rule. - -2002-07-27 17:37 John Millaway <millaway@acm.org> - - * flex.skl, tests/test-c-cpp-nr/Makefile.am, - tests/test-c-cpp-r/Makefile.am: Fixed test-c-cpp to actually use - the C++ compiler for the test. Fixed the bug that this exposed. - -2002-07-27 15:34 John Millaway <millaway@acm.org> - - * ccl.c, flex.skl, flexdef.h, gen.c, main.c, nfa.c, parse.y, - scan.l: yylineno check is only performed on rules whose regexs can - match a newline. - -2002-07-24 20:43 John Millaway <millaway@acm.org> - - * flex.skl, tests/TEMPLATE/scanner.l, - tests/test-array-nr/scanner.l, tests/test-array-r/scanner.l, - tests/test-basic-nr/scanner.l, tests/test-basic-r/scanner.l, - tests/test-bison-yylloc/parser.y, tests/test-c-cpp-nr/scanner.l, - tests/test-c-cpp-r/scanner.l, tests/test-debug-nr/scanner.l, - tests/test-debug-r/scanner.l, - tests/test-include-by-buffer/scanner.l, - tests/test-include-by-reentrant/scanner.l, - tests/test-lineno-nr/scanner.l, tests/test-lineno-r/scanner.l, - tests/test-mem-nr/scanner.l, tests/test-mem-r/scanner.l, - tests/test-posix/scanner.l, tests/test-posixly-correct/scanner.l, - tests/test-prefix-nr/scanner.l, tests/test-prefix-r/scanner.l, - tests/test-pthread/scanner.l, tests/test-string-nr/scanner.l, - tests/test-string-r/scanner.l, tests/test-yyextra/scanner.l: All - prototypes were rewritten to depend upon the macro - YY_TRADITIONAL_FUNC_DEFS, which is defined by default. The - generated scanners build cleanly under gcc's traditional strictness - and under C++ compilers. - -2002-07-24 11:58 Will Estes <wlestes@uncg.edu> - - * NEWS: dist-bzip2 and rename yy_globals and yy_globals_t - -2002-07-24 11:57 Will Estes <wlestes@uncg.edu> - - * configure.in: version 2.5.10 - -2002-07-24 11:57 Will Estes <wlestes@uncg.edu> - - * Makefile.am: add dist-bzip2 to automake_options so we'll start - getting tar.bz2 archives - -2002-07-23 16:11 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi, tests/test-bison-yylval/scanner.l, - tests/test-mem-r/scanner.l, - tests/test-multiple-scanners-r/scanner-1.l, - tests/test-multiple-scanners-r/scanner-2.l, - tests/test-prefix-r/scanner.l, tests/test-pthread/scanner.l, - tests/test-yyextra/scanner.l: s/yy_globals_t/yyguts_t/g - s/yy_globals/yyscanner/g - -2002-07-23 13:55 John Millaway <millaway@acm.org> - - * Makefile.am: typo in tags target - -2002-07-22 12:18 John Millaway <millaway@acm.org> - - * Makefile.am: Removed erroneous $(srcdir) from help2man target. - -2002-07-22 10:03 Will Estes <wlestes@uncg.edu> - - * NEWS, configure.in: it's version 2.5.9 now - -2002-07-22 09:56 Will Estes <wlestes@uncg.edu> - - * po/: .cvsignore, remove-potcdate.sin: updated gettext to 0.11.3 - -2002-07-22 09:49 Will Estes <wlestes@uncg.edu> - - * ABOUT-NLS, config.rpath, m4/gettext.m4, m4/iconv.m4, - m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-link.m4: updated gettext - to version 0.11.3 - -2002-07-22 09:29 Will Estes <wlestes@uncg.edu> - - * autogen.sh, configure.in: rollback on configure.in and autogen.sh - because autpoint is broken - -2002-07-22 09:15 Will Estes <wlestes@uncg.edu> - - * po/ru.po: new russian translation from translation project - -2002-07-19 17:09 Will Estes <wlestes@uncg.edu> - - * autogen.sh: ok, we're going to start using autopoint, but the - tree is going to undergo some changes after this - -2002-07-19 17:06 Will Estes <wlestes@uncg.edu> - - * configure.in: we're preparing for autopoint - -2002-07-17 11:57 John Millaway <millaway@acm.org> - - * flex.texi: Updated manual. - -2002-07-17 08:53 Will Estes <wlestes@uncg.edu> - - * NEWS: update the NEWS file for lots of things millaway has done - -2002-07-17 02:46 John Millaway <millaway@acm.org> - - * flex.skl, main.c, misc.c, scan.l, scanopt.c, sym.c, - tests/test-mem-nr/scanner.l, tests/test-mem-r/scanner.l: Fixed - prototype/definition conflicts with "traditional" C in skeleton at - request of gcc developer. Removed duplicate prototypes in gen.c, - sym.c, main.c. Added missing prototypes where needed. All - functions in skeleton follow ISO C style protos and defs, instead - of BOTH ISO and new-style. Skeleton now compiles cleanly under - super-strict gcc flags. Flex itself almost compiles cleanly under - strict flags. - -2002-07-15 14:59 John Millaway <millaway@acm.org> - - * faq.texi, flex.texi: Worked on mem mgmt sect of manual. - -2002-07-15 12:55 Will Estes <wlestes@uncg.edu> - - * scan.l: allow blank lines and continuations in more places - -2002-07-12 13:43 Will Estes <wlestes@uncg.edu> - - * TODO: millaway finished the faqs directory - -2002-07-12 13:39 Will Estes <wlestes@uncg.edu> - - * TODO: removed items as per email from millaway - -2002-07-12 12:23 John Millaway <millaway@acm.org> - - * configure.in, tests/Makefile.am, tests/descriptions, - tests/test-posix/.cvsignore, tests/test-posix/Makefile.am, - tests/test-posix/scanner.l, tests/test-posixly-correct/.cvsignore, - tests/test-posixly-correct/Makefile.am, - tests/test-posixly-correct/scanner.l: Added test for %option - posix-compat and repeat operator. Added test for POSIXLY_CORRECT - environment variable and repeat operator. - -2002-07-12 12:21 John Millaway <millaway@acm.org> - - * main.c, scan.l: Fixed POSIXLY_CORRECT detection in scanner. - -2002-07-11 16:27 John Millaway <millaway@acm.org> - - * faq.texi: More work on faq. - -2002-07-11 16:06 John Millaway <millaway@acm.org> - - * faq.texi: Moved all faqs into manual -- but did not evaluate them - yet. Removed the old faq files. - -2002-07-10 17:59 John Millaway <millaway@acm.org> - - * main.c: Removed duplicate definition of FLEX_DEBUG. gcc doesn't - care, but other compilers might. - -2002-07-10 17:55 John Millaway <millaway@acm.org> - - * flex.texi: Wrote some more about memory mgmt in the manual. - -2002-07-10 11:43 John Millaway <millaway@acm.org> - - * flex.texi: flex.texi now works with install-info. - -2002-07-10 10:02 Will Estes <wlestes@uncg.edu> - - * TODO: added items as per email from millaway - -2002-07-10 10:02 Will Estes <wlestes@uncg.edu> - - * NEWS: after we release a version, we have to keep the version - number in NEWS current - -2002-07-09 20:04 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi, main.c, scan.l, tests/test-mem-nr/scanner.l, - tests/test-mem-r/scanner.l: Fixed prefix issue with get/set debug - functions. Fixed prefix issues with memory functions. - -2002-07-09 19:35 John Millaway <millaway@acm.org> - - * flex.skl: Memory functions are no longer static. - -2002-07-09 19:02 John Millaway <millaway@acm.org> - - * tests/test-mem-nr/test.input: Added a missing input file for - test-mem-nr/ - -2002-07-09 18:47 John Millaway <millaway@acm.org> - - * tests/: test-mem-nr/.cvsignore, test-mem-nr/Makefile.am, - test-mem-nr/scanner.l, test-mem-r/.cvsignore, - test-mem-r/Makefile.am, test-mem-r/scanner.l, - test-mem-r/test.input: Added tests for overriding memory. - -2002-07-09 18:45 John Millaway <millaway@acm.org> - - * flex.texi: Added sections in manual for memory management. - -2002-07-09 17:36 Will Estes <wlestes@uncg.edu> - - * NEWS: noted more user visible changes - -2002-07-09 16:52 John Millaway <millaway@acm.org> - - * configure.in, flex.skl, scan.l, tests/Makefile.am: Added - yylex_destroy() to non-reentrant scanner. Added ability to - override memory functions. Added tests for overriding memory - functions. - -2002-07-09 14:41 Will Estes <wlestes@uncg.edu> - - * NEWS: new POSIXLY_CORRECT and new ru translation - -2002-07-09 14:40 Will Estes <wlestes@uncg.edu> - - * po/ru.po: new ru translation from the translation project - -2002-07-09 14:25 John Millaway <millaway@acm.org> - - * flex.texi: Made note of set/get debug in docs. - -2002-07-09 14:11 John Millaway <millaway@acm.org> - - * configure.in, flexdef.h, tests/create-test: Replaced obsolete - macros in configure.in. Modified create-test to handle the above - changes in configure.in. Added support for <stdbool.h>. - -2002-07-09 13:27 John Millaway <millaway@acm.org> - - * main.c: Check POSIXLY_CORRECT env variable. - -2002-07-09 12:43 John Millaway <millaway@acm.org> - - * flex.skl: Added prototypes for the get/set debug functions. - -2002-07-09 12:37 John Millaway <millaway@acm.org> - - * configure.in, flex.skl, gen.c, main.c, scan.l, tests/Makefile.am, - tests/test-debug-nr/.cvsignore, tests/test-debug-nr/Makefile.am, - tests/test-debug-nr/scanner.l, tests/test-debug-nr/test.input, - tests/test-debug-r/.cvsignore, tests/test-debug-r/Makefile.am, - tests/test-debug-r/scanner.l, tests/test-debug-r/test.input: Made - yy_flex_debug non-global in reentrant scanner. Created get/set - functions for yy_flex_debug. Defined prefixes for new - yy_flex_debug symbols. Added tests/ for yy_flex_debug. - -2002-07-09 12:31 John Millaway <millaway@acm.org> - - * tests/create-test: create-test script now modifies .cvsignore - -2002-07-09 12:22 John Millaway <millaway@acm.org> - - * tests/create-test: Improved the error checking. - -2002-07-03 09:12 Will Estes <wlestes@uncg.edu> - - * main.c: fix bug whereby prefix didn't get passed to everybody; - patch by rse@engelschall.com - -2002-07-03 08:47 Will Estes <wlestes@uncg.edu> - - * faq.texi: ~ is an active character, so we'll just use the word - 'about' - -2002-07-02 18:59 John Millaway <millaway@acm.org> - - * Makefile.am: Fixed typo. - -2002-07-02 15:47 John Millaway <millaway@acm.org> - - * faq.texi: Added a faq. - -2002-06-28 19:05 John Millaway <millaway@acm.org> - - * Makefile.am: Added 'tags' target -- something I should have done - long ago. - -2002-06-28 12:18 Will Estes <wlestes@uncg.edu> - - * TODO: add two new items regarding coding; remove tests/ copyright - notice item as it's done - -2002-06-26 08:33 Will Estes <wlestes@uncg.edu> - - * NEWS: note the copyright messages in tests/ - -2002-06-25 15:37 John Millaway <millaway@acm.org> - - * tests/: TEMPLATE/Makefile.am, TEMPLATE/parser.y, - TEMPLATE/scanner.l, test-array-nr/Makefile.am, - test-array-nr/scanner.l, test-array-r/Makefile.am, - test-array-r/scanner.l, test-basic-nr/Makefile.am, - test-basic-nr/scanner.l, test-basic-r/Makefile.am, - test-basic-r/scanner.l, test-bison-yylloc/Makefile.am, - test-bison-yylloc/main.c, test-bison-yylloc/parser.y, - test-bison-yylloc/scanner.l, test-bison-yylval/Makefile.am, - test-bison-yylval/main.c, test-bison-yylval/parser.y, - test-bison-yylval/scanner.l, test-c-cpp-nr/Makefile.am, - test-c-cpp-nr/scanner.l, test-c-cpp-r/Makefile.am, - test-c-cpp-r/scanner.l, test-header-nr/Makefile.am, - test-header-nr/main.c, test-header-nr/scanner.l, - test-header-r/Makefile.am, test-header-r/main.c, - test-header-r/scanner.l, test-include-by-buffer/Makefile.am, - test-include-by-buffer/scanner.l, - test-include-by-reentrant/Makefile.am, - test-include-by-reentrant/scanner.l, test-lineno-nr/Makefile.am, - test-lineno-nr/scanner.l, test-lineno-r/Makefile.am, - test-lineno-r/scanner.l, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-nr/main.c, - test-multiple-scanners-nr/scanner-1.l, - test-multiple-scanners-nr/scanner-2.l, - test-multiple-scanners-r/Makefile.am, - test-multiple-scanners-r/main.c, - test-multiple-scanners-r/scanner-1.l, - test-multiple-scanners-r/scanner-2.l, test-prefix-nr/Makefile.am, - test-prefix-nr/scanner.l, test-prefix-r/Makefile.am, - test-prefix-r/scanner.l, test-pthread/Makefile.am, - test-pthread/scanner.l, test-string-nr/Makefile.am, - test-string-nr/scanner.l, test-string-r/Makefile.am, - test-string-r/scanner.l, test-yyextra/Makefile.am, - test-yyextra/scanner.l: Prepended explicit license to all test-*/ - sources. - -2002-06-25 08:56 Will Estes <wlestes@uncg.edu> - - * NEWS, po/ca.po, po/de.po, po/fr.po, po/sv.po, po/tr.po: new ca, - de, fr, sv, tr translations - -2002-06-19 09:40 Will Estes <wlestes@uncg.edu> - - * TODO: add bootstrapper to the todo list - -2002-06-19 09:38 Will Estes <wlestes@uncg.edu> - - * configure.in: new version number - -2002-06-19 09:38 Will Estes <wlestes@uncg.edu> - - * TODO: update TODO list - -2002-06-19 09:26 Will Estes <wlestes@uncg.edu> - - * NEWS, TODO, flex.texi, flexdef.h, main.c, options.c, options.h, - parse.y, scan.l: address typos in NEWS; add --posix option for ERE - parsing the way posix wants it; update the TODO file - -2002-05-31 13:18 Will Estes <wlestes@uncg.edu> - - * README-alpha: made code quality warning more explicit; gave url - for cvs and beta flex - -2002-05-23 11:53 John Millaway <millaway@acm.org> - - * gen.c: Fixed bug where omission of user section 3 caused - unmatched #ifdef's in generated code. - -2002-05-20 08:39 Will Estes <wlestes@uncg.edu> - - * configure.in: configure.in requires at least autoconf 2.50 - -2002-05-13 14:45 John Millaway <millaway@acm.org> - - * Makefile.am: Updated my email address. - -2002-05-10 15:33 John Millaway <millaway@acm.org> - - * flexdef.h, misc.c: chomp'd lines when reading external skel file. - -2002-05-07 11:00 Will Estes <wlestes@uncg.edu> - - * po/sv.po: new sweedish translation from the translation project - -2002-04-29 11:37 Will Estes <wlestes@uncg.edu> - - * po/ca.po: new catalan translation from the translation project - -2002-04-29 11:37 Will Estes <wlestes@uncg.edu> - - * po/es.po: new spanish translation from the translation project - -2002-04-25 17:54 Will Estes <wlestes@uncg.edu> - - * TODO: note that the lex matching of abc{1,3} is the posix - behavior and so we have a problem - -2002-04-25 17:53 Will Estes <wlestes@uncg.edu> - - * flex.texi: note that the lex matching of abc{1,3} is the posix - behavior - -2002-04-23 07:02 Will Estes <wlestes@uncg.edu> - - * configure.in: new version 2.5.7; use autoconf versioning info - -2002-04-23 07:01 Will Estes <wlestes@uncg.edu> - - * NEWS: note changes in 2.5.7 - -2002-04-23 06:23 Will Estes <wlestes@uncg.edu> - - * main.c: conditional compile gettext initialization - -2002-04-22 13:28 Will Estes <wlestes@uncg.edu> - - * po/de.po: new german translation from the translation project - -2002-04-19 18:40 John Millaway <millaway@acm.org> - - * tests/test-include-by-reentrant/Makefile.am: Fixed command line - for test-include-by-reentrant/Makefile.am - -2002-04-19 18:30 John Millaway <millaway@acm.org> - - * tests/: Makefile.am, TEMPLATE/Makefile.am, - test-array-nr/Makefile.am, test-array-r/Makefile.am, - test-basic-nr/Makefile.am, test-basic-r/Makefile.am, - test-bison-yylloc/Makefile.am, test-bison-yylval/Makefile.am, - test-c-cpp-nr/Makefile.am, test-c-cpp-r/Makefile.am, - test-header-nr/Makefile.am, test-header-r/Makefile.am, - test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-string-nr/Makefile.am, test-string-r/Makefile.am, - test-yyextra/Makefile.am: Added -I . to compiler search path in - tests (so it finds the generated parser.h). - -2002-04-19 18:20 John Millaway <millaway@acm.org> - - * flexdef.h, misc.c, parse.y, sym.c: Applied 'const' to a few more - char*, where appropriate. - -2002-04-19 17:54 John Millaway <millaway@acm.org> - - * tests/: TEMPLATE/Makefile.am, test-array-nr/Makefile.am, - test-array-r/Makefile.am, test-basic-nr/Makefile.am, - test-basic-r/Makefile.am, test-bison-yylloc/Makefile.am, - test-bison-yylval/Makefile.am, test-c-cpp-nr/Makefile.am, - test-c-cpp-r/Makefile.am, test-header-nr/Makefile.am, - test-header-r/Makefile.am, test-include-by-buffer/Makefile.am, - test-include-by-reentrant/Makefile.am, test-lineno-nr/Makefile.am, - test-lineno-r/Makefile.am, test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-prefix-nr/Makefile.am, - test-prefix-r/Makefile.am, test-pthread/Makefile.am, - test-string-nr/Makefile.am, test-string-r/Makefile.am, - test-yyextra/Makefile.am: Added top_builddir to -I path. Changed - $(srcdir)/$(testname) to ./$(testname) in 'make test' rule. - -2002-04-19 17:53 John Millaway <millaway@acm.org> - - * flexdef.h, gen.c, misc.c: Changed 'char[]' to 'const char*' - wherever in conflicted with gettext. - -2002-04-19 10:35 Will Estes <wlestes@uncg.edu> - - * po/: fr.po, sv.po: new files from translation after 2.5.6 beta - release - -2002-04-18 19:01 John Millaway <millaway@acm.org> - - * tests/test-lineno-r/Makefile.am: Fixed minor typo/cut and paste - error. - -2002-04-18 18:07 John Millaway <millaway@acm.org> - - * configure.in: Added yylineno test. - -2002-04-18 18:06 John Millaway <millaway@acm.org> - - * tests/Makefile.am: Added yylineno tests. - -2002-04-18 18:06 John Millaway <millaway@acm.org> - - * tests/: test-lineno-nr/.cvsignore, test-lineno-nr/Makefile.am, - test-lineno-nr/scanner.l, test-lineno-nr/test.input, - test-lineno-r/.cvsignore, test-lineno-r/Makefile.am, - test-lineno-r/scanner.l, test-lineno-r/test.input: Created yylineno - tests. - -2002-04-15 16:49 John Millaway <millaway@acm.org> - - * scanopt.c: Applied gettext macros to error messages from scanopt. - -2002-04-15 16:46 John Millaway <millaway@acm.org> - - * buf.c, faq.texi, options.c, options.h, scanopt.c, scanopt.h: - Changed copyright from Millaway to flex? U.S. Gov't? Regents of U. - Cali.? Paxson? - -2002-04-15 10:44 Will Estes <wlestes@uncg.edu> - - * tests/: test-bison-yylloc/Makefile.am, - test-header-nr/Makefile.am, test-header-r/Makefile.am: we missed a - few main.c files in the distribution - -2002-04-15 08:05 Will Estes <wlestes@uncg.edu> - - * TODO: a lot more work has happened to flex; note this by removing - a number of TODO entries - -2002-04-15 07:59 Will Estes <wlestes@uncg.edu> - - * TODO: make sure all gettext modules use gettext translation - facilities - -2002-04-14 15:53 John Millaway <millaway@acm.org> - - * faq.texi: Converted faqs 34-41 to texinfo. - -2002-04-14 14:42 John Millaway <millaway@acm.org> - - * Makefile.am, faq.texi, flex.texi: Added faq.texi to archive. - Added faq.texi to flex_TEXINFOS macro in Makefile.am. flex.texi - now includes faq.texi. - -2002-04-13 00:16 John Millaway <millaway@acm.org> - - * flexdef.h: defined FLEX_EXIT macro to call longjmp on errors. - -2002-04-13 00:08 John Millaway <millaway@acm.org> - - * main.c, misc.c: Replaced exit(2) calls with longjmps (in the form - of FLEX_EXIT macro). Moved main() to flex_main() to allow flex to - be called from a library. - -2002-04-13 00:06 John Millaway <millaway@acm.org> - - * scanopt.c: Fixed minor typo in error message - -2002-04-12 12:23 Will Estes <wlestes@uncg.edu> - - * tests/: test-header-nr/Makefile.am, test-header-r/Makefile.am, - test-multiple-scanners-nr/Makefile.am, - test-multiple-scanners-r/Makefile.am, test-pthread/Makefile.am, - test-string-nr/Makefile.am, test-string-r/Makefile.am, - test-yyextra/Makefile.am: removed eroneous files listed in - EXTRA_DIST - -2002-04-12 12:09 Will Estes <wlestes@uncg.edu> - - * tests/test-yyextra/.cvsignore: ignore Makefile.in - -2002-04-12 12:09 Will Estes <wlestes@uncg.edu> - - * tests/test-string-r/.cvsignore: it's Makefile.in, not makefile.in - -2002-04-12 12:02 Will Estes <wlestes@uncg.edu> - - * tests/test-yyextra/: Makefile.am, Makefile.in: put test-yyextra - under automake - -2002-04-12 11:52 Will Estes <wlestes@uncg.edu> - - * tests/test-string-r/: Makefile.am, Makefile.in: put test-string-r - under automake - -2002-04-12 11:50 Will Estes <wlestes@uncg.edu> - - * tests/: test-string-nr/.cvsignore, test-string-r/.cvsignore: we - can ignore Makefile.in - -2002-04-12 11:49 Will Estes <wlestes@uncg.edu> - - * tests/test-string-nr/: Makefile.am, Makefile.in: put - test-string-nr under automake - -2002-04-12 11:40 Will Estes <wlestes@uncg.edu> - - * tests/test-pthread/.cvsignore: ignore Makefile.in - -2002-04-12 11:37 Will Estes <wlestes@uncg.edu> - - * tests/test-pthread/: Makefile.am, Makefile.in: put test-pthread - under automake - -2002-04-12 11:24 Will Estes <wlestes@uncg.edu> - - * tests/test-prefix-r/.cvsignore: we can ignore Makefile.in - -2002-04-12 11:23 Will Estes <wlestes@uncg.edu> - - * tests/test-prefix-r/: Makefile.am, Makefile.in: put test-prefix-r - under automake - -2002-04-12 11:20 Will Estes <wlestes@uncg.edu> - - * tests/test-prefix-nr/.cvsignore: we can ignore Makefile.in - -2002-04-12 11:19 Will Estes <wlestes@uncg.edu> - - * tests/test-prefix-nr/: Makefile.am, Makefile.in: put - test-prefix-nr under automake - -2002-04-12 08:03 Will Estes <wlestes@uncg.edu> - - * tests/test-multiple-scanners-r/.cvsignore: we can ignore - Makefile.in now - -2002-04-12 08:02 Will Estes <wlestes@uncg.edu> - - * tests/test-multiple-scanners-r/: Makefile.am, Makefile.in: put - test-multiple-scanners-r under automake - -2002-04-12 07:59 Will Estes <wlestes@uncg.edu> - - * tests/test-multiple-scanners-nr/.cvsignore: we can ignore - Makefile.in now - -2002-04-12 07:59 Will Estes <wlestes@uncg.edu> - - * tests/test-multiple-scanners-nr/: Makefile.am, Makefile.in: put - test-multiple-scanners-nr under automake - -2002-04-11 07:44 Will Estes <wlestes@uncg.edu> - - * tests/: test-c-cpp-nr/Makefile.am, test-c-cpp-r/Makefile.am: we - didn't need parser.y - -2002-04-11 07:43 Will Estes <wlestes@uncg.edu> - - * TODO: work done on the test suite; remove relevant entries from - TODO - -2002-04-10 13:06 Will Estes <wlestes@uncg.edu> - - * tests/test-include-by-reentrant/: .cvsignore, Makefile.am, - Makefile.in: put test-include-by-reentrant under automake - -2002-04-09 09:52 Will Estes <wlestes@uncg.edu> - - * tests/test-include-by-buffer/.cvsignore: we have a Makefile.in - which we need to ignore - -2002-04-09 09:33 Will Estes <wlestes@uncg.edu> - - * tests/test-include-by-buffer/: Makefile.am, Makefile.in: - test-include-by-buffer now under automake control - -2002-04-09 09:32 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/Makefile.am: and we want LFLAGS in the rule to - make scanner.c as well - -2002-04-09 09:13 Will Estes <wlestes@uncg.edu> - - * tests/test-header-r/: .cvsignore, Makefile.am, Makefile.in: put - test-header-r under automake - -2002-04-09 09:12 Will Estes <wlestes@uncg.edu> - - * tests/test-header-nr/.cvsignore: we now generate a Makefile.in - from automake; cvs should ignore it - -2002-04-09 09:12 Will Estes <wlestes@uncg.edu> - - * tests/test-header-nr/Makefile.am: add dependencies for main.o and - scaner.h - -2002-04-09 09:11 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/Makefile.am: We may want to have LFLAGS readily - available - -2002-04-09 08:48 Will Estes <wlestes@uncg.edu> - - * tests/test-header-nr/: Makefile.am, Makefile.in: put - test-header-nr under automake - -2002-04-09 08:47 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/Makefile.am: oops, we need to clean objects too - -2002-04-09 08:35 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/Makefile.am, test-array-nr/Makefile.am, - test-array-r/Makefile.am, test-basic-nr/Makefile.am, - test-basic-r/Makefile.am, test-bison-yylloc/Makefile.am, - test-bison-yylval/Makefile.am, test-c-cpp-nr/Makefile.am, - test-c-cpp-r/Makefile.am: now that config.h lives in the top-level - directory, we need to tell the testsuite - -2002-04-08 11:06 Will Estes <wlestes@uncg.edu> - - * tests/: test-array-nr/.cvsignore, test-array-r/.cvsignore, - test-basic-nr/.cvsignore, test-basic-r/.cvsignore, - test-bison-yylval/.cvsignore, test-c-cpp-nr/.cvsignore, - test-c-cpp-r/.cvsignore: we can ignore some Makefile.in - -2002-04-08 11:00 Will Estes <wlestes@uncg.edu> - - * configure.in, tests/TEMPLATE/Makefile.am: only one config file - header apparently; this will have consequences in the test suite - -2002-04-08 10:36 Will Estes <wlestes@uncg.edu> - - * tests/test-bison-yylval/: Makefile.am, Makefile.in: adding - automake support - -2002-04-08 10:26 Will Estes <wlestes@uncg.edu> - - * tests/test-bison-yylloc/: .cvsignore, Makefile.am: tuned - Makefile.am to build correctly; ignore Makefile.in now - -2002-04-08 09:22 Will Estes <wlestes@uncg.edu> - - * tests/configure.in: test suite changes - -2002-04-08 09:16 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/.cvsignore, TEMPLATE/Makefile.am, - TEMPLATE/Makefile.in, test-array-nr/Makefile.am, - test-array-nr/Makefile.in, test-array-r/Makefile.am, - test-array-r/Makefile.in, test-basic-nr/Makefile.am, - test-basic-nr/Makefile.in, test-basic-r/Makefile.am, - test-basic-r/Makefile.in, test-bison-yylloc/Makefile.am, - test-bison-yylloc/Makefile.in, test-c-cpp-nr/Makefile.am, - test-c-cpp-nr/Makefile.in, test-c-cpp-r/Makefile.am, - test-c-cpp-r/Makefile.in: test suite changes - -2002-04-08 09:13 Will Estes <wlestes@uncg.edu> - - * autogen.sh, configure.in, tests/.cvsignore, tests/Makefile.am, - tests/Makefile.in, tests/README, tests/configure.in, - tests/create-test, tests/create-test.pl: test suite changes - -2002-04-05 14:18 John Millaway <millaway@acm.org> - - * flex.texi: Corrected error in manual regarding return type for - yy_scan_{string,buffer,bytes}. - -2002-04-05 08:25 Will Estes <wlestes@uncg.edu> - - * po/de.po: new german translations from the translation project - -2002-04-03 13:13 Will Estes <wlestes@uncg.edu> - - * po/es.po: new spanish translations - -2002-04-01 11:47 Will Estes <wlestes@uncg.edu> - - * Makefile.am: DIST_SUBDIRS: new variable. we can build flex with - SUBDIRS and then build the distribution using DIST_SUBDIRS - -2002-04-01 08:03 Will Estes <wlestes@uncg.edu> - - * main.c: fix typo in comment - -2002-03-31 12:17 John Millaway <millaway@acm.org> - - * main.c: Documented the header file kludge, (in anticipation of - buffering Section 1.) - -2002-03-30 22:26 John Millaway <millaway@acm.org> - - * flex.texi: Created appendix "Makefiles and Flex" in the manual. - -2002-03-29 19:12 John Millaway <millaway@acm.org> - - * flex.texi: updating manual. - -2002-03-29 17:32 Will Estes <wlestes@uncg.edu> - - * po/POTFILES.in: we want parse.y, not parse.c - -2002-03-29 16:37 John Millaway <millaway@acm.org> - - * flex.texi: Indexing the manual (75% done). - -2002-03-29 16:08 Will Estes <wlestes@uncg.edu> - - * Makefile.am: unlisted intermediate flex/yacc-created files - -2002-03-29 15:59 Will Estes <wlestes@uncg.edu> - - * TODO: millaway has done more work - -2002-03-29 15:03 Will Estes <wlestes@uncg.edu> - - * Makefile.am, configure.in: ok, one last touch up; users most - likely wont have help2man so we need to insure that's ok - -2002-03-29 14:55 Will Estes <wlestes@uncg.edu> - - * Makefile.am: fine tune flex.1 some more - -2002-03-29 14:36 Will Estes <wlestes@uncg.edu> - - * Makefile.am, configure.in: generalize the manpage a bit and tell - autofoo about help2man - -2002-03-29 12:18 Will Estes <wlestes@uncg.edu> - - * po/da.po: new danish from translation project robot - -2002-03-28 16:05 John Millaway <millaway@acm.org> - - * .cvsignore: Added flex.1 and version.texi to cvsignore. - -2002-03-28 16:02 John Millaway <millaway@acm.org> - - * flex.texi: Indexing the manual -- it's only half done. - -2002-03-28 15:57 John Millaway <millaway@acm.org> - - * flex.texi: flex manual now uses automake's versioning info. - -2002-03-28 14:55 John Millaway <millaway@acm.org> - - * README.cvs-snapshot: Mentioned requirements for gettext and - help2man. - -2002-03-28 14:52 John Millaway <millaway@acm.org> - - * Makefile.am, main.c: Output of `flex --version` now matches GNU - coding standards. Makefile.am now uses `help2man` to generate - flex.1 - -2002-03-27 08:58 Will Estes <wlestes@uncg.edu> - - * TODO: millaway has done a lot on the TODO list; remove those - items that he has take care of - -2002-03-27 08:45 Will Estes <wlestes@uncg.edu> - - * README.cvs-snapshot: edited millaway's initial draft - -2002-03-26 20:09 John Millaway <millaway@acm.org> - - * README.cvs-snapshot: Created file. - -2002-03-26 19:28 John Millaway <millaway@acm.org> - - * flex.texi: Fixed case of node names in flex.texi. - -2002-03-24 16:08 Will Estes <wlestes@uncg.edu> - - * TODO: lex- and yacc- generated files - -2002-03-24 14:25 Will Estes <wlestes@uncg.edu> - - * po/fr.po: new french - -2002-03-18 08:27 Will Estes <wlestes@uncg.edu> - - * NEWS: ending periods in news items removed; mention nounistd - options - -2002-03-18 08:00 Will Estes <wlestes@uncg.edu> - - * po/sv.po: updated sweedish translations - -2002-03-18 08:00 Will Estes <wlestes@uncg.edu> - - * po/de.po: german translation - -2002-03-18 02:50 John Millaway <millaway@acm.org> - - * flex.skl, flex.texi, main.c, options.c, options.h, scan.l: - Removed CFront 1.2 -specific code from skeleton, because CFront now - defines __cplusplus properly. Removed TurboC-specific code from - skeleton. Skeleton now includes proper C++ standard headers. - Relocated "unistd.h" code after user section 1 to allow user to - overrid it. New option "nounistd" to suppress unistd.h from being - included. - -2002-03-15 11:29 Will Estes <wlestes@uncg.edu> - - * po/tr.po: new turkish translation - -2002-03-15 10:33 Will Estes <wlestes@uncg.edu> - - * NEWS: mention included translations - -2002-03-15 10:32 Will Estes <wlestes@uncg.edu> - - * TODO: we've done the gettext thing, but sometime we should get - 0.11.1 - -2002-03-15 10:30 Will Estes <wlestes@uncg.edu> - - * po/ca.po: new catalan translation - -2002-03-14 18:23 John Millaway <millaway@acm.org> - - * flex.texi: Added section on format of comments. - -2002-03-14 17:18 John Millaway <millaway@acm.org> - - * flex.texi: Split format chapter into sections. - -2002-03-14 16:51 John Millaway <millaway@acm.org> - - * flex.texi: Removed explicit pointers in node definitions. - -2002-03-14 16:31 Will Estes <wlestes@uncg.edu> - - * configure.in: unistd.h can be problematic - -2002-03-14 09:11 Will Estes <wlestes@uncg.edu> - - * tests/README: editing changes to README - -2002-03-13 15:50 Will Estes <wlestes@uncg.edu> - - * po/POTFILES.in: scan.l, not scan.c because gettext gets confused - -2002-03-13 12:36 Will Estes <wlestes@uncg.edu> - - * scan.l: gettext cruft - -2002-03-13 10:57 Will Estes <wlestes@uncg.edu> - - * tests/descriptions: separate out test descriptions - -2002-03-13 09:34 Will Estes <wlestes@uncg.edu> - - * po/LINGUAS: french and korean dont crash now - -2002-03-12 16:40 Will Estes <wlestes@uncg.edu> - - * po/: fr.po, ko.po: remove duplicate messages as per advice from - Jordi Mallach <jordi@debian.org> - -2002-03-12 14:21 Will Estes <wlestes@uncg.edu> - - * gettext.h: yes, more gettext cruft - -2002-03-12 14:11 Will Estes <wlestes@uncg.edu> - - * po/Makefile.in.in, po/Rules-quot, po/boldquot.sed, - po/en@boldquot.header, po/en@quot.header, po/insert-header.sin, - po/quot.sed, m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, - m4/iconv.m4, m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-ld.m4, - m4/lib-link.m4, m4/lib-prefix.m4, m4/progtest.m4, ABOUT-NLS, - config.rpath: this is gettext cruft - -2002-03-12 13:58 Will Estes <wlestes@uncg.edu> - - * NEWS: gettext and autofoo are now involved - -2002-03-12 13:29 Will Estes <wlestes@uncg.edu> - - * .cvsignore, Makefile.am, autogen.sh, configure.in, flexdef.h, - main.c: mostly, changes for gettext - -2002-03-12 13:29 Will Estes <wlestes@uncg.edu> - - * po/: ca.po, da.po, es.po, ru.po, sv.po, tr.po: these sure change - a lot - -2002-03-12 13:28 Will Estes <wlestes@uncg.edu> - - * TODO: note about cvs documentation - -2002-03-12 13:02 Will Estes <wlestes@uncg.edu> - - * po/LINGUAS: we now have turkish - -2002-03-12 13:01 Will Estes <wlestes@uncg.edu> - - * po/tr.po: updated translations, i think - -2002-03-12 12:42 Will Estes <wlestes@uncg.edu> - - * po/: ca.po, da.po, es.po, fr.po, ko.po, ru.po, sv.po, tr.po: ok, - maybe we do keep these things? - -2002-03-12 12:26 Will Estes <wlestes@uncg.edu> - - * README-alpha: README-alpha for those bad-hair days - -2002-03-12 12:18 Will Estes <wlestes@uncg.edu> - - * m4/: .cvsignore, Makefile.am: ok,now we kinda have a m4/ subdir - for gettext - -2002-03-12 12:13 Will Estes <wlestes@uncg.edu> - - * po/: .cvsignore, LINGUAS, Makevars, POTFILES.in, da.po, es.po, - fr.po, ko.po, ru.po, sv.po: now, we have a po/ subdirectory for - gettext. i hope you're happy - -2002-03-12 12:06 Will Estes <wlestes@uncg.edu> - - * po/ca.po: removing po files, maybe - -2002-03-12 12:01 Will Estes <wlestes@uncg.edu> - - * tests/.cvsignore: ignore autom4te.cache - -2002-03-11 09:27 Will Estes <wlestes@uncg.edu> - - * po/: ca.po, da.po, es.po, fr.po, ko.po, ru.po, sv.po: po files - from debian - -2002-03-08 10:00 Will Estes <wlestes@uncg.edu> - - * TODO: add several notes about tasks which need doing; create a - new top-level entry for generic coding concerns (this is distinct - from specific API or other such issues) - -2002-03-06 16:15 Will Estes <wlestes@uncg.edu> - - * README: eliminate to.do and faqs from the README file - -2002-03-06 16:13 Will Estes <wlestes@uncg.edu> - - * TODO: more notes on tests/ - -2002-03-06 11:32 Will Estes <wlestes@uncg.edu> - - * Makefile.am: remove subdirectories from EXTRA_DIST; add a SUBDIRS - macro to handle examples/; clean up the dist-hook target - -2002-03-06 11:32 Will Estes <wlestes@uncg.edu> - - * configure.in: we want to generate Makefiles in some more - subdirectories; automake will like this - -2002-03-06 11:26 Will Estes <wlestes@uncg.edu> - - * TODO: notes on subdirectories - -2002-03-05 09:49 Will Estes <wlestes@uncg.edu> - - * examples/: .cvsignore, Makefile.am: now examples/ fits into - automake - -2002-03-05 09:48 Will Estes <wlestes@uncg.edu> - - * examples/fastwc/: .cvsignore, Makefile.am: examples/fastwc now - fits into automake - -2002-03-05 09:47 Will Estes <wlestes@uncg.edu> - - * examples/manual/: .cvsignore, Makefile.am, Makefile.examples, - README: examples/manual directory now fits into automake - -2002-03-05 09:45 Will Estes <wlestes@uncg.edu> - - * examples/manual/Makefile: renamed Makefile to Makefile.examples - for automake's sake - -2002-03-04 10:58 Will Estes <wlestes@uncg.edu> - - * Makefile.am: add parse.c and scan.c to built_sources - -2002-02-24 17:19 John Millaway <millaway@acm.org> - - * Makefile.am: Removed CVS-specific code from 'dist-hook' target so - anybody with a copy of the tree can build a dist. - -2002-02-22 17:50 John Millaway <millaway@acm.org> - - * tests/Makefile.in: Converted test script to portable /bin/sh. - -2002-02-22 17:47 John Millaway <millaway@acm.org> - - * tests/test-bison-yylloc/Makefile.in: Added some spaces in shell - scripts for portability. - -2002-02-22 16:59 John Millaway <millaway@acm.org> - - * tests/create-test.pl: Fixed #! line for portability. - -2002-02-22 16:58 John Millaway <millaway@acm.org> - - * tests/test-bison-yylloc/Makefile.in: Fixed return status code on - bison-lloc test. - -2002-02-21 00:40 John Millaway <millaway@acm.org> - - * tests/create-test.pl: Added script to auto-create tests. Probably - overkill. - -2002-02-21 00:16 John Millaway <millaway@acm.org> - - * flex.skl: Fixed C++ #ifdef problem. Removed mistyped __CPLUSPLUS - macro. Removed THROW_NIL. Not sure where it came from in the first - place. - -2002-02-21 00:12 John Millaway <millaway@acm.org> - - * tests/: README, configure.in, TEMPLATE/Makefile.in, - test-c-cpp-nr/.cvsignore, test-c-cpp-nr/Makefile.in, - test-c-cpp-nr/scanner.l, test-c-cpp-nr/test.input, - test-c-cpp-r/.cvsignore, test-c-cpp-r/Makefile.in, - test-c-cpp-r/scanner.l, test-c-cpp-r/test.input: Added - test-c-cpp-nr and test-c-cpp-r. - -2002-02-16 15:26 John Millaway <millaway@acm.org> - - * flex.skl: Added missing #endif. - -2002-02-07 10:19 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/.cvsignore, test-array-nr/.cvsignore, - test-array-r/.cvsignore, test-basic-nr/.cvsignore, - test-basic-r/.cvsignore, test-bison-yylloc/.cvsignore, - test-bison-yylval/.cvsignore, test-header-nr/.cvsignore, - test-header-r/.cvsignore, test-include-by-buffer/.cvsignore, - test-include-by-reentrant/.cvsignore, - test-multiple-scanners-nr/.cvsignore, - test-multiple-scanners-r/.cvsignore, test-prefix-nr/.cvsignore, - test-prefix-r/.cvsignore, test-pthread/.cvsignore, - test-string-nr/.cvsignore, test-string-r/.cvsignore, - test-yyextra/.cvsignore: add OUTPUT to .cvsignore files in test - directories; it's also in the template directory - -2002-02-06 18:30 Will Estes <wlestes@uncg.edu> - - * gen.c: fix interrupted reads and freads; from the debian package - maintainer - -2002-02-06 16:41 Will Estes <wlestes@uncg.edu> - - * flex.texi, flexdef.h, main.c, nfa.c: support large flex tables; - from debian package maintainer - -2002-01-29 08:48 Will Estes <wlestes@uncg.edu> - - * tests/configure.in: add more output files to account for new - tests - -2002-01-03 15:19 Will Estes <wlestes@uncg.edu> - - * tests/test-array-nr/: .cvsignore, Makefile.in, scanner.l, - test.input: add this test - -2002-01-03 15:17 Will Estes <wlestes@uncg.edu> - - * tests/test-array-r/: .cvsignore, Makefile.in, scanner.l, - test.input: add this test suite - -2001-11-20 14:58 Will Estes <wlestes@uncg.edu> - - * flex.skl, main.c: millaway: Fixed yytext_ptr when using %array in - reentrant scanner - -2001-11-20 14:48 Will Estes <wlestes@uncg.edu> - - * buf.c: oops, forgot this one line - -2001-11-19 01:39 John Millaway <millaway@acm.org> - - * tests/: test-array-nr/Makefile.in, test-array-r/Makefile.in: file - Makefile.in was initially added on branch flex-2-5-6-branch. - -2001-11-19 01:39 John Millaway <millaway@acm.org> - - * tests/: test-array-nr/scanner.l, test-array-r/scanner.l: file - scanner.l was initially added on branch flex-2-5-6-branch. - -2001-11-19 01:39 John Millaway <millaway@acm.org> - - * tests/: test-array-nr/.cvsignore, test-array-r/.cvsignore: file - .cvsignore was initially added on branch flex-2-5-6-branch. - -2001-11-19 01:39 John Millaway <millaway@acm.org> - - * tests/: test-array-nr/test.input, test-array-r/test.input: file - test.input was initially added on branch flex-2-5-6-branch. - -2001-11-14 18:09 Will Estes <wlestes@uncg.edu> - - * tests/test-header-r/: .cvsignore, Makefile.in, main.c, scanner.l, - test.input: and more fallout - -2001-11-14 16:13 Will Estes <wlestes@uncg.edu> - - * TODO, flex.skl, flex.texi, flexdef.h, main.c, misc.c, - tests/README, tests/configure.in, tests/TEMPLATE/Makefile.in, - tests/test-basic-r/scanner.l, tests/test-bison-yylloc/.cvsignore, - tests/test-bison-yylloc/Makefile.in, - tests/test-bison-yylloc/parser.y, - tests/test-bison-yylloc/scanner.l, - tests/test-bison-yylval/.cvsignore, - tests/test-bison-yylval/Makefile.in, - tests/test-bison-yylval/parser.y, - tests/test-bison-yylval/scanner.l, - tests/test-include-by-reentrant/scanner.l, - tests/test-prefix-r/scanner.l, tests/test-pthread/scanner.l, - tests/test-string-r/scanner.l, tests/test-yyextra/scanner.l: more - from the same batch - -2001-11-14 16:12 Will Estes <wlestes@uncg.edu> - - * tests/: test-bison-yylloc/main.c, test-bison-yylval/main.c, - test-header-nr/.cvsignore, test-header-nr/Makefile.in, - test-header-nr/main.c, test-header-nr/scanner.l, - test-header-nr/test.input, test-multiple-scanners-nr/.cvsignore, - test-multiple-scanners-nr/Makefile.in, - test-multiple-scanners-nr/main.c, - test-multiple-scanners-nr/scanner-1.l, - test-multiple-scanners-nr/scanner-2.l, - test-multiple-scanners-r/.cvsignore, - test-multiple-scanners-r/Makefile.in, - test-multiple-scanners-r/main.c, - test-multiple-scanners-r/scanner-1.l, - test-multiple-scanners-r/scanner-2.l: a big batch from millaway - -2001-10-28 01:49 John Millaway <millaway@acm.org> - - * tests/: test-bison-yylloc/main.c, test-bison-yylval/main.c: file - main.c was initially added on branch flex-2-5-6-branch. - -2001-10-26 23:59 John Millaway <millaway@acm.org> - - * tests/: test-multiple-scanners-nr/Makefile.in, - test-multiple-scanners-r/Makefile.in: file Makefile.in was - initially added on branch flex-2-5-6-branch. - -2001-10-26 23:59 John Millaway <millaway@acm.org> - - * tests/: test-multiple-scanners-nr/scanner-2.l, - test-multiple-scanners-r/scanner-2.l: file scanner-2.l was - initially added on branch flex-2-5-6-branch. - -2001-10-26 23:59 John Millaway <millaway@acm.org> - - * tests/: test-multiple-scanners-nr/.cvsignore, - test-multiple-scanners-r/.cvsignore: file .cvsignore was initially - added on branch flex-2-5-6-branch. - -2001-10-26 23:59 John Millaway <millaway@acm.org> - - * tests/: test-multiple-scanners-nr/main.c, - test-multiple-scanners-r/main.c: file main.c was initially added on - branch flex-2-5-6-branch. - -2001-10-26 23:59 John Millaway <millaway@acm.org> - - * tests/: test-multiple-scanners-nr/scanner-1.l, - test-multiple-scanners-r/scanner-1.l: file scanner-1.l was - initially added on branch flex-2-5-6-branch. - -2001-10-26 10:30 Will Estes <wlestes@uncg.edu> - - * NEWS: now NEWS has forgotten about the _r variables - -2001-10-26 08:59 Will Estes <wlestes@uncg.edu> - - * flex.skl, flex.texi, gen.c, main.c, - tests/test-bison-yylloc/scanner.l, - tests/test-bison-yylval/scanner.l, - tests/test-include-by-reentrant/scanner.l, - tests/test-prefix-nr/scanner.l, tests/test-pthread/scanner.l, - tests/test-string-r/scanner.l, tests/test-yyextra/scanner.l: - millaway simplified the reentrant api; here's the result - -2001-10-23 17:07 Will Estes <wlestes@uncg.edu> - - * main.c, options.c, options.h: more from millaway - -2001-10-22 10:37 Will Estes <wlestes@uncg.edu> - - * main.c, options.c, options.h: the last checkin was broken; - millaway fixed it - -2001-10-22 09:42 Will Estes <wlestes@uncg.edu> - - * flex.texi, flex.skl, gen.c, main.c, misc.c, options.h, scan.l, - scanopt.c, tests/README, tests/configure.in: phew, millaway's - latest batch - -2001-10-21 13:24 Will Estes <wlestes@uncg.edu> - - * flex.skl: flex.skl should come up in C mode - -2001-10-21 13:23 Will Estes <wlestes@uncg.edu> - - * flex.skl: apparently, isatty and c++ need help getting along - (from octave) - -2001-10-19 18:56 John Millaway <millaway@acm.org> - - * tests/: test-header-nr/Makefile.in, test-header-r/Makefile.in: - file Makefile.in was initially added on branch flex-2-5-6-branch. - -2001-10-19 18:56 John Millaway <millaway@acm.org> - - * tests/: test-header-nr/scanner.l, test-header-r/scanner.l: file - scanner.l was initially added on branch flex-2-5-6-branch. - -2001-10-19 18:56 John Millaway <millaway@acm.org> - - * tests/: test-header-nr/.cvsignore, test-header-r/.cvsignore: file - .cvsignore was initially added on branch flex-2-5-6-branch. - -2001-10-19 18:56 John Millaway <millaway@acm.org> - - * tests/: test-header-nr/main.c, test-header-r/main.c: file main.c - was initially added on branch flex-2-5-6-branch. - -2001-10-19 18:56 John Millaway <millaway@acm.org> - - * tests/: test-header-nr/test.input, test-header-r/test.input: file - test.input was initially added on branch flex-2-5-6-branch. - -2001-10-19 17:13 Will Estes <wlestes@uncg.edu> - - * NEWS: document new options and new option handling - -2001-10-19 16:58 Will Estes <wlestes@uncg.edu> - - * TODO: tell emacs that TODO is a text/outline mode file - -2001-10-19 16:55 Will Estes <wlestes@uncg.edu> - - * TODO: we have new long options; we need to document that - -2001-10-19 16:36 Will Estes <wlestes@uncg.edu> - - * NEWS: tell emacs that NEWS is text/outline mode - -2001-10-19 14:04 Will Estes <wlestes@uncg.edu> - - * flex.skl: oops, lost a line somewhere in the merge process on - millaway's work - -2001-10-17 10:29 Will Estes <wlestes@uncg.edu> - - * Makefile.am, buf.c, flex.skl, flex.texi, flexdef.h, main.c, - misc.c, options.c, options.h, parse.y, scan.l, scanopt.c, - scanopt.h: merge latest batch of millaway's changes - -2001-10-15 13:26 John Millaway <millaway@acm.org> - - * buf.c: file buf.c was initially added on branch - flex-2-5-6-branch. - -2001-10-12 20:44 John Millaway <millaway@acm.org> - - * options.c: file options.c was initially added on branch - flex-2-5-6-branch. - -2001-10-12 20:44 John Millaway <millaway@acm.org> - - * scanopt.h: file scanopt.h was initially added on branch - flex-2-5-6-branch. - -2001-10-12 20:44 John Millaway <millaway@acm.org> - - * scanopt.c: file scanopt.c was initially added on branch - flex-2-5-6-branch. - -2001-10-12 20:44 John Millaway <millaway@acm.org> - - * options.h: file options.h was initially added on branch - flex-2-5-6-branch. - -2001-09-22 13:50 Will Estes <wlestes@uncg.edu> - - * main.c: Fixed typo in options display - -2001-09-20 15:27 Will Estes <wlestes@uncg.edu> - - * main.c: reentrant and non-reentrant scanners share the same - yywrap MACRO. millaway - -2001-09-20 12:32 Will Estes <wlestes@uncg.edu> - - * TODO: clarify item on comments in lexical files - -2001-09-20 12:29 Will Estes <wlestes@uncg.edu> - - * NEWS, scan.l: now flex recognizes \r as an eol character - -2001-09-20 10:55 Will Estes <wlestes@uncg.edu> - - * Makefile.am: specify cvsroot so automake distcheck works - -2001-09-19 16:39 Will Estes <wlestes@uncg.edu> - - * flex.texi: tex has lost its mind; we remove parentheses to - compensate - -2001-09-19 15:42 Will Estes <wlestes@uncg.edu> - - * NEWS: now that c++ is better supported, let's mention it as a - news item - -2001-09-19 15:37 Will Estes <wlestes@uncg.edu> - - * flex.skl, main.c, examples/fastwc/wc1.l, examples/fastwc/wc2.l, - examples/fastwc/wc3.l, examples/fastwc/wc4.l, - examples/fastwc/wc5.l: commit the backwash from the branch merges - -2001-09-19 15:19 Will Estes <wlestes@uncg.edu> - - * FlexLexer.h, flex.skl, examples/testxxLexer.l: made preliminary - c++ fixes; the intent is to make it work with recent c++ compilers - -2001-08-26 12:14 Will Estes <wlestes@uncg.edu> - - * main.c: remove argv_fixup; fix typo in error message; changes - from millaway's branch - -2001-08-24 11:54 Will Estes <wlestes@uncg.edu> - - * NEWS: mention no more c++ comments in c scanners - -2001-08-21 13:47 John Millaway <millaway@acm.org> - - * flex.skl: Changed // comments to /* */ comments in skeleton. - -2001-08-19 16:34 John Millaway <millaway@acm.org> - - * flex.texi: Changed @var to @code everywhere. - -2001-08-16 14:19 Will Estes <wlestes@uncg.edu> - - * to.do/flex.rmail: more mail - -2001-08-16 11:03 Will Estes <wlestes@uncg.edu> - - * TODO: the manual now has its own section; we're not adding - comments either - -2001-08-03 21:14 John Millaway <millaway@acm.org> - - * tests/: Makefile.in, README, TEMPLATE/Makefile.in, - test-basic-nr/Makefile.in, test-basic-r/Makefile.in, - test-bison-yylloc/Makefile.in, test-bison-yylval/Makefile.in, - test-include-by-buffer/Makefile.in, - test-include-by-reentrant/Makefile.in, test-prefix-nr/Makefile.in, - test-prefix-r/Makefile.in, test-pthread/Makefile.in, - test-string-nr/Makefile.in, test-string-r/Makefile.in, - test-yyextra/Makefile.in: Cleaned up the output of the tests. - -2001-08-03 16:43 Will Estes <wlestes@uncg.edu> - - * TODO: note jason's thoughts on having a manpage - -2001-08-03 16:41 Will Estes <wlestes@uncg.edu> - - * TODO: note millaway's assignment and tests to be under flex - license - -2001-08-01 17:14 John Millaway <millaway@acm.org> - - * tests/test-bison-yylval/scanner.l: Fixed semantics of test (the - success or failure of this test should be unaffected by this - change.) - -2001-08-01 16:13 Will Estes <wlestes@uncg.edu> - - * autogen.sh: fake automake into believing that ChangeLog already - exists - -2001-08-01 16:06 Will Estes <wlestes@uncg.edu> - - * Makefile.am: millaway needs to be covered in the ChangeLog - -2001-08-01 15:41 Will Estes <wlestes@uncg.edu> - - * version.h: automake is supplying version info now so we just pick - it up - -2001-08-01 15:40 Will Estes <wlestes@uncg.edu> - - * flex.texi: forgot braces on @copyright - -2001-08-01 15:40 John Millaway <millaway@acm.org> - - * flex.skl: Added missing argument to yy_flex_free. - -2001-08-01 10:05 Will Estes <wlestes@uncg.edu> - - * AUTHORS: john millaway wrote the reentrant C support - -2001-08-01 10:05 Will Estes <wlestes@uncg.edu> - - * flex.texi: add license node to the manual - -2001-08-01 09:48 Will Estes <wlestes@uncg.edu> - - * TODO: c++ ideas - -2001-07-31 17:31 Will Estes <wlestes@uncg.edu> - - * parse.y: error messages will now show up the way that emacs likes - them - -2001-07-31 15:56 Will Estes <wlestes@uncg.edu> - - * Makefile.am: oops, left in an extra backslash - -2001-07-31 15:05 Will Estes <wlestes@uncg.edu> - - * TODO: flex.texi is here; clarify tests/ rewrite issue - -2001-07-31 15:04 Will Estes <wlestes@uncg.edu> - - * NEWS: hey, we have texinfo, not man - -2001-07-31 15:03 Will Estes <wlestes@uncg.edu> - - * flex.1: no more manpage - -2001-07-31 15:01 Will Estes <wlestes@uncg.edu> - - * Makefile.am: remove flex.1 and rewrite the dist-hook so that we - pick up a couple more directories - -2001-07-31 14:15 Will Estes <wlestes@uncg.edu> - - * flex.texi: the namual now compiles; hurray - -2001-07-31 06:13 Will Estes <wlestes@uncg.edu> - - * Makefile.am: first attempt at including the tests/ directory via - automake, dist-hook target added - -2001-07-31 06:12 Will Estes <wlestes@uncg.edu> - - * tests/.cvsignore: ignore config.cache in tests/ directory - -2001-07-31 05:46 Will Estes <wlestes@uncg.edu> - - * Makefile.am: automake groks the ChangeLog now so we don't have to - remind the maintainer to remake it - -2001-07-31 05:33 Will Estes <wlestes@uncg.edu> - - * .cvsignore: we need to ignore dist directories - -2001-07-30 17:06 Will Estes <wlestes@uncg.edu> - - * flex.texi: more corrections to the manual; the end is in site - -2001-07-30 17:06 Will Estes <wlestes@uncg.edu> - - * TODO: auto-generated backup? - -2001-07-27 17:12 Will Estes <wlestes@uncg.edu> - - * flex.texi: today's tinkering on the manual - -2001-07-27 10:50 Will Estes <wlestes@uncg.edu> - - * Makefile.am: if we want flex.1 we have to say so in EXTRA_DIST - -2001-07-27 10:49 Will Estes <wlestes@uncg.edu> - - * TODO: note future issues with flex.texi - -2001-07-27 10:34 Will Estes <wlestes@uncg.edu> - - * Makefile.am: include flex.1 as it's the only working - documentation for now - -2001-07-27 10:32 Will Estes <wlestes@uncg.edu> - - * Makefile.am: rearrange to work with automake on building the - ChangeLog - -2001-07-27 09:33 Will Estes <wlestes@uncg.edu> - - * scan.l: automake is unhappy if we specify the outfile - -2001-07-26 17:18 Will Estes <wlestes@uncg.edu> - - * flex.texi: more conversions/corrections - -2001-07-26 10:04 Will Estes <wlestes@uncg.edu> - - * README: we removed misc/ so we don't mention it any more - -2001-07-25 16:26 Will Estes <wlestes@uncg.edu> - - * flex.texi: begin the manual conversion to texinfo; yes, it's - broken right now - -2001-07-25 16:25 Will Estes <wlestes@uncg.edu> - - * AUTHORS, THANKS: copy in manual author and thanks info - -2001-07-25 10:46 Will Estes <wlestes@uncg.edu> - - * Makefile.am: how to fake the ChangeLog into showing up in the - distribution - -2001-07-25 10:45 Will Estes <wlestes@uncg.edu> - - * .cvsignore: since we're faking the ChangeLog, we can ignore it - -2001-07-25 09:07 Will Estes <wlestes@uncg.edu> - - * Makefile.am: add YFLAGS so parse.h gets made - -2001-07-24 16:23 Will Estes <wlestes@uncg.edu> - - * examples/fastwc/: README, mywc.c, wc1.l, wc2.l, wc3.l, wc4.l, - wc5.l: re-add these files - -2001-07-24 15:11 Will Estes <wlestes@uncg.edu> - - * TODO: reflect recent doings - -2001-07-24 15:07 Will Estes <wlestes@uncg.edu> - - * Makefile.in, .cvsignore: what with automake, we don't need - Makefile.in any more - -2001-07-24 15:06 Will Estes <wlestes@uncg.edu> - - * configure.in: more rearranging for automake - -2001-07-24 15:04 Will Estes <wlestes@uncg.edu> - - * to.do/flex.rmail: more mail came in - -2001-07-24 12:45 Will Estes <wlestes@uncg.edu> - - * .cvsignore: now that automake looks alive, tell cvs about the - fallout - -2001-07-24 12:44 Will Estes <wlestes@uncg.edu> - - * autogen.sh: adjust to automake's idea of the world - -2001-07-24 12:43 Will Estes <wlestes@uncg.edu> - - * Makefile.am: add Vern's misc dependencies; noinst_SCRIPTS was - broken?; list a few last files to be included in the distribution - -2001-07-24 11:49 Will Estes <wlestes@uncg.edu> - - * .cvsignore: aclocal.m4 can be ignored too - -2001-07-24 10:48 Will Estes <wlestes@uncg.edu> - - * NEWS: rearrange for better order; add automake support as a news - item - -2001-07-24 10:38 Will Estes <wlestes@uncg.edu> - - * Makefile.am: copyright notice on Makefile.am; document some -D - switches (are they still usable?) - -2001-07-24 10:37 Will Estes <wlestes@uncg.edu> - - * TODO: add lex-replacement issue - -2001-07-24 06:13 Will Estes <wlestes@uncg.edu> - - * Makefile.am: add EXTRA_DIST - -2001-07-23 17:49 Will Estes <wlestes@uncg.edu> - - * autogen.sh: we need to do the same thing in each directory - -2001-07-23 17:25 Will Estes <wlestes@uncg.edu> - - * configure.in: introduce automake into the macro calls - -2001-07-23 17:06 Will Estes <wlestes@uncg.edu> - - * Makefile.am: add AUTOMAKE_OPTIONS, info_TEXINFOS, - include_HEADERS, noinst_HEADERS; it's libfl.a, not libflex.a - -2001-07-23 16:16 Will Estes <wlestes@uncg.edu> - - * Makefile.am: bin_PROGRAMS and lib_LIBRARIES - -2001-07-23 15:32 Will Estes <wlestes@uncg.edu> - - * to.do/streams.mail: streams.mail has moved here - -2001-07-23 15:12 Will Estes <wlestes@uncg.edu> - - * TODO: add xref for teximanual - -2001-07-19 10:27 Will Estes <wlestes@uncg.edu> - - * flex.1: include typo/punctuation fixes from a patch submitted by - noon@cote-dazur.com (Fabrice Bauzac) - -2001-07-17 14:40 Will Estes <wlestes@uncg.edu> - - * TODO: we want gettext - -2001-06-24 19:45 Will Estes <wlestes@uncg.edu> - - * flex.skl: include c++ STD fixes from quanstro@quanstro.net - -2001-06-24 18:33 Will Estes <wlestes@uncg.edu> - - * flex.skl, gen.c: change some int types to size_t as per FreeBSD - 28364 from avn@any.ru - -2001-06-24 18:31 Will Estes <wlestes@uncg.edu> - - * TODO: remove parse.[ch] from make clean target; repackage - distribution (not rework) - -2001-06-19 08:44 Will Estes <wlestes@uncg.edu> - - * TODO: add memory api and reworking of flex.skl reworking - -2001-06-18 13:18 Will Estes <wlestes@uncg.edu> - - * flex.skl: remove extraneous notice from flex.skl - -2001-06-18 08:49 Will Estes <wlestes@uncg.edu> - - * flex.skl: patch memory leak as per millaway - -2001-06-17 15:23 Will Estes <wlestes@uncg.edu> - - * to.do/flex.rmail: add vern's ok for copyright/license changes and - john's answer on line offsets - -2001-06-17 15:18 Will Estes <wlestes@uncg.edu> - - * TODO: remove creation of .cvsignore files (it's done); add other - notes about the test suite - -2001-06-17 15:16 Will Estes <wlestes@uncg.edu> - - * tests/: TEMPLATE/.cvsignore, test-basic-nr/.cvsignore, - test-basic-r/.cvsignore, test-bison-yylloc/.cvsignore, - test-bison-yylval/.cvsignore, test-include-by-buffer/.cvsignore, - test-include-by-reentrant/.cvsignore, test-prefix-nr/.cvsignore, - test-prefix-r/.cvsignore, test-pthread/.cvsignore, - test-string-nr/.cvsignore, test-string-r/.cvsignore, - test-yyextra/.cvsignore: adding .cvsignore files for existing - tests/ subdirectories - -2001-06-17 15:12 Will Estes <wlestes@uncg.edu> - - * tests/README: reformat, say to add a description to this file and - mention what to do re .cvsignore - -2001-06-17 15:09 Will Estes <wlestes@uncg.edu> - - * tests/TEMPLATE/cvsignore: create template for .cvsignore - -2001-06-17 14:59 Will Estes <wlestes@uncg.edu> - - * TODO: reorganize for logical reasons; test suite now seems to run - out of the box - -2001-06-17 14:28 Will Estes <wlestes@uncg.edu> - - * tests/.cvsignore: we dont want the Makefile either - -2001-06-17 13:40 Will Estes <wlestes@uncg.edu> - - * tests/test-prefix-nr/test.input: test.input was supposed to be - here - -2001-06-17 13:36 Will Estes <wlestes@uncg.edu> - - * tests/test-prefix-r/test.input: test.input was supposed to be - here - -2001-06-17 13:18 Will Estes <wlestes@uncg.edu> - - * tests/.cvsignore: add autoconf legacy files to be ignored - -2001-06-17 13:11 Will Estes <wlestes@uncg.edu> - - * autogen.sh: clarify usage instructions; prepare tests/ as well - -2001-06-17 13:07 Will Estes <wlestes@uncg.edu> - - * tests/.cvsignore: . cvsignore for tests/ subdirectory - -2001-06-17 13:01 Will Estes <wlestes@uncg.edu> - - * FlexLexer.h: tell emacs that FlexLexer.h is c++ - -2001-06-17 13:00 Will Estes <wlestes@uncg.edu> - - * scan.l: tell emacs scan.l is in C mode - -2001-06-17 12:59 Will Estes <wlestes@uncg.edu> - - * flex.skl: added punctuation - -2001-06-17 12:17 Will Estes <wlestes@uncg.edu> - - * FlexLexer.h, Makefile.in, README, RoadMap, autogen.sh, ccl.c, - configure.in, dfa.c, ecs.c, flex.1, flex.skl, flexdef.h, gen.c, - libmain.c, libyywrap.c, main.c, misc.c, mkskel.sh, nfa.c, parse.y, - scan.l, sym.c, tblcmp.c, yylex.c: change copyright/license notices - as per Vern's response to Theo - -2001-06-15 16:22 Will Estes <wlestes@uncg.edu> - - * to.do/flex.rmail: add bill fenlason's emails - -2001-06-15 16:21 Will Estes <wlestes@uncg.edu> - - * COPYING: make changes as per Theo De Raadt; remove tabs - -2001-06-08 08:42 Will Estes <wlestes@uncg.edu> - - * flex.skl: save errno as per Theo de Raadt - -2001-06-07 08:44 Will Estes <wlestes@uncg.edu> - - * flex.1: correct hyphenation as per openbsd tree - -2001-06-05 16:39 Will Estes <wlestes@uncg.edu> - - * Makefile.in, configure.in: change references to TESTS/ to tests/ - to account for the directory name changes - -2001-05-27 15:22 Will Estes <wlestes@uncg.edu> - - * flex.skl, gen.c: commit john millaway's YY_G wrapper corrections - -2001-05-27 15:22 Will Estes <wlestes@uncg.edu> - - * .cvsignore: tell cvs about install-sh - -2001-05-21 17:44 Will Estes <wlestes@uncg.edu> - - * tests/Makefile.in: remove || exit calls - -2001-05-21 15:50 Will Estes <wlestes@uncg.edu> - - * gen.c: complete john millaway's reentrant patch - -2001-05-21 13:23 Will Estes <wlestes@uncg.edu> - - * to.do/flex.rmail: more flex messages in the queue - -2001-05-18 17:25 Will Estes <wlestes@uncg.edu> - - * flex.skl, flexdef.h, gen.c, main.c, nfa.c, scan.l: john - millaway's reentrancy patch - -2001-05-18 16:30 Will Estes <wlestes@uncg.edu> - - * tests/Makefile.in: remove || exit from testing loop - -2001-05-18 16:27 Will Estes <wlestes@uncg.edu> - - * Makefile.in: tell make about the tests directory and its - associated targets - -2001-05-18 16:26 Will Estes <wlestes@uncg.edu> - - * TODO: rethink the todo list - -2001-05-18 16:13 Will Estes <wlestes@uncg.edu> - - * flex.1: describe reentrant api changes - -2001-05-18 16:10 Will Estes <wlestes@uncg.edu> - - * TODO: mention work needed for tests/ - -2001-05-18 16:09 Will Estes <wlestes@uncg.edu> - - * configure.in: tell auto* about the test directory - -2001-05-18 16:04 Will Estes <wlestes@uncg.edu> - - * README: make punctuation uniform, mention the new tests/ - directory - -2001-05-18 16:02 Will Estes <wlestes@uncg.edu> - - * NEWS: reformat items; cut out old items and move them to ONEWS - -2001-05-18 16:01 Will Estes <wlestes@uncg.edu> - - * ONEWS: move old NEWS items to ONEWS - -2001-05-18 15:30 Will Estes <wlestes@uncg.edu> - - * .cvsignore: ignore patch droppings - -2001-05-18 13:22 Will Estes <wlestes@uncg.edu> - - * tests/: Makefile.in, README, configure.in, TEMPLATE/Makefile.in, - TEMPLATE/parser.y, TEMPLATE/scanner.l, TEMPLATE/test.input, - test-basic-nr/Makefile.in, test-basic-nr/scanner.l, - test-basic-nr/test.input, test-basic-r/Makefile.in, - test-basic-r/scanner.l, test-basic-r/test.input, - test-bison-yylloc/Makefile.in, test-bison-yylloc/parser.y, - test-bison-yylloc/scanner.l, test-bison-yylloc/test.input, - test-bison-yylval/Makefile.in, test-bison-yylval/parser.y, - test-bison-yylval/scanner.l, test-bison-yylval/test.input, - test-include-by-buffer/Makefile.in, - test-include-by-buffer/scanner.l, - test-include-by-buffer/test-1.input, - test-include-by-buffer/test-2.input, - test-include-by-buffer/test-3.input, - test-include-by-reentrant/Makefile.in, - test-include-by-reentrant/scanner.l, - test-include-by-reentrant/test-1.input, - test-include-by-reentrant/test-2.input, - test-include-by-reentrant/test-3.input, test-prefix-nr/Makefile.in, - test-prefix-nr/README, test-prefix-nr/scanner.l, - test-prefix-r/Makefile.in, test-prefix-r/README, - test-prefix-r/scanner.l, test-pthread/Makefile.in, - test-pthread/scanner.l, test-pthread/test-1.input, - test-pthread/test-2.input, test-pthread/test-3.input, - test-pthread/test-4.input, test-pthread/test-5.input, - test-string-nr/Makefile.in, test-string-nr/scanner.l, - test-string-r/Makefile.in, test-string-r/scanner.l, - test-yyextra/Makefile.in, test-yyextra/scanner.l, - test-yyextra/test.input: add john millaway's test directory - -2001-05-04 16:04 Will Estes <wlestes@uncg.edu> - - * to.do/flex.rmail: more mail in flex.rmail - -2001-05-03 15:05 Will Estes <wlestes@uncg.edu> - - * FlexLexer.h, ccl.c, dfa.c, ecs.c, flex.skl, flexdef.h, gen.c, - libmain.c, libyywrap.c, main.c, misc.c, nfa.c, parse.y, scan.l, - sym.c, tblcmp.c, yylex.c: remove extraneous rcs keywords - -2001-05-03 14:54 Will Estes <wlestes@uncg.edu> - - * README: mention RoadMap - -2001-05-01 16:47 Will Estes <wlestes@uncg.edu> - - * examples/README, examples/debflex.awk, examples/testxxLexer.l, - examples/manual/ChangeLog, examples/manual/Makefile, - examples/manual/README, examples/manual/cat.lex, - examples/manual/dates.lex, examples/manual/datetest.dat, - examples/manual/eof_rules.lex, examples/manual/eof_test01.txt, - examples/manual/eof_test02.txt, examples/manual/eof_test03.txt, - examples/manual/expr.lex, examples/manual/expr.y, - examples/manual/front.lex, examples/manual/front.y, - examples/manual/j2t.lex, examples/manual/myname.lex, - examples/manual/myname.txt, examples/manual/myname2.lex, - examples/manual/numbers.lex, examples/manual/pas_include.lex, - examples/manual/pascal.lex, examples/manual/reject.lex, - examples/manual/replace.lex, examples/manual/string1.lex, - examples/manual/string2.lex, examples/manual/strtest.dat, - examples/manual/unput.lex, examples/manual/user_act.lex, - examples/manual/userinit.lex, examples/manual/wc.lex, - examples/manual/yymore.lex, examples/manual/yymore2.lex, - examples/manual/yymoretest.dat, to.do/README, to.do/Wilhelms.todo, - to.do/Wish-List, to.do/flex.rmail, to.do/unicode/FlexLexer.h, - to.do/unicode/ccl.c, to.do/unicode/changes.txt, - to.do/unicode/ecs.c, to.do/unicode/flex.1, to.do/unicode/flex.skl, - to.do/unicode/flexdef.h, to.do/unicode/gen.c, to.do/unicode/main.c, - to.do/unicode/misc.c, to.do/unicode/scan.l, to.do/unicode/tblcmp.c: - adding the rest of vern's files - -2001-05-01 16:37 Will Estes <wlestes@uncg.edu> - - * .cvsignore: ignore .info files - -2001-05-01 16:36 Will Estes <wlestes@uncg.edu> - - * README: mention misc/ directory - -2001-05-01 16:32 Will Estes <wlestes@uncg.edu> - - * version.h: version is 2.5.5b - -2001-05-01 16:30 Will Estes <wlestes@uncg.edu> - - * Makefile.in: remove header from top; add rule to generate - initscan.c just in case - -2001-05-01 16:28 Will Estes <wlestes@uncg.edu> - - * configure.in: dont check for initscan.c; check for scan.l instead - -2001-05-01 16:27 Will Estes <wlestes@uncg.edu> - - * .cvsignore: after first successful build, list generated files - -2001-05-01 15:12 Will Estes <wlestes@uncg.edu> - - * RoadMap: list of source files - -2001-05-01 15:10 Will Estes <wlestes@uncg.edu> - - * README: rewrite README to reflect changes in layout of - directories - -2001-05-01 15:08 Will Estes <wlestes@uncg.edu> - - * AUTHORS, THANKS, TODO: initial attempt at the files - -2001-05-01 14:03 Will Estes <wlestes@uncg.edu> - - * COPYING: add 2001 copyright notice - -2001-05-01 13:38 Will Estes <wlestes@uncg.edu> - - * autogen.sh: initial attempt at a bootstrap script for developers - -2001-05-01 13:37 Will Estes <wlestes@uncg.edu> - - * .cvsignore: initial list of files to ignore - -2001-05-01 13:21 Will Estes <wlestes@uncg.edu> - - * flex.texi: texinfo manual, old contributed version - -2000-08-21 12:39 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: fixed some bugs in examples of [[:...:]] ccls - -2000-08-21 12:39 Vern Paxson <vern@ee.lbl.gov> - - * version.h: version shipped to Dick King - -2000-08-21 12:39 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: explicit include of iostream.h - -2000-08-21 12:38 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: if a newline is seen in <ACTION_STRING>, assume it - terminates the string. - -2000-08-21 12:38 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, sym.c: moved symbol table definitions from flexdef.h - into sym.c - -2000-08-21 12:37 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: fixed underallocation for accset - -1997-06-27 15:36 Vern Paxson <vern@ee.lbl.gov> - - * COPYING: revised for rms - -1997-06-23 15:48 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: fixed memory leak - -1997-06-23 15:48 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: input() doesn't destroy yytext - -1997-06-23 15:48 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: wrapped with extern "C++" - -1996-12-13 06:22 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: use delete [] for yy_state_buf - -1996-10-29 09:43 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: fixed %option noinput - -1996-10-29 09:39 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: free(char*) fix ... Sigh ... - -1996-10-11 11:33 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: bug fix for yymore()/yylineno interaction - -1996-10-11 11:13 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: fixed memory leak - -1996-09-10 13:10 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: release 2.5.4 - -1996-09-10 12:59 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: more stuff for distclean - -1996-09-10 12:58 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: "str" -> "yy_str" - -1996-09-10 12:58 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.5.4 - -1996-07-02 12:35 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: (attempted) fix for input() crossing a file boundary - -1996-05-29 08:25 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: don't do Acorn diffs - -1996-05-29 08:15 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: some minor additions for 2.5.3 - -1996-05-29 08:02 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.5.3 - -1996-05-29 07:59 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.5.3 - -1996-05-25 17:02 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: initialize yy_more_offset etc. for yyFlexLexer class - -1996-05-25 16:54 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: niggling cosmetic tweak - -1996-05-25 16:44 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: bug fixes for yymore (especially with %array) - -1996-05-25 16:43 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: yymore + %array tweaks - -1996-05-25 16:43 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: added yy_{,prev_}more_offset - -1996-05-25 16:42 Vern Paxson <vern@ee.lbl.gov> - - * main.c: removed decl of unused library function - -1996-05-25 11:26 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: snapshot of cscope yymore fixes, prior to switching - yymore-on-%array approach - -1995-12-18 09:20 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: don't stack states on NUL-transitions that are jams - -1995-09-27 08:47 Vern Paxson <vern@ee.lbl.gov> - - * libmain.c: fixed re Esmond Pitt's ancient suggestion - -1995-04-28 07:39 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: ANSI C / Solaris tweak - -1995-04-24 09:26 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: credits - -1995-04-24 09:26 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: multiple FlexLexer.h includes - -1995-04-24 09:25 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: fix multiple inclusions - -1995-04-24 08:17 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: lint tweak - -1995-04-24 07:39 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: typo fixed - -1995-04-24 06:49 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: credits update - -1995-04-24 06:48 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: (char*) cast for realloc - -1995-04-24 06:46 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: (char*) tweak - -1995-04-21 07:53 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: VMS update for 2.5.2 - -1995-04-21 07:53 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: clarify when 8-bit scanners are created by default, - vs. 7-bit - -1995-04-21 07:51 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: reworked alloca() chud, from Francois - -1995-04-20 09:57 Vern Paxson <vern@ee.lbl.gov> - - * NEWS, version.h: 2.5.2 - -1995-04-20 09:57 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: 2.5.2 update - -1995-04-20 09:53 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c, main.c: const -> yyconst - -1995-04-20 09:34 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: fixed some old libfl.a references - -1995-04-20 09:09 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: some (but not all) of Francois' tweaks - -1995-04-20 09:08 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: tweaks from Francois - -1995-04-20 08:46 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: yy_delete_buffer allows nil buffer pointer - -1995-04-20 08:43 Vern Paxson <vern@ee.lbl.gov> - - * main.c: do_stdinit now defaults to false - -1995-04-20 08:43 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: remove first default for yylex(new_in, new_out) - -1995-04-20 08:42 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: rearrange some definitions; fix YY_NO_UNPUT - -1995-04-20 08:42 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: more alloca() bullshit - -1995-04-20 07:35 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: octal escape sequence must have just digits 0-7 - -1995-04-20 07:35 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: '-' means stdin octal escape sequence must just be digits - 0-7 - -1995-04-20 07:34 Vern Paxson <vern@ee.lbl.gov> - - * main.c: -- terminates options - -1995-04-20 07:17 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: added dataflush() prototype - -1995-04-20 07:17 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: move dataflush, otoi prototypes into flexdef.h - -1995-04-20 07:17 Vern Paxson <vern@ee.lbl.gov> - - * gen.c, flex.skl: const -> yyconst - -1995-04-20 06:55 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: fixed bug in needing yy_cp for -Cf w/ backing up - -1995-03-28 05:29 Vern Paxson <vern@ee.lbl.gov> - - * flex.1, README: Stan Adermann credit - -1995-03-27 09:38 Vern Paxson <vern@ee.lbl.gov> - - * README: beta-tester update - -1995-03-27 09:38 Vern Paxson <vern@ee.lbl.gov> - - * NEWS, version.h: 2.5.1 - -1995-03-27 09:37 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: update date for 2.5.1 release, some feedbacker credits - -1995-03-27 09:36 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: fixed lint problem with declaring yy_cp unnecessarily - -1995-03-27 09:35 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: {}'s around full-table initializations - -1995-03-21 09:35 Vern Paxson <vern@ee.lbl.gov> - - * README: for version 2.5 - -1995-03-21 09:13 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: added note regarding yylineno should be maintained on a - per-buffer basis - -1995-03-21 09:12 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: new C++ member functions - -1995-03-21 08:44 Vern Paxson <vern@ee.lbl.gov> - - * flex.1, NEWS: 2.5.0.8 update - -1995-03-21 08:44 Vern Paxson <vern@ee.lbl.gov> - - * main.c: rename yylineno if -P - -1995-03-20 09:03 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: do_yylineno MARKER_DIFFERENCE depends on MAXIMUM_MNS - -1995-03-20 09:02 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: removed redundant skel.c from DISTFILES - -1995-03-20 09:02 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: debug(), setdebug(), lineno() - -1995-03-20 09:02 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: %option yylineno support - -1995-03-20 09:02 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: read up to newline for interactive reads, rather than one - char - -1995-03-20 09:01 Vern Paxson <vern@ee.lbl.gov> - - * scan.l, main.c: added %option yylineno - -1995-03-18 04:27 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: added do_yylineno - -1995-03-06 10:53 Vern Paxson <vern@ee.lbl.gov> - - * flex.1, NEWS: 2.5.0.7 - -1995-03-05 16:37 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: realclean -> maintainer-clean - -1995-03-05 16:35 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added yy_flush_buffer - -1995-03-05 16:35 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: added yy_flush_buffer - -1995-03-05 16:35 Vern Paxson <vern@ee.lbl.gov> - - * main.c: prefix support for yy_flush_buffer - -1995-03-05 15:37 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: added %option yyclass - -1995-03-05 15:37 Vern Paxson <vern@ee.lbl.gov> - - * scan.l, flexdef.h, main.c: added yyclass - -1995-03-05 11:50 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: Added switch_streams - -1995-03-05 11:50 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: added switch_streams - -1995-03-05 11:37 Vern Paxson <vern@ee.lbl.gov> - - * main.c: don't rename yy_flex_debug for C++ - -1995-03-05 11:37 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: yy_flex_debug extern only if not C++ - -1995-03-05 11:37 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: added yy_flex_debug member variable - -1995-03-05 11:36 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: yyFlexLexer initialization of yy_flex_debug - -1995-03-04 13:06 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, main.c: VMS POSIX stuff - -1995-03-04 11:36 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: moved position of yy_init = 0 - -1995-03-04 11:15 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: added YY_EXIT_FAILURE - -1995-03-04 11:14 Vern Paxson <vern@ee.lbl.gov> - - * main.c: removed VMS-specific exit - -1995-03-04 11:09 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, dfa.c, yylex.c, sym.c, scan.l, nfa.c, misc.c, gen.c, - main.c: internationalization aids - -1995-03-04 11:07 Vern Paxson <vern@ee.lbl.gov> - - * main.c: do yy_flex_debug prefix for both C++ and C - -1995-02-06 04:38 Vern Paxson <vern@ee.lbl.gov> - - * main.c: fixed program_name tweak again - -1995-01-11 06:00 Vern Paxson <vern@ee.lbl.gov> - - * main.c: oops, fixed program_name tweak - -1995-01-11 05:53 Vern Paxson <vern@ee.lbl.gov> - - * main.c: program_name is "flex" if argv[0] nil - -1995-01-10 05:43 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.5.0.5 - -1995-01-10 05:43 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Documented YY_NUM_RULES - -1995-01-10 05:42 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: added formatted man page to MISC - -1995-01-10 05:42 Vern Paxson <vern@ee.lbl.gov> - - * main.c: help messages to stdout - -1995-01-09 17:05 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Added YY_NUM_RULES - -1995-01-09 16:02 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: better fix for #pragma problem - -1995-01-09 16:02 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: better fix for #pragma portability problem - -1995-01-09 07:54 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: "# line" -> #line - -1995-01-09 07:41 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, flexdef.h: comment out Turbo C #pragma's - -1995-01-09 07:35 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: reset linenum on new file - -1995-01-09 07:13 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: isatty() extern - -1995-01-09 07:13 Vern Paxson <vern@ee.lbl.gov> - - * NEWS, flex.1: 2.5.0.4 - -1995-01-09 07:12 Vern Paxson <vern@ee.lbl.gov> - - * main.c: long options, VMS tweaks - -1995-01-09 07:12 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added parse.c, parse.h for dist MISC directory - -1995-01-09 07:11 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: some "const" cleansing - -1995-01-09 07:11 Vern Paxson <vern@ee.lbl.gov> - - * mkskel.sh: skel[] is now const - -1995-01-09 07:11 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: some const cleansing - -1995-01-09 07:10 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: #line in section 1 - -1995-01-05 17:04 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: preen - -1994-12-29 10:58 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: config.h from conf.in - -1994-12-29 10:58 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: for VMS, delete -> remove - -1994-12-29 10:57 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: config.h.in -> conf.in rm config.h on distclean - -1994-12-29 10:57 Vern Paxson <vern@ee.lbl.gov> - - * main.c: stdinit tweaks - -1994-12-29 10:48 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: added nostdinit - -1994-12-28 13:47 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: added MS-DOS note for 2.5.0.2 - -1994-12-28 13:16 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: typos, tweaks - -1994-12-28 10:40 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: removed flexdoc - -1994-12-28 10:35 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: flexdoc/flex merge - -1994-12-28 08:50 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: typos - -1994-12-28 08:45 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: typo - -1994-12-28 08:42 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: 2.5 update - -1994-12-28 08:41 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.5.0.2 - -1994-12-28 06:55 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: fixed sense of %option main implying %option noyywrap - -1994-12-28 06:54 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: YY_FLEX_{MAJOR,MINOR}_VERSION fixed bug in unput - trashing yytext even with %array - -1994-12-17 17:08 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: prior to 2.5 update - -1994-12-17 13:41 Vern Paxson <vern@ee.lbl.gov> - - * main.c: C++/-P fixes - -1994-12-17 13:40 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: -P fixes constructor, destructor moved to flex.skl - -1994-12-17 13:40 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: YY_SKIP_YYWRAP yyFlexLexer constructor, destructor - -1994-12-15 09:34 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: formatting - -1994-12-15 09:30 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: fixed bug in adjusting yytext before backing up - -1994-12-10 17:24 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: switched scanner itself over to [:xxx:] - -1994-12-10 12:53 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: added YY_FLEX_VERSION - -1994-12-10 12:53 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed CCL-match pattern for [:whatever:] - -1994-12-10 12:52 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: treat [:upper:] as [:lower:] if -i - -1994-12-06 16:59 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.5.0.1 - -1994-12-06 16:28 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, gen.c: input() maintains BOL - -1994-12-06 16:20 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: check size of buffer in yy_scan_buffer - -1994-12-06 16:08 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: added %option main, fixed missing %* - -1994-12-06 16:08 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: added ccl exprs - -1994-12-06 16:07 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: added ccl exprs, %option main - -1994-12-06 16:07 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: added %options, ccl exprs - -1994-12-05 16:18 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: undid previous change - -1994-12-04 10:30 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Makefile.in from srcdir - -1994-12-04 04:14 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: added skel.c to DISTFILES - -1994-12-04 03:56 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: added YYSTATE alias - -1994-12-04 03:28 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: NL is now \r?\n - -1994-12-04 03:28 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: use cerr for C++ diagnostics - -1994-12-03 15:16 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: undid YY_UNIX_NEWLINE - -1994-12-03 08:44 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: STDC_HEADERS to check for stdlib - -1994-12-03 08:43 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: AC_STDC_HEADERS -> AC_HEADER_STDC - -1994-12-03 08:43 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: \n -> '\012' - -1994-12-03 07:20 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added YY_UNIX_NEWLINE - -1994-12-03 06:29 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: BOL changes - -1994-12-03 06:29 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: fixed bug with caseins but not ecs - -1994-12-03 06:27 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: BOL changes some casts for Turbo C - -1994-12-03 06:27 Vern Paxson <vern@ee.lbl.gov> - - * main.c: messages identify filenames - -1994-12-03 06:26 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Increase slowly if realloc double overflows - -1994-12-03 06:26 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: YY_RULE_SETUP - -1994-12-03 06:26 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Added yy_XX_state %option's Added yy_set_bol - -1994-11-29 11:14 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: don't remove ~ files - -1994-11-24 11:50 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: get CFLAGS from autoconf - -1994-11-24 11:42 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c, flex.skl, flexdef.h, gen.c, misc.c, parse.y, scan.l, - sym.c: Brian Madsen's tweaks for Borland - -1994-11-24 10:50 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.5.0 - -1994-11-24 10:50 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added do_stdinit - -1994-11-24 10:49 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: Added yy_delete_buffer() in destructor - -1994-11-24 10:48 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added yy_set_interactive, YY_ALWAYS_INTERACTIVE, - YY_NEVER_INTERACTIVE, YY_NO_INPUT, YY_NO_UNPUT, YY_NO_*_STATE - -1994-11-24 10:48 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added do_stdinit, Think C hacks - -1994-11-24 10:47 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Added %options for input, always-interactive, - never-interactive, yy_scan_{buffer,bytes,string} - -1994-11-05 12:13 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: size_t #ifdef's for not compiling some statics - -1994-11-05 12:13 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: $(FLEX) config.h - -1994-11-05 12:11 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: config.h, size_t, malloc.h, sys/types.h - -1994-11-05 12:10 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: config.h, size_t - -1994-11-05 12:10 Vern Paxson <vern@ee.lbl.gov> - - * main.c: yywrap option, no stdin/out init for VMS, mundane tweaks - -1994-11-05 12:09 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: alloca, lint tweaks - -1994-11-05 12:09 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: %option yywrap size_t tweaks - -1994-11-05 12:08 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: size_t tweaks - -1994-11-05 12:08 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: size_t, STDC tweaks - -1994-11-05 10:17 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added yy_scan_{buffer,bytes,string}, plus tweaks - -1994-10-12 17:13 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: made stack code conditional on "stack" option - -1994-10-12 17:13 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: added use of "stack" %option - -1994-08-03 07:38 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Fixed fencepost in call to yy_flex_strncpy - -1994-07-25 18:05 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: yy_eof_status -> yy_buffer_status - -1994-07-25 17:22 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: yy_flex_strcpy -> yy_flex_strncpy minor prototype tweak - -1994-07-25 17:21 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Bug fix for matching NUL's at end of token when - interactive. yy_flex_strcpy -> yy_flex_strncpy - -1994-07-25 16:49 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: No YY_USER_ACTION if continued action - -1994-03-16 07:18 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added fix for 8-bit chars returned by input() - -1994-03-16 07:09 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Move definition of yy_flex_strcpy to come after #define - of yytext_ptr - -1994-01-08 05:17 Vern Paxson <vern@ee.lbl.gov> - - * mkskel.sh: flex.skel -> flex.skl - -1994-01-08 05:13 Vern Paxson <vern@ee.lbl.gov> - - * mkskel.sh: Initial revision - -1993-12-29 12:09 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Fixed scan.c target so "make" detects flex failure - -1993-12-27 10:14 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Added %option's - -1993-12-27 09:57 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Nuked FLEX_FLAGS that are now done using %option - -1993-12-27 09:41 Vern Paxson <vern@ee.lbl.gov> - - * parse.y, scan.l: %option - -1993-12-27 09:41 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Reworked for %option - -1993-12-27 09:40 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added "unspecified", globals for %option - -1993-12-27 09:40 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: start condition #define's go to action file - -1993-12-27 09:40 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added action_define() - -1993-12-27 05:59 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Minor consolidation using scon scopes etc - -1993-12-27 05:36 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Modified to use scon scopes - -1993-12-27 05:20 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: indented rules - -1993-12-26 17:22 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Added scon_stk stuff, format_warn - -1993-12-26 17:22 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added format_warn - -1993-12-26 10:04 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Working checkpoint prior to adding <scon>{ stuff - -1993-12-26 10:04 Vern Paxson <vern@ee.lbl.gov> - - * main.c, flexdef.h: Added in_rule, deleted actvsc - -1993-12-26 10:03 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added doubling of '\'s in filenames - -1993-12-26 10:02 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Added in_rule, doing_rule_action - -1993-12-26 10:02 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: Removed actvsc - -1993-12-23 15:44 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: -ooutput #line directives credits - -1993-12-23 15:43 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Fixsed sense of test for %array - -1993-12-23 15:42 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.5.0 snapshot for Craig - -1993-12-23 15:41 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Added beginnings of <SCON>{ ... } - -1993-12-23 15:41 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Simplified scanning {}'s - -1993-12-20 04:41 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added <stdlib.h> - -1993-12-17 05:31 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: prototypes for alloc/string routines - -1993-12-17 05:06 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: alloc, string routines internal - -1993-12-17 05:05 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Nuked lib{string,alloc}.c, added dependency of - yylex.o on parse.h - -1993-12-17 05:05 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: Check for string.h - -1993-12-17 05:04 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Use autoconf for string/strings.h yy_flex_XXX -> - flex_XXX - -1993-12-17 05:04 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Added flex_XXX -> yy_flex_XXX wrappers - -1993-12-17 05:04 Vern Paxson <vern@ee.lbl.gov> - - * sym.c, misc.c, dfa.c: yy_flex_XXX -> flex_XXX - -1993-12-17 05:03 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: No more WHITESPACE token - -1993-12-16 15:46 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, FlexLexer.h: Added yy_top_state() - -1993-12-16 15:44 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: simplified comment-scanning using push/pop states - -1993-12-16 15:44 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: removed crufty WHITESPACE token, some uses of '\n' token - -1993-12-15 05:23 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: start stack, extern "C++" moved - -1993-12-15 05:23 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: Bug fix for -CF - -1993-12-15 05:23 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, misc.c: alloc routines take unsigned - -1993-12-15 05:23 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: start-state stacks, alloc routines take unsigned - -1993-12-15 05:08 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, misc.c: bracket -CF table elements - -1993-12-13 07:33 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Do #bytes computation in {re,}allocate_array() only once - -1993-12-11 12:06 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, gen.c, main.c, misc.c, scan.l, flex.skl, sym.c: - yy_str*() -> str*() - -1993-12-11 09:40 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in, dfa.c, flexdef.h, gen.c, main.c, misc.c, nfa.c, - parse.y, scan.l, sym.c: -o option - -1993-12-11 06:09 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: lint tweak - -1993-12-11 06:00 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Expanded on extern "C++" news item - -1993-12-11 05:58 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4.5 - -1993-12-11 05:56 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added yy_fill_buffer - -1993-12-11 05:56 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: is_interactive -> yy_is_interactive - -1993-12-11 05:34 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Updated credits - -1993-12-11 05:33 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Fixed typo in "uninstall" target - -1993-12-11 05:33 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Updated comment regarding 0-based vs. 1-based arrays for - -CF. - -1993-12-11 05:30 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: Initialize dfaacc[0] for -CF representation Fixed minor - memory leak - -1993-12-11 05:29 Vern Paxson <vern@ee.lbl.gov> - - * main.c: #include "FlexLexer.h" -> <FlexLexer.h> - -1993-12-11 05:27 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: Added extern "C++" wrapper - -1993-12-09 08:58 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Detect REJECT etc. before generating YY_USES_REJECT! - -1993-12-09 08:58 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Fixed bug in interactive reads where char is unsigned - -1993-12-09 08:57 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Fixed bug in treating '$' as variable trailing context - -1993-12-09 08:57 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.4.5 - -1993-12-07 08:08 Vern Paxson <vern@ee.lbl.gov> - - * README: pretester update - -1993-12-07 06:16 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4.4 - -1993-12-07 06:15 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: LexError(), C++ experiment warning, credits - -1993-12-07 06:11 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed 8-bit bug - -1993-12-07 06:10 Vern Paxson <vern@ee.lbl.gov> - - * gen.c, flex.skl: Fixed nasty 8-bit bugs - -1993-12-07 05:18 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c, ecs.c, flexdef.h, gen.c, main.c, nfa.c, tblcmp.c: - {min,max,abs} -> {MIN,MAX,ABS} - -1993-12-07 05:11 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h, flex.skl: Support for yyFlexLexer::LexerError - -1993-12-06 04:43 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.4.4 - -1993-12-05 12:11 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: credits update - -1993-12-05 12:08 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: very minor "install" tweaks - -1993-12-05 12:07 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, nfa.c: YY_USER_ACTION generated now for each case in - action switch - -1993-12-04 17:02 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Fixed bug in pointing yyin at a new file and resuming - scanning - -1993-12-03 17:45 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Added note regarding g++ 2.5.X - -1993-12-03 17:20 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: updated credits - -1993-12-03 17:20 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: ranlib addition for 2.4.3 - -1993-12-03 17:19 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Minor tweak to last change - -1993-12-03 17:18 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: run ranlib on libfl.a - -1993-12-03 17:02 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Hopefully last update prior to 2.4.3 - -1993-12-03 16:59 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, gen.c, misc.c, sym.c: lint tweaks - -1993-12-03 16:35 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added exec_prefix - -1993-12-03 16:35 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: credit update - -1993-12-03 16:35 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: lint tweak - -1993-12-03 07:50 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: FlexLexer.h fixed for separate inclusion - -1993-12-03 07:49 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, FlexLexer.h, main.c: mods so FlexLexer.h can be - included separately - -1993-12-03 07:47 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: -F incompatible with -+ - -1993-12-02 17:18 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Elaborated comments for 2.4.3 - -1993-12-02 16:59 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4.3 - -1993-12-02 16:58 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Updated message regarding missing libfl.a routines Added - thanks to Noah Friedman - -1993-12-02 16:52 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added libstring.c Modified "lint" target to use - -Dconst= Added a.out, lex.yy.cc to sundry clean targets - -1993-12-02 16:52 Vern Paxson <vern@ee.lbl.gov> - - * gen.c, scan.l, sym.c, misc.c, main.c, flexdef.h, flex.skl: Use - yy_strXXX() routines instead of <string.h> - -1993-12-01 06:58 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.4.3 - -1993-12-01 06:58 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, misc.c: yy_flex_xmalloc() moved to misc.c - -1993-12-01 06:58 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Fixed bug in yy_fatal_error() - -1993-12-01 02:59 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: ... and remove plain tar file after compression - -1993-12-01 02:57 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4.2 - -1993-12-01 02:56 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Produce both compress'd and gzip'd distribution tar - files - -1993-12-01 02:52 Vern Paxson <vern@ee.lbl.gov> - - * version.h: Release 2.4.2 - -1993-11-30 18:37 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: -a -> -Ca - -1993-11-30 15:59 Vern Paxson <vern@ee.lbl.gov> - - * README: described configuration files in manifest - -1993-11-30 15:58 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added intermediate step of copying MISC/alloca.c -> - alloca.c Included CPPFLAGS when compiling alloca.c - -1993-11-30 10:51 Vern Paxson <vern@ee.lbl.gov> - - * README: Credit to 2.4 pre-testers. - -1993-11-30 08:01 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Fixed nasty bug in short/long decl decision - -1993-11-30 08:01 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Lowered MAX_SHORT out of increased general paranoia. - Added yy_flex_xmalloc() proto - -1993-11-30 08:00 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Fixed very minor typo in -v output - -1993-11-30 08:00 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Removed vestigal cast to (char) in isupper() call - -1993-11-30 07:59 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added casts to unsigned Char for isascii() calls - -1993-11-30 07:59 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Added #ifdef chud for alloca() - -1993-11-30 07:59 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added alloca - -1993-11-30 07:35 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: Add AC_ALLOCA if using bison - -1993-11-29 16:35 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added intermediate file going scan.l -> scan.c - -1993-11-29 12:18 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Removed parse.{c,h} from distribution files, since - they may not be all that portable. - -1993-11-29 12:13 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Fixed %array YYLMAX headaches, added error message if - buffer needs growing but REJECT used - -1993-11-29 12:13 Vern Paxson <vern@ee.lbl.gov> - - * gen.c, main.c: Fixed YYLMAX headaches - -1993-11-29 12:13 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Documented that buffer can't grow if REJECT used - -1993-11-29 12:12 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added parse.{c,h} to dist files - -1993-11-29 11:40 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, flexdef.h, gen.c, main.c, misc.c, scan.l: Fixed to - buffer section 1 definitions - -1993-11-29 11:38 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: Fixed ANSI-C glitch with '%' operator - -1993-11-29 09:57 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed mis-definition of ndlookup() - -1993-11-29 06:04 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4 -> 2.4.1 - -1993-11-29 06:02 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added install.sh, mkinstalldirs to distribution - files - -1993-11-29 05:51 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Added Nathan Zelle, "promoted" Francois - -1993-11-29 05:37 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: only "realclean" removes flex dist depends on flex - -1993-11-29 05:37 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h, misc.c: myctoi takes char[] instead of Char[] - -1993-11-28 11:46 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: -a -> -Ca all_lower, all_upper -> work on char* - -1993-11-28 11:46 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added -Ca to bigcheck - -1993-11-28 11:45 Vern Paxson <vern@ee.lbl.gov> - - * main.c: -a -> -Ca; fixed help output - -1993-11-28 11:45 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c, flex.1: -a -> -Ca - -1993-11-28 11:44 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: all_lower, all_upper work on char* - -1993-11-28 11:44 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed some casts now that yytext is always char* and - never unsigned char* - -1993-11-28 11:42 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Francois' tweaks - -1993-11-28 11:39 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: AC_LN_S, AC_STDC_HEADERS (but not AC_ALLOCA) - -1993-11-27 10:10 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: fixed typo - -1993-11-27 10:03 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Don't remove dist directory - -1993-11-27 10:01 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Include liballoc.c in lint targets - -1993-11-27 10:01 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: lint tweak - -1993-11-27 09:14 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Added -l compression to bigcheck - -1993-11-27 09:07 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: permission tweaking for "dist" - -1993-11-27 09:02 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: more "dist" tweaks - -1993-11-27 08:59 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Changed "make dist" to use version.h, include scan.c - in initial dir copy - -1993-11-27 08:44 Vern Paxson <vern@ee.lbl.gov> - - * version.h: 2.4.1 - -1993-11-27 08:44 Vern Paxson <vern@ee.lbl.gov> - - * README: Revised as per Francois Pinard - -1993-11-27 08:41 Vern Paxson <vern@ee.lbl.gov> - - * COPYING: flex.skel -> flex.skl - -1993-11-27 08:37 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Updated date of 2.4 release - -1993-11-27 08:29 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Removed manual & nroff output from distribution - -1993-11-27 08:20 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4.1 release - -1993-11-27 07:57 Vern Paxson <vern@ee.lbl.gov> - - * configure.in: Initial revision - -1993-11-27 07:56 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Merge w/ 2.4.1 changes added "dist2" target - -1993-11-26 12:02 Vern Paxson <vern@ee.lbl.gov> - - * Makefile.in: Initial revision - -1993-11-26 11:59 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Removed #ifndef FILE protection from include of stdio - -1993-11-26 11:40 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Added Francois Pinard to distribution headache helpers - -1993-11-26 11:10 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Modified C++ scanners to get input a character at a - time for interactive scanners. - -1993-11-26 11:09 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added YY_INTERACTIVE. - -1993-11-26 11:09 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Put definitions inside ()'s so we can test -l option for - "make bigcheck" - -1993-11-26 11:09 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Documented YY_INTERACTIVE. - -1993-11-26 10:08 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, flexdef.h, flex.1, gen.c, main.c, parse.y, scan.l: -l - lex compatibility flag - -1993-11-20 10:05 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Support for read()/fread() section 1 definitions - precede default macro definitions - -1993-11-20 10:05 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added use_read global - -1993-11-20 10:04 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Cleaner definition for yymore() Fixed string broken across - multiple lines - -1993-11-20 10:04 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added -Cr - -1993-11-20 10:03 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: K&R declaration for check_char() - -1993-11-20 09:56 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Documented -Cr - -1993-11-20 09:31 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: No need to #undef before redefining prior to -Cr - documentation - -1993-11-10 05:27 Vern Paxson <vern@ee.lbl.gov> - - * README: Heavily massaged for 2.4 - -1993-11-10 05:27 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Added Landon Noll to thanks. - -1993-11-10 05:07 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.4 release - -1993-11-10 05:06 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: 2.4 documentation - -1993-11-10 05:05 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added global to remember -P prefix so it can be written - in -v summary. Alphabetized prefix generation, added yywrap - -1993-11-09 16:11 Vern Paxson <vern@ee.lbl.gov> - - * version.h: updated date for 2.4.0 :-( - -1993-10-10 11:28 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: Whitespace tweaking - -1993-10-10 10:52 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Use DEFAULT_CSIZE only if not using equivalence classes. - -1993-10-10 10:47 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Checkpoint prior to final 2.4 update - -1993-10-04 17:15 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Raw 2.4 changes - -1993-10-04 12:44 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: osfcn.h -> unistd.h - -1993-10-04 06:56 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added "static" to definition of yy_fatal_error as well - as fwd decl. - -1993-10-04 06:17 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added yy_fatal_error function. - -1993-10-03 13:38 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Got rid of (char *) casts of yytext, no longer needed. - -1993-10-03 13:34 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Got rid of (char *) casts of yytext, no longer needed. - -1993-10-03 12:05 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: YY_CHAR -> char added YYText(), YYLeng() - -1993-10-03 12:01 Vern Paxson <vern@ee.lbl.gov> - - * gen.c, flex.skl: Minimized use of YY_CHAR - -1993-10-03 12:01 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added "flex++" feature Minimized use of YY_CHAR - -1993-10-02 11:25 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Clarified help message for -S - -1993-10-02 11:23 Vern Paxson <vern@ee.lbl.gov> - - * libyywrap.c, version.h: Initial revision - -1993-10-02 11:20 Vern Paxson <vern@ee.lbl.gov> - - * main.c: If -+ used, output to lex.yy.cc - -1993-10-02 11:19 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h, flex.skl: Switched from FILE*'s to stream's - -1993-10-02 09:44 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added expand_nxt_chk() extern. - -1993-10-02 09:38 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added dynamic buffer growing. Added yyless() for - section 3. - -1993-10-02 09:37 Vern Paxson <vern@ee.lbl.gov> - - * main.c, flexdef.h, dfa.c, gen.c: Added -a option for long-align. - -1993-10-02 09:36 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: formfeed no longer considered whitespace - -1993-09-21 16:45 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Nuked FILENAMESIZE - -1993-09-21 16:45 Vern Paxson <vern@ee.lbl.gov> - - * main.c: yyflexlexer.h -> FlexLexer.h minor portability tweak - -1993-09-21 16:45 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Added start condition to EOF trace output - -1993-09-21 16:44 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added YY_START changed yyFlexLexer to define yylex() - -1993-09-21 16:44 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Minor portability tweaks - -1993-09-21 16:43 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: Split into two classes, one fully abstract. yylex() - no longer abstract in yyFlexLexer - -1993-09-21 16:42 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: PC lint tweak - -1993-09-21 16:42 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: YYSTYPE #define'd to int - -1993-09-21 16:42 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: minor lint tweak - -1993-09-16 16:53 Vern Paxson <vern@ee.lbl.gov> - - * FlexLexer.h: Initial revision - -1993-09-16 16:38 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Delete prototypes for Unix system calls. - -1993-09-16 16:31 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c, tblcmp.c, sym.c, nfa.c, misc.c, main.c, gen.c, ecs.c, - ccl.c, dfa.c, scan.l, parse.y: nuked static RCS string - -1993-09-16 16:28 Vern Paxson <vern@ee.lbl.gov> - - * main.c: %array not allowed with C++ scanners - -1993-09-16 16:27 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed bugs regarding %{%} code in section 2 prolog %array - not allowed with C++ scanners - -1993-08-25 13:11 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added C_plus_plus flag. - -1993-08-25 13:11 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: First version of C/C++ skeleton - -1993-08-25 13:10 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: yy_state_type declared earlier. Made a bunch of statics - only output if not -+ - -1993-08-25 12:59 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added -+ option, updated usage() output, rearranged some - generated code to come at the right point in the output for - yyflexlexer.h. - -1993-08-25 12:52 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added %+/%-/%* to skelout() - -1993-08-25 12:51 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: EOF in section 2 prolog leads to section 0, not section 3 - -1993-08-25 12:40 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: Dump promotion of EOF in section 2 to turn on section 3; - instead just treat it like a final EOF - -1993-08-25 12:40 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: yy_nxt table should be "const" - -1993-08-24 16:46 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Removed a lot of #ifdef chud "backtracking" -> - "backing up" - -1993-08-24 16:45 Vern Paxson <vern@ee.lbl.gov> - - * main.c: "backtracking" -> "backing up" got rid of time reports - -1993-08-24 16:44 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: "backtracking" -> "backing up" some portability tweaks - fixed to only call flexscan() when done if known to be in section 3 - -1993-08-24 16:43 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: isascii() moved to flexdef.h nuked flex_gettime() - -1993-08-24 16:43 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed bug with empty section 2 - -1993-08-24 16:42 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: Chucked definition of isascii() - -1993-08-24 16:40 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: preserve yytext on input() bug fix when combining - yyless() with yymore() checkpoint prior to C++ option - -1993-08-24 16:37 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: "backtracking" -> "backing up" - -1993-07-09 15:47 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Fixed to not generate extra EOF's after reading one. - -1993-07-05 17:52 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Spit out definition of YY_CHAR early - -1993-07-05 17:52 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Some rearranging to make sure things get declared in - the right order - -1993-07-05 17:37 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: Some comment fixes as per Wilhelms - -1993-07-05 17:37 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Nuked #undef of yywrap, now that it's a function - -1993-07-05 17:36 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Fixed bug with Z-a character classes as per Wilhelms - -1993-07-05 17:36 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: added check_char call in mkstate() to prevent bad xtion - chars - -1993-07-05 17:35 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added check_char() - -1993-07-05 17:35 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Fixed some reallocation bugs, etc. as per Wilhelms - -1993-07-05 17:34 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added check_char(), readable_form() - -1993-07-05 17:34 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added #ifndef's around #define's to let user override - Moved a bunch of definitions prior to section 1 - -1993-07-05 17:32 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: Wilhems bug fixes. - -1993-07-05 17:31 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: Added check_char() - -1993-06-12 09:44 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Changed to use yy_flex_alloc() and friends - -1993-06-12 09:43 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added -P flag - -1993-06-12 09:42 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed bug in lex % directives - -1993-06-12 09:42 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Modified to use yy_flex_alloc() and friends - -1993-06-12 09:42 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: Modified to use yy_flex_alloc() - -1993-06-12 09:41 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Modified to use yy_flex_alloc() and friends Moved some - globals earlier in the file to permit access in section 1 - -1993-06-12 09:40 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: Got rid of code needed for %t - -1993-04-14 18:41 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c, dfa.c, ecs.c, flex.skl, flexdef.h, gen.c, libmain.c, - main.c, misc.c, nfa.c, parse.y, scan.l, sym.c, tblcmp.c, yylex.c: - Reformatting. - -1993-04-05 16:38 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Fixed bug in description of backtracking - -1993-04-05 16:37 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.3.8 - -1993-04-05 16:37 Vern Paxson <vern@ee.lbl.gov> - - * main.c, flex.skl: %array support - -1993-04-05 16:36 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added non-STDC clause for '\a' - -1993-04-05 16:35 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Fixed subtle problems regarding '*'s in comments - %pointer/%array match entire lines - -1993-04-05 16:35 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Added %array support - -1993-02-06 16:08 Vern Paxson <vern@ee.lbl.gov> - - * README: Finally updated email addr - -1993-02-06 16:08 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Mostly .LP -> .PP - -1993-02-06 16:06 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: [no log message] - -1993-02-06 16:05 Vern Paxson <vern@ee.lbl.gov> - - * main.c, scan.l: A lot of tweaks ... - -1993-02-06 16:04 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: reallocate_character_array -> reallocate_Character_array - -1993-02-06 16:04 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Bug/lint fixes Modified to work with "action" array - instead of temp file - -1993-02-06 16:03 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: Fixed bug in 8-bit hashing - -1993-02-06 16:03 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: numerous bug fixes extra formatting of error/warning - messages added support of <*>, partial support for nested start - conditions - -1993-02-06 16:01 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c: Remove %t cruft - -1993-02-06 16:01 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Beginning of %pointer/%array support - -1993-02-06 16:00 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: Added keeping track of which rules are useful fixed a - fencepost error in checking for scanners that require -8 - -1993-02-06 15:59 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: Added checking for whether rules are useful modified to - work with internal "action" array - -1993-02-06 15:58 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added internal "action" array, internal skeleton, - zero_out() in lieu of bzero - -1993-02-06 15:58 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: Fixed a bunch of fencepost errors in increasing tables. - -1993-02-06 15:57 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: -Wall fix - -1991-03-28 07:01 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Fixed out-of-bounds access bug; patch #7 for release 2.3 - -1991-03-28 07:00 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Patch #7 for 2.3 - -1990-10-23 10:51 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: fixed missing "rule_type" entry for end-of-buffer action - -1990-08-29 08:11 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Fixed yymore() but in not resetting yy_more_len - -1990-08-29 08:10 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Patch #6 for 2.3 - -1990-08-16 16:22 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Patch #5 - -1990-08-13 20:10 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: fixed comment in myesc() - -1990-08-13 20:07 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: fixed date in patch #4 - -1990-08-13 20:05 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: patch #4 - -1990-08-13 20:01 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: fixed hexadecimal escapes; added is_hex_digit() - -1990-08-03 10:12 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Patch #3 - -1990-08-03 10:09 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, flexdef.h: changed to include <stddef.h> for __GNUC__ - -1990-08-01 21:03 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.3 patch #2 - -1990-08-01 21:01 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Another try at getting the malloc() definitions - correct; this time for g++, too - -1990-08-01 20:30 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, flexdef.h: fixed to declare malloc() and free() by hand - if __GNUC__ - -1990-07-28 12:53 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Changed to get malloc definition in identical fashion - to that used by flex.skel - -1990-06-27 20:43 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: [no log message] - -1990-06-27 20:40 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Fixed bug in mini-scanner examle Fixed bug in YY_INPUT - redefinition yylineno defense reentrancy documentation Something - else which I forget. - -1990-06-27 19:47 Vern Paxson <vern@ee.lbl.gov> - - * COPYING, ccl.c, dfa.c, ecs.c, flexdef.h, gen.c, main.c, misc.c, - nfa.c, parse.y, scan.l, sym.c, tblcmp.c, yylex.c: 4.4 BSD copyright - -1990-05-26 13:31 Vern Paxson <vern@ee.lbl.gov> - - * README: Changed prolog to reflect 2.3 release. - -1990-05-26 13:29 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: pointed reader at Makefile instead of README for porting - considerations added Makefile comments: support for SCO Unix; - parameterization - -1990-05-26 13:24 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added DONT_HAVE_STDLIB_H and declarations of malloc() - -1990-05-26 13:16 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.3 changes - -1990-05-26 13:02 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: documentation on new features Comment regarding Ove's - work ^foo|bar difference between flex / lex yyin initialization - difference documented that yy_switch_to_buffer can be used in - yywrap() documented that # comments are deprecated - -1990-05-26 12:56 Vern Paxson <vern@ee.lbl.gov> - - * main.c: declared void functions as such added prototypes for - forward references changed to check for error status when closing - files - -1990-05-26 12:54 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: Added macro definition for isascii() if not already - present - -1990-05-26 12:53 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: declared void functions as such added prototypes for - forward references changed to use format_pinpoint_message where - appropriate - -1990-05-26 12:53 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: declared void functions as such changed to strip # - comments, as documented moved #undef of yywrap() to before include - of flexdef, so prototype doesn't get screwed up - -1990-05-26 12:52 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: introduced format_pinpoint_message() declared void - functions as such changed lone <<EOF>> to apply to all outstanding - start conditions - -1990-05-26 12:51 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c, tblcmp.c: declared void functions as such added prototypes - for forward references - -1990-05-26 12:50 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: declared void functions as such prototypes for forward - references shuffled around some routines to make the order perhaps - a little more logical changed memory references to use void* - instead of char* - -1990-05-26 12:50 Vern Paxson <vern@ee.lbl.gov> - - * libmain.c: Added declaration of arguments made yylex() a function - -1990-05-26 12:48 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: prototypes for forward references declared void functions - as such yy_flex_debug testing of error on file closes casts to void - for sprintf() and strcpy() - -1990-05-26 12:42 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added prototypes changed memory allocation routines to - deal with void*'s instead of char*'s some rearranging for VMS - -1990-05-26 12:40 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Added YY_USER_INIT Added yy_new_buffer() alias for - yy_create_buffer() fixed (hopefully) malloc declaration headaches - -1990-05-26 12:40 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c: declared void functions as such declared void functions as - such - -1990-05-26 12:39 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: prototypes for forward references declared void functions - as such - -1990-05-26 12:38 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: Declared void functions as such - -1990-04-12 07:03 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: added fix for allowing yy_switch_to_buffer() in - yywrap() - -1990-04-03 10:09 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: patch #3 - -I fix - -1990-03-29 21:43 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Changed generation of archaic "continue" to "goto - yy_find_action" - -1990-03-27 07:06 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Patch #2 changes - -1990-03-27 07:03 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: fixed fencepost errors with yy_buf_size and detecting - NUL's - -1990-03-26 11:41 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: [no log message] - -1990-03-26 11:38 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: g++ tweaks - -1990-03-23 09:25 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: Changes for Patch #1. - -1990-03-23 09:20 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: fix for g++ - -1990-03-23 09:18 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: minor typos and formatting changes. Removed BITNET - address. - -1990-03-23 09:16 Vern Paxson <vern@ee.lbl.gov> - - * README: nuked BITNET address. - -1990-03-20 09:54 Vern Paxson <vern@ee.lbl.gov> - - * README: 2.2 README - -1990-03-20 09:33 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: USG alias. - -1990-03-20 09:32 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added USG alias for SYS_V - -1990-03-20 09:25 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-03-20 09:17 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Added Earle Horton for 8-bit chars. - -1990-03-20 08:52 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Tweaks for lint and C++ - -1990-03-20 08:52 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: -ll => -lfl - -1990-03-20 08:52 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: 2.2 changes - -1990-03-20 08:17 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Changed to use YY_BUFFER_STATE everywhere. - -1990-03-20 08:16 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-03-20 08:16 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: "associated rules" changed to "associated rule line - numbers". - -1990-03-20 08:15 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: cast added to malloc() call to keep lint happy. - -1990-03-20 06:36 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: Fixed handling of premature EOF's. - -1990-03-20 06:36 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: Removed declaration of malloc() - -1990-03-20 06:36 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Removed malloc() declaration. Added detection of EOF in - actions. - -1990-03-20 06:35 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Rules rewritten so '/' and '$' parsed correctly. - -1990-03-20 06:34 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: Corrected line numbers for continued actions. - -1990-03-20 06:33 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Removed declarations of malloc() and realloc(). - -1990-03-20 06:32 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Summary of generation flags. Minor -8 tweaks. - -1990-03-20 06:32 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: full support for -d - -1990-03-20 06:31 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: defines for malloc() and realloc() conditional defines - for abs(), min(), and max() - -1990-03-20 06:31 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Many multiple-buffer additions. - -1990-03-20 06:30 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: -8 tweaks. - -1990-03-19 11:34 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Proto hacks. NUL hacks. Debugging hacks. C++ hacks. - -1990-03-16 12:40 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: RCS won't let me unedit! gets "Missing access list" - -1990-03-16 11:55 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c: Many hacks for NUL's. Hope they're right. - -1990-03-16 11:53 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: Minor tweaks for NUL's. - -1990-03-16 11:53 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: no changes -- had checked out for testing smaller read - buffer sizes - -1990-03-16 11:52 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Nuked some extraneous whitespace. NUL's hacks. - -1990-03-16 11:52 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: hack for NUL's. - -1990-03-16 11:51 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Hack to cshell for NUL's. - -1990-03-16 11:51 Vern Paxson <vern@ee.lbl.gov> - - * main.c: NUL's. -8 - -1990-03-16 11:51 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: NUL's. - -1990-03-16 11:50 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: NUL's. 8-bit chars. - -1990-03-16 11:50 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: NUL's; indenting - -1990-03-16 11:50 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: more thrashing around with NUL's - -1990-03-16 11:49 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: removed NUL hack - -1990-03-14 08:41 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: Added <<EOF>> token - -1990-03-14 08:39 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c, flexdef.h: Tweaks for NUL chars. - -1990-03-14 08:39 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c, gen.c, main.c, misc.c, parse.y, scan.l, tblcmp.c: Tweaks - for NUL chars. - -1990-03-14 08:39 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: Tweaks for handling NUL's. - -1990-02-28 13:10 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-02-28 11:59 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Changed .so options.man to inlined version since flex.1 - will have a different (shorter) options description. - -1990-02-28 10:09 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-02-28 06:10 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-02-26 12:59 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-02-25 14:47 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: [no log message] - -1990-02-24 20:28 Vern Paxson <vern@ee.lbl.gov> - - * flex.1: Initial revision - -1990-01-16 06:17 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Restored EOB accepting list for REJECT. Second try at 2.2 - Release. - -1990-01-16 05:39 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Added missing ',' in error message. 2.2 Release, second - try. - -1990-01-16 05:29 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: 8-bit char support. 2.2 Release. - -1990-01-15 13:02 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: 8-bit char support. Arbitrary indented/%{} code allowed - in section 2. \x escapes. %t support. Minor POSIX-compliance - changes. BEGIN(0) -> BEGIN(INITIAL). yywrap() and - set_input_file() for multiple input files. C_COMMENT_2 removed. - 2.2 Release. - -1990-01-15 13:00 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: 8-bit char support. SYS_V / Atari portability fixes. - Removed generated array names. CSIZE now only defined if not - already defined. Added "csize" global. Added "input_files", - "num_input_files", and "program_name" globals. %t support globals. - 2.2 Release. - -1990-01-15 12:58 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Removed unused EOB_accepting_list array. 2.2 Release. - -1990-01-15 12:53 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Bug in -F table generation fixed. 8-bit char support. - Hardwired generated array names. "const"'s added to generated - code. Fixed yymore() / trailing context bug. - -1990-01-15 12:53 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: 8-bit char support. Error-message pinpointing. 2.2 - Release. - -1990-01-15 12:49 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Unsigned char support. %t support. Removed hard-wiring - of program name "flex". -c changed to -C; -c now deprecated. -n - added. :-( Multiple input files. SYSV tmpnam() use. Removed old - #define's from output. Identified error messages w/ filename and - line. 2.2 Release. - -1990-01-15 12:49 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: Unsigned char support. 2.2 Release. - -1990-01-15 12:48 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: Removed redundant test. 2.2 Release. - -1990-01-15 12:48 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: Unsigned char support. \x support. 2.2 Release. - -1990-01-15 12:47 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: 8-bit char support. 2.2 Release. - -1990-01-15 12:44 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: C++ support. Turbo-C support. 8-bit char support. - yyleng is an int. unput() callable in section 3. yymore hacks. - yyrestart() no longer closes stdin. 2.2 Release. - -1990-01-15 12:41 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c: %t support. 8-bit/unsigned char support. 2.2 Release. - -1990-01-15 12:40 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: %t hacks. minor cosmetics. 2.2 Relase. - -1990-01-15 12:37 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: Changes for unsigned/8-bit chars. 2.2 Release. - -1990-01-10 10:10 Vern Paxson <vern@ee.lbl.gov> - - * libmain.c: Initial revision - -1989-12-30 10:34 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: removed gratuitous trailing context code - -1989-12-30 10:34 Vern Paxson <vern@ee.lbl.gov> - - * main.c: made -c<compression flags> case-sensitive - -1989-12-30 10:33 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: unput() bug fix - -1989-12-30 10:32 Vern Paxson <vern@ee.lbl.gov> - - * README: [no log message] - -1989-06-20 13:24 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: changed to not use '|' and trailing context combo so - users can test using -F ... - -1989-06-20 13:23 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: made trailing context combined with '|' warning always - come out - -1989-06-20 13:12 Vern Paxson <vern@ee.lbl.gov> - - * README: [no log message] - -1989-06-20 12:47 Vern Paxson <vern@ee.lbl.gov> - - * COPYING: Initial revision - -1989-06-20 12:36 Vern Paxson <vern@ee.lbl.gov> - - * main.c, README, NEWS: [no log message] - -1989-06-20 12:27 Vern Paxson <vern@ee.lbl.gov> - - * README: [no log message] - -1989-06-20 12:02 Vern Paxson <vern@ee.lbl.gov> - - * NEWS, README, main.c: [no log message] - -1989-06-20 11:49 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c, dfa.c, ecs.c, flex.skl, flexdef.h, gen.c, misc.c, nfa.c, - parse.y, scan.l, sym.c, tblcmp.c, yylex.c: Beta release - -1989-06-20 11:48 Vern Paxson <vern@ee.lbl.gov> - - * NEWS, README, main.c: 2.1 beta release - -1989-06-20 11:44 Vern Paxson <vern@ee.lbl.gov> - - * main.c, NEWS: [no log message] - -1989-06-20 11:38 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl, flexdef.h, gen.c, misc.c, nfa.c, parse.y, scan.l, - sym.c: 2.0.1 beta - -1989-06-20 11:37 Vern Paxson <vern@ee.lbl.gov> - - * README: [no log message] - -1989-05-25 08:21 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: fixsed bug with -I and backtracking - -1989-05-25 07:49 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Cleaned up forward declarations of yyunput() and - input() - -1989-05-25 07:48 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: Split copyright string. - -1989-05-25 07:48 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: Split copyright string. Added check for empty machine in - dupmachine(). - -1989-05-25 07:46 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c, main.c, misc.c, scan.l, ecs.c, sym.c, yylex.c, dfa.c, - tblcmp.c, gen.c: Split copyright string into two to avoid tempting - fate with \<newline> sequences ... - -1989-05-24 08:48 Vern Paxson <vern@ee.lbl.gov> - - * README: updated for 2nd release Beta test added RCS header - -1989-05-24 07:48 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: removed static char copyright - -1989-05-24 07:45 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added BSD copyright notice. Removed - FAST_SKELETON_FILE. - -1989-05-24 07:44 Vern Paxson <vern@ee.lbl.gov> - - * main.c: added BSD copyright notice. Removed references to - FAST_SKELETON_FILE. - -1989-05-24 07:44 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c, gen.c, ecs.c: Added BSD copyright notice - -1989-05-24 07:42 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c, dfa.c, misc.c, yylex.c, sym.c, tblcmp.c, scan.l, parse.y: - added BSD copyright notice - -1989-05-23 20:32 Vern Paxson <vern@ee.lbl.gov> - - * flex.skl: Initial revision - -1989-05-19 10:13 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: renamed accnum to num_rules - -1989-05-19 10:12 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: moved table generation code to gen.c moved ntod() to - dfa.c - -1989-05-19 10:11 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: the most piddling format change imaginable - -1989-05-19 10:10 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: changed to look for yymore, REJECT, %used and %unused - removed gross magic for dealing with section 3 - -1989-05-19 10:08 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c, parse.y: changes for variable trailing context - -1989-05-19 10:07 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: added all_lower() and all_upper() - -1989-05-19 10:07 Vern Paxson <vern@ee.lbl.gov> - - * main.c: added checking for features being Really used - backtracking, performance reports misc. cleanup - -1989-05-19 10:06 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: major overhaul for merged skeleton - -1989-05-19 10:05 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: a zillion changes/additions/cleanups - -1989-05-19 10:01 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: added backtrack report added checking for dangerous - trailing context considerable minor cleanup - -1989-05-19 09:56 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: list_character_set() modified to take a FILE to write to - ... - -1989-05-19 09:56 Vern Paxson <vern@ee.lbl.gov> - - * README: updated for beta release - -1988-11-25 16:30 Vern Paxson <vern@ee.lbl.gov> - - * main.c: added -p flag generation of #define's for scanner - -1988-11-25 16:28 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: Added END_OF_BUFFER_ACTION and bol_needed - -1988-11-25 16:27 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: added ntod() - -1988-05-09 13:01 Vern Paxson <vern@ee.lbl.gov> - - * gen.c: Initial revision - -1988-05-08 16:13 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: RCS header changed display style of non-printings from - ^x to \0xx - -1988-05-08 16:08 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: RCS header MAX_XTIONS_FOR_FULL_INTERIOR_FIT -> - MAX_XTIONS_FULL_INTERIOR_FIT made back-tracking accepting number be - one greater than the last legit accepting number, instead of 0. - This way, end-of-buffer can take 0 and no negative accepting - numbers are needed. added genftbl() changed last ftl references to - C added check for UNSIGNED_CHAR's added back-track logic to - make_tables() added checking and report for backtracking fixed - fence-post error with onesp stack pointer - -1988-05-08 16:08 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: RCS header changed "entry" to "sym_entry" to avoid - conflict with old keyword - -1988-05-08 16:07 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: RCS header removed \^ from ESCSEQ - -1988-05-08 16:06 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: RCS header bug fix due to missing default rule, could - have to backtrack when backtrack variables haven't been set up - -1988-05-08 16:05 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: RCS ident yy_cp, yy_bp support name shortenings assoc_rule - support - -1988-05-08 16:04 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: RCS header check before malloc()'ing for 16 bit overflow - MS_DOS, VMS ifdef's removed commented-out \^ code removed FTLSOURCE - code added readable_form() - -1988-05-08 16:03 Vern Paxson <vern@ee.lbl.gov> - - * main.c: Added RCS header removed revision history misc additions - and fixes to globals VMS ifdef's backtracking statistics -p flag - name shortenings - -1988-05-08 15:59 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: removed revision history added RCS header added VMS, - MS_DOS ifdef's removed DEFAULT_ACTION, changed END_OF_BUFFER_ACTION - shortened MAX_XTIONS_FOR_FULL_INTERIOR_FIT to - MAX_XTIONS_FULL_INTERIOR_FIT added MAX_ASSOC_RULES added - performance_report, assoc_rule gloabls added num_backtracking - gloabl shortened allocate_integer_pointer_array, - reallocate_integer_pointer_array - -1988-05-08 15:53 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c: added RCS id added PROCFLG to avoid assumption of signed - char's - -1988-05-08 15:51 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: added RCS id added check_for_backtracking() added - dump_associated_rules() added dump_transitions() shortened - reallocate_integer_pointer_array to reallocate_int_ptr_array - removed some dfaacc_{state,set} abuses - -1988-05-08 15:51 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: Added list_character_set() - -1988-05-06 20:06 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: added RCS id - -1988-04-10 17:57 Vern Paxson <vern@ee.lbl.gov> - - * README: minor tweaks - -1988-04-10 17:42 Vern Paxson <vern@ee.lbl.gov> - - * README: forgot sh flex.shar - -1988-04-10 17:27 Vern Paxson <vern@ee.lbl.gov> - - * README: final tweaking - -1988-04-10 17:27 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: removed minor lint fluff - -1988-04-10 17:27 Vern Paxson <vern@ee.lbl.gov> - - * NEWS: [no log message] - -1988-04-10 16:55 Vern Paxson <vern@ee.lbl.gov> - - * NEWS, README: Initial revision - -1988-04-10 16:54 Vern Paxson <vern@ee.lbl.gov> - - * yylex.c: added identifying comment. changed to include "parse.h" - instead of "y.tab.h" - -1988-04-10 16:53 Vern Paxson <vern@ee.lbl.gov> - - * tblcmp.c: Changed name from flexcmp.c -> tblcmp.c fixed misc. - typos made generating ec tables be a routine - -1988-04-10 16:52 Vern Paxson <vern@ee.lbl.gov> - - * sym.c: changed name from flexsym.c -> sym.c revamped calling - sequences, etc., for extended table struct definition which now - has both char * and int fields. - -1988-04-10 16:51 Vern Paxson <vern@ee.lbl.gov> - - * scan.l: Changed name from flexscan.l -> scan.l fixed bug in - <RECOVER> added block comments between rules. - -1988-04-10 16:50 Vern Paxson <vern@ee.lbl.gov> - - * parse.y: changed name from flexparse.y -> parse.y added start - condition "INITIAL" made a{3} have "variable length" - -1988-04-10 16:48 Vern Paxson <vern@ee.lbl.gov> - - * nfa.c: changed name from flexnfa.c -> nfa.c corrected some typos. - -1988-04-10 16:48 Vern Paxson <vern@ee.lbl.gov> - - * misc.c: changed name from flexmisc.c -> misc.c - -1988-04-10 16:46 Vern Paxson <vern@ee.lbl.gov> - - * main.c: fixed bug causing core dumps if skeleton files could not - be opened. Added -cF. Added fullspd to be equivalent to fulltbl - for which options is cannot be mixed with. - -1988-04-10 16:45 Vern Paxson <vern@ee.lbl.gov> - - * flexdef.h: fixed typos, enhanced symbol table definition. - -1988-04-10 16:42 Vern Paxson <vern@ee.lbl.gov> - - * ecs.c: changed name from flexecs.c to ecs.c - -1988-04-10 16:42 Vern Paxson <vern@ee.lbl.gov> - - * dfa.c: changed name from flexdfa.c to dfa.c - -1988-04-10 16:42 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c: changed name from flexccl.c -> ccl.c - -1988-02-13 06:00 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c, tblcmp.c, dfa.c, ecs.c, main.c, misc.c, nfa.c, sym.c, - yylex.c, flexdef.h, parse.y, scan.l: Beta Release. - -1987-11-08 17:24 Vern Paxson <vern@ee.lbl.gov> - - * ccl.c, tblcmp.c, flexdef.h, dfa.c, ecs.c, main.c, misc.c, nfa.c, - parse.y, scan.l, sym.c, yylex.c: Initial revision - diff --git a/Makefile.am b/Makefile.am index 1dc346b..4d419a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,7 +118,6 @@ EXTRA_DIST = \ ONEWS \ README \ README.cvs-snapshot \ - RoadMap \ THANKS \ TODO \ autogen.sh \ diff --git a/Makefile.in b/Makefile.in index 081f9b0..7b7dcea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,6 +110,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBINTL@ @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -146,6 +147,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -264,7 +266,6 @@ EXTRA_DIST = \ ONEWS \ README \ README.cvs-snapshot \ - RoadMap \ THANKS \ TODO \ autogen.sh \ @@ -408,7 +409,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/progtest.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 +$(ACLOCAL_M4): configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/nls.m4 m4/po.m4 m4/progtest.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -548,7 +549,7 @@ distclean-depend: .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -558,14 +559,14 @@ distclean-depend: .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ @am__fastdepCC_TRUE@ fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .l.c: $(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$< @@ -574,8 +575,6 @@ distclean-depend: .y.c: $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< - sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@ - rm -f y.tab.c if test -f y.tab.h; then \ to=`echo "$*_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ @@ -591,6 +590,8 @@ distclean-depend: if test -f y.output; then \ mv y.output $*.output; \ fi + sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@ + rm -f y.tab.c uninstall-info-am: includeHEADERS_INSTALL = $(INSTALL_HEADER) install-includeHEADERS: $(include_HEADERS) @@ -689,9 +690,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) conf.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) conf.in $(LISP) $(TAGS_FILES)'; \ @@ -751,9 +758,11 @@ distdir: $(DISTFILES) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -812,15 +821,13 @@ distcheck: dist $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst + mkdir $(distdir)/_build + mkdir $(distdir)/_inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && $(mkinstalldirs) $$dc_destdir \ - && cd $(distdir)/=build \ + && cd $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - --with-included-gettext \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -831,7 +838,9 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ - && ({ $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && ({ \ + (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ @@ -844,7 +853,7 @@ distcheck: dist @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' distuninstallcheck: - cd $(distuninstallcheck_dir) \ + @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -853,22 +862,24 @@ distuninstallcheck: $(distuninstallcheck_listfiles) ; \ exit 1; } >&2 distcleancheck: distclean - if test '$(srcdir)' = . ; then \ + @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-recursive +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) -install: install-recursive +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -892,11 +903,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -rm -f parse.h -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -rm -f parse.c -rm -f scan.c + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -rm -f parse.c clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \ @@ -3,8 +3,21 @@ changes between releases of flex. See the file COPYING for copying conditions. +* version 2.5.33 released 2006-2-20 -* version 2.5.31 rleased 2003-4-1 +** all flex resources are now to be found from the website at + http://flex.sourceforge.net/ + +** there was no release 2.5.32 published + +** numerous bug and security fixes + +** new nl, vi, sv, ro, po, ga, ca, fr, tr translations from the translation project + +** upgrade to use gettext 0.12 (this now makes the "pdf" and "ps" + targets in the build system able to be run successfully) + +* version 2.5.31 released 2003-4-1 ** remove --enable-maintainer-mode configure option; none of the Makefiles were using it and it can be unduely confusing @@ -6,10 +6,10 @@ lexical patterns in text. More information about flex as well as the latest official release of flex can be found at: -http://lex.sourceforge.net/ +http://flex.sourceforge.net/ Of particular interest is the mailing list -lex-announce@lists.sourceforge.net as that is where posts will be made +flex-announce@lists.sourceforge.net as that is where posts will be made announcing new releases of flex. Note that flex is distributed under a copyright very similar to that of @@ -43,7 +43,7 @@ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -Please send bug reports and feedback to lex-help@lists.sourceforge.net. +Please send bug reports and feedback to flex-help@lists.sourceforge.net. The flex distribution contains the following files which may be of interest: @@ -59,8 +59,6 @@ COPYING - flex's copyright and license. doc/ - user documentation. -RoadMap - notes for developers. - examples/ - containing examples of some possible flex scanners and a few other things. See the file examples/README for more details. diff --git a/RoadMap b/RoadMap deleted file mode 100644 index f976bd7..0000000 --- a/RoadMap +++ /dev/null @@ -1,44 +0,0 @@ -This is a list of some of the files in the flex distribution. It may -be of use when beginning to study the code. - -conf.in, configure.in, configure, Makefile.in, install.sh, -mkinstalldirs - - elements of the "autoconf" auto-configuration process - -flexdef.h, parse.y, scan.l, ccl.c, dfa.c, ecs.c, gen.c, main.c, -misc.c, nfa.c, sym.c, tblcmp.c, yylex.c - - source files - -version.h - version of this flex release - -flex.skl - flex scanner skeleton -mkskel.sh - script for converting flex.skl to C source file skel.c -skel.c - pre-converted C version of flex.skl - -libmain.c - flex library (-lfl) sources -libyywrap.c - -initscan.c - pre-flex'd version of scan.l - -FlexLexer.h - header file for C++ lexer class - -This file is part of flex. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -Neither the name of the University nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. @@ -68,6 +68,10 @@ ** merge yylineno into support for location tracking +** bug where yylineno is not decremented on REJECT + +** bug where yylineno is counted in trailing context + * C++ ** have a separate skeleton for c++ @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.7 -*- Autoconf -*- +# generated automatically by aclocal 1.7.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -16,7 +16,7 @@ # This macro actually does too much some checks are only needed if # your package does certain things. But this isn't really a big deal. -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -34,14 +34,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - +# serial 10 AC_PREREQ([2.54]) @@ -86,8 +79,8 @@ m4_ifval([$2], AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl - AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) @@ -108,6 +101,7 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], @@ -130,7 +124,16 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], # loop where config.status creates the headers, so we can generate # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright 2002 Free Software Foundation, Inc. @@ -160,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7])]) + [AM_AUTOMAKE_VERSION([1.7.5])]) # Helper functions for option handling. -*- Autoconf -*- @@ -446,9 +449,42 @@ fi INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# serial 4 -*- Autoconf -*- +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. +# serial 5 -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -540,11 +576,17 @@ AC_CACHE_CHECK([dependency style of $depcc], if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + >/dev/null 2>conftest.err && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_$1_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi done @@ -566,16 +608,8 @@ AM_CONDITIONAL([am__fastdep$1], [ # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null -AC_SUBST([DEPDIR]) +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) @@ -679,7 +713,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -704,8 +738,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) @@ -733,9 +768,9 @@ if test "$am__include" = "#"; then _am_result=BSD fi fi -AC_SUBST(am__include) -AC_SUBST(am__quote) -AC_MSG_RESULT($_am_result) +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) @@ -783,8 +818,8 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]) fi])]) -# gettext.m4 serial 17 (gettext-0.11.5) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +# gettext.m4 serial 20 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -802,7 +837,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. dnl Macro to add for using GNU gettext. @@ -877,13 +912,8 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + dnl Set USE_NLS. + AM_NLS ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no @@ -1001,7 +1031,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", dnl libintl. (Cf. the install rule in intl/Makefile.in.) if test "$gt_cv_func_gnugettext_libc" = "yes" \ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. @@ -1020,7 +1051,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" @@ -1045,6 +1075,22 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", fi fi + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then @@ -1068,7 +1114,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", ifelse(gt_included_intl, yes, [ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then BUILD_INCLUDED_LIBINTL=yes fi @@ -1076,7 +1122,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATOBJEXT) - AC_SUBST(INTLOBJS) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -1094,6 +1139,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", GENCAT=gencat AC_SUBST(GENCAT) + dnl For backward compatibility. Some Makefiles may be using this. + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + AC_SUBST(INTLOBJS) + dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) @@ -1110,13 +1161,107 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", ]) -dnl Checks for all prerequisites of the po subdirectory, -dnl except for USE_NLS. +dnl Checks for all prerequisites of the intl subdirectory, +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. +AC_DEFUN([AM_INTL_SUBDIR], +[ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gt_INTDIV0])dnl + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl + AC_REQUIRE([gt_INTTYPES_PRI])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ +geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ +strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ +__fsetlocking]) + + AM_ICONV + AM_LANGINFO_CODESET + if test $ac_cv_header_locale_h = yes; then + AM_LC_MESSAGES + fi + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + +# po.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. + +dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AM_NLS])dnl dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -1130,12 +1275,12 @@ AC_DEFUN([AM_PO_SUBDIRS], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - dnl Search for GNU xgettext 0.11 or newer in the PATH. + dnl Search for GNU xgettext 0.12 or newer in the PATH. dnl The first test excludes Solaris xgettext and early GNU xgettext versions. dnl The second test excludes FreeBSD xgettext. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) dnl Remove leftover from FreeBSD xgettext call. rm -f messages.po @@ -1165,8 +1310,8 @@ AC_DEFUN([AM_PO_SUBDIRS], if test "$XGETTEXT" != ":"; then dnl If it is no GNU xgettext we define it as : so that the dnl Makefiles still can work. - if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else AC_MSG_RESULT( @@ -1201,17 +1346,22 @@ AC_DEFUN([AM_PO_SUBDIRS], rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend # on $ac_dir but don't depend on user-specified configuration # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. - if test -n "$ALL_LINGUAS"; then + if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi case "$ac_given_srcdir" in .) srcdirpre= ;; @@ -1260,7 +1410,7 @@ AC_DEFUN([AM_PO_SUBDIRS], done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in @@ -1276,90 +1426,55 @@ AC_DEFUN([AM_PO_SUBDIRS], [# Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" ]) ]) +# nls.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) - - AM_ICONV - AM_LANGINFO_CODESET - if test $ac_cv_header_locale_h = yes; then - AM_LC_MESSAGES - fi +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) ]) - AC_DEFUN([AM_MKINSTALLDIRS], [ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate is. + dnl Try to locate it. MKINSTALLDIRS= if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" @@ -1367,12 +1482,100 @@ AC_DEFUN([AM_MKINSTALLDIRS], AC_SUBST(MKINSTALLDIRS) ]) +# progtest.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1996. -# lib-prefix.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# Search path for a program which passes the given test. + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# lib-prefix.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -1381,6 +1584,13 @@ dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed dnl to access previously installed libraries. The basic assumption is that dnl a user will want packages to use other packages he previously installed @@ -1399,7 +1609,7 @@ AC_DEFUN([AC_LIB_PREFIX], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib-prefix], + AC_LIB_ARG_WITH([lib-prefix], [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib --without-lib-prefix don't search for libraries in includedir and libdir], [ @@ -1520,8 +1730,8 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-link.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-link.m4 serial 4 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -1614,8 +1824,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Determine the platform dependent parameters needed to use rpath: dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L, -dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. +dnl hardcode_direct, hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS @@ -1636,8 +1845,6 @@ AC_DEFUN([AC_LIB_RPATH], hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" - sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" - sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" dnl Determine whether the user wants rpath handling at all. AC_ARG_ENABLE(rpath, [ --disable-rpath do not hardcode runtime library paths], @@ -1657,7 +1864,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib$1-prefix], + AC_LIB_ARG_WITH([lib$1-prefix], [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib --without-lib$1-prefix don't search for lib$1 in includedir and libdir], [ @@ -2075,8 +2282,8 @@ AC_DEFUN([AC_LIB_APPENDTOVAR], done ]) -# lib-ld.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. +# lib-ld.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -2106,6 +2313,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -2277,66 +2497,6 @@ size_t iconv(); fi ]) -# progtest.m4 serial 2 (gettext-0.10.40) -dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1996. - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - # isc-posix.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU @@ -2470,8 +2630,8 @@ int main () [Define if integer division by zero raises signal SIGFPE.]) ]) -# uintmax_t.m4 serial 6 (gettext-0.11) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +# uintmax_t.m4 serial 7 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -2482,8 +2642,8 @@ dnl From Paul Eggert. AC_PREREQ(2.13) -# Define uintmax_t to `unsigned long' or `unsigned long long' -# if <inttypes.h> does not exist. +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in <stdint.h> or <inttypes.h>. AC_DEFUN([jm_AC_TYPE_UINTMAX_T], [ @@ -2495,13 +2655,16 @@ AC_DEFUN([jm_AC_TYPE_UINTMAX_T], && ac_type='unsigned long long' \ || ac_type='unsigned long' AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if <inttypes.h> and <stdint.h> don't define.]) + [Define to unsigned long or unsigned long long + if <stdint.h> and <inttypes.h> don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) fi ]) -# inttypes_h.m4 serial 4 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +# inttypes_h.m4 serial 5 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -2524,13 +2687,13 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H], jm_ac_cv_header_inttypes_h=no)]) if test $jm_ac_cv_header_inttypes_h = yes; then AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, - and declares uintmax_t. ]) + [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) fi ]) -# stdint_h.m4 serial 2 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +# stdint_h.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -2553,8 +2716,8 @@ AC_DEFUN([jm_AC_HEADER_STDINT_H], jm_ac_cv_header_stdint_h=no)]) if test $jm_ac_cv_header_stdint_h = yes; then AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -[Define if <stdint.h> exists, doesn't clash with <sys/types.h>, - and declares uintmax_t. ]) + [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) fi ]) @@ -89,7 +89,7 @@ struct Buf *buf_linedir (struct Buf *buf, const char* filename, int lineno) { char *t, *fmt = "#line %d \"%s\"\n"; - t = flex_alloc (strlen (fmt) + strlen (filename) + (int)(1 + log(lineno>=0?lineno:-lineno)/log(10)) + 1); + t = flex_alloc (strlen (fmt) + strlen (filename) + (int)(1 + log10(lineno>=0?lineno:-lineno)) + 1); sprintf (t, fmt, lineno, filename); buf = buf_strappend (buf, t); flex_free (t); @@ -24,18 +24,27 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the <libintl.h> header file. */ +#undef HAVE_LIBINTL_H + /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H +/* Define to 1 if you have the <locale.h> header file. */ +#undef HAVE_LOCALE_H + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H +/* Define to 1 if you have the <regex.h> header file. */ +#undef HAVE_REGEX_H + /* Define to 1 if you have the <stdbool.h> header file. */ #undef HAVE_STDBOOL_H @@ -66,6 +75,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the GNU M4 executable name. */ +#undef M4 + /* Name of package */ #undef PACKAGE diff --git a/config.guess b/config.guess index f1657bb..6bdac8d 100755 --- a/config.guess +++ b/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-09-03' +timestamp='2003-05-09' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -98,30 +98,31 @@ trap 'exit 1' 1 2 15 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do - if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -178,7 +179,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. @@ -227,66 +239,47 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <<EOF >$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) @@ -437,10 +430,9 @@ EOF exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ + $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) @@ -449,7 +441,7 @@ EOF Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit 0 ;; Night_Hawk:Power_UNIX:*:*) @@ -524,8 +516,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -623,11 +614,21 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -661,8 +662,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -720,15 +720,15 @@ EOF CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` @@ -744,7 +744,7 @@ EOF *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*) + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) # Determine whether the default compiler uses glibc. eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -756,7 +756,6 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) @@ -769,13 +768,16 @@ EOF echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; x86:Interix*:3*) - echo i386-pc-interix3 + echo i586-pc-interix3 + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -818,8 +820,26 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -914,7 +934,6 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; @@ -932,6 +951,23 @@ EOF # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -966,9 +1002,6 @@ EOF echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -995,9 +1028,12 @@ EOF mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1014,9 +1050,6 @@ EOF mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1098,7 +1131,11 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1134,11 +1171,6 @@ EOF fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1157,12 +1189,6 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1283,8 +1309,7 @@ main () } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff --git a/config.rpath b/config.rpath index 5ead758..fa24bfc 100755 --- a/config.rpath +++ b/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2002 Free Software Foundation, Inc. +# Copyright 1996-2003 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -34,43 +34,57 @@ # # The set of defined variables is at the end of this script. +# Known limitations: +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer +# than 256 bytes, otherwise the compiler driver will dump core. The only +# known workaround is to choose shorter directory names for the build +# directory and/or the installation directory. + # All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a -shlibext= +shrext=.so host="$1" host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. + wl= if test "$GCC" = yes; then wl='-Wl,' else case "$host_os" in - aix3* | aix4* | aix5*) + aix*) wl='-Wl,' ;; + mingw* | pw32* | os2*) + ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' ;; - irix5* | irix6*) + irix5* | irix6* | nonstopux*) wl='-Wl,' ;; + newsos6) + ;; linux*) - echo '__INTEL_COMPILER' > conftest.$ac_ext - if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null - then - : - else - # Intel icc - wl='-Qoption,ld,' - fi + case $CC in + icc|ecc) + wl='-Wl,' + ;; + ccc) + wl='-Wl,' + ;; + esac ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; + sco3.2v5*) + ;; solaris*) wl='-Wl,' ;; @@ -78,15 +92,17 @@ else wl='-Qoption ld ' ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - if test "x$host_vendor" = xsni; then - wl='-LD' - else - wl='-Wl,' - fi + wl='-Wl,' + ;; + sysv4*MP*) + ;; + uts4*) ;; esac fi +# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. + hardcode_libdir_flag_spec= hardcode_libdir_separator= hardcode_direct=no @@ -110,8 +126,10 @@ ld_shlibs=yes if test "$with_gnu_ld" = yes; then case "$host_os" in aix3* | aix4* | aix5*) - # On AIX, the GNU linker is very broken - ld_shlibs=no + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + fi ;; amigaos*) hardcode_libdir_flag_spec='-L$libdir' @@ -135,6 +153,13 @@ if test "$with_gnu_ld" = yes; then # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; + netbsd*) ;; solaris* | sysv5*) if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then @@ -157,6 +182,8 @@ if test "$with_gnu_ld" = yes; then ;; esac if test "$ld_shlibs" = yes; then + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' fi else @@ -209,13 +236,27 @@ else fi esac fi + # Begin _LT_AC_SYS_LIBPATH_AIX. + echo 'int main () { return 0; }' > conftest.c + ${CC} ${LDFLAGS} conftest.c -o conftest + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` + fi + if test -z "$aix_libpath"; then + aix_libpath="/usr/lib:/lib" + fi + rm -f conftest.c conftest + # End _LT_AC_SYS_LIBPATH_AIX. if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" fi fi ;; @@ -225,6 +266,8 @@ else # see comment about different semantics on the GNU ld section ld_shlibs=no ;; + bsdi4*) + ;; cygwin* | mingw* | pw32*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -234,7 +277,12 @@ else libext=lib ;; darwin* | rhapsody*) - hardcode_direct=yes + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + hardcode_direct=no + fi + ;; + dgux*) + hardcode_libdir_flag_spec='-L$libdir' ;; freebsd1*) ld_shlibs=no @@ -251,14 +299,41 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; - hpux9* | hpux10* | hpux11*) + hpux9*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes ;; - irix5* | irix6*) + hpux10* | hpux11*) + if test "$with_gnu_ld" = no; then + case "$host_cpu" in + hppa*64*) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=no + ;; + ia64*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + *) + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; @@ -314,23 +389,20 @@ else hardcode_minus_L=yes ;; sysv4) - if test "x$host_vendor" = xsno; then - hardcode_direct=yes # is this really true??? - else - hardcode_direct=no # Motorola manual says yes, but my tests say they lie - fi + case $host_vendor in + sni) + hardcode_direct=yes # is this really true??? + ;; + siemens) + hardcode_direct=no + ;; + motorola) + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac ;; sysv4.3*) ;; - sysv5*) - hardcode_libdir_flag_spec= - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; sysv4*MP*) if test -d /usr/nec; then ld_shlibs=yes @@ -340,7 +412,13 @@ else hardcode_direct=yes hardcode_minus_L=no ;; - sysv5uw7* | unixware7*) + sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) + ;; + sysv5*) + hardcode_libdir_flag_spec= + ;; + uts4*) + hardcode_libdir_flag_spec='-L$libdir' ;; *) ld_shlibs=no @@ -349,134 +427,97 @@ else fi # Check dynamic linker characteristics +# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. libname_spec='lib$name' -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" case "$host_os" in aix3*) - shlibext=so ;; aix4* | aix5*) - shlibext=so ;; amigaos*) - shlibext=ixlibrary ;; beos*) - shlibext=so ;; bsdi4*) - shlibext=so - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ;; cygwin* | mingw* | pw32*) - case $GCC,$host_os in - yes,cygwin*) - shlibext=dll.a - ;; - yes,mingw*) - shlibext=dll - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` - ;; - yes,pw32*) - shlibext=dll - ;; - *) - shlibext=dll - ;; - esac + shrext=.dll ;; darwin* | rhapsody*) - shlibext=dylib + shrext=.dylib + ;; + dgux*) ;; freebsd1*) ;; freebsd*) - shlibext=so ;; gnu*) - shlibext=so ;; hpux9* | hpux10* | hpux11*) - shlibext=sl + case "$host_cpu" in + ia64*) + shrext=.so + ;; + hppa*64*) + shrext=.sl + ;; + *) + shrext=.sl + ;; + esac ;; - irix5* | irix6*) - shlibext=so + irix5* | irix6* | nonstopux*) case "$host_os" in - irix5*) + irix5* | nonstopux*) libsuff= shlibsuff= ;; *) case $LD in - *-32|*"-32 ") libsuff= shlibsuff= ;; - *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 ") libsuff=64 shlibsuff=64 ;; + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; *) libsuff= shlibsuff= ;; esac ;; esac - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ;; - linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) + linux*oldld* | linux*aout* | linux*coff*) ;; - linux-gnu*) - shlibext=so + linux*) ;; netbsd*) - shlibext=so ;; newsos6) - shlibext=so + ;; + nto-qnx) ;; openbsd*) - shlibext=so ;; os2*) libname_spec='$name' - shlibext=dll + shrext=.dll ;; osf3* | osf4* | osf5*) - shlibext=so - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) - shlibext=so ;; solaris*) - shlibext=so ;; sunos4*) - shlibext=so ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - shlibext=so - case "$host_vendor" in - motorola) - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - uts4*) - shlibext=so - ;; - dgux*) - shlibext=so ;; sysv4*MP*) - if test -d /usr/nec; then - shlibext=so - fi + ;; + uts4*) ;; esac sed_quote_subst='s/\(["`$\\]\)/\\\1/g' escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF @@ -504,10 +545,4 @@ hardcode_direct="$hardcode_direct" # resulting binary. hardcode_minus_L="$hardcode_minus_L" -# Compile-time system search path for libraries -sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec" - EOF @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-09-05' +timestamp='2003-05-09' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -245,17 +245,19 @@ case $basic_machine in | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ @@ -294,7 +296,7 @@ case $basic_machine in | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -315,21 +317,25 @@ case $basic_machine in | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ @@ -367,6 +373,9 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -716,6 +725,10 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -901,10 +914,6 @@ case $basic_machine in basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -921,6 +930,14 @@ case $basic_machine in basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -977,10 +994,6 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1027,7 +1040,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sh64) @@ -1113,11 +1126,12 @@ case $os in | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1129,8 +1143,10 @@ case $os in ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1224,6 +1240,12 @@ case $os in -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; -none) ;; *) @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.54 for flex 2.5.31. +# Generated by GNU Autoconf 2.57 for flex 2.5.33. # -# Report bugs to <lex-help@lists.sourceforge.net>. +# Report bugs to <flex-help@lists.sourceforge.net>. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -38,7 +38,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var @@ -84,15 +87,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conftest.sh + rm -f conf$$.sh fi @@ -265,9 +268,9 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='flex' PACKAGE_TARNAME='flex' -PACKAGE_VERSION='2.5.31' -PACKAGE_STRING='flex 2.5.31' -PACKAGE_BUGREPORT='lex-help@lists.sourceforge.net' +PACKAGE_VERSION='2.5.33' +PACKAGE_STRING='flex 2.5.33' +PACKAGE_BUGREPORT='flex-help@lists.sourceforge.net' ac_unique_file="scan.l" # Factoring default headers for most tests. @@ -307,7 +310,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S RANLIB ac_ct_RANLIB BISON HELP2MAN M4 INDENT CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB YACC LEX LEXLIB LEX_OUTPUT_ROOT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LN_S RANLIB ac_ct_RANLIB BISON HELP2MAN M4 INDENT CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -784,7 +787,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures flex 2.5.31 to adapt to many kinds of systems. +\`configure' configures flex 2.5.33 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -850,25 +853,25 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of flex 2.5.31:";; + short | recursive ) echo "Configuration of flex 2.5.33:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-nls do not use Native Language Support --disable-dependency-tracking Speeds up one-time builds --enable-dependency-tracking Do not reject slow dependency extractors --disable-rpath do not hardcode runtime library paths - --disable-nls do not use Native Language Support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir Some influential environment variables: @@ -885,7 +888,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <lex-help@lists.sourceforge.net>. +Report bugs to <flex-help@lists.sourceforge.net>. _ACEOF fi @@ -948,8 +951,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -flex configure 2.5.31 -generated by GNU Autoconf 2.54 +flex configure 2.5.33 +generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -963,8 +966,8 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by flex $as_me 2.5.31, which was -generated by GNU Autoconf 2.54. Invocation command line was +It was created by flex $as_me 2.5.33, which was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1016,24 +1019,54 @@ _ACEOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_sep= -for ac_arg +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n ) continue ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " + ;; + esac + done done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1485,15 +1518,15 @@ fi test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: - @echo 'ac_maketemp="${MAKE}"' + @echo 'ac_maketemp="$(MAKE)"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` @@ -1514,6 +1547,15 @@ echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then @@ -1533,8 +1575,8 @@ fi # Define the identity of the package. - PACKAGE=flex - VERSION=2.5.31 + PACKAGE='flex' + VERSION='2.5.33' cat >>confdefs.h <<_ACEOF @@ -1667,7 +1709,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" MKINSTALLDIRS= if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" @@ -1675,9 +1720,52 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=yes +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + + - # Extract the first word of "msgfmt", so it can be a program name with args. + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -1685,24 +1773,27 @@ if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; + ;; esac fi MSGFMT="$ac_cv_path_MSGFMT" @@ -1755,7 +1846,36 @@ echo "${ECHO_T}no" >&6 fi - # Extract the first word of "xgettext", so it can be a program name with args. + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -1763,24 +1883,27 @@ if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; + ;; esac fi XGETTEXT="$ac_cv_path_XGETTEXT" @@ -1794,7 +1917,36 @@ fi rm -f messages.po - # Extract the first word of "msgmerge", so it can be a program name with args. + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -1802,23 +1954,26 @@ if test "${ac_cv_path_MSGMERGE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else case "$MSGMERGE" in - /*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGMERGE="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" - ;; + ;; esac fi MSGMERGE="$ac_cv_path_MSGMERGE" @@ -1844,8 +1999,8 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 fi if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then : ; else echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 @@ -1874,24 +2029,16 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" prefix="$acl_save_prefix" -rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null - +DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 @@ -2256,8 +2403,10 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. @@ -2282,7 +2431,11 @@ ac_compiler=`set X $ac_compile; echo $2` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2293,7 +2446,7 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. @@ -2312,27 +2465,39 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; esac done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { { echo "$as_me:$LINENO: error: C compiler cannot create executables -check \`config.log' for details." >&5 +See \`config.log' for more details." >&5 echo "$as_me: error: C compiler cannot create executables -check \`config.log' for details." >&2;} +See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi @@ -2359,9 +2524,11 @@ if test "$cross_compiling" != yes; then cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi @@ -2369,7 +2536,7 @@ fi echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -2400,8 +2567,10 @@ for ac_file in conftest.exe conftest conftest.*; do esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -2419,7 +2588,11 @@ if test "${ac_cv_objext+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2444,9 +2617,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -2463,7 +2639,11 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2491,7 +2671,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2511,7 +2692,11 @@ if test "${ac_cv_prog_cc_g+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -2536,7 +2721,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -2567,7 +2753,11 @@ else ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> #include <sys/types.h> @@ -2630,7 +2820,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext done @@ -2681,7 +2872,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> $ac_declaration int @@ -2707,13 +2902,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -2738,7 +2938,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -2751,7 +2952,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -2809,11 +3011,17 @@ else if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + >/dev/null 2>conftest.err && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CC_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi fi done @@ -2903,6 +3111,19 @@ if test "${with_gnu_ld+set}" = set; then else with_gnu_ld=no fi; +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -3018,8 +3239,6 @@ echo "${ECHO_T}$acl_cv_rpath" >&6 hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" - sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" - sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" @@ -3427,6 +3646,7 @@ fi; + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. @@ -3441,6 +3661,7 @@ echo "${ECHO_T}$USE_NLS" >&6 + LIBINTL= LTLIBINTL= POSUB= @@ -3460,7 +3681,11 @@ if test "${gt_cv_func_gnugettext1_libc+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <libintl.h> extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; @@ -3488,7 +3713,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 gt_cv_func_gnugettext1_libc=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_func_gnugettext1_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -3537,7 +3763,11 @@ else am_cv_lib_iconv=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> int @@ -3565,7 +3795,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then @@ -3573,7 +3804,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> int @@ -3602,7 +3837,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" @@ -4021,7 +4257,11 @@ else LIBS="$LIBS $LIBINTL" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <libintl.h> extern int _nl_msg_cat_cntr; extern @@ -4053,7 +4293,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 gt_cv_func_gnugettext1_libintl=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gt_cv_func_gnugettext1_libintl=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4061,7 +4302,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <libintl.h> extern int _nl_msg_cat_cntr; extern @@ -4096,7 +4341,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi @@ -4109,7 +4355,8 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 if test "$gt_cv_func_gnugettext1_libc" = "yes" \ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= @@ -4131,6 +4378,26 @@ _ACEOF fi fi + echo "$as_me:$LINENO: checking whether to use NLS" >&5 +echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + if test "$USE_NLS" = "yes"; then + echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 +echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + echo "$as_me:$LINENO: result: $gt_source" >&5 +echo "${ECHO_T}$gt_source" >&6 + fi + if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then @@ -4283,7 +4550,11 @@ else LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -4315,7 +4586,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_cv_lib_fl_yywrap=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_fl_yywrap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4335,7 +4607,11 @@ else LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -4367,7 +4643,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_cv_lib_l_yywrap=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_l_yywrap=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4445,7 +4722,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_cv_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS @@ -4775,8 +5053,10 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. @@ -4806,7 +5086,11 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4834,7 +5118,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4854,7 +5139,11 @@ if test "${ac_cv_prog_cc_g+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -4879,7 +5168,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4910,7 +5200,11 @@ else ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> #include <sys/types.h> @@ -4973,7 +5267,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext done @@ -5024,7 +5319,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> $ac_declaration int @@ -5050,13 +5349,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -5081,7 +5385,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -5094,7 +5399,8 @@ fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c @@ -5152,11 +5458,17 @@ else if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + >/dev/null 2>conftest.err && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CC_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi fi done @@ -5304,7 +5616,11 @@ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -5332,7 +5648,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -5352,7 +5669,11 @@ if test "${ac_cv_prog_cxx_g+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main () @@ -5377,7 +5698,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -5410,7 +5732,11 @@ for ac_declaration in \ do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> $ac_declaration int @@ -5436,13 +5762,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_declaration int main () @@ -5467,7 +5798,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi rm -f conftest.$ac_objext conftest.$ac_ext done @@ -5533,11 +5865,17 @@ else if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ + >/dev/null 2>conftest.err && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CXX_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi fi done @@ -5737,7 +6075,10 @@ else echo "${ECHO_T}no" >&6 fi -for ac_prog in gnum4 gm4 m4 + + +# Check for a GNU m4 that supports --prefix-builtins +for ac_prog in gm4 gnum4 m4 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5782,6 +6123,29 @@ fi done test -n "$M4" || M4="m4" +if test x"$M4" != x; then + echo "$as_me:$LINENO: checking for GNU m4" >&5 +echo $ECHO_N "checking for GNU m4... $ECHO_C" >&6 + case `$M4 --help < /dev/null 2>&1` in + *prefix-builtins*) echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; + *) echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ; + { { echo "$as_me:$LINENO: error: GNU M4 1.4 is required" >&5 +echo "$as_me: error: GNU M4 1.4 is required" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + { { echo "$as_me:$LINENO: error: GNU M4 1.4 is required" >&5 +echo "$as_me: error: GNU M4 1.4 is required" >&2;} + { (exit 1); exit 1; }; } ; +fi + +cat >>confdefs.h <<_ACEOF +#define M4 "$M4" +_ACEOF + + # Extract the first word of "indent", so it can be a program name with args. set dummy indent; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -5825,7 +6189,7 @@ fi if test "$INDENT" != indent ; then echo "$as_me:$LINENO: checking if $INDENT is GNU indent" >&5 echo $ECHO_N "checking if $INDENT is GNU indent... $ECHO_C" >&6 - if $INDENT --version 2>/dev/null | head -1|grep "GNU indent" > /dev/null ; then + if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -5849,7 +6213,11 @@ else LIBS="-lm $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5881,7 +6249,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_cv_lib_m_log=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_m_log=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -5923,12 +6292,22 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" -#include <assert.h> +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -5951,7 +6330,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -5961,7 +6341,11 @@ rm -f conftest.err conftest.$ac_ext # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -5985,7 +6369,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -6014,12 +6399,22 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" -#include <assert.h> +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -6042,7 +6437,8 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi @@ -6052,7 +6448,11 @@ rm -f conftest.err conftest.$ac_ext # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -6076,7 +6476,8 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -6089,8 +6490,10 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -6123,43 +6526,54 @@ if test "${ac_cv_header_stdc+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> #include <string.h> #include <float.h> +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <string.h> _ACEOF @@ -6177,7 +6591,11 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <stdlib.h> _ACEOF @@ -6198,13 +6616,18 @@ if test $ac_cv_header_stdc = yes; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) @@ -6237,7 +6660,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ( exit $ac_status ) ac_cv_header_stdc=no fi @@ -6276,7 +6700,11 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> @@ -6296,7 +6724,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6334,7 +6763,11 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -6353,7 +6786,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6365,7 +6799,11 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -6388,7 +6826,8 @@ if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -6401,14 +6840,32 @@ case $ac_header_compiler:$ac_header_preproc in { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -6449,7 +6906,11 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -6468,7 +6929,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6480,7 +6942,11 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -6503,7 +6969,8 @@ if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -6516,14 +6983,32 @@ case $ac_header_compiler:$ac_header_preproc in { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -6563,7 +7048,11 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF @@ -6582,7 +7071,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6594,7 +7084,11 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -6617,7 +7111,8 @@ if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext @@ -6630,14 +7125,317 @@ case $ac_header_compiler:$ac_header_preproc in { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in locale.h libintl.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in regex.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 @@ -6668,7 +7466,11 @@ if test "${ac_cv_type_size_t+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -6696,7 +7498,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6722,7 +7525,11 @@ if test "${ac_cv_have_decl___func__+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -#include "confdefs.h" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ $ac_includes_default int main () @@ -6750,7 +7557,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_cv_have_decl___func__=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_have_decl___func__=no fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -6774,7 +7582,7 @@ fi - ac_config_files="$ac_config_files flex.spec Makefile doc/Makefile examples/Makefile examples/fastwc/Makefile examples/manual/Makefile m4/Makefile po/Makefile.in tools/Makefile tests/Makefile tests/TEMPLATE/Makefile tests/test-array-nr/Makefile tests/test-array-r/Makefile tests/test-basic-nr/Makefile tests/test-basic-r/Makefile tests/test-bison-yylloc/Makefile tests/test-bison-yylval/Makefile tests/test-c-cpp-nr/Makefile tests/test-c-cpp-r/Makefile tests/test-header-nr/Makefile tests/test-header-r/Makefile tests/test-include-by-buffer/Makefile tests/test-include-by-push/Makefile tests/test-include-by-reentrant/Makefile tests/test-multiple-scanners-nr/Makefile tests/test-multiple-scanners-r/Makefile tests/test-noansi-nr/Makefile tests/test-noansi-r/Makefile tests/test-prefix-nr/Makefile tests/test-prefix-r/Makefile tests/test-pthread/Makefile tests/test-string-nr/Makefile tests/test-string-r/Makefile tests/test-yyextra/Makefile tests/test-lineno-nr/Makefile tests/test-lineno-r/Makefile tests/test-linedir-r/Makefile tests/test-debug-r/Makefile tests/test-debug-nr/Makefile tests/test-mem-nr/Makefile tests/test-mem-r/Makefile tests/test-posix/Makefile tests/test-posixly-correct/Makefile tests/test-table-opts/Makefile tests/test-c++-basic/Makefile tests/test-bison-nr/Makefile tests/test-reject/Makefile tests/test-c++-multiple-scanners/Makefile tests/test-top/Makefile" + ac_config_files="$ac_config_files flex.spec Makefile doc/Makefile examples/Makefile examples/fastwc/Makefile examples/manual/Makefile m4/Makefile po/Makefile.in tools/Makefile tests/Makefile tests/TEMPLATE/Makefile tests/test-array-nr/Makefile tests/test-array-r/Makefile tests/test-basic-nr/Makefile tests/test-basic-r/Makefile tests/test-bison-yylloc/Makefile tests/test-bison-yylval/Makefile tests/test-c-cpp-nr/Makefile tests/test-c-cpp-r/Makefile tests/test-header-nr/Makefile tests/test-header-r/Makefile tests/test-include-by-buffer/Makefile tests/test-include-by-push/Makefile tests/test-include-by-reentrant/Makefile tests/test-multiple-scanners-nr/Makefile tests/test-multiple-scanners-r/Makefile tests/test-noansi-nr/Makefile tests/test-noansi-r/Makefile tests/test-prefix-nr/Makefile tests/test-prefix-r/Makefile tests/test-pthread/Makefile tests/test-string-nr/Makefile tests/test-string-r/Makefile tests/test-yyextra/Makefile tests/test-lineno-nr/Makefile tests/test-lineno-r/Makefile tests/test-linedir-r/Makefile tests/test-debug-r/Makefile tests/test-debug-nr/Makefile tests/test-mem-nr/Makefile tests/test-mem-r/Makefile tests/test-posix/Makefile tests/test-posixly-correct/Makefile tests/test-table-opts/Makefile tests/test-c++-basic/Makefile tests/test-bison-nr/Makefile tests/test-reject/Makefile tests/test-c++-multiple-scanners/Makefile tests/test-top/Makefile tests/test-rescan-nr/Makefile tests/test-rescan-r/Makefile" cat >confcache <<\_ACEOF @@ -6822,7 +7630,7 @@ _ACEOF t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache -if cmp -s $cache_file confcache; then :; else +if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file @@ -6910,6 +7718,8 @@ cat >$CONFIG_STATUS <<_ACEOF # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -6944,7 +7754,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var @@ -6990,15 +7803,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi - rm -f conftest.sh + rm -f conf$$.sh fi @@ -7160,8 +7973,8 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by flex $as_me 2.5.31, which was -generated by GNU Autoconf 2.54. Invocation command line was +This file was extended by flex $as_me 2.5.33, which was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7201,6 +8014,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -7222,8 +8036,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -flex config.status 2.5.31 -configured by $0, generated by GNU Autoconf 2.54, +flex config.status 2.5.33 +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -7260,12 +8074,9 @@ do case $ac_option in # Handling of the options. _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) @@ -7287,6 +8098,9 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 @@ -7301,6 +8115,20 @@ Try \`$0 --help' for more information." >&2;} shift done +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + _ACEOF cat >>$CONFIG_STATUS <<_ACEOF @@ -7311,7 +8139,7 @@ cat >>$CONFIG_STATUS <<_ACEOF # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" @@ -7375,6 +8203,8 @@ do "tests/test-reject/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/test-reject/Makefile" ;; "tests/test-c++-multiple-scanners/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/test-c++-multiple-scanners/Makefile" ;; "tests/test-top/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/test-top/Makefile" ;; + "tests/test-rescan-nr/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/test-rescan-nr/Makefile" ;; + "tests/test-rescan-r/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/test-rescan-r/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:conf.in" ;; @@ -7394,6 +8224,9 @@ if $ac_need_defaults; then test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { @@ -7402,17 +8235,17 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM + tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } @@ -7478,7 +8311,9 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t +s,@am__leading_dot@,$am__leading_dot,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t +s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t @@ -7507,7 +8342,6 @@ s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t -s,@USE_NLS@,$USE_NLS,;t t s,@LIBICONV@,$LIBICONV,;t t s,@LTLIBICONV@,$LTLIBICONV,;t t s,@INTLLIBS@,$INTLLIBS,;t t @@ -7912,7 +8746,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else @@ -7960,7 +8794,16 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} cat $tmp/config.h rm -f $tmp/config.h fi -_am_stamp_count=`expr ${_am_stamp_count-0} + 1` +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X$ac_file : 'X\(//\)[^/]' \| \ @@ -8055,17 +8898,22 @@ echo "$as_me: executing $ac_dest commands" >&6;} rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend # on $ac_dir but don't depend on user-specified configuration # parameters. if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. - if test -n "$ALL_LINGUAS"; then + if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi case "$ac_given_srcdir" in .) srcdirpre= ;; @@ -8114,7 +8962,7 @@ echo "$as_me: executing $ac_dest commands" >&6;} done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in @@ -8240,8 +9088,11 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff --git a/configure.in b/configure.in index d8a43c0..354b6c9 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,7 @@ dnl PURPOSE. dnl autoconf requirements and initialization AC_PREREQ(2.54) -AC_INIT(flex,2.5.31,lex-help@lists.sourceforge.net) +AC_INIT(flex,2.5.33,flex-help@lists.sourceforge.net) AC_CONFIG_SRCDIR(scan.l) AM_INIT_AUTOMAKE AC_CONFIG_HEADER(config.h:conf.in) @@ -32,7 +32,7 @@ AC_CONFIG_HEADER(config.h:conf.in) dnl checks for programs AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT_VERSION(0.12) AC_PROG_YACC AM_PROG_LEX @@ -43,12 +43,27 @@ AC_PROG_RANLIB AC_PATH_PROG(BISON, bison,bison) AC_PATH_PROG(HELP2MAN, help2man, help2man) -AC_PATH_PROGS(M4, gnum4 gm4 m4, m4) + + +# Check for a GNU m4 that supports --prefix-builtins +AC_PATH_PROGS(M4, gm4 gnum4 m4, m4) +if test x"$M4" != x; then + AC_MSG_CHECKING([for GNU m4]) + case `$M4 --help < /dev/null 2>&1` in + *prefix-builtins*) AC_MSG_RESULT(yes) ;; + *) AC_MSG_RESULT(no) ; + AC_MSG_ERROR([GNU M4 1.4 is required]) ;; + esac +else + AC_MSG_ERROR([GNU M4 1.4 is required]) ; +fi +AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.]) + AC_PATH_PROG(INDENT, indent, indent) dnl if INDENT is set to 'indent' then we didn't find indent if test "$INDENT" != indent ; then AC_MSG_CHECKING(if $INDENT is GNU indent) - if $INDENT --version 2>/dev/null | head -1|grep "GNU indent" > /dev/null ; then + if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -67,6 +82,8 @@ AC_HEADER_STDC AC_CHECK_HEADERS(unistd.h stdbool.h netinet/in.h limits.h) AC_CHECK_HEADERS( sys/wait.h sys/params.h) AC_CHECK_HEADERS(cunistd) +AC_CHECK_HEADERS(locale.h libintl.h) +AC_CHECK_HEADERS(regex.h) dnl checks for types @@ -126,6 +143,8 @@ tests/test-bison-nr/Makefile tests/test-reject/Makefile tests/test-c++-multiple-scanners/Makefile tests/test-top/Makefile +tests/test-rescan-nr/Makefile +tests/test-rescan-r/Makefile dnl --new-test-here-- This line is processed by tests/create-test. ) @@ -206,6 +206,36 @@ aix) rm -f "$tmpdepfile" ;; +icc) + # Must come before tru64. + + # Intel's C compiler understands `-MD -MF file'. However + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -265,9 +295,7 @@ dashmstdout) shift fi - # Remove `-o $object'. We will use -o /dev/null later, - # however we can't do the remplacement now because - # `-o $object' might simply not be used + # Remove `-o $object'. IFS=" " for arg do @@ -287,7 +315,11 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' @@ -306,6 +338,13 @@ dashXmstdout) makedepend) "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi # X makedepend shift cleared=no @@ -318,7 +357,9 @@ makedepend) case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; - -*) + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; @@ -382,7 +382,7 @@ void ntod () { int *accset, ds, nacc, newds; int sym, hashval, numstates, dsize; - int num_full_table_rows; /* used only for -f */ + int num_full_table_rows=0; /* used only for -f */ int *nset, *dset; int targptr, totaltrans, i, comstate, comfreq, targ; int symlist[CSIZE + 1]; diff --git a/doc/Makefile.in b/doc/Makefile.in index 558853f..f38e413 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -75,6 +75,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -111,6 +112,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -157,6 +159,7 @@ EXTRA_DIST = \ $(man_MANS) subdir = doc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -183,9 +186,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) .texi.info: - @rm -f $@ $@-[0-9] $@-[0-9][0-9] + @rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9] $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - `test -f '$<' || echo '$(srcdir)/'`$< -o $@ + -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .texi.dvi: TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ @@ -200,7 +203,7 @@ flex.info: flex.texi version.texi flex.dvi: flex.texi version.texi flex.pdf: flex.texi version.texi version.texi: stamp-vti -stamp-vti: flex.texi $(top_srcdir)/configure.in +stamp-vti: flex.texi $(top_srcdir)/configure @(dir=.; test -f ./flex.texi || dir=$(srcdir); \ set `$(SHELL) $(srcdir)/mdate-sh $$dir/flex.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ @@ -223,7 +226,7 @@ TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch DVIPS = dvips .dvi.ps: - $(DVIPS) $< -o $@ + $(DVIPS) -o $@ $< uninstall-info-am: $(PRE_UNINSTALL) @@ -231,16 +234,19 @@ uninstall-info-am: install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \ + install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \ done; \ else :; fi @$(NORMAL_UNINSTALL) @list='$(INFO_DEPS)'; \ for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ (if cd $(DESTDIR)$(infodir); then \ - echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ - rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ + echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \ + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ else :; fi); \ done @@ -256,16 +262,16 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - -rm -f flex.aux flex.cp flex.cps flex.fn flex.fns flex.hk flex.ky flex.log \ - flex.op flex.pg flex.tmp flex.toc flex.tp flex.tps flex.vr \ - flex.vrs flex.dvi flex.pdf flex.ps + -rm -f flex.aux flex.cp flex.cps flex.fn flex.fns flex.hk flex.hks flex.ky \ + flex.kys flex.log flex.op flex.ops flex.pg flex.pgs flex.tmp \ + flex.toc flex.tp flex.tps flex.vr flex.vrs flex.dvi flex.pdf \ + flex.ps maintainer-clean-aminfo: - list='$(INFO_DEPS)'; for i in $$list; do \ - rm -f $$i; \ - if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ - rm -f $$i-[0-9]*; \ - fi; \ + @list='$(INFO_DEPS)'; for i in $$list; do \ + i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ + echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ done man1dir = $(mandir)/man1 @@ -304,6 +310,10 @@ uninstall-man1: done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -323,9 +333,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -355,7 +367,6 @@ all-am: Makefile $(INFO_DEPS) $(MANS) installdirs: $(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -410,9 +421,11 @@ install-info-am: $(INFO_DEPS) @list='$(INFO_DEPS)'; \ for file in $$list; do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ - for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \ + file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ if test -f $$ifile; then \ - relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \ + relfile=`echo "$$ifile" | sed 's|^.*/||'`; \ echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ else : ; fi; \ @@ -423,8 +436,9 @@ install-info-am: $(INFO_DEPS) install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\ done; \ else : ; fi install-man: install-man1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27. -.TH FLEX "1" "April 2003" "flex 2.5.31" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. +.TH FLEX "1" "February 2006" "flex 2.5.33" "User Commands" .SH NAME flex \- fast lexical analyzer generator .SH SYNOPSIS diff --git a/doc/flex.info b/doc/flex.info index 012bc80..d32eadc 100644 --- a/doc/flex.info +++ b/doc/flex.info @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY @@ -39,236 +39,239 @@ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Indirect: -flex.info-1: 1543 -flex.info-2: 44188 -flex.info-3: 94777 -flex.info-4: 143377 -flex.info-5: 193020 -flex.info-6: 242671 -flex.info-7: 279163 +flex.info-1: 1542 +flex.info-2: 44385 +flex.info-3: 94974 +flex.info-4: 144097 +flex.info-5: 193935 +flex.info-6: 243586 +flex.info-7: 281964 Tag Table: (Indirect) -Node: Top1543 -Node: Copyright7312 -Node: Reporting Bugs8746 -Node: Introduction9041 -Node: Simple Examples9868 -Node: Format13257 -Node: Definitions Section13670 -Ref: Definitions Section-Footnote-115928 -Node: Rules Section15996 -Node: User Code Section17149 -Node: Comments in the Input17582 -Node: Patterns18951 -Ref: case and character ranges24209 -Node: Matching26884 -Node: Actions30169 -Node: Generated Scanner39171 -Node: Start Conditions44188 -Node: Multiple Input Buffers54900 -Ref: Scanning Strings61518 -Node: EOF63134 -Node: Misc Macros64729 -Node: User Values67581 -Node: Yacc69909 -Node: Scanner Options70812 -Node: Options for Specifing Filenames73572 -Ref: option-header73785 -Ref: option-outfile74497 -Ref: option-stdout74822 -Node: Options Affecting Scanner Behavior75804 -Ref: option-case-insensitive76034 -Ref: option-lex-compat76467 -Ref: option-batch76999 -Ref: option-interactive77523 -Ref: option-7bit78877 -Ref: option-8bit80181 -Ref: option-default80593 -Ref: option-always-interactive80657 -Ref: option-posix81261 -Ref: option-stack82408 -Ref: option-stdinit82516 -Ref: option-yylineno82994 -Ref: option-yywrap83437 -Node: Code-Level And API Options83705 -Ref: option-ansi-definitions83922 -Ref: option-ansi-prototypes84174 -Ref: option-bison-bridge84421 -Ref: option-bison-locations84760 -Ref: option-noline85020 -Ref: option-reentrant85534 -Ref: option-c++86145 -Ref: option-array86271 -Ref: option-pointer86369 -Ref: option-prefix86497 -Ref: option-main88026 -Ref: option-nounistd88210 -Ref: option-yyclass88718 -Node: Options for Scanner Speed and Size89198 -Ref: option-align89737 -Ref: option-ecs90238 -Ref: option-meta-ecs91274 -Ref: option-read91761 -Ref: option-full93644 -Ref: option-fast93839 -Node: Debugging Options94777 -Ref: option-backup94954 -Ref: option-debug95499 -Ref: option-perf-report96222 -Ref: option-nodefault96848 -Ref: option-trace97166 -Ref: option-nowarn97457 -Ref: option-verbose97525 -Ref: option-warn97954 -Node: Miscellaneous Options98173 -Node: Performance98647 -Node: Cxx108984 -Node: Reentrant116582 -Node: Reentrant Uses117256 -Node: Reentrant Overview118857 -Node: Reentrant Example119649 -Node: Reentrant Detail120406 -Node: Specify Reentrant120832 -Node: Extra Reentrant Argument121468 -Node: Global Replacement122709 -Node: Init and Destroy Functions123927 -Node: Accessor Methods126080 -Node: Extra Data127413 -Node: About yyscan_t129584 -Node: Reentrant Functions129969 -Ref: bison-functions131451 -Node: Lex and Posix132192 -Node: Memory Management139441 -Ref: memory-management139581 -Node: The Default Memory Management139812 -Ref: The Default Memory Management-Footnote-1143224 -Node: Overriding The Default Memory Management143377 -Ref: Overriding The Default Memory Management-Footnote-1145815 -Node: A Note About yytext And Memory145979 -Node: Serialized Tables147205 -Ref: serialization147343 -Node: Creating Serialized Tables148111 -Node: Loading and Unloading Serialized Tables149714 -Node: Tables File Format151473 -Node: Diagnostics158482 -Node: Limitations161890 -Node: Bibliography163835 -Node: FAQ164505 -Node: When was flex born?168543 -Node: How do I expand \ escape sequences in C-style quoted strings?168915 -Node: Why do flex scanners call fileno if it is not ANSI compatible?170198 -Node: Does flex support recursive pattern definitions?170988 -Node: How do I skip huge chunks of input (tens of megabytes) while using flex?171838 -Node: Flex is not matching my patterns in the same order that I defined them.172308 -Node: My actions are executing out of order or sometimes not at all.174057 -Node: How can I have multiple input sources feed into the same scanner at the same time?174845 -Node: Can I build nested parsers that work with the same input file?176836 -Node: How can I match text only at the end of a file?177845 -Node: How can I make REJECT cascade across start condition boundaries?178653 -Node: Why cant I use fast or full tables with interactive mode?179672 -Node: How much faster is -F or -f than -C?180934 -Node: If I have a simple grammar cant I just parse it with flex?181249 -Node: Why doesnt yyrestart() set the start state back to INITIAL?181732 -Node: How can I match C-style comments?182361 -Node: The period isnt working the way I expected.183176 -Node: Can I get the flex manual in another format?184425 -Node: Does there exist a "faster" NDFA->DFA algorithm?184916 -Node: How does flex compile the DFA so quickly?185428 -Node: How can I use more than 8192 rules?186398 -Node: How do I abandon a file in the middle of a scan and switch to a new file?187812 -Node: How do I execute code only during initialization (only before the first scan)?188368 -Node: How do I execute code at termination?189130 -Node: Where else can I find help?189459 -Node: Can I include comments in the "rules" section of the file?189834 -Node: I get an error about undefined yywrap().190216 -Node: How can I change the matching pattern at run time?190696 -Node: How can I expand macros in the input?191061 -Node: How can I build a two-pass scanner?192102 -Node: How do I match any string not matched in the preceding rules?193020 -Node: I am trying to port code from AT&T lex that uses yysptr and yysbuf.193933 -Node: Is there a way to make flex treat NULL like a regular character?194731 -Node: Whenever flex can not match the input it says "flex scanner jammed".195255 -Node: Why doesnt flex have non-greedy operators like perl does?195906 -Node: Memory leak - 16386 bytes allocated by malloc.197261 -Ref: faq-memory-leak197558 -Node: How do I track the byte offset for lseek()?198529 -Node: How do I use my own I/O classes in a C++ scanner?200040 -Node: How do I skip as many chars as possible?200886 -Node: deleteme00201966 -Node: Are certain equivalent patterns faster than others?202412 -Node: Is backing up a big deal?205901 -Node: Can I fake multi-byte character support?207873 -Node: deleteme01209350 -Node: Can you discuss some flex internals?210475 -Node: unput() messes up yy_at_bol212765 -Node: The | operator is not doing what I want213903 -Node: Why can't flex understand this variable trailing context pattern?215495 -Node: The ^ operator isn't working216760 -Node: Trailing context is getting confused with trailing optional patterns218031 -Node: Is flex GNU or not?219300 -Node: ERASEME53221014 -Node: I need to scan if-then-else blocks and while loops221810 -Node: ERASEME55223030 -Node: ERASEME56224144 -Node: ERASEME57225538 -Node: Is there a repository for flex scanners?226572 -Node: How can I conditionally compile or preprocess my flex input file?226890 -Node: Where can I find grammars for lex and yacc?227366 -Node: I get an end-of-buffer message for each character scanned.227716 -Node: unnamed-faq-62228314 -Node: unnamed-faq-63229363 -Node: unnamed-faq-64230676 -Node: unnamed-faq-65231678 -Node: unnamed-faq-66232480 -Node: unnamed-faq-67233611 -Node: unnamed-faq-68234614 -Node: unnamed-faq-69235772 -Node: unnamed-faq-70236506 -Node: unnamed-faq-71237283 -Node: unnamed-faq-72238513 -Node: unnamed-faq-73239582 -Node: unnamed-faq-74240527 -Node: unnamed-faq-75241498 -Node: unnamed-faq-76242671 -Node: unnamed-faq-77243393 -Node: unnamed-faq-78244302 -Node: unnamed-faq-79245316 -Node: unnamed-faq-80247052 -Node: unnamed-faq-81248396 -Node: unnamed-faq-82251237 -Node: unnamed-faq-83252220 -Node: unnamed-faq-84254026 -Node: unnamed-faq-85255145 -Node: unnamed-faq-86256193 -Node: unnamed-faq-87257167 -Node: unnamed-faq-88257829 -Node: unnamed-faq-90258686 -Node: unnamed-faq-91259985 -Node: unnamed-faq-92262469 -Node: unnamed-faq-93262984 -Node: unnamed-faq-94263927 -Node: unnamed-faq-95265370 -Node: unnamed-faq-96266904 -Node: unnamed-faq-97267689 -Node: unnamed-faq-98268372 -Node: unnamed-faq-99269063 -Node: unnamed-faq-100270023 -Node: unnamed-faq-101270749 -Node: Appendices271519 -Node: Makefiles and Flex271686 -Ref: Makefiles and Flex-Footnote-1274903 -Ref: Makefiles and Flex-Footnote-2275020 -Node: Bison Bridge275071 -Ref: Bison Bridge-Footnote-1277745 -Node: M4 Dependency277937 -Ref: M4 Dependency-Footnote-1278853 -Node: Indices278925 -Node: Concept Index279163 -Node: Index of Functions and Macros296037 -Node: Index of Variables299256 -Node: Index of Data Types300483 -Node: Index of Hooks301087 -Node: Index of Scanner Options301589 +Node: Top1542 +Node: Copyright7508 +Node: Reporting Bugs8942 +Node: Introduction9238 +Node: Simple Examples10065 +Node: Format13454 +Node: Definitions Section13867 +Ref: Definitions Section-Footnote-116125 +Node: Rules Section16193 +Node: User Code Section17346 +Node: Comments in the Input17779 +Node: Patterns19148 +Ref: case and character ranges24406 +Node: Matching27081 +Node: Actions30366 +Node: Generated Scanner39368 +Node: Start Conditions44385 +Node: Multiple Input Buffers55097 +Ref: Scanning Strings61715 +Node: EOF63331 +Node: Misc Macros64926 +Node: User Values67778 +Node: Yacc70106 +Node: Scanner Options71009 +Node: Options for Specifing Filenames73769 +Ref: option-header73982 +Ref: option-outfile74694 +Ref: option-stdout75019 +Node: Options Affecting Scanner Behavior76001 +Ref: option-case-insensitive76231 +Ref: option-lex-compat76664 +Ref: option-batch77196 +Ref: option-interactive77720 +Ref: option-7bit79074 +Ref: option-8bit80378 +Ref: option-default80790 +Ref: option-always-interactive80854 +Ref: option-posix81458 +Ref: option-stack82605 +Ref: option-stdinit82713 +Ref: option-yylineno83191 +Ref: option-yywrap83634 +Node: Code-Level And API Options83902 +Ref: option-ansi-definitions84119 +Ref: option-ansi-prototypes84371 +Ref: option-bison-bridge84618 +Ref: option-bison-locations84957 +Ref: option-noline85217 +Ref: option-reentrant85731 +Ref: option-c++86342 +Ref: option-array86468 +Ref: option-pointer86566 +Ref: option-prefix86694 +Ref: option-main88223 +Ref: option-nounistd88407 +Ref: option-yyclass88915 +Node: Options for Scanner Speed and Size89395 +Ref: option-align89934 +Ref: option-ecs90435 +Ref: option-meta-ecs91471 +Ref: option-read91958 +Ref: option-full93841 +Ref: option-fast94036 +Node: Debugging Options94974 +Ref: option-backup95151 +Ref: option-debug95696 +Ref: option-perf-report96419 +Ref: option-nodefault97045 +Ref: option-trace97363 +Ref: option-nowarn97654 +Ref: option-verbose97722 +Ref: option-warn98151 +Node: Miscellaneous Options98370 +Node: Performance98844 +Node: Cxx109181 +Node: Reentrant116780 +Node: Reentrant Uses117454 +Node: Reentrant Overview119055 +Node: Reentrant Example119847 +Node: Reentrant Detail120604 +Node: Specify Reentrant121030 +Node: Extra Reentrant Argument121666 +Node: Global Replacement122907 +Node: Init and Destroy Functions124125 +Node: Accessor Methods126278 +Node: Extra Data127611 +Node: About yyscan_t129782 +Node: Reentrant Functions130167 +Ref: bison-functions131649 +Node: Lex and Posix132390 +Node: Memory Management139771 +Ref: memory-management139911 +Node: The Default Memory Management140142 +Ref: The Default Memory Management-Footnote-1143944 +Node: Overriding The Default Memory Management144097 +Ref: Overriding The Default Memory Management-Footnote-1146535 +Node: A Note About yytext And Memory146699 +Node: Serialized Tables147925 +Ref: serialization148063 +Node: Creating Serialized Tables148831 +Node: Loading and Unloading Serialized Tables150434 +Node: Tables File Format152193 +Node: Diagnostics159202 +Node: Limitations162610 +Node: Bibliography164555 +Node: FAQ165225 +Node: When was flex born?169457 +Node: How do I expand \ escape sequences in C-style quoted strings?169829 +Node: Why do flex scanners call fileno if it is not ANSI compatible?171112 +Node: Does flex support recursive pattern definitions?171902 +Node: How do I skip huge chunks of input (tens of megabytes) while using flex?172752 +Node: Flex is not matching my patterns in the same order that I defined them.173222 +Node: My actions are executing out of order or sometimes not at all.174971 +Node: How can I have multiple input sources feed into the same scanner at the same time?175759 +Node: Can I build nested parsers that work with the same input file?177750 +Node: How can I match text only at the end of a file?178759 +Node: How can I make REJECT cascade across start condition boundaries?179567 +Node: Why cant I use fast or full tables with interactive mode?180586 +Node: How much faster is -F or -f than -C?181848 +Node: If I have a simple grammar cant I just parse it with flex?182163 +Node: Why doesnt yyrestart() set the start state back to INITIAL?182646 +Node: How can I match C-style comments?183275 +Node: The period isnt working the way I expected.184090 +Node: Can I get the flex manual in another format?185339 +Node: Does there exist a "faster" NDFA->DFA algorithm?185830 +Node: How does flex compile the DFA so quickly?186342 +Node: How can I use more than 8192 rules?187312 +Node: How do I abandon a file in the middle of a scan and switch to a new file?188726 +Node: How do I execute code only during initialization (only before the first scan)?189282 +Node: How do I execute code at termination?190044 +Node: Where else can I find help?190373 +Node: Can I include comments in the "rules" section of the file?190749 +Node: I get an error about undefined yywrap().191131 +Node: How can I change the matching pattern at run time?191611 +Node: How can I expand macros in the input?191976 +Node: How can I build a two-pass scanner?193017 +Node: How do I match any string not matched in the preceding rules?193935 +Node: I am trying to port code from AT&T lex that uses yysptr and yysbuf.194848 +Node: Is there a way to make flex treat NULL like a regular character?195646 +Node: Whenever flex can not match the input it says "flex scanner jammed".196170 +Node: Why doesnt flex have non-greedy operators like perl does?196821 +Node: Memory leak - 16386 bytes allocated by malloc.198176 +Ref: faq-memory-leak198473 +Node: How do I track the byte offset for lseek()?199444 +Node: How do I use my own I/O classes in a C++ scanner?200955 +Node: How do I skip as many chars as possible?201801 +Node: deleteme00202881 +Node: Are certain equivalent patterns faster than others?203327 +Node: Is backing up a big deal?206816 +Node: Can I fake multi-byte character support?208788 +Node: deleteme01210265 +Node: Can you discuss some flex internals?211390 +Node: unput() messes up yy_at_bol213680 +Node: The | operator is not doing what I want214818 +Node: Why can't flex understand this variable trailing context pattern?216410 +Node: The ^ operator isn't working217675 +Node: Trailing context is getting confused with trailing optional patterns218946 +Node: Is flex GNU or not?220215 +Node: ERASEME53221929 +Node: I need to scan if-then-else blocks and while loops222725 +Node: ERASEME55223945 +Node: ERASEME56225059 +Node: ERASEME57226453 +Node: Is there a repository for flex scanners?227487 +Node: How can I conditionally compile or preprocess my flex input file?227805 +Node: Where can I find grammars for lex and yacc?228281 +Node: I get an end-of-buffer message for each character scanned.228631 +Node: unnamed-faq-62229229 +Node: unnamed-faq-63230278 +Node: unnamed-faq-64231591 +Node: unnamed-faq-65232593 +Node: unnamed-faq-66233395 +Node: unnamed-faq-67234526 +Node: unnamed-faq-68235529 +Node: unnamed-faq-69236687 +Node: unnamed-faq-70237421 +Node: unnamed-faq-71238198 +Node: unnamed-faq-72239428 +Node: unnamed-faq-73240497 +Node: unnamed-faq-74241442 +Node: unnamed-faq-75242413 +Node: unnamed-faq-76243586 +Node: unnamed-faq-77244308 +Node: unnamed-faq-78245217 +Node: unnamed-faq-79246231 +Node: unnamed-faq-80247967 +Node: unnamed-faq-81249311 +Node: unnamed-faq-82252152 +Node: unnamed-faq-83253135 +Node: unnamed-faq-84254941 +Node: unnamed-faq-85256060 +Node: unnamed-faq-86257108 +Node: unnamed-faq-87258082 +Node: unnamed-faq-88258744 +Node: unnamed-faq-90259601 +Node: unnamed-faq-91260900 +Node: unnamed-faq-92263384 +Node: unnamed-faq-93263899 +Node: unnamed-faq-94264842 +Node: unnamed-faq-95266285 +Node: unnamed-faq-96267819 +Node: unnamed-faq-97268604 +Node: unnamed-faq-98269287 +Node: unnamed-faq-99269978 +Node: unnamed-faq-100270938 +Node: unnamed-faq-101271664 +Node: What is the difference between YYLEX_PARAM and YY_DECL?272498 +Node: Why do I get "conflicting types for yylex" error?273023 +Node: How do I access the values set in a Flex action from within a Bison action?273556 +Node: Appendices273990 +Node: Makefiles and Flex274157 +Ref: Makefiles and Flex-Footnote-1277374 +Ref: Makefiles and Flex-Footnote-2277491 +Node: Bison Bridge277542 +Ref: Bison Bridge-Footnote-1280216 +Node: M4 Dependency280408 +Ref: M4 Dependency-Footnote-1281591 +Node: Indices281726 +Node: Concept Index281964 +Node: Index of Functions and Macros298838 +Node: Index of Variables302057 +Node: Index of Data Types303284 +Node: Index of Hooks303888 +Node: Index of Scanner Options304390 End Tag Table diff --git a/doc/flex.info-1 b/doc/flex.info-1 index 178d382..da0d581 100644 --- a/doc/flex.info-1 +++ b/doc/flex.info-1 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY @@ -47,8 +47,8 @@ flex perform pattern-matching on text. The manual includes both tutorial and reference sections. - This edition of `The flex Manual' documents `flex' version 2.5.31. -It was last updated on 27 March 2003. + This edition of `The flex Manual' documents `flex' version 2.5.33. +It was last updated on 20 February 2006. * Menu: @@ -230,6 +230,9 @@ FAQ * unnamed-faq-99:: * unnamed-faq-100:: * unnamed-faq-101:: +* What is the difference between YYLEX_PARAM and YY_DECL?:: +* Why do I get "conflicting types for yylex" error?:: +* How do I access the values set in a Flex action from within a Bison action?:: Appendices @@ -292,7 +295,7 @@ Reporting Bugs If you have problems with `flex' or think you have found a bug, please send mail detailing your problem to -<lex-help@lists.sourceforge.net>. Patches are always welcome. +<flex-help@lists.sourceforge.net>. Patches are always welcome. File: flex.info, Node: Introduction, Next: Simple Examples, Prev: Reporting Bugs, Up: Top diff --git a/doc/flex.info-2 b/doc/flex.info-2 index 87025fa..b2ca705 100644 --- a/doc/flex.info-2 +++ b/doc/flex.info-2 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY diff --git a/doc/flex.info-3 b/doc/flex.info-3 index a6cc465..7884ba1 100644 --- a/doc/flex.info-3 +++ b/doc/flex.info-3 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY @@ -612,18 +612,18 @@ scanner classes; you must use `%pointer' (the default). If you want to create multiple (different) lexer classes, you use the `-P' flag (or the `prefix=' option) to rename each `yyFlexLexer' to -some other `xxFlexLexer'. You then can include `FlexLexer.h>' in your +some other `xxFlexLexer'. You then can include `<FlexLexer.h>' in your other sources once per lexer class, first renaming `yyFlexLexer' as follows: #undef yyFlexLexer #define yyFlexLexer xxFlexLexer - #include <FflexLexer.h> + #include <FlexLexer.h> #undef yyFlexLexer #define yyFlexLexer zzFlexLexer - #include FlexLexer.h> + #include <FlexLexer.h> if, for example, you used `%option prefix="xx"' for one of your scanners and `%option prefix="zz"' for the other. @@ -1217,6 +1217,10 @@ exceptions: `flex' being used is a beta version, then the symbol `FLEX_BETA' is defined. + * The symbols `[[' and `]]' in the code sections of the input may + conflict with the m4 delimiters. *Note M4 Dependency::. + + The following `flex' features are not included in `lex' or the POSIX specification: @@ -1312,13 +1316,19 @@ all memory when you call `yylex_destroy' *Note faq-memory-leak::. will grow if necessary, doubling the size each time. Flex frees this memory when you call yylex_destroy(). The default size of this buffer (16384 bytes) is almost always too large. The ideal - size for this buffer is the length of the longest token expected. - Flex will allocate a few extra bytes for housekeeping. - -16kb for the REJECT state. This will only be allocated if you use REJECT. - The size is the same as the input buffer, so if you override the - size of the input buffer, then you automatically override the size - of this buffer as well. + size for this buffer is the length of the longest token expected, + in bytes, plus a little more. Flex will allocate a few extra + bytes for housekeeping. Currently, to override the size of the + input buffer you must `#define YY_BUF_SIZE' to whatever number of + bytes you want. We don't plan to change this in the near future, + but we reserve the right to do so if we ever add a more robust + memory management API. + +64kb for the REJECT state. This will only be allocated if you use REJECT. + The size is the large enough to hold the same number of states as + characters in the input buffer. If you override the size of the + input buffer (via `YY_BUF_SIZE'), then you automatically override + the size of this buffer as well. 100 bytes for the start condition stack. Flex allocates memory for the start condition stack. This is the diff --git a/doc/flex.info-4 b/doc/flex.info-4 index 260ea8d..2304293 100644 --- a/doc/flex.info-4 +++ b/doc/flex.info-4 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY @@ -685,6 +685,9 @@ here. * unnamed-faq-99:: * unnamed-faq-100:: * unnamed-faq-101:: +* What is the difference between YYLEX_PARAM and YY_DECL?:: +* Why do I get "conflicting types for yylex" error?:: +* How do I access the values set in a Flex action from within a Bison action?:: File: flex.info, Node: When was flex born?, Next: How do I expand \ escape sequences in C-style quoted strings?, Up: FAQ @@ -1161,7 +1164,7 @@ Where else can I find help? =========================== You can find the flex homepage on the web at -`http://lex.sourceforge.net/'. See that page for details about flex +`http://flex.sourceforge.net/'. See that page for details about flex mailing lists as well. diff --git a/doc/flex.info-5 b/doc/flex.info-5 index c3b0c72..8935ccf 100644 --- a/doc/flex.info-5 +++ b/doc/flex.info-5 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY @@ -78,7 +78,7 @@ Is there a way to make flex treat NULL like a regular character? ================================================================ Yes, `\0' and `\x00' should both do the trick. Perhaps you have an -ancient version of `flex'. The latest release is version 2.5.31. +ancient version of `flex'. The latest release is version 2.5.33. File: flex.info, Node: Whenever flex can not match the input it says "flex scanner jammed"., Next: Why doesnt flex have non-greedy operators like perl does?, Prev: Is there a way to make flex treat NULL like a regular character?, Up: FAQ diff --git a/doc/flex.info-6 b/doc/flex.info-6 index 4af8802..04f95d8 100644 --- a/doc/flex.info-6 +++ b/doc/flex.info-6 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY @@ -826,7 +826,7 @@ unnamed-faq-100 Vern -File: flex.info, Node: unnamed-faq-101, Prev: unnamed-faq-100, Up: FAQ +File: flex.info, Node: unnamed-faq-101, Next: What is the difference between YYLEX_PARAM and YY_DECL?, Prev: unnamed-faq-100, Up: FAQ unnamed-faq-101 =============== @@ -857,6 +857,40 @@ unnamed-faq-101 Vern +File: flex.info, Node: What is the difference between YYLEX_PARAM and YY_DECL?, Next: Why do I get "conflicting types for yylex" error?, Prev: unnamed-faq-101, Up: FAQ + +What is the difference between YYLEX_PARAM and YY_DECL? +======================================================= + + YYLEX_PARAM is not a flex symbol. It is for Bison. It tells Bison to +pass extra params when it calls yylex() from the parser. + + YY_DECL is the Flex declaration of yylex. The default is similar to +this: + + + #define int yy_lex () + + +File: flex.info, Node: Why do I get "conflicting types for yylex" error?, Next: How do I access the values set in a Flex action from within a Bison action?, Prev: What is the difference between YYLEX_PARAM and YY_DECL?, Up: FAQ + +Why do I get "conflicting types for yylex" error? +================================================= + + This is a compiler error regarding a generated Bison parser, not a +Flex scanner. It means you need a prototype of yylex() in the top of +the Bison file. Be sure the prototype matches YY_DECL. + + +File: flex.info, Node: How do I access the values set in a Flex action from within a Bison action?, Prev: Why do I get "conflicting types for yylex" error?, Up: FAQ + +How do I access the values set in a Flex action from within a Bison action? +=========================================================================== + + With $1, $2, $3, etc. These are called "Semantic Values" in the +Bison manual. See *Note Top: (bison)Top. + + File: flex.info, Node: Appendices, Next: Indices, Prev: FAQ, Up: Top Appendices @@ -1064,11 +1098,15 @@ the actions will be sent through m4. Please follow these rules to protect your code from unwanted `m4' processing. * Do not use symbols that begin with, `m4_', such as, `m4_define', - or `m4_include', since those are reserved for `m4' macro names. + or `m4_include', since those are reserved for `m4' macro names. If + for some reason you need m4_ as a prefix, use a preprocessor + #define to get your symbol past m4 unmangled. * Do not use the strings `[[' or `]]' anywhere in your code. The - former is not valid in C, except within comments, but the latter - is valid in code such as `x[y[z]]'. + former is not valid in C, except within comments and strings, but + the latter is valid in code such as `x[y[z]]'. The solution is + simple. To get the literal string `"]]"', use `"]""]"'. To get the + array notation `x[y[z]]', use `x[y[z] ]'. `m4' is only required at the time you run `flex'. The generated @@ -1077,6 +1115,7 @@ scanner is ordinary C or C++, and does _not_ require `m4'. ---------- Footnotes ---------- (1) The use of m4 is subject to change in future revisions of flex. +It is not part of the public API of flex. Do not depend on it. File: flex.info, Node: Indices, Prev: Appendices, Up: Top diff --git a/doc/flex.info-7 b/doc/flex.info-7 index ef030b8..8ccc35c 100644 --- a/doc/flex.info-7 +++ b/doc/flex.info-7 @@ -1,4 +1,4 @@ -This is flex.info, produced by makeinfo version 4.3d from flex.texi. +This is flex.info, produced by makeinfo version 4.5 from flex.texi. INFO-DIR-SECTION Programming START-INFO-DIR-ENTRY diff --git a/doc/flex.texi b/doc/flex.texi index 64d9767..130cf09 100644 --- a/doc/flex.texi +++ b/doc/flex.texi @@ -256,6 +256,9 @@ FAQ * unnamed-faq-99:: * unnamed-faq-100:: * unnamed-faq-101:: +* What is the difference between YYLEX_PARAM and YY_DECL?:: +* Why do I get "conflicting types for yylex" error?:: +* How do I access the values set in a Flex action from within a Bison action?:: Appendices @@ -290,7 +293,7 @@ Indices If you have problems with @code{flex} or think you have found a bug, please send mail detailing your problem to -@email{lex-help@@lists.sourceforge.net}. Patches are always welcome. +@email{flex-help@@lists.sourceforge.net}. Patches are always welcome. @node Introduction, Simple Examples, Reporting Bugs, Top @chapter Introduction @@ -3866,7 +3869,7 @@ Here is an example of a simple C++ scanner: If you want to create multiple (different) lexer classes, you use the @samp{-P} flag (or the @code{prefix=} option) to rename each @code{yyFlexLexer} to some other @samp{xxFlexLexer}. You then can -include @file{FlexLexer.h>} in your other sources once per lexer class, +include @file{<FlexLexer.h>} in your other sources once per lexer class, first renaming @code{yyFlexLexer} as follows: @cindex include files, with C++ @@ -3876,11 +3879,11 @@ first renaming @code{yyFlexLexer} as follows: @verbatim #undef yyFlexLexer #define yyFlexLexer xxFlexLexer - #include <FflexLexer.h> + #include <FlexLexer.h> #undef yyFlexLexer #define yyFlexLexer zzFlexLexer - #include FlexLexer.h> + #include <FlexLexer.h> @end verbatim @end example @@ -4585,6 +4588,12 @@ indicating which version of @code{flex} generated the scanner. For example, for the 2.5.22 release, these defines would be 2, 5 and 22 respectively. If the version of @code{flex} being used is a beta version, then the symbol @code{FLEX_BETA} is defined. + +@item +The symbols @samp{[[} and @samp{]]} in the code sections of the input +may conflict with the m4 delimiters. @xref{M4 Dependency}. + + @end itemize @cindex POSIX comp;compliance @@ -4694,12 +4703,15 @@ character buffer. This buffer is typically the largest chunk of dynamic memory flex consumes. This buffer will grow if necessary, doubling the size each time. Flex frees this memory when you call yylex_destroy(). The default size of this buffer (16384 bytes) is almost always too large. The ideal size for this -buffer is the length of the longest token expected. Flex will allocate a few -extra bytes for housekeeping. +buffer is the length of the longest token expected, in bytes, plus a little more. Flex will allocate a few +extra bytes for housekeeping. Currently, to override the size of the input buffer +you must @code{#define YY_BUF_SIZE} to whatever number of bytes you want. We don't plan +to change this in the near future, but we reserve the right to do so if we ever add a more robust memory management +API. -@item 16kb for the REJECT state. This will only be allocated if you use REJECT. -The size is the same as the input buffer, so if you override the size of the -input buffer, then you automatically override the size of this buffer as well. +@item 64kb for the REJECT state. This will only be allocated if you use REJECT. +The size is the large enough to hold the same number of states as characters in the input buffer. If you override the size of the +input buffer (via @code{YY_BUF_SIZE}), then you automatically override the size of this buffer as well. @item 100 bytes for the start condition stack. Flex allocates memory for the start condition stack. This is the stack used @@ -5392,6 +5404,9 @@ publish them here. * unnamed-faq-99:: * unnamed-faq-100:: * unnamed-faq-101:: +* What is the difference between YYLEX_PARAM and YY_DECL?:: +* Why do I get "conflicting types for yylex" error?:: +* How do I access the values set in a Flex action from within a Bison action?:: @end menu @node When was flex born? @@ -5827,7 +5842,7 @@ You can specify an action for the @code{<<EOF>>} rule. @unnumberedsec Where else can I find help? You can find the flex homepage on the web at -@uref{http://lex.sourceforge.net/}. See that page for details about flex +@uref{http://flex.sourceforge.net/}. See that page for details about flex mailing lists as well. @node Can I include comments in the "rules" section of the file? @@ -8005,6 +8020,34 @@ then the problem is that the last rule needs to be "{whitespace}" ! @end verbatim @end example +@node What is the difference between YYLEX_PARAM and YY_DECL? +@unnumberedsec What is the difference between YYLEX_PARAM and YY_DECL? + +YYLEX_PARAM is not a flex symbol. It is for Bison. It tells Bison to pass extra +params when it calls yylex() from the parser. + +YY_DECL is the Flex declaration of yylex. The default is similar to this: + +@example +@verbatim +#define int yy_lex () +@end verbatim +@end example + + +@node Why do I get "conflicting types for yylex" error? +@unnumberedsec Why do I get "conflicting types for yylex" error? + +This is a compiler error regarding a generated Bison parser, not a Flex scanner. +It means you need a prototype of yylex() in the top of the Bison file. +Be sure the prototype matches YY_DECL. + +@node How do I access the values set in a Flex action from within a Bison action? +@unnumberedsec How do I access the values set in a Flex action from within a Bison action? + +With $1, $2, $3, etc. These are called "Semantic Values" in the Bison manual. +See @ref{Top, , , bison, the GNU Bison Manual}. + @node Appendices, Indices, FAQ, Top @appendix Appendices @@ -8228,9 +8271,9 @@ As you can see, there really is no magic here. We just use @node M4 Dependency, , Bison Bridge, Appendices @section M4 Dependency @cindex m4 - The macro processor @code{m4}@footnote{The use of m4 is subject to change in -future revisions of flex.} must be installed wherever flex is installed. +future revisions of flex. It is not part of the public API of flex. Do not depend on it.} +must be installed wherever flex is installed. @code{flex} invokes @samp{m4}, found by searching the directories in the @code{PATH} environment variable. Any code you place in section 1 or in the actions will be sent through m4. Please follow these rules to protect your @@ -8239,11 +8282,15 @@ code from unwanted @code{m4} processing. @itemize @item Do not use symbols that begin with, @samp{m4_}, such as, @samp{m4_define}, -or @samp{m4_include}, since those are reserved for @code{m4} macro names. +or @samp{m4_include}, since those are reserved for @code{m4} macro names. If for +some reason you need m4_ as a prefix, use a preprocessor #define to get your +symbol past m4 unmangled. @item Do not use the strings @samp{[[} or @samp{]]} anywhere in your code. The -former is not valid in C, except within comments, but the latter is valid in -code such as @code{x[y[z]]}. +former is not valid in C, except within comments and strings, but the latter is valid in +code such as @code{x[y[z]]}. The solution is simple. To get the literal string +@code{"]]"}, use @code{"]""]"}. To get the array notation @code{x[y[z]]}, +use @code{x[y[z] ]}. @end itemize diff --git a/doc/mdate-sh b/doc/mdate-sh index c079aed..b610b47 100755 --- a/doc/mdate-sh +++ b/doc/mdate-sh @@ -1,6 +1,6 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -# Copyright 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc. # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # # This program is free software; you can redistribute it and/or modify @@ -30,24 +30,38 @@ export LC_ALL LC_TIME=C export LC_TIME -# Get the extended ls output of the file or directory. -# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. +save_arg1="$1" + +# Find out how to get the extended ls output of a file or directory. if ls -L /dev/null 1>/dev/null 2>&1; then - set - x`ls -L -l -d $1` + ls_command='ls -L -l -d' else - set - x`ls -l -d $1` + ls_command='ls -l -d' fi -# The month is at least the fourth argument -# (3 shifts here, the next inside the loop). -shift -shift -shift -# Find the month. Next argument is day, followed by the year or time. +# A `ls -l' line looks as follows on OS/2. +# drwxrwx--- 0 Aug 11 2001 foo +# This differs from Unix, which adds ownership information. +# drwxrwx--- 2 root root 4096 Aug 11 2001 foo +# +# To find the date, we split the line on spaces and iterate on words +# until we find a month. This cannot work with files whose owner is a +# user named `Jan', or `Feb', etc. However, it's unlikely that `/' +# will be owned by a user whose name is a month. So we first look at +# the extended ls output of the root directory to decide how many +# words should be skipped to get the date. + +# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. +set - x`$ls_command /` + +# Find which argument is the month. month= +command= until test $month do shift + # Add another shift to the command. + command="$command shift;" case $1 in Jan) month=January; nummonth=1;; Feb) month=February; nummonth=2;; @@ -64,6 +78,28 @@ do esac done +# Get the extended ls output of the file or directory. +set - x`eval "$ls_command \"\$save_arg1\""` + +# Remove all preceding arguments +eval $command + +# Get the month. Next argument is day, followed by the year or time. +case $1 in + Jan) month=January; nummonth=1;; + Feb) month=February; nummonth=2;; + Mar) month=March; nummonth=3;; + Apr) month=April; nummonth=4;; + May) month=May; nummonth=5;; + Jun) month=June; nummonth=6;; + Jul) month=July; nummonth=7;; + Aug) month=August; nummonth=8;; + Sep) month=September; nummonth=9;; + Oct) month=October; nummonth=10;; + Nov) month=November; nummonth=11;; + Dec) month=December; nummonth=12;; +esac + day=$2 # Here we have to deal with the problem that the ls output gives either diff --git a/doc/stamp-vti b/doc/stamp-vti index 1cec6fe..7711f31 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 27 March 2003 -@set UPDATED-MONTH March 2003 -@set EDITION 2.5.31 -@set VERSION 2.5.31 +@set UPDATED 20 February 2006 +@set UPDATED-MONTH February 2006 +@set EDITION 2.5.33 +@set VERSION 2.5.33 diff --git a/doc/version.texi b/doc/version.texi index 1cec6fe..7711f31 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 27 March 2003 -@set UPDATED-MONTH March 2003 -@set EDITION 2.5.31 -@set VERSION 2.5.31 +@set UPDATED 20 February 2006 +@set UPDATED-MONTH February 2006 +@set EDITION 2.5.33 +@set VERSION 2.5.33 diff --git a/examples/Makefile.in b/examples/Makefile.in index 396b22b..dff64d8 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -172,6 +174,7 @@ SUBDIRS = \ fastwc subdir = examples +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -274,9 +277,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -318,9 +327,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ diff --git a/examples/fastwc/Makefile.in b/examples/fastwc/Makefile.in index 7f96510..e580cbb 100644 --- a/examples/fastwc/Makefile.in +++ b/examples/fastwc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -171,6 +173,7 @@ EXTRA_DIST = \ README subdir = examples/fastwc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -198,9 +201,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -226,7 +231,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/examples/manual/Makefile.in b/examples/manual/Makefile.in index 721d56e..381cd83 100644 --- a/examples/manual/Makefile.in +++ b/examples/manual/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -197,6 +199,7 @@ EXTRA_DIST = \ yymoretest.dat subdir = examples/manual +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -224,9 +227,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -252,7 +257,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -22,6 +22,11 @@ /* PURPOSE. */ #include "flexdef.h" +static const char * check_4_gnu_m4 = + "m4_dnl ifdef(`__gnu__', ," + "`errprint(Flex requires GNU M4. Set the PATH or set the M4 environment variable to its path name.)" + " m4exit(2)')\n"; + /** global chain. */ struct filter *output_chain = NULL; @@ -158,9 +163,9 @@ bool filter_apply_chain (struct filter * chain) int r; /* setup streams again */ - if ((stdin = fdopen (0, "r")) == NULL) + if ( ! fdopen (0, "r")) flexfatal (_("fdopen(0) failed")); - if ((stdout = fdopen (1, "w")) == NULL) + if (!fdopen (1, "w")) flexfatal (_("fdopen(1) failed")); if ((r = chain->filter_func (chain)) == -1) @@ -181,7 +186,7 @@ bool filter_apply_chain (struct filter * chain) if (dup2 (pipes[1], 1) == -1) flexfatal (_("dup2(pipes[1],1)")); close (pipes[1]); - if ((stdout = fdopen (1, "w")) == NULL) + if ( !fdopen (1, "w")) flexfatal (_("fdopen(1) failed")); return true; @@ -248,6 +253,7 @@ int filter_tee_header (struct filter *chain) */ if (write_header) { + fputs (check_4_gnu_m4, to_h); fputs ("m4_changecom`'m4_dnl\n", to_h); fputs ("m4_changequote`'m4_dnl\n", to_h); fputs ("m4_changequote([[,]])[[]]m4_dnl\n", to_h); @@ -262,6 +268,7 @@ int filter_tee_header (struct filter *chain) } + fputs (check_4_gnu_m4, to_c); fputs ("m4_changecom`'m4_dnl\n", to_c); fputs ("m4_changequote`'m4_dnl\n", to_c); fputs ("m4_changequote([[,]])[[]]m4_dnl\n", to_c); @@ -286,12 +293,23 @@ int filter_tee_header (struct filter *chain) fputs ("m4_undefine( [[M4_YY_IN_HEADER]])m4_dnl\n", to_h); fflush (to_h); - fclose (to_h); + if (ferror (to_h)) + lerrsf (_("error writing output file %s"), + (char *) chain->extra); + + else if (fclose (to_h)) + lerrsf (_("error closing output file %s"), + (char *) chain->extra); } fflush (to_c); - fclose (to_c); + if (ferror (to_c)) + lerrsf (_("error writing output file %s"), + outfilename ? outfilename : "<stdout>"); + else if (fclose (to_c)) + lerrsf (_("error closing output file %s"), + outfilename ? outfilename : "<stdout>"); while (wait (0) > 0) ; @@ -373,6 +391,13 @@ int filter_fix_linedirs (struct filter *chain) lineno++; } fflush (stdout); + if (ferror (stdout)) + lerrsf (_("error writing output file %s"), + outfilename ? outfilename : "<stdout>"); + + else if (fclose (stdout)) + lerrsf (_("error closing output file %s"), + outfilename ? outfilename : "<stdout>"); return 0; } @@ -66,6 +66,10 @@ m4_changequote([[, ]]) m4_ifdef( [[M4_YY_IN_HEADER]], , [[m4_define([[M4_YY_NOT_IN_HEADER]], [[]])]]) m4_ifdef( [[M4_YY_REENTRANT]], , [[m4_define([[M4_YY_NOT_REENTRANT]], [[]])]]) +%# This is the m4 way to say "(stack_used || is_reentrant) +m4_ifdef( [[M4_YY_STACK_USED]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]]) +m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]]) + %# Prefixes. %# The complexity here is necessary so that m4 preserves %# the argument lists to each C function. @@ -78,7 +82,10 @@ m4preproc_define(`M4_GEN_PREFIX', %if-c++-only /* The c++ scanner is a mess. The FlexLexer.h header file relies on the - * following macro. + * following macro. This is required in order to pass the c++-multiple-scanners + * test in the regression suite. We get reports that it breaks inheritance. + * We will address this in a future release of flex, or omit the C++ scanner + * altogether. */ #define yyFlexLexer M4_YY_PREFIX[[FlexLexer]] %endif @@ -168,6 +175,7 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], %endif %if-tables-serialization +#include <sys/types.h> #include <netinet/in.h> %endif /* end standard C headers. */ @@ -345,19 +353,19 @@ m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]], %# yyscan_t yyscanner; %# %# Generate traditional function defs - m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) + m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]] M4_YY_DECL_LAST_ARG]]) - m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) - $1 $2; + m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]] + $1 $2; [[\]] M4_YY_DECL_LAST_ARG]]) - m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) - $1 $2; - $3 $4; + m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]] + $1 $2; [[\]] + $3 $4; [[\]] M4_YY_DECL_LAST_ARG]]) - m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) - $1 $2; - $3 $4; - $5 $6; + m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]] + $1 $2; [[\]] + $3 $4; [[\]] + $5 $6; [[\]] M4_YY_DECL_LAST_ARG]]) ]], [[ @@ -410,6 +418,10 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], #ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 #endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) ]]) @@ -609,7 +621,7 @@ int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow yywrap()'s to do buffer switches @@ -724,6 +736,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]], [[#endif]]) m4_ifdef( [[M4_YY_NO_UNISTD_H]],, [[ +#ifndef YY_NO_UNISTD_H /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. @@ -734,6 +747,7 @@ m4_ifdef( [[M4_YY_NO_UNISTD_H]],, %if-c++-only #include <unistd.h> %endif +#endif ]]) #ifndef YY_EXTRA_TYPE @@ -808,10 +822,12 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]], ]]) -m4_ifdef( [[M4_YY_IN_HEADER]], +%if-c-only +m4_ifdef( [[M4_YY_NOT_IN_HEADER]], [[ static int yy_init_globals M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); ]]) +%endif %if-reentrant @@ -975,7 +991,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], [[ static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; - static int *yy_start_stack = 0; + static int *yy_start_stack = NULL; ]]) ]]) @@ -1100,7 +1116,7 @@ static struct yytbl_dmap yydmap[] = /** A tables-reader object to maintain some state in the read. */ struct yytbl_reader { FILE * fp; /**< input stream */ - uint32_t bread; /**< bytes read since beginning of current tableset */ + flex_uint32_t bread; /**< bytes read since beginning of current tableset */ }; %endif @@ -1206,9 +1222,9 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]], yylloc = yylloc_param; ]]) - if ( YY_G(yy_init) ) + if ( !YY_G(yy_init) ) { - YY_G(yy_init) = 0; + YY_G(yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; @@ -1216,8 +1232,9 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]], m4_ifdef( [[M4_YY_USES_REJECT]], [[ + /* Create the reject buffer large enough to save one state per allowed character. */ if ( ! YY_G(yy_state_buf) ) - YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_BUF_SIZE + 2 M4_YY_CALL_LAST_ARG); + YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE M4_YY_CALL_LAST_ARG); ]]) if ( ! YY_G(yy_start) ) @@ -1415,7 +1432,7 @@ yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ) yyin = arg_yyin; yyout = arg_yyout; yy_c_buf_p = 0; - yy_init = 1; + yy_init = 0; yy_start = 0; yy_flex_debug = 0; yylineno = 1; // this will only get updated if %option yylineno @@ -1428,7 +1445,7 @@ yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ) yy_more_offset = yy_prev_more_offset = 0; yy_start_stack_ptr = yy_start_stack_depth = 0; - yy_start_stack = 0; + yy_start_stack = NULL; YY_G(yy_buffer_stack) = 0; YY_G(yy_buffer_stack_top) = 0; @@ -1437,7 +1454,7 @@ yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ) m4_ifdef( [[M4_YY_USES_REJECT]], [[ - yy_state_buf = new yy_state_type[YY_BUF_SIZE + 2]; + yy_state_buf = new yy_state_type[YY_STATE_BUF_SIZE]; ]], [[ yy_state_buf = 0; @@ -1561,7 +1578,7 @@ int yyFlexLexer::yy_get_next_buffer() else { - size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1684,7 +1701,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], %endif { register int yy_is_jam; - M4_YY_DECL_GUTS_VAR(); + M4_YY_DECL_GUTS_VAR(); /* This var may be unused depending upon options. */ %% [17.0] code to find the next state, and perhaps do backing up, goes here return yy_is_jam ? 0 : yy_current_state; @@ -2251,11 +2268,11 @@ m4_ifdef( [[M4_YY_NO_SCAN_STRING]],, * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str) +YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *, yystr) { m4_dnl M4_YY_DECL_GUTS_VAR(); - return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG); + return yy_scan_bytes( yystr, strlen(yystr) M4_YY_CALL_LAST_ARG); } %endif ]]) @@ -2271,7 +2288,7 @@ m4_ifdef( [[M4_YY_NO_SCAN_BYTES]],, * M4_YY_DOC_PARAM * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,bytes, int ,len) +YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, int ,_yybytes_len) { YY_BUFFER_STATE b; char *buf; @@ -2280,15 +2297,15 @@ YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,bytes, int ,len) m4_dnl M4_YY_DECL_GUTS_VAR(); /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; + n = _yybytes_len + 2; buf = (char *) yyalloc( n M4_YY_CALL_LAST_ARG ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; b = yy_scan_buffer( buf, n M4_YY_CALL_LAST_ARG); if ( ! b ) @@ -2666,11 +2683,48 @@ void yyset_lloc YYFARGS1( YYLTYPE * ,yylloc_param) %endif +/* User-visible API */ + +/* yylex_init is special because it creates the scanner itself, so it is + * the ONLY reentrant function that doesn't take the scanner as the last argument. + * That's why we explicitly handle the declaration, instead of using our macros. + */ +m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]], +[[ +int yylex_init( ptr_yy_globals ) + yyscan_t* ptr_yy_globals; +]], +[[ +int yylex_init(yyscan_t* ptr_yy_globals) +]]) +{ + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + return yy_init_globals ( *ptr_yy_globals ); +} + +%endif + +%if-c-only static int yy_init_globals YYFARGS0(void) { M4_YY_DECL_GUTS_VAR(); /* Initialization is the same as for the non-reentrant scanner. - This function is called once per scanner lifetime. */ + * This function is called from yylex_destroy(), so don't allocate here. + */ m4_ifdef( [[M4_YY_USE_LINENO]], [[ @@ -2684,11 +2738,15 @@ m4_ifdef( [[M4_YY_USE_LINENO]], YY_G(yy_buffer_stack_top) = 0; YY_G(yy_buffer_stack_max) = 0; YY_G(yy_c_buf_p) = (char *) 0; - YY_G(yy_init) = 1; + YY_G(yy_init) = 0; YY_G(yy_start) = 0; + +m4_ifdef( [[M4_YY_HAS_START_STACK_VARS]], +[[ YY_G(yy_start_stack_ptr) = 0; YY_G(yy_start_stack_depth) = 0; - YY_G(yy_start_stack) = (int *) 0; + YY_G(yy_start_stack) = NULL; +]]) m4_ifdef( [[M4_YY_USES_REJECT]], [[ @@ -2719,41 +2777,9 @@ m4_ifdef( [[M4_YY_TEXT_IS_ARRAY]], */ return 0; } - -/* User-visible API */ - -/* yylex_init is special because it creates the scanner itself, so it is - * the ONLY reentrant function that doesn't take the scanner as the last argument. - * That's why we explicitly handle the declaration, instead of using our macros. - */ -m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]], -[[ -int yylex_init( ptr_yy_globals ) - yyscan_t* ptr_yy_globals; -]], -[[ -int yylex_init(yyscan_t* ptr_yy_globals) -]]) -{ - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - memset(*ptr_yy_globals,0,sizeof(struct yyguts_t)); - - return yy_init_globals ( *ptr_yy_globals ); -} - %endif + %if-c-only SNIP! this currently causes conflicts with the c++ scanner /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy YYFARGS0(void) @@ -2771,10 +2797,7 @@ int yylex_destroy YYFARGS0(void) yyfree(YY_G(yy_buffer_stack) M4_YY_CALL_LAST_ARG); YY_G(yy_buffer_stack) = NULL; -%# This is the m4 way to say "if (stack_used || is_reentrant){ destroy_stack }" -m4_ifdef( [[M4_YY_STACK_USED]], [[m4_define([[M4_YY_DESTROY_START_STACK]])]]) -m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_DESTROY_START_STACK]])]]) -m4_ifdef( [[M4_YY_DESTROY_START_STACK]], +m4_ifdef( [[M4_YY_HAS_START_STACK_VARS]], [[ /* Destroy the start condition stack. */ yyfree( YY_G(yy_start_stack) M4_YY_CALL_LAST_ARG ); @@ -2784,11 +2807,17 @@ m4_ifdef( [[M4_YY_DESTROY_START_STACK]], m4_ifdef( [[M4_YY_USES_REJECT]], [[ yyfree ( YY_G(yy_state_buf) M4_YY_CALL_LAST_ARG); + YY_G(yy_state_buf) = NULL; ]]) + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( M4_YY_CALL_ONLY_ARG); + %if-reentrant /* Destroy the main struct (reentrant only). */ yyfree ( yyscanner M4_YY_CALL_LAST_ARG ); + yyscanner = NULL; %endif return 0; } @@ -2808,7 +2837,6 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n) { register int i; - M4_YY_DECL_GUTS_VAR(); for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2821,7 +2849,6 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], static int yy_flex_strlen YYFARGS1( yyconst char *,s) { register int n; - M4_YY_DECL_GUTS_VAR(); for ( n = 0; s[n]; ++n ) ; @@ -2867,35 +2894,35 @@ m4preproc_include(`tables_shared.c') static int yytbl_read8 (void *v, struct yytbl_reader * rd) { errno = 0; - if (fread (v, sizeof (uint8_t), 1, rd->fp) != 1){ + if (fread (v, sizeof (flex_uint8_t), 1, rd->fp) != 1){ errno = EIO; return -1; } - rd->bread += sizeof(uint8_t); + rd->bread += sizeof(flex_uint8_t); return 0; } static int yytbl_read16 (void *v, struct yytbl_reader * rd) { errno = 0; - if (fread (v, sizeof (uint16_t), 1, rd->fp) != 1){ + if (fread (v, sizeof (flex_uint16_t), 1, rd->fp) != 1){ errno = EIO; return -1; } - *((uint16_t *) v) = ntohs (*((uint16_t *) v)); - rd->bread += sizeof(uint16_t); + *((flex_uint16_t *) v) = ntohs (*((flex_uint16_t *) v)); + rd->bread += sizeof(flex_uint16_t); return 0; } static int yytbl_read32 (void *v, struct yytbl_reader * rd) { errno = 0; - if (fread (v, sizeof (uint32_t), 1, rd->fp) != 1){ + if (fread (v, sizeof (flex_uint32_t), 1, rd->fp) != 1){ errno = EIO; return -1; } - *((uint32_t *) v) = ntohl (*((uint32_t *) v)); - rd->bread += sizeof(uint32_t); + *((flex_uint32_t *) v) = ntohl (*((flex_uint32_t *) v)); + rd->bread += sizeof(flex_uint32_t); return 0; } @@ -3028,22 +3055,22 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read * YYTD_STRUCT for the yy_transition array. */ for (j = 0; j < inner_loop_count; j++, i++) { - int32_t t32; + flex_int32_t t32; /* read into t32 no matter what the real size is. */ { - int16_t t16; - int8_t t8; + flex_int16_t t16; + flex_int8_t t8; switch (YYTDFLAGS2BYTES (td.td_flags)) { - case sizeof (int32_t): + case sizeof (flex_int32_t): rv = yytbl_read32 (&t32, rd); break; - case sizeof (int16_t): + case sizeof (flex_int16_t): rv = yytbl_read16 (&t16, rd); t32 = t16; break; - case sizeof (int8_t): + case sizeof (flex_int8_t): rv = yytbl_read8 (&t8, rd); t32 = t8; break; @@ -3065,26 +3092,26 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read : &(((struct yy_trans_info *) p)->yy_nxt); switch (dmap->dm_sz) { - case sizeof (int32_t): + case sizeof (flex_int32_t): if (M4_YY_TABLES_VERIFY){ - if( ((int32_t *) v)[0] != (int32_t) t32) - yy_fatal_error("tables verification failed at YYTD_STRUCT int32_t" M4_YY_CALL_LAST_ARG); + if( ((flex_int32_t *) v)[0] != (flex_int32_t) t32) + yy_fatal_error("tables verification failed at YYTD_STRUCT flex_int32_t" M4_YY_CALL_LAST_ARG); }else - ((int32_t *) v)[0] = (int32_t) t32; + ((flex_int32_t *) v)[0] = (flex_int32_t) t32; break; - case sizeof (int16_t): + case sizeof (flex_int16_t): if (M4_YY_TABLES_VERIFY ){ - if(((int16_t *) v)[0] != (int16_t) t32) - yy_fatal_error("tables verification failed at YYTD_STRUCT int16_t" M4_YY_CALL_LAST_ARG); + if(((flex_int16_t *) v)[0] != (flex_int16_t) t32) + yy_fatal_error("tables verification failed at YYTD_STRUCT flex_int16_t" M4_YY_CALL_LAST_ARG); }else - ((int16_t *) v)[0] = (int16_t) t32; + ((flex_int16_t *) v)[0] = (flex_int16_t) t32; break; - case sizeof(int8_t): + case sizeof(flex_int8_t): if (M4_YY_TABLES_VERIFY ){ - if( ((int8_t *) v)[0] != (int8_t) t32) - yy_fatal_error("tables verification failed at YYTD_STRUCT int8_t" M4_YY_CALL_LAST_ARG); + if( ((flex_int8_t *) v)[0] != (flex_int8_t) t32) + yy_fatal_error("tables verification failed at YYTD_STRUCT flex_int8_t" M4_YY_CALL_LAST_ARG); }else - ((int8_t *) v)[0] = (int8_t) t32; + ((flex_int8_t *) v)[0] = (flex_int8_t) t32; break; default: yy_fatal_error("invalid dmap->dm_sz for struct" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG); @@ -3122,29 +3149,29 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read else { /* t32 is a plain int. copy data, then incrememnt p. */ switch (dmap->dm_sz) { - case sizeof (int32_t): + case sizeof (flex_int32_t): if(M4_YY_TABLES_VERIFY ){ - if( ((int32_t *) p)[0] != (int32_t) t32) - yy_fatal_error("tables verification failed at int32_t" M4_YY_CALL_LAST_ARG); + if( ((flex_int32_t *) p)[0] != (flex_int32_t) t32) + yy_fatal_error("tables verification failed at flex_int32_t" M4_YY_CALL_LAST_ARG); }else - ((int32_t *) p)[0] = (int32_t) t32; - p = ((int32_t *) p) + 1; + ((flex_int32_t *) p)[0] = (flex_int32_t) t32; + p = ((flex_int32_t *) p) + 1; break; - case sizeof (int16_t): + case sizeof (flex_int16_t): if(M4_YY_TABLES_VERIFY ){ - if( ((int16_t *) p)[0] != (int16_t) t32) - yy_fatal_error("tables verification failed at int16_t" M4_YY_CALL_LAST_ARG); + if( ((flex_int16_t *) p)[0] != (flex_int16_t) t32) + yy_fatal_error("tables verification failed at flex_int16_t" M4_YY_CALL_LAST_ARG); }else - ((int16_t *) p)[0] = (int16_t) t32; - p = ((int16_t *) p) + 1; + ((flex_int16_t *) p)[0] = (flex_int16_t) t32; + p = ((flex_int16_t *) p) + 1; break; - case sizeof (int8_t): + case sizeof (flex_int8_t): if(M4_YY_TABLES_VERIFY ){ - if( ((int8_t *) p)[0] != (int8_t) t32) - yy_fatal_error("tables verification failed at int8_t" M4_YY_CALL_LAST_ARG); + if( ((flex_int8_t *) p)[0] != (flex_int8_t) t32) + yy_fatal_error("tables verification failed at flex_int8_t" M4_YY_CALL_LAST_ARG); }else - ((int8_t *) p)[0] = (int8_t) t32; - p = ((int8_t *) p) + 1; + ((flex_int8_t *) p)[0] = (flex_int8_t) t32; + p = ((flex_int8_t *) p) + 1; break; default: yy_fatal_error("invalid dmap->dm_sz for plain int" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG); @@ -3160,7 +3187,7 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read int pad; pad = yypad64(rd->bread); while(--pad >= 0){ - int8_t t8; + flex_int8_t t8; if(yytbl_read8(&t8,rd) != 0) return -1; } @@ -3275,15 +3302,17 @@ int main () ]]) %ok-for-header +m4_ifdef( [[M4_YY_IN_HEADER]], +[[ #undef YY_NEW_FILE #undef YY_FLUSH_BUFFER #undef yy_set_bol #undef yy_new_buffer #undef yy_set_interactive -#undef yytext_ptr #undef YY_DO_BEFORE_ACTION #ifdef YY_DECL_IS_OURS #undef YY_DECL_IS_OURS #undef YY_DECL #endif +]]) @@ -1,12 +1,13 @@ Summary: fast lexical analyzer generator Name: flex -Version: 2.5.31 +Version: 2.5.33 Release: 0 License: BSD style Group: Development/Tools Source: ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version} +Prereq: /sbin/install-info %description The flex program generates scanners. Scanners are programs which can @@ -29,10 +30,19 @@ make %install rm -rf $RPM_BUILD_ROOT %makeinstall +rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} +%post +/sbin/install-info %{_infodir}/flex.info.gz %{_infodir}/dir + +%postun +if [ "$1" = 0 ]; then + /sbin/install-info --del %{_infodir}/flex.info.gz %{_infodir}/dir +fi + %files %defattr(-,root,root) %doc COPYING NEWS README @@ -40,3 +50,5 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/* %{_libdir}/* %{_includedir}/FlexLexer.h +%{_infodir}/flex.info* +%{_datadir}/locale/* diff --git a/flex.spec.in b/flex.spec.in index 4317168..026f021 100644 --- a/flex.spec.in +++ b/flex.spec.in @@ -7,6 +7,7 @@ Group: Development/Tools Source: ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version} +Prereq: /sbin/install-info %description The flex program generates scanners. Scanners are programs which can @@ -29,10 +30,19 @@ make %install rm -rf $RPM_BUILD_ROOT %makeinstall +rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} +%post +/sbin/install-info %{_infodir}/flex.info.gz %{_infodir}/dir + +%postun +if [ "$1" = 0 ]; then + /sbin/install-info --del %{_infodir}/flex.info.gz %{_infodir}/dir +fi + %files %defattr(-,root,root) %doc COPYING NEWS README @@ -40,3 +50,5 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/* %{_libdir}/* %{_includedir}/FlexLexer.h +%{_infodir}/flex.info* +%{_datadir}/locale/* @@ -202,7 +202,7 @@ #define JAM -1 /* to mark a missing DFA transition */ #define NO_TRANSITION NIL #define UNIQUE -1 /* marks a symbol as an e.c. representative */ -#define INFINITY -1 /* for x{5,} constructions */ +#define INFINITE_REPEAT -1 /* for x{5,} constructions */ #define INITIAL_MAX_CCLS 100 /* max number of unique character classes */ #define MAX_CCLS_INCREMENT 100 @@ -5,7 +5,15 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + #include <inttypes.h> typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -1812,7 +1812,6 @@ void make_tables () if (yytext_is_array) { if (!reentrant){ indent_puts ("static int yy_more_offset = 0;"); - }else{ indent_puts ("static int yy_prev_more_offset = 0;"); } } @@ -1983,7 +1982,7 @@ void make_tables () do_indent (); out_str ("for ( yyl = %s; yyl < yyleng; ++yyl )\n", yymore_used ? (yytext_is_array ? "YY_G(yy_prev_more_offset)" : - "(yy_more_len)") : "0"); + "YY_G(yy_more_len)") : "0"); indent_up (); indent_puts ("if ( yytext[yyl] == '\\n' )"); indent_up (); @@ -1,19 +1,37 @@ #!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). # -# Copyright 1991 by the Massachusetts Institute of Technology +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -56,7 +74,7 @@ dir_arg="" while [ x"$1" != x ]; do case $1 in - -c) instcmd="$cpprog" + -c) instcmd=$cpprog shift continue;; @@ -79,7 +97,7 @@ while [ x"$1" != x ]; do shift continue;; - -s) stripcmd="$stripprog" + -s) stripcmd=$stripprog shift continue;; @@ -106,7 +124,7 @@ done if [ x"$src" = x ] then - echo "install: no input file specified" + echo "$0: no input file specified" >&2 exit 1 else : @@ -115,8 +133,8 @@ fi if [ x"$dir_arg" != x ]; then dst=$src src="" - - if [ -d $dst ]; then + + if [ -d "$dst" ]; then instcmd=: chmodcmd="" else @@ -125,20 +143,20 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f "$src" ] || [ -d "$src" ] then : else - echo "install: $src does not exist" + echo "$0: $src does not exist" >&2 exit 1 fi - + if [ x"$dst" = x ] then - echo "install: no destination specified" + echo "$0: no destination specified" >&2 exit 1 else : @@ -147,16 +165,16 @@ else # If destination is a directory, append the input filename; if your system # does not like double slashes in filenames, you may need to add some logic - if [ -d $dst ] + if [ -d "$dst" ] then - dst="$dst"/`basename $src` + dst=$dst/`basename "$src"` else : fi fi ## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. # this part is taken from Noah Friedman's mkinstalldirs script @@ -165,69 +183,73 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` if [ ! -d "$dstdir" ]; then defaultIFS=' ' -IFS="${IFS-${defaultIFS}}" +IFS="${IFS-$defaultIFS}" -oIFS="${IFS}" +oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" +set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS=$oIFS pathcomp='' while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + pathcomp=$pathcomp$1 shift - if [ ! -d "${pathcomp}" ] ; + if [ ! -d "$pathcomp" ] ; then - $mkdirprog "${pathcomp}" + $mkdirprog "$pathcomp" else : fi - pathcomp="${pathcomp}/" + pathcomp=$pathcomp/ done fi if [ x"$dir_arg" != x ] then - $doit $instcmd $dst && + $doit $instcmd "$dst" && - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename "$dst" $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else : fi -# Make a temp file name in the proper directory. +# Make a couple of temp file names in the proper directory. dsttmp=$dstdir/#inst.$$# + rmtmp=$dstdir/#rm.$$# -# Move or copy the file name to the temp name +# Trap to clean up temp files at exit. - $doit $instcmd $src $dsttmp && + trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 - trap "rm -f ${dsttmp}" 0 && +# Move or copy the file name to the temp name + + $doit $instcmd "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits @@ -235,17 +257,38 @@ else # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && + if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && + +# Now remove or move aside any old file at destination location. We try this +# two ways since rm can't unlink itself on some systems and the destination +# file might be busy for other reasons. In this case, the final cleanup +# might fail but the new file should still install successfully. + +{ + if [ -f "$dstdir/$dstfile" ] + then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || + $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || + { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi +} && # Now rename the file to the real destination. - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" fi && +# The final little trick to "correctly" pass the exit status to the exit trap. -exit 0 +{ + (exit 0); exit +} diff --git a/libyywrap.c b/libyywrap.c index 6345d9d..8561a43 100644 --- a/libyywrap.c +++ b/libyywrap.c @@ -21,8 +21,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ - -int yywrap () +int yywrap (void) { return 1; } diff --git a/m4/Makefile.am b/m4/Makefile.am index 90d5128..109e92d 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 nls.m4 po.m4 diff --git a/m4/Makefile.in b/m4/Makefile.in index 20bf09e..e19c957 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -75,6 +75,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -111,6 +112,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -139,8 +141,9 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 nls.m4 po.m4 subdir = m4 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -168,9 +171,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -196,7 +201,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 45cad85..16070b4 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 17 (gettext-0.11.5) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +# gettext.m4 serial 20 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -17,7 +17,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. dnl Macro to add for using GNU gettext. @@ -92,13 +92,8 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + dnl Set USE_NLS. + AM_NLS ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no @@ -216,7 +211,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", dnl libintl. (Cf. the install rule in intl/Makefile.in.) if test "$gt_cv_func_gnugettext_libc" = "yes" \ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes else dnl Reset the values set by searching for libintl. @@ -235,7 +231,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" @@ -260,6 +255,22 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", fi fi + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then @@ -283,7 +294,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", ifelse(gt_included_intl, yes, [ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then BUILD_INCLUDED_LIBINTL=yes fi @@ -291,7 +302,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATOBJEXT) - AC_SUBST(INTLOBJS) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -309,6 +319,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", GENCAT=gencat AC_SUBST(GENCAT) + dnl For backward compatibility. Some Makefiles may be using this. + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + AC_SUBST(INTLOBJS) + dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) @@ -325,179 +341,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", ]) -dnl Checks for all prerequisites of the po subdirectory, -dnl except for USE_NLS. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext 0.11 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - AC_MSG_RESULT( - [found $GMSGFMT program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - fi - - AC_OUTPUT_COMMANDS([ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - fi - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - GMOFILES= - UPDATEPOFILES= - DUMMYPOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it - # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - - dnl Checks for all prerequisites of the intl subdirectory, dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. @@ -526,7 +369,8 @@ AC_DEFUN([AM_INTL_SUBDIR], stdlib.h string.h unistd.h sys/param.h]) AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) +strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ +__fsetlocking]) AM_ICONV AM_LANGINFO_CODESET @@ -567,21 +411,5 @@ changequote([,])dnl ]) -AC_DEFUN([AM_MKINSTALLDIRS], -[ - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) -]) - - dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 400a111..f342eba 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ -# inttypes_h.m4 serial 4 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +# inttypes_h.m4 serial 5 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -22,7 +22,7 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H], jm_ac_cv_header_inttypes_h=no)]) if test $jm_ac_cv_header_inttypes_h = yes; then AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, - and declares uintmax_t. ]) + [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) fi ]) diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index ddb5732..11d0ce7 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. +# lib-ld.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -29,6 +29,19 @@ AC_DEFUN([AC_LIB_PROG_LD], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 6b94251..eeb200d 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-link.m4 serial 4 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -92,8 +92,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Determine the platform dependent parameters needed to use rpath: dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L, -dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. +dnl hardcode_direct, hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS @@ -114,8 +113,6 @@ AC_DEFUN([AC_LIB_RPATH], hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" - sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" - sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" dnl Determine whether the user wants rpath handling at all. AC_ARG_ENABLE(rpath, [ --disable-rpath do not hardcode runtime library paths], @@ -135,7 +132,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib$1-prefix], + AC_LIB_ARG_WITH([lib$1-prefix], [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib --without-lib$1-prefix don't search for lib$1 in includedir and libdir], [ diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index b8b79ab..c719bc8 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-prefix.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -8,6 +8,13 @@ dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed dnl to access previously installed libraries. The basic assumption is that dnl a user will want packages to use other packages he previously installed @@ -26,7 +33,7 @@ AC_DEFUN([AC_LIB_PREFIX], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib-prefix], + AC_LIB_ARG_WITH([lib-prefix], [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib --without-lib-prefix don't search for libraries in includedir and libdir], [ diff --git a/m4/nls.m4 b/m4/nls.m4 new file mode 100644 index 0000000..36bc493 --- /dev/null +++ b/m4/nls.m4 @@ -0,0 +1,49 @@ +# nls.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate it. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +]) diff --git a/m4/po.m4 b/m4/po.m4 new file mode 100644 index 0000000..861e3de --- /dev/null +++ b/m4/po.m4 @@ -0,0 +1,197 @@ +# po.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. + +dnl Checks for all prerequisites of the po subdirectory. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AM_NLS])dnl + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + AC_MSG_RESULT( + [found $GMSGFMT program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + fi + + AC_OUTPUT_COMMANDS([ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + GMOFILES= + UPDATEPOFILES= + DUMMYPOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done], + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 443c8e3..8fe527c 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 2 (gettext-0.10.40) -dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. +# progtest.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -23,31 +23,63 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1996. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ])dnl - ;; + ;; esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 4b5a4ac..32ba7ae 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ -# stdint_h.m4 serial 2 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +# stdint_h.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -22,7 +22,7 @@ AC_DEFUN([jm_AC_HEADER_STDINT_H], jm_ac_cv_header_stdint_h=no)]) if test $jm_ac_cv_header_stdint_h = yes; then AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -[Define if <stdint.h> exists, doesn't clash with <sys/types.h>, - and declares uintmax_t. ]) + [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) fi ]) diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 index ec3a8b9..b5f28d4 100644 --- a/m4/uintmax_t.m4 +++ b/m4/uintmax_t.m4 @@ -1,5 +1,5 @@ -# uintmax_t.m4 serial 6 (gettext-0.11) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +# uintmax_t.m4 serial 7 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -10,8 +10,8 @@ dnl From Paul Eggert. AC_PREREQ(2.13) -# Define uintmax_t to `unsigned long' or `unsigned long long' -# if <inttypes.h> does not exist. +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in <stdint.h> or <inttypes.h>. AC_DEFUN([jm_AC_TYPE_UINTMAX_T], [ @@ -23,7 +23,10 @@ AC_DEFUN([jm_AC_TYPE_UINTMAX_T], && ac_type='unsigned long long' \ || ac_type='unsigned long' AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if <inttypes.h> and <stdint.h> don't define.]) + [Define to unsigned long or unsigned long long + if <stdint.h> and <inttypes.h> don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) fi ]) @@ -136,6 +136,7 @@ extern FILE* yyout; static char outfile_path[MAXLINE]; static int outfile_created = 0; static char *skelname = NULL; +static int _stdout_closed = 0; /* flag to prevent double-fclose() on stdout. */ /* For debugging. The max number of filters to apply to skeleton. */ static int preproc_level = 1000; @@ -147,7 +148,7 @@ int flex_main (argc, argv) int argc; char *argv[]; { - int i, exit_status; + int i, exit_status, child_status; /* Set a longjmp target. Yes, I know it's a hack, but it gets worse: The * return value of setjmp, if non-zero, is the desired exit code PLUS ONE. @@ -158,11 +159,21 @@ int flex_main (argc, argv) */ exit_status = setjmp (flex_main_jmp_buf); if (exit_status){ - fflush(stdout); - fclose(stdout); - while (wait(0) > 0){ + if (stdout && !_stdout_closed && !ferror(stdout)){ + fflush(stdout); + fclose(stdout); } - return exit_status - 1; + while (wait(&child_status) > 0){ + if (!WIFEXITED (child_status) + || WEXITSTATUS (child_status) != 0){ + /* report an error of a child + */ + if( exit_status <= 1 ) + exit_status = 2; + + } + } + return exit_status - 1; } flexinit (argc, argv); @@ -198,10 +209,12 @@ int main (argc, argv) char *argv[]; { #if ENABLE_NLS +#if HAVE_LOCALE_H setlocale (LC_MESSAGES, ""); textdomain (PACKAGE); bindtextdomain (PACKAGE, LOCALEDIR); #endif +#endif return flex_main (argc, argv); } @@ -211,6 +224,7 @@ int main (argc, argv) void check_options () { int i; + const char * m4 = NULL; if (lex_compat) { if (C_plus_plus) @@ -342,9 +356,12 @@ void check_options () outfile_created = 1; } + /* Setup the filter chain. */ output_chain = filter_create_int(NULL, filter_tee_header, headerfilename); - filter_create_ext(output_chain,"m4","-P",0); + if ( !(m4 = getenv("M4"))) + m4 = M4; + filter_create_ext(output_chain, m4, "-P", 0); filter_create_int(output_chain, filter_fix_linedirs, NULL); /* For debugging, only run the requested number of filters. */ @@ -431,8 +448,8 @@ void check_options () buf_init(&tmpbuf, sizeof(char)); for (i = 1; i <= lastsc; i++) { char *str, *fmt = "#define %s %d\n"; - - str = (char*)flex_alloc(strlen(fmt) + strlen(scname[i]) + (int)(1 + log(i)/log(10)) + 2); + + str = (char*)flex_alloc(strlen(fmt) + strlen(scname[i]) + (int)(1 + log10(i)) + 2); sprintf(str, fmt, scname[i], i - 1); buf_strappend(&tmpbuf, str); free(str); @@ -453,7 +470,7 @@ void check_options () /* Place a bogus line directive, it will be fixed in the filter. */ outn("#line 0 \"M4_YY_OUTFILE_NAME\"\n"); - + /* Dump the user defined preproc directives. */ if (userdef_buf.elts) outn ((char *) (userdef_buf.elts)); @@ -488,7 +505,7 @@ void flexend (exit_status) skelname); } -#if 0 +#if 0 fprintf (header_out, "#ifdef YY_HEADER_EXPORT_START_CONDITIONS\n"); fprintf (header_out, @@ -646,7 +663,7 @@ void flexend (exit_status) /* must be null-terminated */ NULL}; - + for (i=0; undef_list[i] != NULL; i++) fprintf (header_out, "#undef %s\n", undef_list[i]); } @@ -679,7 +696,7 @@ void flexend (exit_status) lerrsf (_("error writing output file %s"), outfilename); - else if (fclose (stdout)) + else if ((_stdout_closed = 1) && fclose (stdout)) lerrsf (_("error closing output file %s"), outfilename); @@ -1595,7 +1612,6 @@ void readin () outn ("#else"); outn (yy_stdinit); outn ("#endif"); - outn ("#endif"); } else { diff --git a/mkinstalldirs b/mkinstalldirs index f8574a0..d2d5f21 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,37 +4,108 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1.1.1 2002/07/16 23:37:48 bruno Exp $ - errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" 1>&2 + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +case $dirmode in + '') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi + ;; + *) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi + ;; +esac + +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" + mkdir "$pathcomp" || lasterr=$? - mkdir "$pathcomp" || lasterr=$? + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi - pathcomp="$pathcomp/" - done + pathcomp="$pathcomp/" + done done exit $errstatus +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# End: # mkinstalldirs ends here @@ -539,7 +539,7 @@ int mkposcl (state) * number of times to "ub" number of times * * note - * if "ub" is INFINITY then "new" matches "lb" or more occurrences of "mach" + * if "ub" is INFINITE_REPEAT then "new" matches "lb" or more occurrences of "mach" */ int mkrep (mach, lb, ub) @@ -549,7 +549,7 @@ int mkrep (mach, lb, ub) base_mach = copysingl (mach, lb - 1); - if (ub == INFINITY) { + if (ub == INFINITE_REPEAT) { copy = dupmachine (mach); mach = link_machines (mach, link_machines (base_mach, @@ -1386,7 +1386,7 @@ case 47: } else - yyval = mkrep( yyvsp[-4], yyvsp[-2], INFINITY ); + yyval = mkrep( yyvsp[-4], yyvsp[-2], INFINITE_REPEAT ); ; break;} case 48: @@ -1473,7 +1473,7 @@ case 53: } else - yyval = mkrep( yyvsp[-4], yyvsp[-2], INFINITY ); + yyval = mkrep( yyvsp[-4], yyvsp[-2], INFINITE_REPEAT ); ; break;} case 54: @@ -604,7 +604,7 @@ series : series singleton } else - $$ = mkrep( $1, $3, INFINITY ); + $$ = mkrep( $1, $3, INFINITE_REPEAT ); } | series BEGIN_REPEAT_POSIX NUMBER END_REPEAT_POSIX @@ -687,7 +687,7 @@ singleton : singleton '*' } else - $$ = mkrep( $1, $3, INFINITY ); + $$ = mkrep( $1, $3, INFINITE_REPEAT ); } | singleton BEGIN_REPEAT_FLEX NUMBER END_REPEAT_FLEX @@ -2,10 +2,15 @@ ca da de es +fr +ga +ko +nl +pl +pt_BR +ro ru sv tr -fr -ko +vi zh_CN -pt_BR diff --git a/po/Makefile.in.in b/po/Makefile.in.in index ada8bb4..27b721a 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu> +# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -27,7 +27,7 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ @@ -42,9 +42,9 @@ POFILES = @POFILES@ GMOFILES = @GMOFILES@ UPDATEPOFILES = @UPDATEPOFILES@ DUMMYPOFILES = @DUMMYPOFILES@ -DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) -DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \ +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ $(POFILES) $(GMOFILES) \ $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) @@ -74,18 +74,35 @@ CATALOGS = @CATALOGS@ all: all-@USE_NLS@ -all-yes: $(CATALOGS) +all-yes: stamp-po all-no: +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test -z "$(CATALOGS)" || $(MAKE) $(CATALOGS) + @echo "touch stamp-po" + @echo timestamp > stamp-poT + @mv stamp-poT stamp-po + # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -101,9 +118,14 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed fi; \ } +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. $(srcdir)/$(DOMAIN).pot: $(MAKE) $(DOMAIN).pot-update +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ @@ -114,12 +136,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common); do \ + for file in $(DISTFILES.common) Makevars.template; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ : ; \ fi @@ -170,7 +195,7 @@ install-strip: install installdirs: installdirs-exec installdirs-data installdirs-exec: installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ @@ -215,8 +240,8 @@ installcheck: uninstall: uninstall-exec uninstall-data uninstall-exec: uninstall-data: uninstall-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext"; then \ - for file in $(DISTFILES.common); do \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ @@ -235,10 +260,11 @@ uninstall-data-yes: check: all -dvi info tags TAGS ID: +info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: rm -f remove-potcdate.sed + rm -f stamp-poT rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o @@ -250,7 +276,7 @@ distclean: clean maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) + rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: @@ -259,7 +285,17 @@ dist distdir: # This is a separate target because 'update-po' must be executed before. dist2: $(DISTFILES) dists="$(DISTFILES)"; \ - if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ if test -f $$file; then \ @@ -271,14 +307,14 @@ dist2: $(DISTFILES) update-po: Makefile $(MAKE) $(DOMAIN).pot-update - $(MAKE) $(UPDATEPOFILES) + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) $(MAKE) update-gmo # General rule for updating PO files. .nop.po-update: @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ @@ -305,7 +341,7 @@ $(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: -Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in +Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status diff --git a/po/Makevars b/po/Makevars index c942818..91bd774 100644 --- a/po/Makevars +++ b/po/Makevars @@ -20,6 +20,22 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # their copyright. COPYRIGHT_HOLDER = +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = lex-help@lists.sourceforge.net + # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = Binary files differ@@ -1,12 +1,13 @@ # Catalan translation of flex message catalogs. -# Copyright (C) 2002 Free Software Foundation, Inc. -# Jordi Mallach <jordi@sindominio.net>, 2002. +# Copyright © 2002, 2003 Free Software Foundation, Inc. +# Jordi Mallach <jordi@sindominio.net>, 2002, 2003. # msgid "" msgstr "" -"Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" -"PO-Revision-Date: 2002-09-06 17:30+0200\n" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2003-11-07 14:33+0100\n" "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" "MIME-Version: 1.0\n" @@ -98,9 +99,8 @@ msgid "state # %d accepts: " msgstr "l'estat # %d accepta: " #: gen.c:1163 -#, fuzzy msgid "Could not write yyacclist_tbl" -msgstr "No s'ha pogut escriure yyacc_tbl" +msgstr "No s'ha pogut escriure yyacclist_tbl" #: gen.c:1239 msgid "Could not write yyacc_tbl" @@ -145,257 +145,253 @@ msgid "Could not write ftbl" msgstr "No s'ha pogut escriure ftbl" #: gen.c:1630 -#, fuzzy msgid "Could not write ssltbl" -msgstr "No s'ha pogut escriure ecstbl" +msgstr "No s'ha pogut escriure ssltbl" #: gen.c:1681 -#, fuzzy msgid "Could not write eoltbl" -msgstr "No s'ha pogut escriure ecstbl" +msgstr "No s'ha pogut escriure eoltbl" #: gen.c:1741 msgid "Could not write yynultrans_tbl" msgstr "No s'ha pogut escriure yynultrans_tbl" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "la regla no es pot satisfer" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "S'ha especificat l'opció -s però es pot aplicar la regla per defecte" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "No es pot fer servir -+ amb l'opció -l" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "No es pot fer servir -f o -F amb l'opció -l" -#: main.c:224 -#, fuzzy +#: main.c:238 msgid "Can't use --reentrant or --bison-bridge with -l option" -msgstr "No es pot fer servir -R o -Rb amb l'opció -l" +msgstr "No es pot fer servir --reentrant o --bison-bridge amb l'opció -l" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF i -Cm no tenen sentit juntes" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF i -I són incompatibles" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF són incompatibles amb el mode de compatibilitat amb lex" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf i -CF són mútuament excloents" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "No es pot fer servir -+ amb l'opció -CF" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible amb l'opció -+" -#: main.c:285 -#, fuzzy +#: main.c:299 msgid "Options -+ and --reentrant are mutually exclusive." -msgstr "Les opcions -+ i -R són mútuament excloents" +msgstr "Les opcions -+ i --reentrant són mútuament excloents" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." -msgstr "" +msgstr "No es suporta «bison bridge» per a l'analitzador de C++" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "no s'ha pogut crear %s" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "no s'ha pogut crear la capçalera de les taules" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "No es pot obrir el fitxer d'esquema %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "error d'entrada al llegir el fitxer d'esquema %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "error al tancar el fitxer d'esquema %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "error al crear el fitxer de capçalera %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "error al escriure el fitxer d'eixida %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "error al tancar el fitxer d'eixida %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "error al borrar el fitxer d'eixida %s" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "No hi ha retrocés.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d estats de retrocés (no-acceptació).\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Les taules comprimides sempre impliquen un retard.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "error al escriure el fitxer de còpia de seguretat %s" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "error al tancar el fitxer de còpia de seguretat %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versió %s estadístiques d'ús:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " opcions de l'analitzador: -" # NFA == Autómata finit no-determinista. jm -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estats AFN\n" # DFA == Autómata finit deterministic. jm -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estats AFD (%d paraules)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d regles\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Sense retrocés\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d estats de retrocés (no-acceptació)\n" # Es refereix a còpia de seguretat, o retrocés? jm -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Sempre es realitza còpia de seguretat de les taules comprimides\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Utilitzats patrons de principi-de-línia\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condicions d'activació\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estats èpsilon, %d estats doble èpsilon\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " sense classes de caràcter\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " les classes de caràcters %d/%d necessitaren %d/%d paraules de magatzement, " "%d reutilitzades\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d parells estat/estat-següent creats\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transicions úniques/duplicades\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d entrades de la taula\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entrades base-def creades\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pic %d) entrades nxt-chk creades\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pic %d) entrades de plantilla nxt-chk creades\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d entrades de la tabla buides\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d prototips creats\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d plantilles creades, %d usos\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes d'equivalència creades\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de meta-equivalència creades\n" @@ -404,107 +400,109 @@ msgstr " %d/%d classes de meta-equivalència creades\n" # segons un company de treballa que estudia a la UOC, allí # les "hashtables" s'anomenen "taules de DISPERSIÓ". En aquest context # no sé que dir-te. ear -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" " %d (%d desades) col·lisions de localització («hash»), %d AFD iguals\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " es necessiten %d conjunts de relocalització\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " es necessiten %d entrades totals de la taula\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Error intern. Els flexopts estan malformats.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Proveu «%s --help» per a obtindre més informació.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "opció de -C desconeguda «%c»" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" # Hmm. No se si açò està be. jm -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "error fatal al analitzar sintàcticament" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "no s'ha pogut crear un fitxer d'informació del retrocés %s" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l l'opció de compatibilitat amb AT&T lex implica una penalització del " "rendiment molt gran\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " i pot ser l'origen real d'altres penalitzacions del rendiment notificades\n" -#: main.c:1504 -#, fuzzy, c-format +#: main.c:1521 +#, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -msgstr "l'%%opció yylineno implica una penalització del rendiment molt gran\n" +msgstr "" +"l'%%opció yylineno implica una penalització del rendiment NOMÉS en regles " +"que poden fer coincidir caràcters de nova línia\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactiu) implica una xicoteta penalització del rendiment\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() implica una xicoteta penalització del rendiment\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT implica una penalització del rendiment molt gran\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Les regles de context posterior variable implica una penalització del " "rendiment molt gran\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT no es pot fer servir amb -f o -F" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "l'%opció yylineno no es pot fer servir amb REJECT" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "Les regles de context posterior variable no es poden utilitzar amb -f o -F" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "l'%opció yyclass només te sentit per a analitzadors de C++" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Forma d'ús: %s [OPCIONS] [FITXER]...\n" @@ -513,8 +511,8 @@ msgstr "Forma d'ús: %s [OPCIONS] [FITXER]...\n" # molt això de text emparellat. # Encara que coincident tampoc no m'acaba de convéncer. ear # I que faig amb "reentrant" i "parser"? jm -#: main.c:1771 -#, fuzzy, c-format +#: main.c:1787 +#, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -633,9 +631,11 @@ msgstr "" " -L, --noline suprimeix les directives #line en l'analitzador\n" " -P, --prefix=CADENA utilitza CADENA com prefix en comptes de «yy»\n" " -R, --reentrant genera un analitzador de C reentrant\n" -" -Rb, --reentrant-bison analitzador reentrant per a l'analitzador " -"sintàctic pur de bison\n" +" --bison-bridge analitzador per a l'analitzador pur de bison\n" +" --bison-locations inclou suport per a yylloc\n" " --stdinit inicialitza yyin/yyout a stdin/stdout\n" +" --noansi-definitions estil antic de definicions de funcions\n" +" --noansi-prototypes llista de paràmetres buida als prototips\n" " --nounistd no inclou <unistd.h>\n" " --noFUNCIÓ no genera una FUNCIÓ en particular\n" "\n" @@ -761,79 +761,81 @@ msgstr "el valor d'iteració ha de ser positiu" #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" +"el rang de caràcters [%c-%c] és ambigu en un analitzador insensible a les " +"majúscules i minúscules" #: parse.y:832 msgid "negative range in character class" msgstr "rang negatiu en classe de caràcter" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "La línia d'entrada és massa llarga\n" -#: scan.l:149 -#, fuzzy, c-format +#: scan.l:150 +#, c-format msgid "malformed '%top' directive" -msgstr "directiva «%» no reconeguda" +msgstr "directiva «%top» malformada" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "directiva «%» no reconeguda" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" -msgstr "" +msgstr "«|» no emparellat" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "definició del nom incompleta" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opció no reconeguda: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "classe de caràcter incorrecta" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "definició no definida {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "<condició d'activació> incorrecta: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "falta una cometa" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "expressió de la classe de caràcters incorrecta: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "caràcter incorrecte dins de {}" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "falta una }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "EOF trobat dins d'una acció" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "caràcter incorrecte: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "no es pot obrir %s" Binary files differ@@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: flex 2002.3.12a\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 2002-03-27 09:12+0100\n" "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -161,347 +162,347 @@ msgstr "kunne ikke oprette %s" msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "reglen kan ikke matches" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "flaget -s angivet, men standardreglen kan følges" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "-+ kan ikke bruges sammen med flaget -l" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "-f eller -F kan ikke bruges sammen med -l" -#: main.c:224 +#: main.c:238 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "-R eller -Rb kan ikke bruges sammen med -l" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF og -Cm kan ikke bruges sammen" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF og -I kan ikke bruges sammen" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF kan ikke bruges i lex-kompatibilitetstilstand" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf og -CF er gensidigt udelukkende" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "-+ kan ikke bruges sammen med flaget -CF" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "-+ kan ikke bruges sammen med %array" -#: main.c:285 +#: main.c:299 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Flagene -+ og -R er gensidigt udelukkende." -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "kunne ikke oprette %s" -#: main.c:398 +#: main.c:415 #, fuzzy msgid "could not write tables header" msgstr "kunne ikke oprette %s" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "kan ikke åbne skabelonfilen %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "fejl ved læsning af skabelonsfilen %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "fejl ved lukning af skabelonfilen %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "fejl ved oprettelsen af headerfilen %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "fejl ved skrivning af udfilen %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "fejl ved lukning af udfilen %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "fejl ved sletning af udfilen %s" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Ingen sikkerhedskopiering.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d sikkerhedskopierer (ikke-accepterende) tilstande.\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Komprimerete tabeller backer alltid tillbaka.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "fejl ved skrivning af sikkerhedskopifilen %s" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "fejl ved lukning af sikerhedskopifilen %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Statistik over brugaf %s version %s:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " fortolkningsflag: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-tilstand\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-tilstand (%d ord)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d regler\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Ingen sikkerhedskopiering\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d sikkerhedskopierer (ikke-accepterende) tilstande.\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Komprimerede tabeller bakker altid tilbake\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Begyndelse-af-linje-mønster brugt\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startbetingelse\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontilstande, %d dobbelte epsilontilstande\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " ingen tegnklasser\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d tegnklasser behøvede %d/%d ord for gemning, %d genbrugte\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d par med tilstand/næste-tilstand oprettede\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unikke/duplikerede overgange\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d tabelposter\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base/standard-poster oprettede\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max %d) næste/test-poster oprettede\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max %d) skablon-næste/test-poster oprettede\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d tomme tabelposter\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d prototyper oprettede\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d skabloner oprettede, %d formål\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ækvivalensklasser oprettet\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-ækvivalensklasser oprettede\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d gemte) hash-kollisioner, %d DFA'er er ens\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d opsætninger med omallokeringer krævedes\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " %d totale tabelposter kræves\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Intern fejl. flexopts er fejlbehæftede.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "ukendt flag til -C \"%c\"" -#: main.c:1167 +#: main.c:1184 #, fuzzy, c-format msgid "%s %s\n" msgstr "%s version %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "uoprettelig fejl ved analysen" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "kunne ikke oprette sikkerhedskopi af info-fil %s" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "flaget -l for opførsel som AT&T's lex medfører et væsentligt præstationstab\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr " og kan være den egentlige årsag til andre rapporter om dette\n" -#: main.c:1504 +#: main.c:1521 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno medfører en væsentlig præstationstab\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) medfører et mindre præstationstab\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() medfører et mindre præstationstab\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT medfører et væsentligt præstationstab\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regler for variabel efterfølgende kontekst medfører et væsentlig " "præstationstab\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kan ikke bruges sammen med -f eller -F" -#: main.c:1542 +#: main.c:1559 #, fuzzy, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kan ikke bruges sammen med -f eller -F" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "regler for variabel efterfølgende kontekst kan ikke bruges\n" "sammen med -f eller -F" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass er kun meningsfyldt for C++-fortolkere" -#: main.c:1768 +#: main.c:1784 #, fuzzy, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "%s [FLAG...] [fil...]\n" -#: main.c:1771 +#: main.c:1787 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -745,74 +746,74 @@ msgstr "" msgid "negative range in character class" msgstr " ingen tegnklasser\n" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "" -#: scan.l:149 +#: scan.l:150 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "ukendt %-direktiv" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "ukendt %-direktiv" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "ufuldstændig navnedefinition" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "ukendt %%option: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "forkert tegnklasse" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "udefinieret definition {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "forkert <startbetingelse>: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "citationstegn savnes" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "forkert udtryk for tegnklasse: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "forkert tegn imellem {}" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "} savnes" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "filslutning mødt inden i en handling" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "forkert tegn: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "kan ikke åbne %s" Binary files differ@@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 2002-09-11 10:23:07+0200\n" "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n" "Language-Team: German <de@li.org>\n" @@ -158,348 +159,348 @@ msgstr "Konnte ecstbl nicht schreiben" msgid "Could not write yynultrans_tbl" msgstr "Konnte yynultrans_tbl nicht schreiben" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "Regel kann nicht passen" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "»-s«-Option gegeben, aber Vorgabe-Regel kann nicht passen" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "Kann nicht »-+« zusammen mit »-l«-Option verwenden" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "Kann nicht »-f« oder »-F« mit »-l«-Option verwenden" -#: main.c:224 +#: main.c:238 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Kann nicht »-R« oder »-Rb« mit »-l«-Option verwenden" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "»-Cf«/»-CF« und »-Cm« machen zusammen keinen Sinn" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "»-Cf«/»-CF« und »-I« sind inkompatibel" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "»-Cf«/»-CF« sind inkompatibel mit lex-Kompatibilitätsmodus" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "»-Cf« und »-CF« schließen sich gegenseitig aus" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "Kann nicht »-+« zusammen mit »-CF«-Option verwenden" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "»%array« inkompatibel mit »-+«-Option" -#: main.c:285 +#: main.c:299 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Optionen »-+« und »-R« schließen sich gegenseitig aus" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "konnte %s nicht erzeugen" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "konnte Tabellenköpfe nicht schreiben" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "kann Skelett-Datei %s nicht öffnen" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "Eingabefehler beim Lesen der Skelett-Datei %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "Fehler beim Schließen der Skelett-Datei %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "Fehler beim Erstellen der Header-Datei %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "Fehler beim Schreiben der Ausgabe-Datei %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "Fehler beim Schließen der Ausgabe-Datei %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "Fehler beim Löschen der Ausgabe-Datei %s" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Kein Backing-up.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d Zustände mit Backing-up (nicht akzeptierend).\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Komprimierte Tabellen benutzen immer Backing-up.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "Fehler beim Schreiben der Backup-Datei %s" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "Fehler beim Schließen der Backup-Datei %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s Version %s Benutzungsstatistiken:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " Scanner-Optionen: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-Zustände\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-Zustände (%d Wörter)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d Regeln\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Kein Backing-up.\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d Zustände mit Backing-up (nicht akzeptierend).\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Komprimierte Tabellen benutzen immer Backing-up.\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Zeilenanfang-Muster benutzt\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d Startbedingungen\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d Epsilon-Zustände, %d Doppel-Epsilon-Zustände\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " keine Zeichenklassen\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d Zeichenklassen brauchten %d/%d Speicherwörter, %d wiederbenutzt\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d Zustand/Nächster-Zustand-Paare erzeugt\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d einzigartige/doppelte Ãœbergänge\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d Tabelleneinträge\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d Einträge »base-def« erzeugt\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max. %d) Einträge »nxt-chk« erzeugt\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max. %d) Einträge »template nxt-chk« erzeugt\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d leere Tabelleneinträge\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d Protos erzeugt\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d Schablonen erzeugt, %d Benutzungen\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d Äquivalenz-Klassen erzeugt\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d Meta-Äquivalenz-Klassen erzeugt\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d gespeichert) Hash-Kollisionen, %d DFAs gleich\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d Sätze von Neuallozierungen benötigt\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " %d Tabelleneinträge insgesamt benötigt\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Interner Fehler. flexopts sind missgestaltet.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Versuchen Sie es mit »%s --help« für mehr Informationen.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "unbekannte »-C«-Option »%c«" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "fataler Parse-Fehler" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "konnte Datei %s mit Informationen zum Backing-up nicht erzeugen" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l AT&T-lex-Kompatibilitätsmodus führt zu großen Geschwindigkeitseinbußen\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " und ist möglicherweise die wirkliche Quelle anderer gemeldeter Einbußen\n" -#: main.c:1504 +#: main.c:1521 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno führt zu großen Geschwindigkeitseinbußen\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) führt zu kleineren Geschwindigkeitseinbußen\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() führt zu kleineren Geschwindigkeitseinbußen\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT führt zu großen Geschwindigkeitseinbußen\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regeln mit variablem folgenden Kontext führen zu großen " "Geschwindigkeitseinbußen\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kann nicht mit »-f« oder »-F« zusammen verwendet werden" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kann nicht mit REJECT zusammen verwendet werden" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "Regeln mit variablem folgenden Kontext können nicht mit »-f« oder »-F« " "verwendet werden" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass ist nur bei C++-Scannern sinnvoll" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Aufruf: %s [OPTIONEN...] [DATEI...]\n" -#: main.c:1771 +#: main.c:1787 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -748,74 +749,74 @@ msgstr "" msgid "negative range in character class" msgstr "negativer Bereich in Zeichenklasse" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "Eingabezeile zu lang\n" -#: scan.l:149 +#: scan.l:150 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "nicht erkannte '%'-Direktive" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "nicht erkannte '%'-Direktive" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "unvollständige Namensdefinition" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "nicht erkannte %%option: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "ungültige Zeichenklasse" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "undefinierte Definitione {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "ungültige <Startbedingung>: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "fehlendes Anführungszeichen" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "ungültiger Zeichenklassenausdruck: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "ungültiges Zeichen innerhalb von {}" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "fehlende }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "EOF innerhalb einer Aktion angetroffen" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "ungültiges Zeichen: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "kann %s nicht öffnen" Binary files differ@@ -10,7 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU flex 2.5.8\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 2003-01-02 12:06+0100\n" "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n" "Language-Team: Spanish <es@li.org>\n" @@ -191,25 +192,25 @@ msgstr "" # abierta con una cerrada, por ejemplo, pero no cuando se trata de ver # si una regla "matches" o no "matches". # creo que aplicar no qeuda mal ng+ -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "la regla no se puede aplicar" # ## re-redacto el mensaje. sv -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "" "se ha especificado la opción -s pero se puede aplicar la regla por defecto" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "No se puede usar -+ con la opción -l" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "No se pueden usar las opciones -f o -F con la opción -l" -#: main.c:224 +#: main.c:238 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "No se pueden usar las opciones -R o -Rb con la opción -l" @@ -217,7 +218,7 @@ msgstr "No se pueden usar las opciones -R o -Rb con la opción -l" # ¿juntos o juntas? # Creo que está bien así em # ok ng -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF y -Cm no tienen sentido juntos" @@ -226,42 +227,42 @@ msgstr "-Cf/-CF y -Cm no tienen sentido juntos" # entonces lo dejo ng # Yo creo que en este caso no hace falta porque se leería así: # "menos ce efe o menos ce efe mayúscula y menos I son incompatibles". sv -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF e -I son incompatibles" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF son incompatibles con el modo de compatibilidad con lex" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf y -CF son mutuamente excluyentes" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "No se puede usar -+ con la opción -CF" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible con la opción -+" -#: main.c:285 +#: main.c:299 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "-+ y -R son mutuamente excluyentes" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "no se pudo crear %s" -#: main.c:398 +#: main.c:415 #, fuzzy msgid "could not write tables header" msgstr "no se pudo crear %s" @@ -270,7 +271,7 @@ msgstr "no se pudo crear %s" # lo mismo de antes ng # Lo mismo que antes :) em # idem ng+ -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "no se puede abrir el archivo de esquema %s" @@ -291,45 +292,45 @@ msgstr "no se puede abrir el archivo de esquema %s" # que decida una tercera persona # # ## Cambio "leyendo" por "al leer", como en otras traducciones. sv -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "error de entrada al leer el archivo de esquema %s" # Otra vez :) em -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "error al cerrar el archivo de esquema %s" # Lo mismo, archivo de seguridad? em -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "error al crear el archivo de cabecera %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "error al escribir el archivo de salida %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "error al cerrar el archivo de salida %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "error al borrar el archivo de salida %s" # Copia de seguridad? em # Sugerencia: No hay retroceso. sv -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Sin retroceso.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d estados de retroceso (no-aceptación).\n" @@ -339,12 +340,12 @@ msgstr "%d estados de retroceso (no-aceptación).\n" # "Compressed tables are always back up" # (supuesto que back es irregular y su pasado/participio es back y no backed, # que ahora mismo no me acuerdo). sv -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Las tablas comprimidas siempre implican un retraso.\n" # Lo mismo, archivo de seguridad? em -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "error al escribir el archivo de seguridad %s" @@ -352,45 +353,45 @@ msgstr "error al escribir el archivo de seguridad %s" # En todas las traducciones que ha aparecido # he sugerido el uso de copia de seguridad em # ok ng -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "error al cerrar el archivo de copia de seguridad %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versión %s estadísticas de uso:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " opciones del analizador: -" # NFA significa non-deterministic finite automata, así que lo he traducido # por AFN -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estados AFN\n" # DFA significa deterministic finite autómata, lo he traducido por AFD -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estados AFD {%d palabras}\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d reglas\n" # Otra vez ;) em # modificado como en la anterior ng -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Sin retroceso\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d estados de retroceso (no-aceptación)\n" @@ -398,16 +399,16 @@ msgstr " %d estados de retroceso (no-aceptación)\n" # FIXME. # Informar al autor de que esta frase es casi idéntica a una anterior, para # que sólo haya que traducirla una vez. sv -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Siempre se realiza copia de seguridad de las tablas comprimidas\n" # Lo mismo "se han usado patrones de comienzo de línea". sv -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Usados patrones de comienzo-de-línea\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condiciones de activación\n" @@ -420,16 +421,16 @@ msgstr " %d/%d condiciones de activación\n" # lo de doble épsilon no lo he oído nunca. Creo que hay que dejar el término # técnico. ng # Tu mandas, no tengo nada que decir a eso em -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estados épsilon, %d estados doble épsilon\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " sin clases de caracteres\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" @@ -440,13 +441,13 @@ msgstr "" # ¿Qué tal " se han creado %d pares estado/estado-siguiente"? # Bueno, mejor no lo hagas hasta que no se sepa cómo queda al lado # de las otras. sv -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d pares estado/estado-siguiente creados\n" # ## Añado sendas eses, ya que son transiciones. sv -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transiciones únicas/duplicadas\n" @@ -455,50 +456,50 @@ msgstr " %d/%d transiciones únicas/duplicadas\n" # sí, mejor ng # ¿Que había antes? (¿entradas a la tabla?) # (entradas *de* la tabla me suena mejor) sv. -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d entradas en la tabla\n" # ## pongo `comillas' en el base-def. sv -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entradas `base-def' creadas\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas nxt-chk creadas\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas de plantilla nxt-chk creadas\n" # ¿entradas a la tabla o entradas de la tabla? sv -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d entradas en la tabla vacías\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d prototipos creados\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d plantillas creadas, %d usos\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d clases de equivalencia creadas\n" # "se han creado..." sv -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d clases de metaequivalencia creadas\n" @@ -516,39 +517,39 @@ msgstr " %d/%d clases de metaequivalencia creadas\n" # un lugar que se puede determinar mediante una transformación directa de su # clave, por eso si hay dos claves iguales hay una colisión, porque dos # registros van al mismo sitio ng+ -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" " %d (%d almacenadas) colisiones de localización ('hash'), %d AFDs iguales\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " se necesitan %d conjuntos de relocalización\n" # Lo mismo que en otro sitio: ¿table entries son entradas a la tabla o # de la tabla? sv -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " se necesitan %d entradas totales en la tabla\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Error interno. flexopts mal formadas.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "opción -C desconocida '%c'" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" @@ -565,7 +566,7 @@ msgstr "%s %s\n" # Sugerencia: error fatal. sv # con comillas es un término medio. Lo de error grave fue una sugerencia # de Enrique, y croe que queda mejor. ng+ -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "error muy grave en el analizador sintáctico" @@ -588,26 +589,26 @@ msgstr "error muy grave en el analizador sintáctico" # ## # ## Eso no es válido ( solución, usa emacs po-mode :) ) em # ## ok, ya estoy instalando linux otra vez ng+ -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "" "no se pudo crear el archivo de información de las reglas\n" "que producen un retroceso del analizador %s" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l la opción de compatibilidad con AT&T lex implica una penalización del\n" "rendimiento muy alta\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " y puede ser el origen real de otras penalizaciones del rendimiento " "notificadas\n" -#: main.c:1504 +#: main.c:1521 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -615,49 +616,49 @@ msgid "" msgstr "" "la %%opción yylineno implica una penalización del rendimiento muy alta\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactivo) implica una pequeña penalización del rendimiento\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() implica un pequeña penalización del rendimiento\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT implica una penalización del rendimiento muy alta\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "La existencia de reglas de contexto posterior variable implica una\n" "penalización del rendimiento muy alta\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT no se puede usar con -f o -F" -#: main.c:1542 +#: main.c:1559 #, fuzzy, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "la %opción yylineno no se puede usar con -f o -F" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "las reglas de contexto posterior variable no se pueden usar con -f o -F" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "la %option yyclass sólo tiene sentido para los analizadores en C++" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uso: %s [OPCIONES] [FICHERO]...\n" -#: main.c:1771 +#: main.c:1787 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -916,49 +917,49 @@ msgstr "" msgid "negative range in character class" msgstr "rango negativo en clase caracteres" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "" -#: scan.l:149 +#: scan.l:150 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "directiva '%' no reconocida" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "directiva '%' no reconocida" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "definición de nombre incompleta" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opción no reconocida: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "clase de caracteres incorrecta" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "definición no definida {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "<condición de activación> incorrecta: %s" # Sugerencia: falta una comilla. sv -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "falta comilla" @@ -966,30 +967,30 @@ msgstr "falta comilla" # incorrecta la expresión ... em # ok, de traducir al final ocurre que acabas hablando al revés, # como en inglés ng -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "expresión de la clase de caracteres incorrecta: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "carácter incorrecto dentro de {}'s" # Sugerencia: "falta una }". sv -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "falta }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "Fin de archivo (EOF) encontrado dentro de una acción" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "carácter incorrecto: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "no se puede abrir %s" diff --git a/po/flex.pot b/po/flex.pot index 063354d..6213b15 100644 --- a/po/flex.pot +++ b/po/flex.pot @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -143,339 +144,339 @@ msgstr "" msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "" -#: main.c:224 +#: main.c:238 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "" -#: main.c:285 +#: main.c:299 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr "" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr "" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr "" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr "" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr "" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr "" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr "" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr "" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr "" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr "" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr "" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr "" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr "" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr "" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr "" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr "" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr "" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr "" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr "" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr "" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr "" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr "" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" -#: main.c:1504 +#: main.c:1521 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "" -#: main.c:1771 +#: main.c:1787 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -658,74 +659,74 @@ msgstr "" msgid "negative range in character class" msgstr "" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "" -#: scan.l:149 +#: scan.l:150 #, c-format msgid "malformed '%top' directive" msgstr "" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "" Binary files differ@@ -1,19 +1,22 @@ # Messages français pour Flex. -# Copyright © 1996 Free Software Foundation, Inc. -# Dominique Boucher <boucherd@IRO.UMontreal.CA>, 1996. -# Marc Baudoin <babafou@ensta.fr>, 1996, traducteur jusqu'en mars 2002 +# Copyright © 2004 Free Software Foundation, Inc. # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996, depuis mars 2002 pour flex. # +# Marc Baudoin <babafou@ensta.fr>, 1996, traducteur jusqu'en mars 2002 +# Dominique Boucher <boucherd@IRO.UMontreal.CA>, 1996. +# msgid "" msgstr "" -"Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" -"PO-Revision-Date: 2002-09-06 08:00-0500\n" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2004-05-10 08:00-0500\n" "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n" "Language-Team: French <traduc@traduc.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: dfa.c:61 #, c-format @@ -100,13 +103,12 @@ msgid "state # %d accepts: " msgstr "l'état n° %d accepte : " #: gen.c:1163 -#, fuzzy msgid "Could not write yyacclist_tbl" -msgstr "ne peut écrire yyac_tbl" +msgstr "Ne peut écrire yyacclist_tbl" #: gen.c:1239 msgid "Could not write yyacc_tbl" -msgstr "ne peut écrire yyac_tbl" +msgstr "ne peut écrire yyacc_tbl" #: gen.c:1254 gen.c:1639 gen.c:1662 msgid "Could not write ecstbl" @@ -147,364 +149,364 @@ msgid "Could not write ftbl" msgstr "ne peut écrire ftbl" #: gen.c:1630 -#, fuzzy msgid "Could not write ssltbl" -msgstr "ne peut écrire ecstbl" +msgstr "Ne peut écrire ssltbl" #: gen.c:1681 -#, fuzzy msgid "Could not write eoltbl" -msgstr "ne peut écrire ecstbl" +msgstr "Ne peut écrire eoltbl" #: gen.c:1741 msgid "Could not write yynultrans_tbl" msgstr "ne peut écrire yynultrnas_tbl" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "la règle ne peut être pairée" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "l'option -s est donnée mais la règle par défaut peut être reconnue" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "L'option -+ ne peut être combinée à -l" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "Les options -f et -F ne peuvent être combinées à -l" -#: main.c:224 -#, fuzzy +#: main.c:238 msgid "Can't use --reentrant or --bison-bridge with -l option" -msgstr "Les options -R ou -Rb ne peuvent être combinées à -l" +msgstr "" +"Les options --reentrant ou --bison-bridge ne peuvent être combinées à " +"l'option -l" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF et -Cm ne peuvent être spécifiés ensemble" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF et -I sont incompatibles" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" "l'option -Cf/-CF n'est pas compatible avec le mode de compatibilité « lex »" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf et -CF sont mutuellement exclusifs" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "L'option -+ ne peut être combinée à -CF" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible avec l'option -+" -#: main.c:285 -#, fuzzy +#: main.c:299 msgid "Options -+ and --reentrant are mutually exclusive." -msgstr "Les options +- et -R sont mutuellement exclusives" +msgstr "Les options +- et --reentrant sont mutuellement exclusives." -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." -msgstr "" +msgstr "bridge bison n'est pas supporté pour l'analyseur C++" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "impossible de créer %s" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "ne peut écrire les tables d'en-tête" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "impossible d'ouvrir le fichier canevas %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "erreur lors de la lecture du fichier canevas %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "erreur lors de la fermeture du fichier canevas %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "erreur de création du fichier d'en-tête %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "erreur lors de l'écriture du fichier de sortie %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "erreur lors de la fermeture du fichier de sortie %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "erreur lors de l'effacement du fichier de sortie %s" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Pas de retour-arrière.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d états avec retour arrière (non-acceptants).\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Les tables comprimées font toujours des retours-arrière.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "erreur lors de l'écriture du fichier de sauvegarde %s" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "erreur lors de la fermeture du fichier de sauvegarde %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "« %s » version %s, statistiques d'utilisation :\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " options de l'analyseur lexical : -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d états NFA\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d états AFD (%d mots)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d règles\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Pas de retour arrière\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d états avec retour arrière (si non-acceptants)\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Les tables comprimées font toujours des retours arrière\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Modèles utilisés en début de ligne\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d conditions de départ\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d états epsilon, %d états double epsilon\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " pas de classes de caractères\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d classes de caractères requises %d/%d mots-mémoire, %d recyclés\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d paires state/nextstate produites\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transitions uniques/dupliquées\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d entrées dans la table\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entrées base-def produites\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max %d) entrées nxt-chk produites\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max %d) entrées de modèle nxt-chk produites\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d entrées vides dans la table\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d prototypes produits\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modèles produits, %d usages\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes d'équivalence produites\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de méta-équivalence produites\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d sauvés) collisions durant dispersion, %d AFD égaux\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d ensembles de réallocations requis\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " %d entrées requises dans la table, au total\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Erreur interne. Les options « flexopts » sont mal composées.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayer « %s --help » pour plus d'informations.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "l'option -C « %c » inconnue" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "erreur de lecture fatale" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "" "impossible de créer le fichier d'information sur les retours-arrière %s" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "L'option -l de compatibilité avec le « lex » d'AT&T entraîne une importante\n" "perte de performance\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr " et peuvent être cause d'autres vices de performance observés\n" -#: main.c:1504 -#, fuzzy, c-format +#: main.c:1521 +#, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -msgstr "%%option yylineno entraîne une importante perte de performance\n" +msgstr "" +"%%option yylineno entraîne une importante perte de performance SEULEMENT\n" +"sur les règles pouvant concorder avec le caractère de retour de chartiot\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" -msgstr "l'option -I (interactif) entraîne une légère perte de performance\n" +msgstr "l'option -I (interactif) entraîne une faible perte de performance\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" -msgstr "yymore() entraîne une petite baisse de performance\n" +msgstr "yymore() entraîne une faible baisse de performance\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entraîne une importante baisse de performance\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Les règles de contexte traîné variable entraînent une importante baisse de\n" "performance\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ne peut pas être utilisé avec -f ou -F" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ne peut être utilisé avec REJECT" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "les règles de contexte traîné variable ne peuvent pas être utilisées avec\n" "-f ou -F" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass n'a de sens qu'avec les analyseurs C++" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Usage: %s [OPTIONS] [fichier]...\n" -#: main.c:1771 -#, fuzzy, c-format +#: main.c:1787 +#, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -568,8 +570,8 @@ msgid "" " -h, --help produce this help message\n" " -V, --version report %s version\n" msgstr "" -"Produit des programmes qui sont capables de traiter la concordance de " -"patrons sur du texte.\n" +"Génération de programmes capables de traiter la concordance de patrons sur " +"du texte.\n" "\n" "Compression de table:\n" " -Ca, --align négocier les grandes tables pour un meilleur alignement " @@ -588,22 +590,23 @@ msgstr "" " -Cem compression par défaut (identique à --ecs --meta-ecs)\n" "\n" "Mise au point (mode débug):\n" -" -d, --debug permettre le mode débug du scanner\n" -" -b, --backup archiver les informations vers %s\n" -" -p, --perf-report produire un rapport de performance sur stderr\n" -" -s, --nodefault supprimer les règles par défaut pour\n" -" le texte non concordant par ECHO\n" -" -T, --trace %s devrait s'exécuter en mode trace\n" -" -w, --nowarn ne pas générer d'avertissements\n" -" -v, --verbose produire des statistiques sommaires du scanner sur " -"stdout\n" +" -d, --debug permettre le mode débug du scanner\n" +" -b, --backup archiver les informations vers %s\n" +" -p, --perf-report produire un rapport de performance sur stderr\n" +" -s, --nodefault supprimer les règles par défaut pour\n" +" le texte non concordant par ECHO\n" +" -T, --trace %s devrait s'exécuter en mode trace\n" +" -w, --nowarn ne pas générer d'avertissements\n" +" -v, --verbose produire des statistiques sommaires du scanner " +"sur stdout\n" "\n" "Fichiers:\n" -" -o, --outfile=FICHIER spécifier un nom de fichier de sortie\n" -" -S, --skel=FICHIER spécifier le fichier du squelette\n" -" -t, --stdout produire le scanner sur stdout au lieu de %s\n" -" --yyclass=NOM nom de la classe C++\n" -" --header-file=FICHIER créer le fichier d'en-tête C en plus du scanner\n" +" -o, --outfile=FICHIER spécifier un nom de fichier de sortie\n" +" -S, --skel=FICHIER spécifier le fichier du squelette\n" +" -t, --stdout produire le scanner sur stdout au lieu de %s\n" +" --yyclass=NOM nom de la classe C++\n" +" --header-file=FICHIER créer le fichier d'en-tête C en plus du " +"scanner\n" " --tables-file[=FICHIER] écrire les tables dans le FICHIER\n" "\n" "Comportement du scanner:\n" @@ -626,8 +629,8 @@ msgstr "" " -P, --prefix=CHAÎNE utiliser la CHAÎNE comme préfixe au lieu de \"yy" "\"\n" " -R, --reentrant générer un scanner C en code réentrant\n" -" -Rb, --reentrant-bison scanner réentrant pure pour un analyseur bison " -"pure.\n" +" --bison-bridge scanner pour l'analyseur pur bison\n" +" --bison-locations inclure le support de yylloc.\n" " --stdinit initialiser yyin/yyout à stdin/stdout\n" " --nounistd ne pas inclure <unistd.h>\n" " --noFONCTION ne pas générer une FONCTION particulière\n" @@ -755,79 +758,81 @@ msgstr "valeur d'itération doit être positive" #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" +"l'étendue de caractères [%c-%c] est ambiguë pour un scanner insensible à la " +"casse" #: parse.y:832 msgid "negative range in character class" msgstr "plage négative dans la classe de caractères" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "ligne d'entrée trop longue\n" -#: scan.l:149 -#, fuzzy, c-format +#: scan.l:150 +#, c-format msgid "malformed '%top' directive" -msgstr "directive « % » inconnue" +msgstr "directive « %top » mal composée" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "directive « % » inconnue" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" -msgstr "" +msgstr "« { » non pairé" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "définition de nom incomplète" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "%%option non-reconnue : %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "mauvaise classe de caractères" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "définition {%s} non-définie" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "mauvaise <condition de départ> : %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "guillemet manquant" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "mauvaise expression de classe de caractères : %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "mauvais caractère entre accolades « {} »" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "« } » non-apparié" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "Fin de fichier rencontrée à l'intérieur d'une action" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "mauvais caractère : %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "impossible d'ouvrir %s" diff --git a/po/ga.gmo b/po/ga.gmo Binary files differnew file mode 100644 index 0000000..df5a87f --- /dev/null +++ b/po/ga.gmo diff --git a/po/ga.po b/po/ga.po new file mode 100644 index 0000000..928eaf0 --- /dev/null +++ b/po/ga.po @@ -0,0 +1,879 @@ +# Irish translations for flex. +# Copyright (C) 2003 Free Software Foundation, Inc. +# Kevin Patrick Scannell <scannell@SLU.EDU>, 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2003-11-06 13:09-0500\n" +"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n" +"Language-Team: Irish <ga@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: dfa.c:61 +#, c-format +msgid "State #%d is non-accepting -\n" +msgstr "Níl an staid #%d ina staid ghlactha -\n" + +#: dfa.c:124 +msgid "dangerous trailing context" +msgstr "comhthéacs sraoilleach baolach" + +#: dfa.c:166 +msgid " associated rule line numbers:" +msgstr " líne-uimhreacha de na rialacha bainteacha:" + +#: dfa.c:202 +msgid " out-transitions: " +msgstr " athruithe amach: " + +# weak, I know -- KPS +#: dfa.c:210 +msgid "" +"\n" +" jam-transitions: EOF " +msgstr "" +"\n" +" athruithe plúchta: EOF " + +#: dfa.c:341 +msgid "consistency check failed in epsclosure()" +msgstr "teipeadh agus ag seiceáil chomhionannais i epsclosure()" + +#: dfa.c:429 +msgid "" +"\n" +"\n" +"DFA Dump:\n" +"\n" +msgstr "" +"\n" +"\n" +"Dumpáil DFA:\n" +"\n" + +#: dfa.c:604 +msgid "could not create unique end-of-buffer state" +msgstr "níorbh fhéidir staid shainiúil a chruthú ag deireadh maoláin" + +#: dfa.c:625 +#, c-format +msgid "state # %d:\n" +msgstr "staid # %d:\n" + +#: dfa.c:800 +msgid "Could not write yynxt_tbl[][]" +msgstr "Níorbh fhéidir yynxt_tbl[][] a scríobh" + +#: dfa.c:1023 +msgid "consistency check failed in symfollowset" +msgstr "teipeadh agus ag seiceáil chomhionannais i symfollowset" + +#: dfa.c:1071 +msgid "bad transition character detected in sympartition()" +msgstr "carachtar trasdula neamhbhailí i sympartition()" + +#: gen.c:484 +msgid "" +"\n" +"\n" +"Equivalence Classes:\n" +"\n" +msgstr "" +"\n" +"\n" +"Aicmí Coibhéise:\n" +"\n" + +#: gen.c:668 gen.c:697 gen.c:1221 +#, c-format +msgid "state # %d accepts: [%d]\n" +msgstr "glacann staid # %d le: [%d]\n" + +#: gen.c:1116 +#, c-format +msgid "state # %d accepts: " +msgstr "glacann staid # %d le: " + +#: gen.c:1163 +msgid "Could not write yyacclist_tbl" +msgstr "Níorbh fhéidir yyacclist_tbl a scríobh" + +#: gen.c:1239 +msgid "Could not write yyacc_tbl" +msgstr "Níorbh fhéidir yyacc_tbl a scríobh" + +#: gen.c:1254 gen.c:1639 gen.c:1662 +msgid "Could not write ecstbl" +msgstr "Níorbh fhéidir ecstbl a scríobh" + +#: gen.c:1277 +msgid "" +"\n" +"\n" +"Meta-Equivalence Classes:\n" +msgstr "" +"\n" +"\n" +"Aicmí Meiteachoibhéise:\n" + +#: gen.c:1299 +msgid "Could not write yymeta_tbl" +msgstr "Níorbh fhéidir yymeta_tbl a scríobh" + +#: gen.c:1360 +msgid "Could not write yybase_tbl" +msgstr "Níorbh fhéidir yybase_tbl a scríobh" + +#: gen.c:1394 +msgid "Could not write yydef_tbl" +msgstr "Níorbh fhéidir yydef_tbl a scríobh" + +#: gen.c:1434 +msgid "Could not write yynxt_tbl" +msgstr "Níorbh fhéidir yynxt_tbl a scríobh" + +#: gen.c:1470 +msgid "Could not write yychk_tbl" +msgstr "Níorbh fhéidir yychk_tbl a scríobh" + +#: gen.c:1624 gen.c:1653 +msgid "Could not write ftbl" +msgstr "Níorbh fhéidir ftbl a scríobh" + +#: gen.c:1630 +msgid "Could not write ssltbl" +msgstr "Níorbh fhéidir ssltbl a scríobh" + +#: gen.c:1681 +msgid "Could not write eoltbl" +msgstr "Níorbh fhéidir eoltbl a scríobh" + +#: gen.c:1741 +msgid "Could not write yynultrans_tbl" +msgstr "Níorbh fhéidir yynultrans_tbl a scríobh" + +#: main.c:187 +msgid "rule cannot be matched" +msgstr "Ní féidir riail chomhoiriúnach a aimsiú" + +#: main.c:192 +msgid "-s option given but default rule can be matched" +msgstr "" +"bhí an rogha -s tugtha ach is féidir an riail loicthe a chur i " +"gcomhoiriúnacht" + +#: main.c:231 +msgid "Can't use -+ with -l option" +msgstr "Níl -+ ar fáil in éineacht leis an rogha -l" + +#: main.c:234 +msgid "Can't use -f or -F with -l option" +msgstr "Níl -f nó -F ar fáil in éineacht leis an rogha -l" + +#: main.c:238 +msgid "Can't use --reentrant or --bison-bridge with -l option" +msgstr "Níl --reentrant nó --bison-bridge ar fáil in éineacht leis an rogha -l" + +#: main.c:275 +msgid "-Cf/-CF and -Cm don't make sense together" +msgstr "Níl -Cf/-CF agus -Cm comhoiriúnach" + +#: main.c:278 +msgid "-Cf/-CF and -I are incompatible" +msgstr "Níl -Cf/-CF agus -I comhoiriúnach" + +#: main.c:282 +msgid "-Cf/-CF are incompatible with lex-compatibility mode" +msgstr "Níl -Cf/-CF ar fáil sa mhodh chomhoiriúnachta lex" + +#: main.c:287 +msgid "-Cf and -CF are mutually exclusive" +msgstr "Is comheisiatach iad na roghanna -Cf agus -CF" + +#: main.c:291 +msgid "Can't use -+ with -CF option" +msgstr "Níl -+ ar fáil in éineacht leis an rogha -CF" + +#: main.c:294 +#, c-format +msgid "%array incompatible with -+ option" +msgstr "níl %array comhoiriúnach leis an rogha -+" + +#: main.c:299 +msgid "Options -+ and --reentrant are mutually exclusive." +msgstr "Is comheisiatach iad na roghanna -+ agus --reentrant" + +#: main.c:302 +msgid "bison bridge not supported for the C++ scanner." +msgstr "níl bison bridge ar fáil don scanóir C++." + +#: main.c:354 main.c:402 +#, c-format +msgid "could not create %s" +msgstr "níorbh fhéidir %s a chruthú" + +#: main.c:415 +msgid "could not write tables header" +msgstr "níorbh fhéidir ceanntásc táblaí a scríobh" + +#: main.c:419 +#, c-format +msgid "can't open skeleton file %s" +msgstr "ní féidir creatchomhad %s a oscailt" + +#: main.c:500 +#, c-format +msgid "input error reading skeleton file %s" +msgstr "earráid agus ag léamh creatchomhaid %s" + +#: main.c:504 +#, c-format +msgid "error closing skeleton file %s" +msgstr "earráid agus ag dúnadh creatchomhaid %s" + +#: main.c:688 +#, c-format +msgid "error creating header file %s" +msgstr "earráid agus ag cruthú comhad ceanntáisc %s" + +#: main.c:696 +#, c-format +msgid "error writing output file %s" +msgstr "earráid agus ag scríobh aschomhaid %s" + +#: main.c:700 +#, c-format +msgid "error closing output file %s" +msgstr "earráid agus ag dúnadh aschomhad %s" + +#: main.c:704 +#, c-format +msgid "error deleting output file %s" +msgstr "earráid agus ag scriosadh aschomhaid %s" + +#: main.c:711 +msgid "No backing up.\n" +msgstr "Ná cúlaítear.\n" + +#: main.c:715 +#, c-format +msgid "%d backing up (non-accepting) states.\n" +msgstr "%d staid chúlaithe (níl ina staid ghlactha).\n" + +#: main.c:719 +msgid "Compressed tables always back up.\n" +msgstr "Cúlaíonn táblaí comhdhlúite i gcónaí.\n" + +#: main.c:722 +#, c-format +msgid "error writing backup file %s" +msgstr "earráid agus ag scríobh an chomhaid chúlaithe %s" + +#: main.c:726 +#, c-format +msgid "error closing backup file %s" +msgstr "earráid agus ag dúnadh an chomhaid chúlaithe %s" + +#: main.c:731 +#, c-format +msgid "%s version %s usage statistics:\n" +msgstr "%s leagan %s staitistic d'úsáid:\n" + +# fr uses "lexical analyzer"; scanóir seems fine though --KPS +#: main.c:734 +msgid " scanner options: -" +msgstr " roghanna don scanóir: -" + +#: main.c:813 +#, c-format +msgid " %d/%d NFA states\n" +msgstr " %d/%d staid NFA\n" + +#: main.c:815 +#, c-format +msgid " %d/%d DFA states (%d words)\n" +msgstr " %d/%d staid DFA (%d focal)\n" + +#: main.c:817 +#, c-format +msgid " %d rules\n" +msgstr " %d riail\n" + +#: main.c:822 +msgid " No backing up\n" +msgstr " Ná cúlaítear\n" + +#: main.c:826 +#, c-format +msgid " %d backing-up (non-accepting) states\n" +msgstr " %d staid chúlaithe (níl ina staid ghlactha)\n" + +#: main.c:831 +msgid " Compressed tables always back-up\n" +msgstr " Cúlaíonn táblaí comhdhlúite i gcónaí\n" + +#: main.c:835 +msgid " Beginning-of-line patterns used\n" +msgstr " Patrúin úsáidte ag ceann líne\n" + +#: main.c:837 +#, c-format +msgid " %d/%d start conditions\n" +msgstr " %d/%d coinníoll tosaigh\n" + +#: main.c:841 +#, c-format +msgid " %d epsilon states, %d double epsilon states\n" +msgstr " %d staid eipsealóin, %d staid eipsealóin dúbailte\n" + +#: main.c:845 +msgid " no character classes\n" +msgstr " níl aon aicme charachtair\n" + +#: main.c:849 +#, c-format +msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" +msgstr "" +" tá gá le %d/%d aicme charachtair %d/%d focal stórála, %d athúsáidte\n" + +#: main.c:854 +#, c-format +msgid " %d state/nextstate pairs created\n" +msgstr " %d péire state/nextstate\n" + +#: main.c:857 +#, c-format +msgid " %d/%d unique/duplicate transitions\n" +msgstr " %d/%d athrú sainiúil/dúblach\n" + +#: main.c:862 +#, c-format +msgid " %d table entries\n" +msgstr " %d iontráil sa tábla\n" + +#: main.c:870 +#, c-format +msgid " %d/%d base-def entries created\n" +msgstr " %d/%d iontráil base-def\n" + +#: main.c:874 +#, c-format +msgid " %d/%d (peak %d) nxt-chk entries created\n" +msgstr " %d/%d (buaic %d) iontráil nxt-chk\n" + +#: main.c:878 +#, c-format +msgid " %d/%d (peak %d) template nxt-chk entries created\n" +msgstr " %d/%d (buaic %d) iontráil teimpléid nxt-chk\n" + +#: main.c:882 +#, c-format +msgid " %d empty table entries\n" +msgstr " %d iontráil tábla folamh\n" + +#: main.c:884 +#, c-format +msgid " %d protos created\n" +msgstr " %d fréamhshamhail\n" + +#: main.c:887 +#, c-format +msgid " %d templates created, %d uses\n" +msgstr " %d teimpléad, %d i bhfeidhm\n" + +#: main.c:895 +#, c-format +msgid " %d/%d equivalence classes created\n" +msgstr " %d/%d aicme coibhéise\n" + +#: main.c:903 +#, c-format +msgid " %d/%d meta-equivalence classes created\n" +msgstr " %d/%d aicme meiteachoibhéise\n" + +#: main.c:909 +#, c-format +msgid " %d (%d saved) hash collisions, %d DFAs equal\n" +msgstr " %d (%d sábháilte) tuairt haiseála, %d DFA comhionann le chéile\n" + +#: main.c:911 +#, c-format +msgid " %d sets of reallocations needed\n" +msgstr " tá gá le %d sraith athdháilte\n" + +#: main.c:913 +#, c-format +msgid " %d total table entries needed\n" +msgstr " tá gá le %d iontráil tábla ar fad\n" + +#: main.c:988 +msgid "Internal error. flexopts are malformed.\n" +msgstr "Earráid inmheánach (flexopts míchumtha).\n" + +#: main.c:998 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n" + +#: main.c:1055 +#, c-format +msgid "unknown -C option '%c'" +msgstr "rogha -C anaithnid '%c'" + +#: main.c:1184 +#, c-format +msgid "%s %s\n" +msgstr "%s %s\n" + +#: main.c:1459 +msgid "fatal parse error" +msgstr "earráid pharsála mharfach" + +#: main.c:1491 +#, c-format +msgid "could not create backing-up info file %s" +msgstr "níorbh fhéidir comhad %s a chruthú don eolas faoin chúlú" + +#: main.c:1512 +msgid "-l AT&T lex compatibility option entails a large performance penalty\n" +msgstr "is cúis le moilliú mór an rogha -l (comhoiriúnacht le AT&T lex)\n" + +#: main.c:1515 +msgid " and may be the actual source of other reported performance penalties\n" +msgstr " agus is féidir gur cúis é le fadhbanna luais eile é\n" + +#: main.c:1521 +#, c-format +msgid "" +"%%option yylineno entails a performance penalty ONLY on rules that can match " +"newline characters\n" +msgstr "" +"is cúis le moilliú mór an %%rogha yylineno, MÁ tá rialacha ann le línte nua " +"iontu\n" + +#: main.c:1528 +msgid "-I (interactive) entails a minor performance penalty\n" +msgstr "is cúis le moilliú beag an rogha -I (idirghníomhach)\n" + +#: main.c:1533 +msgid "yymore() entails a minor performance penalty\n" +msgstr "is cúis le moilliú beag an fheidhm yymore()\n" + +#: main.c:1539 +msgid "REJECT entails a large performance penalty\n" +msgstr "is REJECT cúis le moilliú mór\n" + +#: main.c:1544 +msgid "Variable trailing context rules entail a large performance penalty\n" +msgstr "" +"is cúis le moilliú na rialacha maidir le comhthéacs sraoilleach " +"athraitheach\n" + +#: main.c:1556 +msgid "REJECT cannot be used with -f or -F" +msgstr "Níl REJECT ar fáil leis na roghanna -f nó -F" + +#: main.c:1559 +#, c-format +msgid "%option yylineno cannot be used with REJECT" +msgstr "níl %option yylineno ar fáil le REJECT" + +#: main.c:1562 +msgid "variable trailing context rules cannot be used with -f or -F" +msgstr "" +"níl rialacha maidir le comhthéacs sraoilleach athraitheach ar fáil le -f nó -" +"F" + +#: main.c:1677 +#, c-format +msgid "%option yyclass only meaningful for C++ scanners" +msgstr "tá an %option yyclass gan bhrí ach amháin le scanóirí C++" + +#: main.c:1784 +#, c-format +msgid "Usage: %s [OPTIONS] [FILE]...\n" +msgstr "Úsáid: %s [ROGHANNA] [COMHAD]...\n" + +#: main.c:1787 +#, c-format +msgid "" +"Generates programs that perform pattern-matching on text.\n" +"\n" +"Table Compression:\n" +" -Ca, --align trade off larger tables for better memory alignment\n" +" -Ce, --ecs construct equivalence classes\n" +" -Cf do not compress tables; use -f representation\n" +" -CF do not compress tables; use -F representation\n" +" -Cm, --meta-ecs construct meta-equivalence classes\n" +" -Cr, --read use read() instead of stdio for scanner input\n" +" -f, --full generate fast, large scanner. Same as -Cfr\n" +" -F, --fast use alternate table representation. Same as -CFr\n" +" -Cem default compression (same as --ecs --meta-ecs)\n" +"\n" +"Debugging:\n" +" -d, --debug enable debug mode in scanner\n" +" -b, --backup write backing-up information to %s\n" +" -p, --perf-report write performance report to stderr\n" +" -s, --nodefault suppress default rule to ECHO unmatched text\n" +" -T, --trace %s should run in trace mode\n" +" -w, --nowarn do not generate warnings\n" +" -v, --verbose write summary of scanner statistics to stdout\n" +"\n" +"Files:\n" +" -o, --outfile=FILE specify output filename\n" +" -S, --skel=FILE specify skeleton file\n" +" -t, --stdout write scanner on stdout instead of %s\n" +" --yyclass=NAME name of C++ class\n" +" --header-file=FILE create a C header file in addition to the " +"scanner\n" +" --tables-file[=FILE] write tables to FILE\n" +"\n" +"Scanner behavior:\n" +" -7, --7bit generate 7-bit scanner\n" +" -8, --8bit generate 8-bit scanner\n" +" -B, --batch generate batch scanner (opposite of -I)\n" +" -i, --case-insensitive ignore case in patterns\n" +" -l, --lex-compat maximal compatibility with original lex\n" +" -X, --posix-compat maximal compatibility with POSIX lex\n" +" -I, --interactive generate interactive scanner (opposite of -B)\n" +" --yylineno track line count in yylineno\n" +"\n" +"Generated code:\n" +" -+, --c++ generate C++ scanner class\n" +" -Dmacro[=defn] #define macro defn (default defn is '1')\n" +" -L, --noline suppress #line directives in scanner\n" +" -P, --prefix=STRING use STRING as prefix instead of \"yy\"\n" +" -R, --reentrant generate a reentrant C scanner\n" +" --bison-bridge scanner for bison pure parser.\n" +" --bison-locations include yylloc support.\n" +" --stdinit initialize yyin/yyout to stdin/stdout\n" +" --noansi-definitions old-style function definitions\n" +" --noansi-prototypes empty parameter list in prototypes\n" +" --nounistd do not include <unistd.h>\n" +" --noFUNCTION do not generate a particular FUNCTION\n" +"\n" +"Miscellaneous:\n" +" -c do-nothing POSIX option\n" +" -n do-nothing POSIX option\n" +" -?\n" +" -h, --help produce this help message\n" +" -V, --version report %s version\n" +msgstr "" +"Gineann an clár seo cláir eile le haghaidh chomhoiriúnú de phatrúin.\n" +"\n" +"Comhfháscadh táblaí:\n" +" -Ca, --align malartaigh táblaí níos mó d'ailíniú cuimhne níos fearr\n" +" -Ce, --ecs déan aicmí coibhéise\n" +" -Cf ná comhfháisc táblaí; bain úsáid as léiriú -f\n" +" -CF ná comhfháisc táblaí; bain úsáid as léiriú -F\n" +" -Cm, --meta-ecs déan aicmí meiteachoibhéise\n" +" -Cr, --read bain úsáid as read() in ionad stdio d'ionchur\n" +" -f, --full tóg scanóir atá mear agus mór; ar chomhbhrí le -Cfr\n" +" -F, --fast úsáid léiriú táblaí tánaisteach; ar chomhbhrí le -CFr\n" +" -Cem comhfháscadh loicthe (ar chomhbhrí le --ecs --meta-ecs)\n" +"\n" +"Dífhabhtú:\n" +" -d, --debug cuir dífhabhtú ar obair\n" +" -b, --backup scríobh eolas faoin chúlú chuig %s\n" +" -p, --perf-report scríobh tuairisc fheidhmithe chuig stderr\n" +" -s, --nodefault ná déan macalla de théacs neamh-chomhoiriúnach\n" +" -T, --trace ba chóir do %s a rith i modh loirg\n" +" -w, --nowarn ná taispeáin rabhaidh\n" +" -v, --verbose taispeáin achoimre ar staitistic scanóra chuig " +"stdout\n" +"\n" +"Comhaid:\n" +" -o, --outfile=COMHAD roghnaigh ainm comhaid le haghaidh aschuir\n" +" -S, --skel=COMHAD roghnaigh creatchomhad\n" +" -t, --stdout scríobh an scanóir chuig stdout in ionad %s\n" +" --yyclass=COMHAD ainm de `class' C++\n" +" --header-file=COMHAD scríobh comhad ceanntáisc C i dteannta an " +"scanóir\n" +" --tables-file[=COMHAD] scríobh na táblaí chuig COMHAD\n" +"\n" +"Scanóir:\n" +" -7, --7bit gin scanóir 7-giotán\n" +" -8, --8bit gin scanóir 8-giotán\n" +" -B, --batch gin scanóir baisce (i gcodarsnacht le -I)\n" +" -i, --case-insensitive déan neamhshuim ar ceannlitreacha/litreacha beaga\n" +" -l, --lex-compat comhoiriúnacht le lex bunúsach, a mhéad is féidir\n" +" -X, --posix-compat comhoiriúnacht le lex POSIX, a mhéad is féidir\n" +" -I, --interactive gin scanóir idirghníomhach (i gcodarsnacht le -B)\n" +" --yylineno coimeád líon na línte i yylineno\n" +"\n" +"Generated code:\n" +" -+, --c++ gin scanóir mar class C++\n" +" -Dmacra[=sain] #define macra sain (sain='1' trí " +"mhainneachtain)\n" +" -L, --noline ná cuir treoracha #line sa scanóir\n" +" -P, --prefix=TEAGHRÁN úsáid TEAGHRÁN mar réimír in ionad \"yy\"\n" +" -R, --reentrant gin scanóir reentrant C\n" +" --bison-bridge scanóir do pharsálaí íon bison.\n" +" --bison-locations ceadaigh an úsáid de yylloc.\n" +" --stdinit socraigh yyin/yyout mar stdin/stdout faoi seach\n" +" --noansi-definitions sainmhíniú d'fheidhmeanna ar an sean-nós\n" +" --noansi-prototypes ceadaigh liosta folamh de pharaiméadair\n" +" --nounistd ná cuir <unistd.h> san áireamh\n" +" --noFEIDHM ná gin an FHEIDHM seo\n" +"\n" +"Miscellaneous:\n" +" -c rogha POSIX gan feidhm\n" +" -n rogha POSIX gan feidhm\n" +" -?\n" +" -h, --help taispeáin an chabhair seo\n" +" -V, --version taispeáin leagan %s\n" + +#: misc.c:100 misc.c:126 +#, c-format +msgid "name \"%s\" ridiculously long" +msgstr "tá an t-ainm \"%s\" i bhfad Éireann rófhada" + +#: misc.c:175 +msgid "memory allocation failed in allocate_array()" +msgstr "teipeadh agus ag riaradh cuimhne i allocate_array()" + +#: misc.c:250 +#, c-format +msgid "bad character '%s' detected in check_char()" +msgstr "aimsíodh carachtar neamhbhailí '%s' i check_char()" + +#: misc.c:255 +#, c-format +msgid "scanner requires -8 flag to use the character %s" +msgstr "ní foláir an rogha -8 chun an charachtair %s a úsáid" + +#: misc.c:288 +msgid "dynamic memory failure in copy_string()" +msgstr "teipeadh agus ag riaradh cuimhne i copy_string()" + +#: misc.c:422 +#, c-format +msgid "%s: fatal internal error, %s\n" +msgstr "%s: earráid inmheánach marfach, %s\n" + +#: misc.c:875 +msgid "attempt to increase array size failed" +msgstr "teipeadh agus ag iarraidh an eagair a mhéadú" + +#: misc.c:1002 +msgid "bad line in skeleton file" +msgstr "drochlíne i gcreatchomhad" + +#: misc.c:1051 +msgid "memory allocation failed in yy_flex_xmalloc()" +msgstr "teipeadh agus ag riaradh cuimhne i yy_flex_xmalloc()" + +#: nfa.c:104 +#, c-format +msgid "" +"\n" +"\n" +"********** beginning dump of nfa with start state %d\n" +msgstr "" +"\n" +"\n" +"********** ag tosú dumpála de nfa le staid tosaigh %d\n" + +#: nfa.c:115 +#, c-format +msgid "state # %4d\t" +msgstr "staid # %4d\t" + +#: nfa.c:130 +msgid "********** end of dump\n" +msgstr "********** i ndeireadh dumpála\n" + +#: nfa.c:174 +msgid "empty machine in dupmachine()" +msgstr "meaisín folamh i dupmachine()" + +#: nfa.c:240 +#, c-format +msgid "Variable trailing context rule at line %d\n" +msgstr "riail maidir le comhthéacs sraoilleach athraitheach ag líne %d\n" + +#: nfa.c:353 +msgid "bad state type in mark_beginning_as_normal()" +msgstr "drochstaid i mark_beginning_as_normal()" + +#: nfa.c:598 +#, c-format +msgid "input rules are too complicated (>= %d NFA states)" +msgstr "is róchasta na rialacha ionchuir (>= %d staid NFA)" + +#: nfa.c:677 +msgid "found too many transitions in mkxtion()" +msgstr "an iomarca athruithe i mkxtion()" + +#: nfa.c:703 +#, c-format +msgid "too many rules (> %d)!" +msgstr "an iomarca rialacha (> %d)!" + +#: parse.y:183 +msgid "unknown error processing section 1" +msgstr "earráid anaithnid agus ag próiseáil an chéad pháirt" + +#: parse.y:208 parse.y:373 +msgid "bad start condition list" +msgstr "is neamhbhailí liosta na coinníollacha tosaigh" + +#: parse.y:337 +msgid "unrecognized rule" +msgstr "riail anaithnid" + +#: parse.y:456 parse.y:469 parse.y:538 +msgid "trailing context used twice" +msgstr "baineadh úsáid as comhthéacs sraoilleach faoi dhó" + +#: parse.y:574 parse.y:584 parse.y:657 parse.y:667 +msgid "bad iteration values" +msgstr "luachanna timthrialla neamhbhailí" + +#: parse.y:602 parse.y:620 parse.y:685 parse.y:703 +msgid "iteration value must be positive" +msgstr "ní foláir luach timthrialla deimhneach" + +#: parse.y:817 parse.y:827 +#, c-format +msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" +msgstr "" +"tá an réimse carachtair [%c-%c] débhríoch i scanóir a dhéanann neamhshuim ar " +"ceannlitreacha agus litreacha beaga" + +#: parse.y:832 +msgid "negative range in character class" +msgstr "réimse diúltach in aicme carachtair" + +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 +msgid "Input line too long\n" +msgstr "Tá líne an ionchuir rófhada\n" + +#: scan.l:150 +#, c-format +msgid "malformed '%top' directive" +msgstr "treoir '%top' míchumtha" + +#: scan.l:172 +#, no-c-format +msgid "unrecognized '%' directive" +msgstr "treoir '%' anaithnid" + +#: scan.l:252 +msgid "Unmatched '{'" +msgstr "'{' corr" + +#: scan.l:285 +msgid "incomplete name definition" +msgstr "is neamhiomlán an sainmhíniú ainm" + +#: scan.l:418 +#, c-format +msgid "unrecognized %%option: %s" +msgstr "rogha %% anaithnid: %s" + +#: scan.l:559 scan.l:678 +msgid "bad character class" +msgstr "aicme charachtair neamhbhailí" + +#: scan.l:606 +#, c-format +msgid "undefined definition {%s}" +msgstr "sainmhíniú neamhshainithe {%s}" + +#: scan.l:646 +#, c-format +msgid "bad <start condition>: %s" +msgstr "<coinníoll tosaigh> neamhbhailí: %s" + +#: scan.l:659 +msgid "missing quote" +msgstr "comhartha athfhriotal ar iarraidh" + +#: scan.l:699 +#, c-format +msgid "bad character class expression: %s" +msgstr "is neamhbhailí an slonn aicme carachtair: %s" + +#: scan.l:721 +msgid "bad character inside {}'s" +msgstr "carachtar neamhbhailí idir {}" + +#: scan.l:727 +msgid "missing }" +msgstr "} ar iarraidh." + +#: scan.l:800 +msgid "EOF encountered inside an action" +msgstr "Buaileadh EOF i ngníomh" + +#: scan.l:820 +#, c-format +msgid "bad character: %s" +msgstr "carachtar neamhbhailí: %s" + +#: scan.l:849 +#, c-format +msgid "can't open %s" +msgstr "ní féidir %s a oscailt" + +#: scanopt.c:291 +#, c-format +msgid "Usage: %s [OPTIONS]...\n" +msgstr "Úsáid: %s [ROGHANNA]...\n" + +#: scanopt.c:565 +#, c-format +msgid "option `%s' doesn't allow an argument\n" +msgstr "ní cheadaítear argóint i ndiaidh an rogha `%s'\n" + +#: scanopt.c:570 +#, c-format +msgid "option `%s' requires an argument\n" +msgstr "ní foláir argóint don rogha `%s'\n" + +#: scanopt.c:574 +#, c-format +msgid "option `%s' is ambiguous\n" +msgstr "tá an rogha `%s' débhríoch\n" + +#: scanopt.c:578 +#, c-format +msgid "Unrecognized option `%s'\n" +msgstr "Rogha anaithnid `%s'\n" + +#: scanopt.c:582 +#, c-format +msgid "Unknown error=(%d)\n" +msgstr "Earráid anaithnid=(%d)\n" + +#: sym.c:100 +msgid "symbol table memory allocation failed" +msgstr "teipeadh agus ag riaradh cuimhne don tábla siombalach" + +#: sym.c:203 +msgid "name defined twice" +msgstr "sainmhíníodh an t-ainm faoi dhó" + +#: sym.c:254 +#, c-format +msgid "start condition %s declared twice" +msgstr "fógraíodh an choinníoll tosaigh %s faoi dhó" + +#: yylex.c:56 +msgid "premature EOF" +msgstr "EOF gan choinne" + +#: yylex.c:198 +msgid "End Marker\n" +msgstr "Comhartha Deiridh\n" + +#: yylex.c:204 +#, c-format +msgid "*Something Weird* - tok: %d val: %d\n" +msgstr "*Rud Éigin Aisteach* - tok: %d val: %d\n" Binary files differ@@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.2\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 1997-02-05 20:30\n" "Last-Translator: Choi Jun Ho <junker@jazz.snu.ac.kr>\n" "Language-Team: Korean <ko@li.org>\n" @@ -160,344 +161,342 @@ msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "¸Â´Â ±ÔÄ¢À» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "-s ¿É¼ÇÀÌ ÁÖ¾îÁ³Áö¸¸ ±âº» ±ÔÄ¢ÀÌ Àû¿ëµÉ ¼ö ÀÖ½À´Ï´Ù" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "-l¿É¼Ç¿¡´Â -+¿É¼ÇÀ» °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "-l¿É¼Ç¿¡ -f³ª -F¿É¼ÇÀ» ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:224 +#: main.c:238 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "-l¿É¼Ç¿¡ -f³ª -F¿É¼ÇÀ» ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF´Â -Cm¿Í °°ÀÌ ¾²¸é Àǹ̰¡ ¾ø½À´Ï´Ù" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF¿Í -I´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF ´Â lexȣȯ ¸ðµå¿Í´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf¿Í -CF´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "-CF¿É¼Ç¿¡ -+¿É¼ÇÀ» °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array´Â -+¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:285 +#: main.c:299 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "-Cf¿Í -CF´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: main.c:398 +#: main.c:415 #, fuzzy msgid "could not write tables header" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:671 +#: main.c:688 #, fuzzy, c-format msgid "error creating header file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ¾²´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ ¾²´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ Áö¿ì´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "µÇµ¹¸²ÀÌ ¾ø½À´Ï´Ù.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d°³ÀÇ µÇµ¹¸²(¹Þ¾ÆµéÀÌÁö ¾Ê´Â) »óÅÂ.\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr " ¾ÐÃàµÈ Å×À̺íÀº Ç×»ó ¹é¾÷ÇÕ´Ï´Ù.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ¾²´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s ¹öÀü %s »ç¿ë Åë°è:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " ½ºÄ³³Ê ¿É¼Ç: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d°³ÀÇ NFA »óÅÂ\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d°³ÀÇ DFA »óÅ (%d ´Ü¾î)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d°³ÀÇ ±ÔÄ¢\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " µÇµ¹¸²ÀÌ ¾ø½À´Ï´Ù\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d°³ÀÇ µÇµ¹¸²(¹Þ¾ÆµéÀÌÁö ¾Ê´Â) »óÅÂ\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " ¾ÐÃàµÈ Å×À̺íÀº Ç×»ó ¹é¾÷ÇÕ´Ï´Ù\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Çà ½ÃÀÛ(beginning-of-line) À¯ÇüÀ» »ç¿ëÇÏ¿´½À´Ï´Ù\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d°³ÀÇ ½ÃÀÛÁ¶°Ç\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d°³ÀÇ ¿¦½Ç·Ð »óÅÂ, %d°³ÀÇ ÀÌÁß ¿¦½Ç·Ð »óÅÂ\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " ¹®ÀÚ·ù°¡ ¾ø½À´Ï´Ù\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" -msgstr "" -" %d/%d ¹®ÀÚ ÁýÇÕ¿¡ %d/%d°³ÀÇ ÀúÀå¿ë ¹®ÀÚ°¡ ÇÊ¿äÇß°í, %d°³´Â Àç»ç¿ëµÇ¾ú½À´Ï" -"´Ù.\n" +msgstr " %d/%d ¹®ÀÚ ÁýÇÕ¿¡ %d/%d°³ÀÇ ÀúÀå¿ë ¹®ÀÚ°¡ ÇÊ¿äÇß°í, %d°³´Â Àç»ç¿ëµÇ¾ú½À´Ï´Ù.\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d°³ÀÇ »óÅÂ/´ÙÀ½ »óÅ ½ÖÀÌ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d°³ÀÇ À¯ÀÏÇÑ/Áߺ¹µÇ´Â ÀüÀÌ\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d°³ÀÇ Å×ÀÌºí ¿£Æ®¸®\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (ÃÖ´ë %d) nxt-chk ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (ÃÖ´ë %d) ÅÛÇø®Æ® nxt-chk ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d°³ÀÇ ºó Å×ÀÌºí ¿£Æ®¸®\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d°³ÀÇ ¿øÇüÀÌ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d°³ÀÇ ÅÛÇø®Æ®°¡ ¸¸µé¾îÁö°í, %d°³¸¦ ¾¹´Ï´Ù\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d°³ÀÇ µ¿Ä¡·ù°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d ¸ÞŸ µ¿Ä¡·ù°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d(%d ÀúÀåµÊ)°³ÀÇ ÇØ½Ì Ãæµ¹·Î %d°³ÀÇ DFA°¡ °°°Ô 󸮵˴ϴÙ\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d°³ÀÇ ÀçÇÒ´ç ÁýÇÕÀÌ ÇÊ¿äÇÕ´Ï´Ù\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " ÃÑ %d°³ÀÇ Å×ÀÌºí ¿£Æ®¸®°¡ ÇÊ¿äÇÕ´Ï´Ù\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "¾Ë ¼ö ¾ø´Â -C ¿É¼Ç '%c'" -#: main.c:1167 +#: main.c:1184 #, fuzzy, c-format msgid "%s %s\n" msgstr "%s ¹öÀü %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "Ä¡¸íÀûÀÎ ÆÄ½Ì ¿¡·¯" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "µÇµ¹¸² Á¤º¸ ÆÄÀÏ %s¸¦ ¸¸µé ¼ö ¾ø¾ú½À´Ï´Ù" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex ȣȯ ¿É¼ÇÀº Å« ¼º´É ÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr " ±×¸®°í ¾Æ¸¶µµ ´Ù¸¥ º¸°íµÈ ¼º´É ÀúÇÏÀÇ ½ÇÁ¦ ¿øÀÎÀÏ °ÍÀÔ´Ï´Ù\n" -#: main.c:1504 +#: main.c:1521 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno´Â Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (´ëÈÇü) Àº ¼Ò±Ô¸ðÀÇ ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore()´Â ¼Ò±Ô¸ðÀÇ ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT´Â Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "°¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢Àº Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT´Â -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:1542 +#: main.c:1559 #, fuzzy, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylinenoÀº -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "°¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢Àº -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass´Â C++½ºÄ³³Ê¿¡°Ô¸¸ Àǹ̰¡ ÀÖ½À´Ï´Ù" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "" -#: main.c:1771 +#: main.c:1787 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -687,74 +686,74 @@ msgstr "" msgid "negative range in character class" msgstr " ¹®ÀÚ·ù°¡ ¾ø½À´Ï´Ù\n" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "" -#: scan.l:149 +#: scan.l:150 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "ºÒ¿ÏÀüÇÑ À̸§ Á¤ÀÇ" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "¾Ë ¼ö ¾ø´Â %%option: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "À߸øµÈ ¹®ÀÚ·ù" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "Á¤ÀǵÇÁö ¾ÊÀº Á¤ÀÇ {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "À߸øµÈ <½ÃÀÛ Á¶°Ç>: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "Àοë±âÈ£ ºüÁü" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "À߸øµÈ ¹®ÀÚ ÁýÇÕ ½Ä: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "{}¾ÈÀÇ À߸øµÈ ¹®ÀÚ" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "}ÀÌ ºüÁ³½À´Ï´Ù" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "µ¿ÀÛ µµÁß¿¡ EOF¸¦ ¸¸³µ½À´Ï´Ù" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "À߸øµÈ ¹®ÀÚ: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "%s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù" @@ -839,8 +838,7 @@ msgstr "*¹«¾ð°¡ ÀÌ»óÇÕ´Ï´Ù* - tok: %d val: %d\n" #~ msgid "" #~ "%s [-bcdfhilnpstvwBFILTV78+? -C[aefFmr] -ooutput -Pprefix -Sskeleton]\n" -#~ msgstr "" -#~ "%s [-bcdfhilnpstvwBFILTV78+? -C[aefFmr] -oÃâ·ÂÆÄÀÏ -PÁ¢µÎ»ç -S½ºÄÌ·¹Åæ]\n" +#~ msgstr "%s [-bcdfhilnpstvwBFILTV78+? -C[aefFmr] -oÃâ·ÂÆÄÀÏ -PÁ¢µÎ»ç -S½ºÄÌ·¹Åæ]\n" #~ msgid "\t[--help --version] [file ...]\n" #~ msgstr "\t[--help --version] [ÆÄÀÏ ...]\n" @@ -933,8 +931,7 @@ msgstr "*¹«¾ð°¡ ÀÌ»óÇÕ´Ï´Ù* - tok: %d val: %d\n" #~ msgstr "\t\t-Cm ¸ÞŸ µ¿Ä¡·ù¸¦ ¸¸µì´Ï´Ù\n" #~ msgid "\t\t-Cr use read() instead of stdio for scanner input\n" -#~ msgstr "" -#~ "\t\t-Cr ½ºÄ³³Ê ÀÔ·ÂÀ» stdio¶óÀ̺귯¸® ´ë½Å read()½Ã½ºÅÛ ÄÝÀ» »ç¿ëÇÕ´Ï´Ù\n" +#~ msgstr "\t\t-Cr ½ºÄ³³Ê ÀÔ·ÂÀ» stdio¶óÀ̺귯¸® ´ë½Å read()½Ã½ºÅÛ ÄÝÀ» »ç¿ëÇÕ´Ï´Ù\n" #~ msgid "\t-o specify output filename\n" #~ msgstr "\t-o Ãâ·Â ÆÄÀÏÀ̸§À» ÁöÁ¤ÇÕ´Ï´Ù\n" diff --git a/po/nl.gmo b/po/nl.gmo Binary files differnew file mode 100644 index 0000000..d056ace --- /dev/null +++ b/po/nl.gmo diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 0000000..e2d56a4 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,875 @@ +# Translation of flex-2.5.31 to Dutch. +# Copyright (C) 2005 Free Software Foundation, Inc. +# Benno Schulenberg <benno@nietvergeten.nl>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2005-04-14 21:12+0200\n" +"Last-Translator: Benno Schulenberg <benno@nietvergeten.nl>\n" +"Language-Team: Dutch <vertaling@vrijschrift.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: dfa.c:61 +#, c-format +msgid "State #%d is non-accepting -\n" +msgstr "Toestand #%d is niet-accepterend -\n" + +#: dfa.c:124 +msgid "dangerous trailing context" +msgstr "gevaarlijke nakomende context" + +#: dfa.c:166 +msgid " associated rule line numbers:" +msgstr " regelnummers van de betrokken regels:" + +#: dfa.c:202 +msgid " out-transitions: " +msgstr " uit-transities: " + +#: dfa.c:210 +msgid "" +"\n" +" jam-transitions: EOF " +msgstr "" +"\n" +" vastlopende transities: EOF " + +#: dfa.c:341 +msgid "consistency check failed in epsclosure()" +msgstr "consistentiecontrole faalde in epsclosure()" + +#: dfa.c:429 +msgid "" +"\n" +"\n" +"DFA Dump:\n" +"\n" +msgstr "" +"\n" +"\n" +"DFA-dump:\n" +"\n" + +#: dfa.c:604 +msgid "could not create unique end-of-buffer state" +msgstr "kon geen unieke toestand voor einde-van-buffer aanmaken" + +#: dfa.c:625 +#, c-format +msgid "state # %d:\n" +msgstr "toestand # %d:\n" + +#: dfa.c:800 +msgid "Could not write yynxt_tbl[][]" +msgstr "Kon yynxt_tbl[][] niet schrijven" + +#: dfa.c:1023 +msgid "consistency check failed in symfollowset" +msgstr "consistentiecontrole faalde in symfollowset" + +#: dfa.c:1071 +msgid "bad transition character detected in sympartition()" +msgstr "onjuist transitieteken in sympartition()" + +#: gen.c:484 +msgid "" +"\n" +"\n" +"Equivalence Classes:\n" +"\n" +msgstr "" +"\n" +"\n" +"Equivalentieklassen:\n" +"\n" + +#: gen.c:668 gen.c:697 gen.c:1221 +#, c-format +msgid "state # %d accepts: [%d]\n" +msgstr "toestand # %d accepteert: [%d]\n" + +#: gen.c:1116 +#, c-format +msgid "state # %d accepts: " +msgstr "toestand # %d accepteert: " + +#: gen.c:1163 +msgid "Could not write yyacclist_tbl" +msgstr "Kon yyacclist_tbl niet schrijven" + +#: gen.c:1239 +msgid "Could not write yyacc_tbl" +msgstr "Kon yyacc_tbl niet schrijven" + +#: gen.c:1254 gen.c:1639 gen.c:1662 +msgid "Could not write ecstbl" +msgstr "Kon ecstbl niet schrijven" + +#: gen.c:1277 +msgid "" +"\n" +"\n" +"Meta-Equivalence Classes:\n" +msgstr "" +"\n" +"\n" +"Meta-equivalentieklassen:\n" + +#: gen.c:1299 +msgid "Could not write yymeta_tbl" +msgstr "Kon yymeta_tbl niet schrijven" + +#: gen.c:1360 +msgid "Could not write yybase_tbl" +msgstr "Kon yybase_tbl niet schrijven" + +#: gen.c:1394 +msgid "Could not write yydef_tbl" +msgstr "Kon yydef_tbl niet schrijven" + +#: gen.c:1434 +msgid "Could not write yynxt_tbl" +msgstr "Kon yynxt_tbl niet schrijven" + +#: gen.c:1470 +msgid "Could not write yychk_tbl" +msgstr "Kon yychk_tbl niet schrijven" + +#: gen.c:1624 gen.c:1653 +msgid "Could not write ftbl" +msgstr "Kon ftbl niet schrijven" + +#: gen.c:1630 +msgid "Could not write ssltbl" +msgstr "Kon ssltbl niet schrijven" + +#: gen.c:1681 +msgid "Could not write eoltbl" +msgstr "Kon eoltbl niet schrijven" + +#: gen.c:1741 +msgid "Could not write yynultrans_tbl" +msgstr "Kon yynultrans_tbl niet schrijven" + +#: main.c:187 +msgid "rule cannot be matched" +msgstr "regel geeft geen overeenkomsten" + +#: main.c:192 +msgid "-s option given but default rule can be matched" +msgstr "optie -s gegeven, maar de standaardregel geeft overeenkomsten" + +#: main.c:231 +msgid "Can't use -+ with -l option" +msgstr "Optie -+ gaat niet samen met -l" + +#: main.c:234 +msgid "Can't use -f or -F with -l option" +msgstr "Optie -f of -F gaat niet samen met -l" + +#: main.c:238 +msgid "Can't use --reentrant or --bison-bridge with -l option" +msgstr "Optie --reentrant of --bison-bridge gaat niet samen met -l" + +#: main.c:275 +msgid "-Cf/-CF and -Cm don't make sense together" +msgstr "Opties -Cf/-CF en -Cm gaan niet samen" + +#: main.c:278 +msgid "-Cf/-CF and -I are incompatible" +msgstr "Opties -Cf/-CF en -I gaan niet samen" + +#: main.c:282 +msgid "-Cf/-CF are incompatible with lex-compatibility mode" +msgstr "Optie -Cf of -CF gaat niet samen met lex-compatibiliteitsmodus" + +#: main.c:287 +msgid "-Cf and -CF are mutually exclusive" +msgstr "Opties -Cf en -CF sluiten elkaar uit" + +#: main.c:291 +msgid "Can't use -+ with -CF option" +msgstr "Optie -+ gaat niet samen met -CF" + +#: main.c:294 +#, c-format +msgid "%array incompatible with -+ option" +msgstr "Optie -+ gaat niet samen met %array" + +#: main.c:299 +msgid "Options -+ and --reentrant are mutually exclusive." +msgstr "Opties -+ en --reentrant sluiten elkaar uit." + +#: main.c:302 +msgid "bison bridge not supported for the C++ scanner." +msgstr "bison bridge wordt niet ondersteund voor de C++-scanner." + +#: main.c:354 main.c:402 +#, c-format +msgid "could not create %s" +msgstr "kon %s niet aanmaken" + +#: main.c:415 +msgid "could not write tables header" +msgstr "kon tabellenkop niet schrijven" + +#: main.c:419 +#, c-format +msgid "can't open skeleton file %s" +msgstr "kan skeletbestand %s niet openen" + +#: main.c:500 +#, c-format +msgid "input error reading skeleton file %s" +msgstr "invoerfout tijdens lezen van skeletbestand %s" + +#: main.c:504 +#, c-format +msgid "error closing skeleton file %s" +msgstr "fout tijdens sluiten van skeletbestand %s" + +#: main.c:688 +#, c-format +msgid "error creating header file %s" +msgstr "fout tijdens aanmaken van headerbestand %s" + +#: main.c:696 +#, c-format +msgid "error writing output file %s" +msgstr "fout tijdens schrijven van uitvoerbestand %s" + +#: main.c:700 +#, c-format +msgid "error closing output file %s" +msgstr "fout tijdens sluiten van uitvoerbestand %s" + +#: main.c:704 +#, c-format +msgid "error deleting output file %s" +msgstr "fout tijdens verwijderen van uitvoerbestand %s" + +#: main.c:711 +msgid "No backing up.\n" +msgstr "Terugstappen is niet mogelijk.\n" + +#: main.c:715 +#, c-format +msgid "%d backing up (non-accepting) states.\n" +msgstr "%d terugstappende (niet-accepterende) toestanden.\n" + +#: main.c:719 +msgid "Compressed tables always back up.\n" +msgstr "Gecomprimeerde tabellen kunnen altijd terugstappen.\n" + +#: main.c:722 +#, c-format +msgid "error writing backup file %s" +msgstr "fout tijdens schrijven van terugstapbestand %s" + +#: main.c:726 +#, c-format +msgid "error closing backup file %s" +msgstr "fout tijdens sluiten van terugstapbestand %s" + +#: main.c:731 +#, c-format +msgid "%s version %s usage statistics:\n" +msgstr "%s versie %s gebruiksstatistieken:\n" + +#: main.c:734 +msgid " scanner options: -" +msgstr " scanner-opties: -" + +#: main.c:813 +#, c-format +msgid " %d/%d NFA states\n" +msgstr " %d/%d NFA-toestanden\n" + +#: main.c:815 +#, c-format +msgid " %d/%d DFA states (%d words)\n" +msgstr " %d/%d DFA-toestanden (%d woorden)\n" + +#: main.c:817 +#, c-format +msgid " %d rules\n" +msgstr " %d regels\n" + +#: main.c:822 +msgid " No backing up\n" +msgstr " Terugstappen is niet mogelijk\n" + +#: main.c:826 +#, c-format +msgid " %d backing-up (non-accepting) states\n" +msgstr " %d terugstappende (niet-accepterende) toestanden\n" + +#: main.c:831 +msgid " Compressed tables always back-up\n" +msgstr " Gecomprimeerde tabellen kunnen altijd terugstappen\n" + +#: main.c:835 +msgid " Beginning-of-line patterns used\n" +msgstr " Begin-van-regel-patronen gebruikt\n" + +#: main.c:837 +#, c-format +msgid " %d/%d start conditions\n" +msgstr " %d/%d startvoorwaarden\n" + +#: main.c:841 +#, c-format +msgid " %d epsilon states, %d double epsilon states\n" +msgstr " %d epsilon-toestanden, %d dubbele epsilon-toestanden\n" + +#: main.c:845 +msgid " no character classes\n" +msgstr " geen tekenklassen\n" + +#: main.c:849 +#, c-format +msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" +msgstr "" +" %d/%d tekenklassen hadden %d/%d opslagwoorden nodig, %d hergebruikt\n" + +#: main.c:854 +#, c-format +msgid " %d state/nextstate pairs created\n" +msgstr " %d toestand/volgtoestand-paren aangemaakt\n" + +#: main.c:857 +#, c-format +msgid " %d/%d unique/duplicate transitions\n" +msgstr " %d/%d unieke/dubbele transities\n" + +#: main.c:862 +#, c-format +msgid " %d table entries\n" +msgstr " %d tabelitems\n" + +#: main.c:870 +#, c-format +msgid " %d/%d base-def entries created\n" +msgstr " %d/%d base-def-items aangemaakt\n" + +#: main.c:874 +#, c-format +msgid " %d/%d (peak %d) nxt-chk entries created\n" +msgstr " %d/%d (piek %d) nxt-chk-items aangemaakt\n" + +#: main.c:878 +#, c-format +msgid " %d/%d (peak %d) template nxt-chk entries created\n" +msgstr " %d/%d (piek %d) sjabloon-nxt-chk-items aangemaakt\n" + +#: main.c:882 +#, c-format +msgid " %d empty table entries\n" +msgstr " %d lege tabelitems\n" + +#: main.c:884 +#, c-format +msgid " %d protos created\n" +msgstr " %d prototypes aangemaakt\n" + +#: main.c:887 +#, c-format +msgid " %d templates created, %d uses\n" +msgstr " %d sjablonen aangemaakt, %d keer gebruikt\n" + +#: main.c:895 +#, c-format +msgid " %d/%d equivalence classes created\n" +msgstr " %d/%d equivalentieklassen aangemaakt\n" + +#: main.c:903 +#, c-format +msgid " %d/%d meta-equivalence classes created\n" +msgstr " %d/%d meta-equivalentieklassen aangemaakt\n" + +#: main.c:909 +#, c-format +msgid " %d (%d saved) hash collisions, %d DFAs equal\n" +msgstr " %d (%d bewaarde) hash-botsingen, %d DFA's gelijk\n" + +#: main.c:911 +#, c-format +msgid " %d sets of reallocations needed\n" +msgstr " %d sets van herallocaties waren nodig\n" + +#: main.c:913 +#, c-format +msgid " %d total table entries needed\n" +msgstr " in totaal %d tabelitems nodig\n" + +#: main.c:988 +msgid "Internal error. flexopts are malformed.\n" +msgstr "Interne fout, ongeldige flexopts.\n" + +#: main.c:998 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Probeer '%s --help' voor meer informatie.\n" + +#: main.c:1055 +#, c-format +msgid "unknown -C option '%c'" +msgstr "onbekende -C-optie '%c'" + +#: main.c:1184 +#, c-format +msgid "%s %s\n" +msgstr "%s %s\n" + +#: main.c:1459 +msgid "fatal parse error" +msgstr "fatale ontleedfout" + +#: main.c:1491 +#, c-format +msgid "could not create backing-up info file %s" +msgstr "kon terugstapbestand %s niet aanmaken" + +#: main.c:1512 +msgid "-l AT&T lex compatibility option entails a large performance penalty\n" +msgstr "" +"de AT&T-lexcompatibiliteitsoptie -l betekent een grote " +"prestatievermindering\n" + +#: main.c:1515 +msgid " and may be the actual source of other reported performance penalties\n" +msgstr "" +" en zou de eigenlijke bron kunnen zijn van andere gemelde " +"prestatieverminderingen\n" + +#: main.c:1521 +#, c-format +msgid "" +"%%option yylineno entails a performance penalty ONLY on rules that can match " +"newline characters\n" +msgstr "" +"de %%optie yylineno betekent een prestatievermindering, maar ALLEEN voor " +"regels die met het regeleindeteken overeen kunnen komen\n" + +#: main.c:1528 +msgid "-I (interactive) entails a minor performance penalty\n" +msgstr "optie -I (interactief) betekent een kleine prestatievermindering\n" + +#: main.c:1533 +msgid "yymore() entails a minor performance penalty\n" +msgstr "yymore() betekent een kleine prestatievermindering\n" + +#: main.c:1539 +msgid "REJECT entails a large performance penalty\n" +msgstr "REJECT betekent een grote prestatievermindering\n" + +#: main.c:1544 +msgid "Variable trailing context rules entail a large performance penalty\n" +msgstr "Variabele nakomende context betekent een grote prestatievermindering\n" + +#: main.c:1556 +msgid "REJECT cannot be used with -f or -F" +msgstr "REJECT gaat niet samen met -f of -F" + +#: main.c:1559 +#, c-format +msgid "%option yylineno cannot be used with REJECT" +msgstr "%optie yylineno gaat niet samen met REJECT" + +#: main.c:1562 +msgid "variable trailing context rules cannot be used with -f or -F" +msgstr "regels met variabele nakomende context gaan niet samen met -f of -F" + +#: main.c:1677 +#, c-format +msgid "%option yyclass only meaningful for C++ scanners" +msgstr "%optie yyclass heeft alleen betekenis voor C++-scanners" + +#: main.c:1784 +#, c-format +msgid "Usage: %s [OPTIONS] [FILE]...\n" +msgstr "Gebruik: %s [OPTIES] [BESTAND]...\n" + +#: main.c:1787 +#, c-format +msgid "" +"Generates programs that perform pattern-matching on text.\n" +"\n" +"Table Compression:\n" +" -Ca, --align trade off larger tables for better memory alignment\n" +" -Ce, --ecs construct equivalence classes\n" +" -Cf do not compress tables; use -f representation\n" +" -CF do not compress tables; use -F representation\n" +" -Cm, --meta-ecs construct meta-equivalence classes\n" +" -Cr, --read use read() instead of stdio for scanner input\n" +" -f, --full generate fast, large scanner. Same as -Cfr\n" +" -F, --fast use alternate table representation. Same as -CFr\n" +" -Cem default compression (same as --ecs --meta-ecs)\n" +"\n" +"Debugging:\n" +" -d, --debug enable debug mode in scanner\n" +" -b, --backup write backing-up information to %s\n" +" -p, --perf-report write performance report to stderr\n" +" -s, --nodefault suppress default rule to ECHO unmatched text\n" +" -T, --trace %s should run in trace mode\n" +" -w, --nowarn do not generate warnings\n" +" -v, --verbose write summary of scanner statistics to stdout\n" +"\n" +"Files:\n" +" -o, --outfile=FILE specify output filename\n" +" -S, --skel=FILE specify skeleton file\n" +" -t, --stdout write scanner on stdout instead of %s\n" +" --yyclass=NAME name of C++ class\n" +" --header-file=FILE create a C header file in addition to the " +"scanner\n" +" --tables-file[=FILE] write tables to FILE\n" +"\n" +"Scanner behavior:\n" +" -7, --7bit generate 7-bit scanner\n" +" -8, --8bit generate 8-bit scanner\n" +" -B, --batch generate batch scanner (opposite of -I)\n" +" -i, --case-insensitive ignore case in patterns\n" +" -l, --lex-compat maximal compatibility with original lex\n" +" -X, --posix-compat maximal compatibility with POSIX lex\n" +" -I, --interactive generate interactive scanner (opposite of -B)\n" +" --yylineno track line count in yylineno\n" +"\n" +"Generated code:\n" +" -+, --c++ generate C++ scanner class\n" +" -Dmacro[=defn] #define macro defn (default defn is '1')\n" +" -L, --noline suppress #line directives in scanner\n" +" -P, --prefix=STRING use STRING as prefix instead of \"yy\"\n" +" -R, --reentrant generate a reentrant C scanner\n" +" --bison-bridge scanner for bison pure parser.\n" +" --bison-locations include yylloc support.\n" +" --stdinit initialize yyin/yyout to stdin/stdout\n" +" --noansi-definitions old-style function definitions\n" +" --noansi-prototypes empty parameter list in prototypes\n" +" --nounistd do not include <unistd.h>\n" +" --noFUNCTION do not generate a particular FUNCTION\n" +"\n" +"Miscellaneous:\n" +" -c do-nothing POSIX option\n" +" -n do-nothing POSIX option\n" +" -?\n" +" -h, --help produce this help message\n" +" -V, --version report %s version\n" +msgstr "" +"Genereert patroonherkenningsprogramma's.\n" +"\n" +"Tabelcompressie:\n" +" -Ca, --align gebruik meer geheugen voor beter uitgelijnde tabellen\n" +" -Ce, --ecs construeer equivalentieklassen\n" +" -Cf comprimeer tabellen niet; gebruik de -f-representatie\n" +" -CF comprimeer tabellen niet; gebruik de -F-representatie\n" +" -Cm, --meta-ecs construeer meta-equivalentieklassen\n" +" -Cr, --read gebruik read() in plaats van stdio voor scannerinvoer\n" +" -f, --full genereer een snelle, grote scanner (zelfde als -Cfr)\n" +" -F, --fast gebruik alternatieve tabelrepresentatie (als -CFr)\n" +" -Cem standaardcompressie (zelfde als --ecs --meta-ecs)\n" +"\n" +"Debuggen:\n" +" -d, --debug zet debugmodus in scanner aan\n" +" -b, --backup schrijf terugstap-informatie naar %s\n" +" -p, --perf-report schrijf prestatierapport naar standaardfoutuitvoer\n" +" -s, --nodefault onderdruk standaardregel om onherkende tekst te " +"ECHOen\n" +" -T, --trace voer %s uit in tracemodus\n" +" -w, --nowarn geef geen waarschuwingen\n" +" -v, --verbose schrijf scannerstatistieken naar standaarduitvoer\n" +"\n" +"Bestanden:\n" +" -o, --outfile=BESTAND gebruik dit uitvoerbestand\n" +" -S, --skel=BESTAND gebruik dit skeletbestand\n" +" -t, --stdout schrijf scanner naar standaarduitvoer, niet naar %" +"s\n" +" --yyclass=NAAM naam van de C++-klasse\n" +" --header-file=BESTAND maak behalve de scanner ook een C-" +"headerbestand\n" +" --tables-file[=BESTAND] schrijf tabellen (naar dit BESTAND)\n" +"\n" +"Scannergedrag:\n" +" -7, --7bit genereer een 7-bits-scanner\n" +" -8, --8bit genereer een 8-bits-scanner\n" +" -B, --batch genereer een batch-scanner (tegengestelde van -I)\n" +" -i, --case-insensitive negeer hoofd-/kleine letters in patronen\n" +" -l, --lex-compat maximale compatibiliteit met de originele lex\n" +" -X, --posix-compat maximale compatibiliteit met de POSIX lex\n" +" -I, --interactive genereer een interactieve scanner\n" +" --yylineno houdt het regelaantal bij in yylineno\n" +"\n" +"Gegenereerde code:\n" +" -+, --c++ genereer een C++-scannerklasse\n" +" -Dmacro[=defn] #define macro defn (standaard defn is '1')\n" +" -L, --noline onderdruk #line directieven in de scanner\n" +" -P, --prefix=STRING gebruik STRING als prefix in plaats van \"yy\"\n" +" -R, --reentrant genereer een herintreedbare C-scanner\n" +" --bison-bridge genereer een scanner voor zuivere bison-ontleder\n" +" --bison-locations neem ondersteuning voor yylloc op\n" +" --stdinit initialiseer yyin/yyout naar standaardin/uitvoer\n" +" --noansi-definitions oude-stijl functiedefinities\n" +" --noansi-prototypes lege parameterlijst in prototypes\n" +" --nounistd sluit <unistd.h> niet in\n" +" --noFUNCTIE genereer specifieke FUNCTIE niet\n" +"\n" +"Varia:\n" +" -c nietsdoende POSIX-optie\n" +" -n nietsdoende POSIX-optie\n" +" -?\n" +" -h, --help geef dit hulpbericht\n" +" -V, --version rapporteer de versie van %s\n" + +#: misc.c:100 misc.c:126 +#, c-format +msgid "name \"%s\" ridiculously long" +msgstr "naam \"%s\" is belachelijk lang" + +#: misc.c:175 +msgid "memory allocation failed in allocate_array()" +msgstr "geheugenreservering is mislukt in allocate_array()" + +#: misc.c:250 +#, c-format +msgid "bad character '%s' detected in check_char()" +msgstr "onjuist teken '%s' in check_char()" + +#: misc.c:255 +#, c-format +msgid "scanner requires -8 flag to use the character %s" +msgstr "scanner heeft de vlag -8 nodig om teken %s te kunnen gebruiken" + +#: misc.c:288 +msgid "dynamic memory failure in copy_string()" +msgstr "dynamische geheugenfout in copy_string()" + +#: misc.c:422 +#, c-format +msgid "%s: fatal internal error, %s\n" +msgstr "%s: fatale interne fout, %s\n" + +#: misc.c:875 +msgid "attempt to increase array size failed" +msgstr "vergroting van array is mislukt" + +#: misc.c:1002 +msgid "bad line in skeleton file" +msgstr "onjuiste regel in skeletbestand" + +#: misc.c:1051 +msgid "memory allocation failed in yy_flex_xmalloc()" +msgstr "geheugenreservering is mislukt in yy_flex_xmalloc()" + +#: nfa.c:104 +#, c-format +msgid "" +"\n" +"\n" +"********** beginning dump of nfa with start state %d\n" +msgstr "" +"\n" +"\n" +"********** begin van dump van NFA met starttoestand %d\n" + +#: nfa.c:115 +#, c-format +msgid "state # %4d\t" +msgstr "toestand # %4d\t" + +#: nfa.c:130 +msgid "********** end of dump\n" +msgstr "********** einde van de dump\n" + +#: nfa.c:174 +msgid "empty machine in dupmachine()" +msgstr "lege machine in dupmachine()" + +#: nfa.c:240 +#, c-format +msgid "Variable trailing context rule at line %d\n" +msgstr "Regel met variabele nakomende context op regel %d\n" + +#: nfa.c:353 +msgid "bad state type in mark_beginning_as_normal()" +msgstr "onjuist toestandstype in mark_beginning_as_normal()" + +#: nfa.c:598 +#, c-format +msgid "input rules are too complicated (>= %d NFA states)" +msgstr "invoerregels zijn te ingewikkeld (>= %d NFA-toestanden)" + +#: nfa.c:677 +msgid "found too many transitions in mkxtion()" +msgstr "te veel transities gevonden in mkxtion()" + +#: nfa.c:703 +#, c-format +msgid "too many rules (> %d)!" +msgstr "te veel regels (> %d)!" + +#: parse.y:183 +msgid "unknown error processing section 1" +msgstr "onbekende fout tijdens verwerken van sectie 1" + +#: parse.y:208 parse.y:373 +msgid "bad start condition list" +msgstr "onjuiste lijst van startvoorwaarden" + +#: parse.y:337 +msgid "unrecognized rule" +msgstr "onbekende regel" + +#: parse.y:456 parse.y:469 parse.y:538 +msgid "trailing context used twice" +msgstr "nakomende context twee keer gebruikt" + +#: parse.y:574 parse.y:584 parse.y:657 parse.y:667 +msgid "bad iteration values" +msgstr "onjuiste iteratiewaarden" + +#: parse.y:602 parse.y:620 parse.y:685 parse.y:703 +msgid "iteration value must be positive" +msgstr "iteratiewaarde moet positief zijn" + +#: parse.y:817 parse.y:827 +#, c-format +msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" +msgstr "" +"het tekenbereik [%c-%c] is niet eenduidig in een hoofdletterongevoelige " +"scanner" + +#: parse.y:832 +msgid "negative range in character class" +msgstr "negatief bereik in tekenklasse" + +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 +msgid "Input line too long\n" +msgstr "Invoerregel is te lang\n" + +#: scan.l:150 +#, c-format +msgid "malformed '%top' directive" +msgstr "verkeerde opbouw van '%top' commando" + +#: scan.l:172 +#, no-c-format +msgid "unrecognized '%' directive" +msgstr "onbekende '%' stuurcode" + +#: scan.l:252 +msgid "Unmatched '{'" +msgstr "Ongepaarde '{'" + +#: scan.l:285 +msgid "incomplete name definition" +msgstr "onvolledige naamsdefinitie" + +#: scan.l:418 +#, c-format +msgid "unrecognized %%option: %s" +msgstr "onbekende %%option: %s" + +#: scan.l:559 scan.l:678 +msgid "bad character class" +msgstr "onjuiste tekenklasse" + +#: scan.l:606 +#, c-format +msgid "undefined definition {%s}" +msgstr "ongedefinieerde definitie {%s}" + +#: scan.l:646 +#, c-format +msgid "bad <start condition>: %s" +msgstr "onjuiste <startvoorwaarde>: %s" + +#: scan.l:659 +msgid "missing quote" +msgstr "ontbrekend aanhalingsteken" + +#: scan.l:699 +#, c-format +msgid "bad character class expression: %s" +msgstr "onjuiste expressie '%s' in tekenklasse" + +#: scan.l:721 +msgid "bad character inside {}'s" +msgstr "onjuist teken tussen {}'s" + +#: scan.l:727 +msgid "missing }" +msgstr "ontbrekende }" + +#: scan.l:800 +msgid "EOF encountered inside an action" +msgstr "EOF bereikt tijdens een actie" + +#: scan.l:820 +#, c-format +msgid "bad character: %s" +msgstr "onjuist teken: %s" + +#: scan.l:849 +#, c-format +msgid "can't open %s" +msgstr "kan %s niet openen" + +#: scanopt.c:291 +#, c-format +msgid "Usage: %s [OPTIONS]...\n" +msgstr "Gebruik: %s [OPTIES]...\n" + +#: scanopt.c:565 +#, c-format +msgid "option `%s' doesn't allow an argument\n" +msgstr "optie '%s' staat geen argument toe\n" + +#: scanopt.c:570 +#, c-format +msgid "option `%s' requires an argument\n" +msgstr "optie '%s' vereist een argument\n" + +#: scanopt.c:574 +#, c-format +msgid "option `%s' is ambiguous\n" +msgstr "optie '%s' is niet eenduidig\n" + +#: scanopt.c:578 +#, c-format +msgid "Unrecognized option `%s'\n" +msgstr "Onbekende optie '%s'\n" + +#: scanopt.c:582 +#, c-format +msgid "Unknown error=(%d)\n" +msgstr "Onbekende fout=(%d)\n" + +#: sym.c:100 +msgid "symbol table memory allocation failed" +msgstr "geheugenreservering voor symbolentabel is mislukt" + +#: sym.c:203 +msgid "name defined twice" +msgstr "naam twee keer gedefinieerd" + +#: sym.c:254 +#, c-format +msgid "start condition %s declared twice" +msgstr "startvoorwaarde %s is twee keer vermeld" + +#: yylex.c:56 +msgid "premature EOF" +msgstr "voortijdige EOF" + +#: yylex.c:198 +msgid "End Marker\n" +msgstr "Eindmarkering\n" + +#: yylex.c:204 +#, c-format +msgid "*Something Weird* - tok: %d val: %d\n" +msgstr "*Iets Raars* - token: %d waarde:%d\n" diff --git a/po/pl.gmo b/po/pl.gmo Binary files differnew file mode 100644 index 0000000..01d3f89 --- /dev/null +++ b/po/pl.gmo diff --git a/po/pl.po b/po/pl.po new file mode 100644 index 0000000..b1a682c --- /dev/null +++ b/po/pl.po @@ -0,0 +1,877 @@ +# Polish translation for flex. +# Copyright (C) 2003 Free Software Foundation, Inc. +# Jakub Bogusz <qboosh@pld-linux.org>, 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2003-06-19 00:44+0200\n" +"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" +"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: dfa.c:61 +#, c-format +msgid "State #%d is non-accepting -\n" +msgstr "Stan #%d jest nieakceptuj±cy -\n" + +#: dfa.c:124 +msgid "dangerous trailing context" +msgstr "niebezpieczny kontekst koñcowy" + +#: dfa.c:166 +msgid " associated rule line numbers:" +msgstr " numery linii powi±zanych regu³:" + +#: dfa.c:202 +msgid " out-transitions: " +msgstr " przej¶cia-wyj¶ciowe: " + +#: dfa.c:210 +msgid "" +"\n" +" jam-transitions: EOF " +msgstr "" +"\n" +" przej¶cia-zapêtlaj±ce: EOF " + +#: dfa.c:341 +msgid "consistency check failed in epsclosure()" +msgstr "kontrola spójno¶ci nie powiod³a siê w epsclosure()" + +#: dfa.c:429 +msgid "" +"\n" +"\n" +"DFA Dump:\n" +"\n" +msgstr "" +"\n" +"\n" +"Zrzut DFA:\n" +"\n" + +#: dfa.c:604 +msgid "could not create unique end-of-buffer state" +msgstr "nie mo¿na utworzyæ unikalnego stanu koñca bufora" + +#: dfa.c:625 +#, c-format +msgid "state # %d:\n" +msgstr "stan # %d:\n" + +#: dfa.c:800 +msgid "Could not write yynxt_tbl[][]" +msgstr "Nie mo¿na zapisaæ yynxt_tbl[][]" + +#: dfa.c:1023 +msgid "consistency check failed in symfollowset" +msgstr "kontrola spójno¶ci nie powiod³a siê w symfollowset" + +#: dfa.c:1071 +msgid "bad transition character detected in sympartition()" +msgstr "wykryto b³êdny znak przej¶cia w sympartition()" + +#: gen.c:484 +msgid "" +"\n" +"\n" +"Equivalence Classes:\n" +"\n" +msgstr "" +"\n" +"\n" +"Klasy równowa¿no¶ci:\n" +"\n" + +#: gen.c:668 gen.c:697 gen.c:1221 +#, c-format +msgid "state # %d accepts: [%d]\n" +msgstr "stan # %d akceptuje: [%d]\n" + +#: gen.c:1116 +#, c-format +msgid "state # %d accepts: " +msgstr "stan # %d akceptuje: " + +#: gen.c:1163 +msgid "Could not write yyacclist_tbl" +msgstr "Nie mo¿na zapisaæ yyacclist_tbl" + +#: gen.c:1239 +msgid "Could not write yyacc_tbl" +msgstr "Nie mo¿na zapisaæ yyacc_tbl" + +#: gen.c:1254 gen.c:1639 gen.c:1662 +msgid "Could not write ecstbl" +msgstr "Nie mo¿na zapisaæ ecstbl" + +#: gen.c:1277 +msgid "" +"\n" +"\n" +"Meta-Equivalence Classes:\n" +msgstr "" +"\n" +"\n" +"Klasy meta-równowa¿no¶ci:\n" + +#: gen.c:1299 +msgid "Could not write yymeta_tbl" +msgstr "Nie mo¿na zapisaæ yymeta_tbl" + +#: gen.c:1360 +msgid "Could not write yybase_tbl" +msgstr "Nie mo¿na zapisaæ yybase_tbl" + +#: gen.c:1394 +msgid "Could not write yydef_tbl" +msgstr "Nie mo¿na zapisaæ yydef_tbl" + +#: gen.c:1434 +msgid "Could not write yynxt_tbl" +msgstr "Nie mo¿na zapisaæ yynxt_tbl" + +#: gen.c:1470 +msgid "Could not write yychk_tbl" +msgstr "Nie mo¿na zapisaæ yychk_tbl" + +#: gen.c:1624 gen.c:1653 +msgid "Could not write ftbl" +msgstr "Nie mo¿na zapisaæ ftbl" + +#: gen.c:1630 +msgid "Could not write ssltbl" +msgstr "Nie mo¿na zapisaæ ssltbl" + +#: gen.c:1681 +msgid "Could not write eoltbl" +msgstr "Nie mo¿na zapisaæ eoltbl" + +#: gen.c:1741 +msgid "Could not write yynultrans_tbl" +msgstr "Nie mo¿na zapisaæ yynultrans_tbl" + +#: main.c:187 +msgid "rule cannot be matched" +msgstr "nie mo¿na dopasowaæ regu³y" + +#: main.c:192 +msgid "-s option given but default rule can be matched" +msgstr "podano opcjê -s, ale domy¶lna regu³a mo¿e byæ dopasowana" + +#: main.c:231 +msgid "Can't use -+ with -l option" +msgstr "Nie mo¿na u¿yæ -+ z opcj± -l" + +#: main.c:234 +msgid "Can't use -f or -F with -l option" +msgstr "Nie mo¿na u¿yæ -f ani -F z opcj± -l" + +#: main.c:238 +msgid "Can't use --reentrant or --bison-bridge with -l option" +msgstr "Nie mo¿na u¿yæ --reentrant ani --bison-bridge z opcj± -l" + +#: main.c:275 +msgid "-Cf/-CF and -Cm don't make sense together" +msgstr "-Cf/-CF i -Cm razem nie maj± sensu" + +#: main.c:278 +msgid "-Cf/-CF and -I are incompatible" +msgstr "-Cf/-CF i -I s± niekompatybilne" + +#: main.c:282 +msgid "-Cf/-CF are incompatible with lex-compatibility mode" +msgstr "-Cf/-CF s± niekompatybilne z trybem kompatybilno¶ci z leksem" + +#: main.c:287 +msgid "-Cf and -CF are mutually exclusive" +msgstr "-Cf i -CF wykluczaj± siê wzajemnie" + +#: main.c:291 +msgid "Can't use -+ with -CF option" +msgstr "Nie mo¿na u¿yæ -+ z opcj± -CF" + +#: main.c:294 +#, c-format +msgid "%array incompatible with -+ option" +msgstr "%array jest niekompatybilne z opcj± -+" + +#: main.c:299 +msgid "Options -+ and --reentrant are mutually exclusive." +msgstr "Opcje -+ i --reentrant wykluczaj± siê wzajemnie." + +#: main.c:302 +msgid "bison bridge not supported for the C++ scanner." +msgstr "pomost dla bisona nie jest obs³ugiwany dla skanera C++." + +#: main.c:354 main.c:402 +#, c-format +msgid "could not create %s" +msgstr "nie mo¿na utworzyæ %s" + +#: main.c:415 +msgid "could not write tables header" +msgstr "nie mo¿na zapisaæ nag³ówka tablic" + +#: main.c:419 +#, c-format +msgid "can't open skeleton file %s" +msgstr "nie mo¿na otworzyæ pliku szablonu %s" + +#: main.c:500 +#, c-format +msgid "input error reading skeleton file %s" +msgstr "b³±d wej¶cia podczas odczytu pliku szablonu %s" + +#: main.c:504 +#, c-format +msgid "error closing skeleton file %s" +msgstr "b³±d podczas zamykania pliku szablonu %s" + +#: main.c:688 +#, c-format +msgid "error creating header file %s" +msgstr "b³±d podczas tworzenia pliku nag³ówkowego %s" + +#: main.c:696 +#, c-format +msgid "error writing output file %s" +msgstr "b³±d podczas zapisu pliku wyj¶ciowego %s" + +#: main.c:700 +#, c-format +msgid "error closing output file %s" +msgstr "b³±d podczas zamykania pliku wyj¶ciowego %s" + +#: main.c:704 +#, c-format +msgid "error deleting output file %s" +msgstr "b³±d podczas usuwania pliku wyj¶ciowego %s" + +#: main.c:711 +msgid "No backing up.\n" +msgstr "Bez zapamiêtywania.\n" + +#: main.c:715 +#, c-format +msgid "%d backing up (non-accepting) states.\n" +msgstr "%d zapamiêtywanych stanów (nie akceptuj±cych).\n" + +#: main.c:719 +msgid "Compressed tables always back up.\n" +msgstr "Skompresowane tablice zawsze zapamiêtuj±.\n" + +#: main.c:722 +#, c-format +msgid "error writing backup file %s" +msgstr "b³±d podczas zapisu pliku raportu z zapamiêtywania %s" + +#: main.c:726 +#, c-format +msgid "error closing backup file %s" +msgstr "b³±d podczas zamykania pliku raportu z zapamiêtywania %s" + +#: main.c:731 +#, c-format +msgid "%s version %s usage statistics:\n" +msgstr "%s w wersji %s - statystyka u¿ycia:\n" + +#: main.c:734 +msgid " scanner options: -" +msgstr " opcje skanera: -" + +#: main.c:813 +#, c-format +msgid " %d/%d NFA states\n" +msgstr " %d/%d stanów NFA\n" + +#: main.c:815 +#, c-format +msgid " %d/%d DFA states (%d words)\n" +msgstr " %d/%d stanów DFA (%d s³ów)\n" + +#: main.c:817 +#, c-format +msgid " %d rules\n" +msgstr " %d regu³\n" + +#: main.c:822 +msgid " No backing up\n" +msgstr " Bez zapamiêtywania\n" + +#: main.c:826 +#, c-format +msgid " %d backing-up (non-accepting) states\n" +msgstr " %d zapamiêtywanych stanów (nie akceptuj±cych)\n" + +#: main.c:831 +msgid " Compressed tables always back-up\n" +msgstr " Skompresowane tablice zawsze zapamiêtuj±\n" + +#: main.c:835 +msgid " Beginning-of-line patterns used\n" +msgstr " U¿ytych wzorców pocz±tek-linii\n" + +#: main.c:837 +#, c-format +msgid " %d/%d start conditions\n" +msgstr " %d/%d warunków pocz±tkowych\n" + +#: main.c:841 +#, c-format +msgid " %d epsilon states, %d double epsilon states\n" +msgstr " %d stanów epsilonowych, %d stanów podwójnie epsilonowych\n" + +#: main.c:845 +msgid " no character classes\n" +msgstr " bez klas znaków\n" + +#: main.c:849 +#, c-format +msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" +msgstr "" +" %d/%d klas znaków potrzebuje %d/%d s³ów pamiêci, %d ponownie u¿ytych\n" + +#: main.c:854 +#, c-format +msgid " %d state/nextstate pairs created\n" +msgstr " %d utworzonych par stan/nastêpny-stan\n" + +#: main.c:857 +#, c-format +msgid " %d/%d unique/duplicate transitions\n" +msgstr " %d/%d przej¶æ unikalny/duplikat\n" + +#: main.c:862 +#, c-format +msgid " %d table entries\n" +msgstr " %d elementów tablicy\n" + +#: main.c:870 +#, c-format +msgid " %d/%d base-def entries created\n" +msgstr " %d/%d utworzonych elementów base-def\n" + +#: main.c:874 +#, c-format +msgid " %d/%d (peak %d) nxt-chk entries created\n" +msgstr " %d/%d (maksymalnie %d) utworzonych elementów nxt-chk\n" + +#: main.c:878 +#, c-format +msgid " %d/%d (peak %d) template nxt-chk entries created\n" +msgstr " %d/%d (maksymalnie %d) utworzonych szablonowych elementów nxt-chk\n" + +#: main.c:882 +#, c-format +msgid " %d empty table entries\n" +msgstr " %d pustych elementów tablicy\n" + +#: main.c:884 +#, c-format +msgid " %d protos created\n" +msgstr " %d utworzonych prototypów\n" + +#: main.c:887 +#, c-format +msgid " %d templates created, %d uses\n" +msgstr " %d utworzonych szablonów, %d u¿yæ\n" + +#: main.c:895 +#, c-format +msgid " %d/%d equivalence classes created\n" +msgstr " %d/%d utworzonych klas równowa¿no¶ci\n" + +#: main.c:903 +#, c-format +msgid " %d/%d meta-equivalence classes created\n" +msgstr " %d/%d utworzonych klas meta-równowa¿no¶ci\n" + +#: main.c:909 +#, c-format +msgid " %d (%d saved) hash collisions, %d DFAs equal\n" +msgstr " %d (%d zachowanych) kolizji haszy, %d jednakowych DFA\n" + +#: main.c:911 +#, c-format +msgid " %d sets of reallocations needed\n" +msgstr " %d potrzebnych zbiorów realokacji\n" + +#: main.c:913 +#, c-format +msgid " %d total table entries needed\n" +msgstr " %d potrzebnych ogó³em elementów tablicy\n" + +#: main.c:988 +msgid "Internal error. flexopts are malformed.\n" +msgstr "B³±d wewnêtrzny. ¬le sformu³owane flexopts.\n" + +#: main.c:998 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "`%s --help' poda wiêcej informacji.\n" + +#: main.c:1055 +#, c-format +msgid "unknown -C option '%c'" +msgstr "nieznana opcja -C '%c'" + +#: main.c:1184 +#, c-format +msgid "%s %s\n" +msgstr "%s %s\n" + +#: main.c:1459 +msgid "fatal parse error" +msgstr "krytyczny b³±d analizy sk³adni" + +#: main.c:1491 +#, c-format +msgid "could not create backing-up info file %s" +msgstr "nie mo¿na utworzyæ pliku informacji o zapamiêtywaniu %s" + +#: main.c:1512 +msgid "-l AT&T lex compatibility option entails a large performance penalty\n" +msgstr "opcja -l zgodno¶ci z leksem AT&T powoduje du¿± stratê wydajno¶ci\n" + +#: main.c:1515 +msgid " and may be the actual source of other reported performance penalties\n" +msgstr " i mo¿e byæ przyczyn± innych zg³aszanych strat wydajno¶ci\n" + +#: main.c:1521 +#, c-format +msgid "" +"%%option yylineno entails a performance penalty ONLY on rules that can match " +"newline characters\n" +msgstr "" +"%%option yylineno powoduje straty wydajno¶ci TYLKO dla regu³ dopasowuj±cych " +"znak koñca linii\n" + +#: main.c:1528 +msgid "-I (interactive) entails a minor performance penalty\n" +msgstr "-I (interaktywny) powoduje ma³± stratê wydajno¶ci\n" + +#: main.c:1533 +msgid "yymore() entails a minor performance penalty\n" +msgstr "yymore() powoduje ma³± stratê wydajno¶ci\n" + +#: main.c:1539 +msgid "REJECT entails a large performance penalty\n" +msgstr "REJECT powoduje du¿± stratê wydajno¶ci\n" + +#: main.c:1544 +msgid "Variable trailing context rules entail a large performance penalty\n" +msgstr "" +"Regu³y ze zmiennym koñcowym kontekstem powoduj± du¿± stratê wydajno¶ci\n" + +#: main.c:1556 +msgid "REJECT cannot be used with -f or -F" +msgstr "REJECT nie mo¿e byæ u¿yte z -f ani -F" + +#: main.c:1559 +#, c-format +msgid "%option yylineno cannot be used with REJECT" +msgstr "%option yylineno nie mo¿e byæ u¿yte z REJECT" + +#: main.c:1562 +msgid "variable trailing context rules cannot be used with -f or -F" +msgstr "regu³y ze zmiennym koñcowym kontekstem nie mog± byæ u¿yte z -f ani -F" + +#: main.c:1677 +#, c-format +msgid "%option yyclass only meaningful for C++ scanners" +msgstr "%option yyclass ma znaczenie tylko dla skanerów C++" + +#: main.c:1784 +#, c-format +msgid "Usage: %s [OPTIONS] [FILE]...\n" +msgstr "Sk³adnia: %s [OPCJE] [PLIK]...\n" + +#: main.c:1787 +#, c-format +msgid "" +"Generates programs that perform pattern-matching on text.\n" +"\n" +"Table Compression:\n" +" -Ca, --align trade off larger tables for better memory alignment\n" +" -Ce, --ecs construct equivalence classes\n" +" -Cf do not compress tables; use -f representation\n" +" -CF do not compress tables; use -F representation\n" +" -Cm, --meta-ecs construct meta-equivalence classes\n" +" -Cr, --read use read() instead of stdio for scanner input\n" +" -f, --full generate fast, large scanner. Same as -Cfr\n" +" -F, --fast use alternate table representation. Same as -CFr\n" +" -Cem default compression (same as --ecs --meta-ecs)\n" +"\n" +"Debugging:\n" +" -d, --debug enable debug mode in scanner\n" +" -b, --backup write backing-up information to %s\n" +" -p, --perf-report write performance report to stderr\n" +" -s, --nodefault suppress default rule to ECHO unmatched text\n" +" -T, --trace %s should run in trace mode\n" +" -w, --nowarn do not generate warnings\n" +" -v, --verbose write summary of scanner statistics to stdout\n" +"\n" +"Files:\n" +" -o, --outfile=FILE specify output filename\n" +" -S, --skel=FILE specify skeleton file\n" +" -t, --stdout write scanner on stdout instead of %s\n" +" --yyclass=NAME name of C++ class\n" +" --header-file=FILE create a C header file in addition to the " +"scanner\n" +" --tables-file[=FILE] write tables to FILE\n" +"\n" +"Scanner behavior:\n" +" -7, --7bit generate 7-bit scanner\n" +" -8, --8bit generate 8-bit scanner\n" +" -B, --batch generate batch scanner (opposite of -I)\n" +" -i, --case-insensitive ignore case in patterns\n" +" -l, --lex-compat maximal compatibility with original lex\n" +" -X, --posix-compat maximal compatibility with POSIX lex\n" +" -I, --interactive generate interactive scanner (opposite of -B)\n" +" --yylineno track line count in yylineno\n" +"\n" +"Generated code:\n" +" -+, --c++ generate C++ scanner class\n" +" -Dmacro[=defn] #define macro defn (default defn is '1')\n" +" -L, --noline suppress #line directives in scanner\n" +" -P, --prefix=STRING use STRING as prefix instead of \"yy\"\n" +" -R, --reentrant generate a reentrant C scanner\n" +" --bison-bridge scanner for bison pure parser.\n" +" --bison-locations include yylloc support.\n" +" --stdinit initialize yyin/yyout to stdin/stdout\n" +" --noansi-definitions old-style function definitions\n" +" --noansi-prototypes empty parameter list in prototypes\n" +" --nounistd do not include <unistd.h>\n" +" --noFUNCTION do not generate a particular FUNCTION\n" +"\n" +"Miscellaneous:\n" +" -c do-nothing POSIX option\n" +" -n do-nothing POSIX option\n" +" -?\n" +" -h, --help produce this help message\n" +" -V, --version report %s version\n" +msgstr "" +"Generowanie programów wykonuj±cych na tek¶cie dopasowywanie wzorców.\n" +"\n" +"Komprecja tablic:\n" +" -Ca, --align u¿ycie wiêkszych tablic dla lepszego wyrównania pamiêci\n" +" -Ce, --ecs konstruowanie klas równowa¿no¶ci\n" +" -Cf nie kompresowanie tablic; u¿ycie reprezentacji -f\n" +" -CF nie kompresowanie tablic; u¿ycie reprezentacji -F\n" +" -Cm, --meta-ecs konstruowanie klas meta-równowa¿no¶ci\n" +" -Cr, --read u¿ycie read() zamiast stdio dla wej¶cia skanera\n" +" -f, --full wygenerowanie szybkiego, wielkiego skanera. To samo co -" +"Cfr\n" +" -F, --fast u¿ycie alternatywnej reprezentacji tablic. To samo co -" +"CFr\n" +" -Cem domy¶lne kompresowanie (to samo co --ecs --meta-ecs)\n" +"\n" +"Diagnostyka:\n" +" -d, --debug w³±czenie trybu diagnostycznego (debug) w " +"skanerze\n" +" -b, --backup zapisanie informacji o zapamiêtywaniu do %s\n" +" -p, --perf-report wypisanie raportu o wydajno¶ci na stderr\n" +" -s, --nodefault pominiêcie domy¶lnej regu³y ECHO dla " +"niedopasowanego\n" +" tekstu\n" +" -T, --trace %s powinien dzia³aæ w trybie ¶ledzenia\n" +" -w, --nowarn nie generowanie ostrze¿eñ\n" +" -v, --verbose wypisanie podsumowania statystyk skanera na " +"stdout\n" +"\n" +"Pliki:\n" +" -o, --outfile=PLIK podanie nazwy pliku wyj¶ciowego\n" +" -S, --skel=PLIK podanie pliku szablonu\n" +" -t, --stdout zapis wyj¶cia skanera na stdout zamiast %s\n" +" --yyclass=NAZWA nazwa klasy C++\n" +" --header-file=PLIK utworzenie pliku nag³ówkowego C oprócz skanera\n" +" --tables-file[=PLIK] zapisanie tablic do PLIKU\n" +"\n" +"Zachowanie skanera:\n" +" -7, --7bit wygenerowanie skanera 7-bitowego\n" +" -8, --8bit wygenerowanie skanera 8-bitowego\n" +" -B, --batch wygenerowanie skanera wsadowego (przeciwieñstwo -" +"I)\n" +" -i, --case-insensitive ignorowanie wielko¶ci liter we wzorcach\n" +" -l, --lex-compat maksymalna kompatybilno¶æ z oryginalnym leksem\n" +" -X, --posix-compat maksymalna kompatybilno¶æ z leksem POSIX\n" +" -I, --interactive wygenerowanie skanera interaktywnego (przeciw. -" +"B)\n" +" --yylineno ¶ledzenie liczby linii w yylineno\n" +"\n" +"Generowany kod:\n" +" -+, --c++ wygenerowanie klasy skanera w C++\n" +" -Dmakro[=defn] #define makro defn (domy¶lne defn to '1')\n" +" -L, --noline pominiêcie dyrektyw #line w skanerze\n" +" -P, --prefix=£AÑCUCH u¿ycie jako prefiksu £AÑCUCHA zamiast \"yy\"\n" +" -R, --reentrant wygenerowanie wielobie¿nego skanera w C\n" +" --bison-bridge skaner dla czystego analizatora w bisonie\n" +" --bison-locations dodanie obs³ugi yylloc\n" +" --stdinit zainicjowanie yyin/yyout na stdin/stdout\n" +" --noansi-definitions definicje funkcji w starym stylu\n" +" --noansi-prototypes puste listy parametrów w prototypach\n" +" --nounistd nie do³±czanie <unistd.h>\n" +" --noFUNKCJA nie generowanie podanej FUNKCJI\n" +"\n" +"Ró¿ne:\n" +" -c nic nie robi±ca opcja POSIX\n" +" -n nic nie robi±ca opcja POSIX\n" +" -?\n" +" -h, --help wy¶wietlenie tego pomocnego opisu\n" +" -V, --version podanie wersji programu %s\n" + +#: misc.c:100 misc.c:126 +#, c-format +msgid "name \"%s\" ridiculously long" +msgstr "nazwa \"%s\" jest ¶miesznie d³uga" + +#: misc.c:175 +msgid "memory allocation failed in allocate_array()" +msgstr "nie uda³o siê przydzieliæ pamiêci w allocate_array()" + +#: misc.c:250 +#, c-format +msgid "bad character '%s' detected in check_char()" +msgstr "b³êdny znak '%s' usuniêty w check_char()" + +#: misc.c:255 +#, c-format +msgid "scanner requires -8 flag to use the character %s" +msgstr "skaner wymaga flagi -8 aby u¿yæ znaku %s" + +#: misc.c:288 +msgid "dynamic memory failure in copy_string()" +msgstr "niepowodzenie dynamicznej pamiêci w copy_string()" + +#: misc.c:422 +#, c-format +msgid "%s: fatal internal error, %s\n" +msgstr "%s: krytyczny b³±d wewnêtrzny: %s\n" + +#: misc.c:875 +msgid "attempt to increase array size failed" +msgstr "próba zwiêkszenia rozmiaru tablicy nie powiod³a siê" + +#: misc.c:1002 +msgid "bad line in skeleton file" +msgstr "b³êdna linia w pliku szablonu" + +#: misc.c:1051 +msgid "memory allocation failed in yy_flex_xmalloc()" +msgstr "nie uda³o siê przydzieliæ pamiêci w yy_flex_xmalloc()" + +#: nfa.c:104 +#, c-format +msgid "" +"\n" +"\n" +"********** beginning dump of nfa with start state %d\n" +msgstr "" +"\n" +"\n" +"********** pocz±tek zrzutu NFA ze stanem pocz±tkowym %d\n" + +#: nfa.c:115 +#, c-format +msgid "state # %4d\t" +msgstr "stan # %4d\t" + +#: nfa.c:130 +msgid "********** end of dump\n" +msgstr "********** koniec zrzutu\n" + +#: nfa.c:174 +msgid "empty machine in dupmachine()" +msgstr "pusty automat w dupmachine()" + +#: nfa.c:240 +#, c-format +msgid "Variable trailing context rule at line %d\n" +msgstr "Regu³a ze zmiennym koñcowym kontekstem w linii %d\n" + +#: nfa.c:353 +msgid "bad state type in mark_beginning_as_normal()" +msgstr "b³êdny typ stanu w mark_beginning_as_normal()" + +#: nfa.c:598 +#, c-format +msgid "input rules are too complicated (>= %d NFA states)" +msgstr "regu³y wej¶ciowe s± zbyt skomplikowane (>= %d stanów NFA)" + +#: nfa.c:677 +msgid "found too many transitions in mkxtion()" +msgstr "znaleziono zbyt du¿o przej¶æ w mkxtion()" + +#: nfa.c:703 +#, c-format +msgid "too many rules (> %d)!" +msgstr "zbyt du¿o regu³ (> %d)!" + +#: parse.y:183 +msgid "unknown error processing section 1" +msgstr "nieznany b³±d podczas przetwarzania sekcji 1" + +#: parse.y:208 parse.y:373 +msgid "bad start condition list" +msgstr "b³êdna lista warunków pocz±tkowych" + +#: parse.y:337 +msgid "unrecognized rule" +msgstr "nierozpoznana regu³a" + +#: parse.y:456 parse.y:469 parse.y:538 +msgid "trailing context used twice" +msgstr "koñcowy kontekst u¿yty dwukrotnie" + +#: parse.y:574 parse.y:584 parse.y:657 parse.y:667 +msgid "bad iteration values" +msgstr "b³êdne warto¶ci iteracji" + +#: parse.y:602 parse.y:620 parse.y:685 parse.y:703 +msgid "iteration value must be positive" +msgstr "warto¶æ iteracji musi byæ dodatnia" + +#: parse.y:817 parse.y:827 +#, c-format +msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" +msgstr "" +"przedzia³ znaków [%c-%c] jest niejednoznaczny w skanerze ignoruj±cym " +"wielko¶æ liter" + +#: parse.y:832 +msgid "negative range in character class" +msgstr "ujemny przedzia³ w klasie znaków" + +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 +msgid "Input line too long\n" +msgstr "Linia wej¶ciowa zbyt d³uga\n" + +#: scan.l:150 +#, c-format +msgid "malformed '%top' directive" +msgstr "¼le sformu³owana dyrektywa '%top'" + +#: scan.l:172 +#, no-c-format +msgid "unrecognized '%' directive" +msgstr "nierozpoznana dyrektywa '%'" + +#: scan.l:252 +msgid "Unmatched '{'" +msgstr "Niesparowany '{'" + +#: scan.l:285 +msgid "incomplete name definition" +msgstr "niekompletna definicja nazwy" + +#: scan.l:418 +#, c-format +msgid "unrecognized %%option: %s" +msgstr "nierozpoznane %%option: %s" + +#: scan.l:559 scan.l:678 +msgid "bad character class" +msgstr "b³êdna klasa znaków" + +#: scan.l:606 +#, c-format +msgid "undefined definition {%s}" +msgstr "niezdefiniowana definicja {%s}" + +#: scan.l:646 +#, c-format +msgid "bad <start condition>: %s" +msgstr "b³êdny <warunek pocz±tkowy>: %s" + +#: scan.l:659 +msgid "missing quote" +msgstr "brak cudzys³owu" + +#: scan.l:699 +#, c-format +msgid "bad character class expression: %s" +msgstr "b³êdne wyra¿enie klasy znaków: %s" + +#: scan.l:721 +msgid "bad character inside {}'s" +msgstr "b³êdny znak wewn±trz {}" + +#: scan.l:727 +msgid "missing }" +msgstr "brak }" + +#: scan.l:800 +msgid "EOF encountered inside an action" +msgstr "EOF napotkany wewn±trz akcji" + +#: scan.l:820 +#, c-format +msgid "bad character: %s" +msgstr "b³êdny znak: %s" + +#: scan.l:849 +#, c-format +msgid "can't open %s" +msgstr "nie mo¿na otworzyæ %s" + +#: scanopt.c:291 +#, c-format +msgid "Usage: %s [OPTIONS]...\n" +msgstr "Sk³adnia: %s [OPCJE]...\n" + +#: scanopt.c:565 +#, c-format +msgid "option `%s' doesn't allow an argument\n" +msgstr "opcja `%s' nie przyjmuje argumentu\n" + +#: scanopt.c:570 +#, c-format +msgid "option `%s' requires an argument\n" +msgstr "opcja `%s' wymaga argumentu\n" + +#: scanopt.c:574 +#, c-format +msgid "option `%s' is ambiguous\n" +msgstr "opcja `%s' jest niejednoznaczna\n" + +#: scanopt.c:578 +#, c-format +msgid "Unrecognized option `%s'\n" +msgstr "Nierozpoznana opcja `%s'\n" + +#: scanopt.c:582 +#, c-format +msgid "Unknown error=(%d)\n" +msgstr "Nieznany b³±d=(%d)\n" + +#: sym.c:100 +msgid "symbol table memory allocation failed" +msgstr "nie uda³o siê przydzieliæ pamiêci dla tablicy symboli" + +#: sym.c:203 +msgid "name defined twice" +msgstr "nazwa zdefiniowana dwukrotnie" + +#: sym.c:254 +#, c-format +msgid "start condition %s declared twice" +msgstr "warunek pocz±tkowy %s zadeklarowany dwukrotnie" + +#: yylex.c:56 +msgid "premature EOF" +msgstr "przedwczesny EOF" + +#: yylex.c:198 +msgid "End Marker\n" +msgstr "Znacznik koñca\n" + +#: yylex.c:204 +#, c-format +msgid "*Something Weird* - tok: %d val: %d\n" +msgstr "*Co¶ dziwnego* - tok: %d val: %d\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex dd2a386..0162724 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 7ccd51d..4faa7b0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 2003-01-15 02:00-0300\n" "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -158,349 +159,349 @@ msgstr "Impossível escrever ecstbl" msgid "Could not write yynultrans_tbl" msgstr "Impossível escrever yynultrans_tbl" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "aplicação da regra não gerou nenhum resultado" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "a opção -s foi fornecida, mas a regra padrão pode ser aplicada" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "Impossível usar -+ com a opção -l" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "Impossível usar -f ou -F com a opção -l" -#: main.c:224 +#: main.c:238 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Impossível usar -R ou -Rb com a opção -l" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF e -Cm não fazem sentido juntos" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF e -I são incompatíveis" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF são incompatíveis com o modo de compatibilidade lex" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf e -CF são mutuamente exclusivos" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "Impossível usar -+ com a opção -CF" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array é incompatível com a opção -+" -#: main.c:285 +#: main.c:299 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "As opções -+ e -R são mutuamente exclusivas." -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "impossível criar %s" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "impossível escrever o cabeçalho das tabelas" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "impossível abrir o arquivo esqueleto %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "erro lendo o arquivo esqueleto %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "erro fechando o arquivo esqueleto %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "erro criando o arquivo cabeçalho %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "erro escrevendo arquivo de saída %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "erro fechando arquivo de saída %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "erro removendo arquivo de saída %s" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Impossível restaurar.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d fazendo cópia de segurança de estados (não-aceita).\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Tabelas compactadas sempre têm cópias de segurança.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "erro escrevendo cópia de segurança %s" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "erro fechando cópia de segurança %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versão %s estatísticas de uso:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " opções de scanner: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estados NFA\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estados DFA (%d palavras)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d regras\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Sem cópia de segurança\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d fazendo cópia de segurança de estados (não-aceita)\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Tabelas compactadas sempre têm cópias de segurança\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Padrões de início-de-linha usados\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condições de início\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estados epsilon, %d estados epsilon duplo\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " nenhuma classe de caracteres\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d classes de caracters precisaram de %d/%d palavras de armazenamento, %" "d reusadas\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d pares estado/próximoestado criados\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transições únicas/duplicadas\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d entradas de tabela\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entradas base-def criadas\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas nxt-chk criadas\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pico %d) modelos de entradas nxt-chk criadas\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d entradas vazias na tabela\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d protos criados\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modelos criados, %d usos\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes de equivalência criadas\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de meta-equivalência criadas\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d salvas) colisões de hash, %d DFAs iguais\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d conjuntos de realocação necessários\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " %d total de entradas de tabela necessárias\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Erro interno. flexopts estão malformados.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para maiores informações.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "opção -C '%c' desconecida" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "erro fatal de análise" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "impossível criar cópia de seguranço do arquivo de informações %s" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "a opção de compatibilidade com lex da AT&T '-l' acarreta em uma grande " "penalidade na performance\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " e pode ser a fonte real de outras penalidades de performance reportadas\n" -#: main.c:1504 +#: main.c:1521 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno acarreta em uma grande penalidade na performance\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interativo) acarreta em uma pequena penalidade na performance\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() acarreta em uma pequena penalidade na performance\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT acarreta em uma grande penalidade na performance\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Variável seguindo regras de contexto implicam em grande perda de " "performance\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT não pode ser usado com -f ou -F" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno não pode ser usada com REJECT" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "variáveis seguindo regras de contexto não podem ser usadas com -f ou -F" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass só tem sentido para scanners C++" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uso: %s [OPÇÕES] [ARQUIVO]...\n" -#: main.c:1771 +#: main.c:1787 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -686,74 +687,74 @@ msgstr "" msgid "negative range in character class" msgstr "faixa negativa na classe de caracteres" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "Linha de entrada muito longa\n" -#: scan.l:149 +#: scan.l:150 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "diretiva '%' não reconhecida" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "diretiva '%' não reconhecida" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "definição de nome incompleta" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opção não reconhecida: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "classe de caractere inválida" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "definição indefinida {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "<condição de início> inválida: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "faltou aspa" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "expressão de classe de caractere inválida: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "caracater inválido entre {}'s" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "faltou }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "Fim de Arquivo encontrado dentro de uma ação" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "caracter inválido: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "impossível abrir %s" diff --git a/po/ro.gmo b/po/ro.gmo Binary files differnew file mode 100644 index 0000000..b5ad6f2 --- /dev/null +++ b/po/ro.gmo diff --git a/po/ro.po b/po/ro.po new file mode 100644 index 0000000..50ada42 --- /dev/null +++ b/po/ro.po @@ -0,0 +1,885 @@ +# Mesajele în limba românã pentru pachetul flex. +# Copyright (C) 2003 Free Software Foundation, Inc. +# Eugen Hoanca <eugenh@urban-grafx.ro>, 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2003-11-22 11:07+0200\n" +"Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n" +"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: dfa.c:61 +#, c-format +msgid "State #%d is non-accepting -\n" +msgstr "Starea #%d este de neacceptat. -\n" + +#: dfa.c:124 +msgid "dangerous trailing context" +msgstr "context de sfârºit(trailing) periculos" + +#: dfa.c:166 +msgid " associated rule line numbers:" +msgstr " numerele de linie asociate regulii:" + +#: dfa.c:202 +msgid " out-transitions: " +msgstr " tranziþii exterioare(out): " + +#: dfa.c:210 +msgid "" +"\n" +" jam-transitions: EOF " +msgstr "" +"\n" +" tranziþii jam: EOF " + +#: dfa.c:341 +msgid "consistency check failed in epsclosure()" +msgstr "verificare de consistenþã eºuatã în epsclosure()" + +#: dfa.c:429 +msgid "" +"\n" +"\n" +"DFA Dump:\n" +"\n" +msgstr "" +"\n" +"\n" +"Rezultat(dump) DFA:\n" +"\n" + +#: dfa.c:604 +msgid "could not create unique end-of-buffer state" +msgstr "nu am putut crea sfârºit unic pentru starea buffer-ului" + +#: dfa.c:625 +#, c-format +msgid "state # %d:\n" +msgstr "stare # %d:\n" + +#: dfa.c:800 +msgid "Could not write yynxt_tbl[][]" +msgstr "Nu am putut scrie yynxt_tbl[][]" + +#: dfa.c:1023 +msgid "consistency check failed in symfollowset" +msgstr "verificare de consistenþã eºuatã în symfollowset" + +#: dfa.c:1071 +msgid "bad transition character detected in sympartition()" +msgstr "caracter greºit de tranziþie detectat în sympartition()" + +#: gen.c:484 +msgid "" +"\n" +"\n" +"Equivalence Classes:\n" +"\n" +msgstr "" +"\n" +"\n" +"Clase de Echivalenþã:\n" +"\n" + +#: gen.c:668 gen.c:697 gen.c:1221 +#, c-format +msgid "state # %d accepts: [%d]\n" +msgstr "starea # %d acceptã: [%d]\n" + +#: gen.c:1116 +#, c-format +msgid "state # %d accepts: " +msgstr "starea # %d acceptã: " + +#: gen.c:1163 +msgid "Could not write yyacclist_tbl" +msgstr "Nu am putut scrie yyacclist_tbl" + +#: gen.c:1239 +msgid "Could not write yyacc_tbl" +msgstr "Nu am putut scrie yyacc_tbl" + +#: gen.c:1254 gen.c:1639 gen.c:1662 +msgid "Could not write ecstbl" +msgstr "Nu am putut scrie ecstbl" + +#: gen.c:1277 +msgid "" +"\n" +"\n" +"Meta-Equivalence Classes:\n" +msgstr "" +"\n" +"\n" +"Clase de Meta-Echivalenþã:\n" + +#: gen.c:1299 +msgid "Could not write yymeta_tbl" +msgstr "Nu am putut scrie yymeta_tbl" + +#: gen.c:1360 +msgid "Could not write yybase_tbl" +msgstr "Nu am putut scrie yybase_tbl" + +#: gen.c:1394 +msgid "Could not write yydef_tbl" +msgstr "Nu am putut scrie yydef_tbl" + +#: gen.c:1434 +msgid "Could not write yynxt_tbl" +msgstr "Nu am putut scrie yynxt_tbl" + +#: gen.c:1470 +msgid "Could not write yychk_tbl" +msgstr "Nu am putut scrie yychk_tbl" + +#: gen.c:1624 gen.c:1653 +msgid "Could not write ftbl" +msgstr "Nu am putut scrie ftbl" + +#: gen.c:1630 +msgid "Could not write ssltbl" +msgstr "Nu am putut scrie ssltbl" + +#: gen.c:1681 +msgid "Could not write eoltbl" +msgstr "Nu am putut scrie eoltbl" + +#: gen.c:1741 +msgid "Could not write yynultrans_tbl" +msgstr "Nu am putut scrie yynultrans_tbl" + +#: main.c:187 +msgid "rule cannot be matched" +msgstr "regula nu se potriveºte cu nimic" + +#: main.c:192 +msgid "-s option given but default rule can be matched" +msgstr "a fost datã opþiunea -s dar regula implicitã se poate potrivi" + +#: main.c:231 +msgid "Can't use -+ with -l option" +msgstr "Nu se poate folosi -+ cu opþiunea -l" + +#: main.c:234 +msgid "Can't use -f or -F with -l option" +msgstr "Nu se poate folosi -f sau -F cu opþiunea -l" + +#: main.c:238 +msgid "Can't use --reentrant or --bison-bridge with -l option" +msgstr "Nu se poate folosi --reentrant sau --bison-bridge cu opþiunea -l" + +#: main.c:275 +msgid "-Cf/-CF and -Cm don't make sense together" +msgstr "-Cf/-CF ºi -Cm nu au sens folosite împreunã" + +#: main.c:278 +msgid "-Cf/-CF and -I are incompatible" +msgstr "-Cf/-CF ºi -I sunt incompatibile" + +#: main.c:282 +msgid "-Cf/-CF are incompatible with lex-compatibility mode" +msgstr "-Cf/-CF sunt incompatibile cu module de compatibilitate lex" + +#: main.c:287 +msgid "-Cf and -CF are mutually exclusive" +msgstr "-Cf ºi -CF se exclud reciproc" + +#: main.c:291 +msgid "Can't use -+ with -CF option" +msgstr "Nu se poate folosi -+ cu opþiunea -CF" + +#: main.c:294 +#, c-format +msgid "%array incompatible with -+ option" +msgstr "%array incompatibil cu opþiunea -+" + +#: main.c:299 +msgid "Options -+ and --reentrant are mutually exclusive." +msgstr "Opþiunile -+ and --reentrant se exclud reciproc" + +#: main.c:302 +msgid "bison bridge not supported for the C++ scanner." +msgstr "bridge bison nu este suportat pentru scannerul C++." + +#: main.c:354 main.c:402 +#, c-format +msgid "could not create %s" +msgstr "nu am putut crea %s" + +#: main.c:415 +msgid "could not write tables header" +msgstr "Nu am putut scrie capul de tabel" + +#: main.c:419 +#, c-format +msgid "can't open skeleton file %s" +msgstr "nu am putut deschide fiºierul schelet %s" + +#: main.c:500 +#, c-format +msgid "input error reading skeleton file %s" +msgstr "eroare de intrare(input) în timpul citirii fiºierului schelet %s" + +#: main.c:504 +#, c-format +msgid "error closing skeleton file %s" +msgstr "eroare în închiderea fiºierului schelet %s" + +#: main.c:688 +#, c-format +msgid "error creating header file %s" +msgstr "eroare în crearea fiºierului de header %s" + +#: main.c:696 +#, c-format +msgid "error writing output file %s" +msgstr "eroare în scrierea fiºierului de output %s" + +#: main.c:700 +#, c-format +msgid "error closing output file %s" +msgstr "eroare în închiderea fiºierului de output %s" + +#: main.c:704 +#, c-format +msgid "error deleting output file %s" +msgstr "eroare în ºtergerea fiºierului de output %s" + +#: main.c:711 +msgid "No backing up.\n" +msgstr "Nu se revine (backing-up).\n" + +#: main.c:715 +#, c-format +msgid "%d backing up (non-accepting) states.\n" +msgstr "%d salvare de (inacceptabile) stãri.\n" + +#: main.c:719 +msgid "Compressed tables always back up.\n" +msgstr "Tabelele compresate întotdeauna au back-up.\n" + +#: main.c:722 +#, c-format +msgid "error writing backup file %s" +msgstr "eroare în scrierea fiºierului de backup %s" + +#: main.c:726 +#, c-format +msgid "error closing backup file %s" +msgstr "eroare în închiderea fiºierului de backup %s" + +#: main.c:731 +#, c-format +msgid "%s version %s usage statistics:\n" +msgstr "%s versiunea %s statistici de folosire:\n" + +#: main.c:734 +msgid " scanner options: -" +msgstr " opþiuni de scanner: -" + +#: main.c:813 +#, c-format +msgid " %d/%d NFA states\n" +msgstr " %d/%d stãri NFA\n" + +#: main.c:815 +#, c-format +msgid " %d/%d DFA states (%d words)\n" +msgstr " %d/%d stãri DFA (%d cuvinte)\n" + +#: main.c:817 +#, c-format +msgid " %d rules\n" +msgstr " %d reguli\n" + +#: main.c:822 +msgid " No backing up\n" +msgstr " Nu se face backup\n" + +#: main.c:826 +#, c-format +msgid " %d backing-up (non-accepting) states\n" +msgstr " %d salvare de (inacceptabile) stãri\n" + +#: main.c:831 +msgid " Compressed tables always back-up\n" +msgstr " Tabelele compresate întotdeauna au back-up\n" + +#: main.c:835 +msgid " Beginning-of-line patterns used\n" +msgstr " Tipare de începuturi de linie folosite\n" + +#: main.c:837 +#, c-format +msgid " %d/%d start conditions\n" +msgstr " %d/%d condiþii de start\n" + +#: main.c:841 +#, c-format +msgid " %d epsilon states, %d double epsilon states\n" +msgstr " %d stãri epsilon, %d stãri dublu epsilon\n" + +#: main.c:845 +msgid " no character classes\n" +msgstr " nici o clasã de caractere\n" + +#: main.c:849 +#, c-format +msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" +msgstr "" +" %d/%d clase de caractere necesare %d/%d cuvinte de stocare, %d refolosite\n" + +#: main.c:854 +#, c-format +msgid " %d state/nextstate pairs created\n" +msgstr " %d perechi de stare/stareurmãtoare create\n" + +#: main.c:857 +#, c-format +msgid " %d/%d unique/duplicate transitions\n" +msgstr " %d/%d tranziþii unice/duplicate\n" + +#: main.c:862 +#, c-format +msgid " %d table entries\n" +msgstr " %d intrãri în tabele\n" + +#: main.c:870 +#, c-format +msgid " %d/%d base-def entries created\n" +msgstr " %d/%d base-def intrãri create\n" + +#: main.c:874 +#, c-format +msgid " %d/%d (peak %d) nxt-chk entries created\n" +msgstr " %d/%d (maxim %d) nxt-chk intrãri create\n" + +#: main.c:878 +#, c-format +msgid " %d/%d (peak %d) template nxt-chk entries created\n" +msgstr " %d/%d (maxim %d) model nxt-chk intrãri create\n" + +#: main.c:882 +#, c-format +msgid " %d empty table entries\n" +msgstr " %d intrãri în tabel goale\n" + +#: main.c:884 +#, c-format +msgid " %d protos created\n" +msgstr " %d prototipuri create\n" + +#: main.c:887 +#, c-format +msgid " %d templates created, %d uses\n" +msgstr " %d modele create, %d folosiri\n" + +#: main.c:895 +#, c-format +msgid " %d/%d equivalence classes created\n" +msgstr " %d/%d clase de echivalenþã create\n" + +#: main.c:903 +#, c-format +msgid " %d/%d meta-equivalence classes created\n" +msgstr " %d/%d clase de meta-echivalenþã create\n" + +#: main.c:909 +#, c-format +msgid " %d (%d saved) hash collisions, %d DFAs equal\n" +msgstr " %d (%d salvate) coliziuni disipate(hash), %d egaluri de DFA-uril\n" + +#: main.c:911 +#, c-format +msgid " %d sets of reallocations needed\n" +msgstr " %d seturi de realocãri necesare\n" + +#: main.c:913 +#, c-format +msgid " %d total table entries needed\n" +msgstr " %d intrãri totale în tabel necesare\n" + +#: main.c:988 +msgid "Internal error. flexopts are malformed.\n" +msgstr "Eroare internã. Opþiunile flex(flexopts) sunt malformate.\n" + +#: main.c:998 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n" + +#: main.c:1055 +#, c-format +msgid "unknown -C option '%c'" +msgstr "opþiune -C necunoscutã `%c'" + +#: main.c:1184 +#, c-format +msgid "%s %s\n" +msgstr "%s %s\n" + +#: main.c:1459 +msgid "fatal parse error" +msgstr "eroare fatalã de analizã(parse)" + +#: main.c:1491 +#, c-format +msgid "could not create backing-up info file %s" +msgstr "nu s-a putut crea fiºierul de informaþii de back-up %s" + +#: main.c:1512 +msgid "-l AT&T lex compatibility option entails a large performance penalty\n" +msgstr "" +"-l opþiunea de compatibilitate AT&T lex determinã o scãdere drasticã a " +"performanþei\n" + +#: main.c:1515 +msgid " and may be the actual source of other reported performance penalties\n" +msgstr "ºi poate fi sursa realã a altor scãderi de performanþã raportate\n" + +#: main.c:1521 +#, c-format +msgid "" +"%%option yylineno entails a performance penalty ONLY on rules that can match " +"newline characters\n" +msgstr "" +"%%opþiunea yylineno determinã o scãdere drasticã a performanþei DOAR în " +"regulile care se potrivesc caracterelor linie_nouã(newline)\n" + +#: main.c:1528 +msgid "-I (interactive) entails a minor performance penalty\n" +msgstr "-I (interactiãe) determinã o scãdere minorã a performanþei\n" + +#: main.c:1533 +msgid "yymore() entails a minor performance penalty\n" +msgstr "yymore() determinã o scãdere minorã a performanþei\n" + +#: main.c:1539 +msgid "REJECT entails a large performance penalty\n" +msgstr "REJECT determinã o scãdere drasticã a performanþei\n" + +#: main.c:1544 +msgid "Variable trailing context rules entail a large performance penalty\n" +msgstr "" +"Contextul de sfârºit(trailing) variabil determinã o scãdere drasticã a " +"performanþei\n" + +#: main.c:1556 +msgid "REJECT cannot be used with -f or -F" +msgstr "REJECT nu poate fi folosit cu -f sau -F" + +#: main.c:1559 +#, c-format +msgid "%option yylineno cannot be used with REJECT" +msgstr "%opþiunea yylineno nu poate fi folositã cu REJECT" + +#: main.c:1562 +msgid "variable trailing context rules cannot be used with -f or -F" +msgstr "" +"contextul de sfârºit(trailing) variabil nu poate fi folosit cu -f sau -F" + +#: main.c:1677 +#, c-format +msgid "%option yyclass only meaningful for C++ scanners" +msgstr "%opþunea yyclass este folositoare doar pentru scannerele C++" + +#: main.c:1784 +#, c-format +msgid "Usage: %s [OPTIONS] [FILE]...\n" +msgstr "Folosire: %s [OPÞIUNI] [FIªIER]...\n" + +#: main.c:1787 +#, c-format +msgid "" +"Generates programs that perform pattern-matching on text.\n" +"\n" +"Table Compression:\n" +" -Ca, --align trade off larger tables for better memory alignment\n" +" -Ce, --ecs construct equivalence classes\n" +" -Cf do not compress tables; use -f representation\n" +" -CF do not compress tables; use -F representation\n" +" -Cm, --meta-ecs construct meta-equivalence classes\n" +" -Cr, --read use read() instead of stdio for scanner input\n" +" -f, --full generate fast, large scanner. Same as -Cfr\n" +" -F, --fast use alternate table representation. Same as -CFr\n" +" -Cem default compression (same as --ecs --meta-ecs)\n" +"\n" +"Debugging:\n" +" -d, --debug enable debug mode in scanner\n" +" -b, --backup write backing-up information to %s\n" +" -p, --perf-report write performance report to stderr\n" +" -s, --nodefault suppress default rule to ECHO unmatched text\n" +" -T, --trace %s should run in trace mode\n" +" -w, --nowarn do not generate warnings\n" +" -v, --verbose write summary of scanner statistics to stdout\n" +"\n" +"Files:\n" +" -o, --outfile=FILE specify output filename\n" +" -S, --skel=FILE specify skeleton file\n" +" -t, --stdout write scanner on stdout instead of %s\n" +" --yyclass=NAME name of C++ class\n" +" --header-file=FILE create a C header file in addition to the " +"scanner\n" +" --tables-file[=FILE] write tables to FILE\n" +"\n" +"Scanner behavior:\n" +" -7, --7bit generate 7-bit scanner\n" +" -8, --8bit generate 8-bit scanner\n" +" -B, --batch generate batch scanner (opposite of -I)\n" +" -i, --case-insensitive ignore case in patterns\n" +" -l, --lex-compat maximal compatibility with original lex\n" +" -X, --posix-compat maximal compatibility with POSIX lex\n" +" -I, --interactive generate interactive scanner (opposite of -B)\n" +" --yylineno track line count in yylineno\n" +"\n" +"Generated code:\n" +" -+, --c++ generate C++ scanner class\n" +" -Dmacro[=defn] #define macro defn (default defn is '1')\n" +" -L, --noline suppress #line directives in scanner\n" +" -P, --prefix=STRING use STRING as prefix instead of \"yy\"\n" +" -R, --reentrant generate a reentrant C scanner\n" +" --bison-bridge scanner for bison pure parser.\n" +" --bison-locations include yylloc support.\n" +" --stdinit initialize yyin/yyout to stdin/stdout\n" +" --noansi-definitions old-style function definitions\n" +" --noansi-prototypes empty parameter list in prototypes\n" +" --nounistd do not include <unistd.h>\n" +" --noFUNCTION do not generate a particular FUNCTION\n" +"\n" +"Miscellaneous:\n" +" -c do-nothing POSIX option\n" +" -n do-nothing POSIX option\n" +" -?\n" +" -h, --help produce this help message\n" +" -V, --version report %s version\n" +msgstr "" +"Genereazã programe care cautã potriviri de tipare pe un text\n" +"\n" +"Compresie de tabele:\n" +" -Ca, --align renunþã la tabelele mari în favoarea unui aliniament mai " +"bun al memoriei\n" +" -Ce, --ecs construieºte clase de echivalenþã\n" +" -Cf nu compreseazã tabelele; foloseºte reprezentare -f \n" +" -CF nu compreseazã tabelele; foloseºte reprezentare -F\n" +" -Cm, --meta-ecs construieºte clase de meta-echivalenþã\n" +" -Cr, --read foloseºte read() în loc de stdio pentru intrarea de " +"scanner\n" +" -F, --fast foloseºte reprezentare alternativã de tabele. Asemãnãtor " +"lui -CFr\n" +" -f, --full genereazã scannere rapide, mari. Asemãnãtor lui -Cfr\n" +" -Cem compresie implicitã (asemãnãtor lui --ecs --meta-ecs)\n" +"\n" +"Debugging:\n" +" -d, --debug activeazã modul debug în scanner\n" +" -b, --backup scriere de informaþii de backup în %s\n" +" -p, --perf-report scrie raportul de performanþã la stderr\n" +" -s, --nodefault eliminã regula implicitã de ECHO text care nu se " +"potriveºte\n" +" -T, --trace %s ar trebui sã ruleze în mod trace\n" +" -w, --nowarn nu genereazã avertismente\n" +" -v, --verbose scrie cuprinsul statisticilor scanner-ului la " +"stdout\n" +"\n" +"Fiºiere:\n" +" -o, --outfile=FIªIER specificã numele de fiºier de ieºire\n" +" -S, --skel=FIªIER specificã fiºierul schelet\n" +" -t, --stdout scrie scannerul la stdout în loc de %s\n" +" --yyclass=NUME numele clasei C++\n" +" --header-file=FIªIER creazã im fiºier de header C pe lângãscanner\n" +" --tables-file[=FIªIER] scrie tabelele în FIªIER\n" +"\n" +"Comportament scanner:\n" +" -7, --7bit genereazã scanner pe 7-biþi\n" +" -8, --8bit genereazã scanner pe 8-biþi\n" +" -B, --batch genereazã scanner comandã(batch) (inversul lui -" +"I)\n" +" -i, --case-insensitive ignorã cazul în tipare\n" +" -l, --lex-compat compatibilitate maximã cu lex original\n" +" -X, --posix-compat compatibilitate maximã cu lex POSIX\n" +" -I, --interactive genereazã scanner interactive (inversul lui -B)\n" +" --yylineno urmãreºte numãrãtoare liniilor în yylineno\n" +"\n" +"Cod generat:\n" +" -+, --c++ genereazã clasã de scanner C++ \n" +" -Dmacro[=defn] #define macro defn (implicit defn is '1')\n" +" -L, --noline eliminã directivele #line din scanner\n" +" -P, --prefix=ªIR foloseºte ªIR ca ºi prefix în loc de \"yy\"\n" +" -R, --reentrant genereazã un scanner C circular(reentrant)\n" +" --bison-bridge scanner pentru analizã purã bison.\n" +" --bison-locations include suport yylloc.\n" +" --stdinit iniþializeazã yyin/yyout cãtre stdin/stdout\n" +" --noansi-definitions definire de funcþii stil vechi\n" +" --noansi-prototypes listã de parametri vidã în prototipuri\n" +" --nounistd nu include <unistd.h>\n" +" --noFUNCÞIE nu genera o FUNCÞIE particularã\n" +"\n" +"Diverse:\n" +" -c opþiune POSIX care nu face nimic\n" +" -n opþiune POSIX care nu face nimic\n" +" -?\n" +" -h, --help produce acest mesaj de ajutor\n" +" -V, --version raporteazã versiunea %s\n" + +#: misc.c:100 misc.c:126 +#, c-format +msgid "name \"%s\" ridiculously long" +msgstr "numele \"%s\" este ridicol de lung" + +#: misc.c:175 +msgid "memory allocation failed in allocate_array()" +msgstr "alocare de memorie eºuatã în allocate_array()" + +#: misc.c:250 +#, c-format +msgid "bad character '%s' detected in check_char()" +msgstr "caracter greºit `%s' detectat în check_char()" + +#: misc.c:255 +#, c-format +msgid "scanner requires -8 flag to use the character %s" +msgstr "scannerul necesitã parametrul(flag) -8 pentru a folosi caracterul %s" + +#: misc.c:288 +msgid "dynamic memory failure in copy_string()" +msgstr "eroare de memorie dinamicã în copy_string()" + +#: misc.c:422 +#, c-format +msgid "%s: fatal internal error, %s\n" +msgstr "%s: eroare internã fatalã, %s\n" + +#: misc.c:875 +msgid "attempt to increase array size failed" +msgstr "încercare de a mãri dimensiunea domeniului eºuatã" + +#: misc.c:1002 +msgid "bad line in skeleton file" +msgstr "linie greºitã în fiºierul schelet" + +#: misc.c:1051 +msgid "memory allocation failed in yy_flex_xmalloc()" +msgstr "alocare de memorie eºuatã în yy_flex_xmalloc()" + +#: nfa.c:104 +#, c-format +msgid "" +"\n" +"\n" +"********** beginning dump of nfa with start state %d\n" +msgstr "" +"\n" +"\n" +"********** începerea aducerii(dump) nfa cu starea de început %d\n" + +#: nfa.c:115 +#, c-format +msgid "state # %4d\t" +msgstr "stare # %4d\t" + +#: nfa.c:130 +msgid "********** end of dump\n" +msgstr "********** sfârºit de aducere(dump)\n" + +#: nfa.c:174 +msgid "empty machine in dupmachine()" +msgstr "maºinã vidã în dupmachine()" + +#: nfa.c:240 +#, c-format +msgid "Variable trailing context rule at line %d\n" +msgstr "Regulã de context de sfârºit variabil la linia %d\n" + +#: nfa.c:353 +msgid "bad state type in mark_beginning_as_normal()" +msgstr "tip de stare greºitã în mark_beginning_as_normal()" + +#: nfa.c:598 +#, c-format +msgid "input rules are too complicated (>= %d NFA states)" +msgstr "regulile de intrare(input) sunt prea complicate (>= %d stãri NFA)" + +#: nfa.c:677 +msgid "found too many transitions in mkxtion()" +msgstr "s-au gãsit prea multe tranziþii în mkxtion()" + +#: nfa.c:703 +#, c-format +msgid "too many rules (> %d)!" +msgstr "prea multe reguli (> %d)!" + +#: parse.y:183 +msgid "unknown error processing section 1" +msgstr "eroare necunoscutã în procesarea secþiunii 1" + +#: parse.y:208 parse.y:373 +msgid "bad start condition list" +msgstr "listã de stãri în condiþie proastã" + +#: parse.y:337 +msgid "unrecognized rule" +msgstr "regulã necunoscutã" + +#: parse.y:456 parse.y:469 parse.y:538 +msgid "trailing context used twice" +msgstr "context de sfârºit(trailing) utilizat de douã ori" + +#: parse.y:574 parse.y:584 parse.y:657 parse.y:667 +msgid "bad iteration values" +msgstr "valori de iteraþie greºite" + +#: parse.y:602 parse.y:620 parse.y:685 parse.y:703 +msgid "iteration value must be positive" +msgstr "valoarea iteraþiei trebuie sã fie pozitivã" + +#: parse.y:817 parse.y:827 +#, c-format +msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" +msgstr "" +"intervalul(range) de caracter [%c %c] este ambiguu într-un scanner caz-" +"insenzitiv" + +#: parse.y:832 +msgid "negative range in character class" +msgstr "domeniu negativ în clasa de caractere" + +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 +msgid "Input line too long\n" +msgstr "Linie de intrare(input) prea lungã\n" + +#: scan.l:150 +#, c-format +msgid "malformed '%top' directive" +msgstr "directivã '%top' malformatã" + +#: scan.l:172 +#, no-c-format +msgid "unrecognized '%' directive" +msgstr "directivã '%' necunoscutã" + +#: scan.l:252 +msgid "Unmatched '{'" +msgstr "'{' fãrã corespondent" + +#: scan.l:285 +msgid "incomplete name definition" +msgstr "definire de nume incompletã" + +#: scan.l:418 +#, c-format +msgid "unrecognized %%option: %s" +msgstr "%%opþiune necunoscutã: %s" + +#: scan.l:559 scan.l:678 +msgid "bad character class" +msgstr "clasã de caractere greºitã" + +#: scan.l:606 +#, c-format +msgid "undefined definition {%s}" +msgstr "definiþie nedefinitã {%s}" + +#: scan.l:646 +#, c-format +msgid "bad <start condition>: %s" +msgstr "<condiþie de start> greºitã: %s" + +#: scan.l:659 +msgid "missing quote" +msgstr "menþionare(quote) lipsã" + +#: scan.l:699 +#, c-format +msgid "bad character class expression: %s" +msgstr "expresie clasã caracter greºitã: %s" + +#: scan.l:721 +msgid "bad character inside {}'s" +msgstr "caracter eronat între {}" + +#: scan.l:727 +msgid "missing }" +msgstr "lipseºte }" + +#: scan.l:800 +msgid "EOF encountered inside an action" +msgstr "EOF întâlnit în mijlocul acþiunii" + +#: scan.l:820 +#, c-format +msgid "bad character: %s" +msgstr "caracter eronat: %s" + +#: scan.l:849 +#, c-format +msgid "can't open %s" +msgstr "nu pot deschide %s" + +#: scanopt.c:291 +#, c-format +msgid "Usage: %s [OPTIONS]...\n" +msgstr "Folosire: %s [OPÞIUNI]...\n" + +#: scanopt.c:565 +#, c-format +msgid "option `%s' doesn't allow an argument\n" +msgstr "opþiunea `%s' nu permite parametri\n" + +#: scanopt.c:570 +#, c-format +msgid "option `%s' requires an argument\n" +msgstr "opþiunea `%s' necesitã un parametru\n" + +#: scanopt.c:574 +#, c-format +msgid "option `%s' is ambiguous\n" +msgstr "opþiunea `%s' este ambiguã\n" + +#: scanopt.c:578 +#, c-format +msgid "Unrecognized option `%s'\n" +msgstr "Opþiune necunoscutã `%s'\n" + +#: scanopt.c:582 +#, c-format +msgid "Unknown error=(%d)\n" +msgstr "Eroare necunoscutã=(%d)\n" + +#: sym.c:100 +msgid "symbol table memory allocation failed" +msgstr "alocare de memorie pentru tabela de simboluri eºuatã" + +#: sym.c:203 +msgid "name defined twice" +msgstr "nume definit de douã ori" + +#: sym.c:254 +#, c-format +msgid "start condition %s declared twice" +msgstr "condiþie de start %s definitã de douã ori" + +#: yylex.c:56 +msgid "premature EOF" +msgstr "EOF prematur" + +#: yylex.c:198 +msgid "End Marker\n" +msgstr "Marcaj de sfârºit\n" + +#: yylex.c:204 +#, c-format +msgid "*Something Weird* - tok: %d val: %d\n" +msgstr "*Ceva Ciudat* - tok: %d val: %d\n" + +#~ msgid "Can't specify header option if writing to stdout." +#~ msgstr "Nu se poate specifica opþiunea de header dacã se scrie la stdout" + +#~ msgid "unknown -R option '%c'" +#~ msgstr "opþiune -R necunoscutã `%c'" Binary files differ@@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 2002-09-08 10:54+0400\n" "Last-Translator: Dmitry S. Sivachenko <mitya@cavia.pp.ru>\n" "Language-Team: Russian <ru@li.org>\n" @@ -156,346 +157,346 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ecstbl" msgid "Could not write yynultrans_tbl" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ yynultrans_tbl" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "ÎÅ×ÏÚÎÏÖÎÏ ÐÒÉÍÅÎÉÔØ ÐÒÁ×ÉÌÏ" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "ÕËÁÚÁÎÁ ÏÐÃÉÑ -s, ÎÏ ÐÒÁ×ÉÌÏ ÐÏ ÕÍÏÌÞÁÎÉÀ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÉÍÅÎÅÎÏ" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ -+ Ó ËÌÀÞÅÍ -l ÎÅ×ÏÚÍÏÖÎÏ" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ -f ÉÌÉ -F Ó ËÌÀÞÅÍ -l ÎÅ×ÏÚÍÏÖÎÏ" -#: main.c:224 +#: main.c:238 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ -R ÉÌÉ -Rb Ó ËÌÀÞÅÍ -l ÎÅ×ÏÚÍÏÖÎÏ" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF É -Cm ×ÍÅÓÔÅ ÎÅ ÉÍÅÀÔ ÓÍÙÓÌÁ" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF É -I ÎÅÓÏ×ÍÅÓÔÉÍÙ" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF ÎÅÓÏ×ÍÅÓÔÎÙ Ó ÒÅÖÉÍÏÍ lex-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf É -CF Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÏÉÓËÌÀÞÁÀÝÉÍÉ" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ -+ Ó ËÌÀÞÅÍ -CF ÎÅ×ÏÚÍÏÖÎÏ" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array ÎÅÓÏ×ÍÅÓÔÉÍ Ó ËÌÀÞÅÍ -+" -#: main.c:285 +#: main.c:299 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "ëÌÀÞÉ -+ É -R Ñ×ÌÑÀÔÓÑ ×ÚÁÉÍÏÉÓËÌÀÞÁÀÝÉÍÉ" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "ÎÅÕÄÁÅÔÓÑ ÚÁÐÉÓÁÔØ ÚÁÇÏÌÏ×ÏË ÔÁÂÌÉÃ" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ-ËÁÒËÁÓ %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ-ËÁÒËÁÓÁ %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "ÏÛÉÂËÁ ÐÒÉ ÚÁËÒÙÔÉÉ ÆÁÊÌÁ-ËÁÒËÁÓÁ %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÚÁÇÏÌÏ×ÏÞÎÏÇÏ ÆÁÊÌÁ %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ × ×ÙÈÏÄÎÏÊ ÆÁÊÌ %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "ÏÛÉÂËÁ ÚÁËÒÙÔÉÑ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "ÏÛÉÂËÁ ÐÒÉ ÕÄÁÌÅÎÉÉ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ %s" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "×ÏÚ×ÒÁÔ ÎÁ %d (ÎÅÄÏÐÕÓÔÉÍÙÈ) ÓÏÓÔÏÑÎÉÊ.\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "óÖÁÔÙÅ ÔÁÂÌÉÃÙ ×ÓÅÇÄÁ ÓÏÈÒÁÎÑÀÔÓÑ.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ ÆÁÊÌÁ %s" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "ÏÛÉÂËÁ ÐÒÉ ÚÁËÒÙÔÉÉ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ ÆÁÊÌÁ %s" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "ÓÔÁÔÉÓÔÉËÁ ÉÓÐÏÌØÚÏ×ÁÎÉÑ %s ×ÅÒÓÉÉ %s:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " ÏÐÃÉÉ ÓËÁÎÅÒÁ: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d ÓÏÓÔÏÑÎÉÊ îëá\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d ÓÏÓÔÏÑÎÉÊ äëá (%d ÓÌÏ×)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d ÐÒÁ×ÉÌ\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr "" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " ÓÏÈÒÁÎÅÎÙ %d (ÎÅÄÏÐÕÓÔÉÍÙÈ) ÓÏÓÔÏÑÎÉÊ\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " óÖÁÔÙÅ ÔÁÂÌÉÃÙ ×ÓÅÇÄÁ ÓÏÈÒÁÎÑÀÔÓÑ\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " éÓÐÏÌØÚÕÀÔÓÑ ÛÁÂÌÏÎÙ ÎÁÞÁÌÁ ÓÔÒÏËÉ\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d ÓÔÁÒÔÏ×ÙÈ ÕÓÌÏ×ÉÊ\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " ÏÔÓÕÔÓÔ×ÕÀÔ ËÌÁÓÓÙ ÓÉÍ×ÏÌÏ×\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d ËÌÁÓÓÏ× ÓÉÍ×ÏÌÏ× ÔÒÅÂÕÀÔ %d/%d ÓÌÏ× ÄÌÑ ÈÒÁÎÅÎÉÑ, %d ÐÏ×ÔÏÒÎÏ " "ÉÓÐÏÌØÚÏ×ÁÎÏ\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " ÓÏÚÄÁÎÏ %d ÐÁÒ ÓÏÓÔÏÑÎÉÅ/ÓÌÅÄ_ÓÏÓÔÏÑÎÉÅ\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d ÕÎÉËÁÌØÎÙÈ/ÐÏ×ÔÏÒÑÀÝÉÈÓÑ ÐÅÒÅÈÏÄÏ×\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d ÜÌÅÍÅÎÔÏ× ÔÁÂÌÉÃÙ\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " ÓÏÚÄÁÎÏ %d/%d base-def ÜÌÅÍÅÎÔÏ×\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " ÓÏÚÄÁÎÏ %d/%d (ÐÉË %d) nxt-chk ÜÌÅÍÅÎÔÏ×\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " ÓÏÚÄÁÎÏ %d/%d (ÐÉË %d) ÛÁÂÌÏÎÎÙÈ nxt-chk ÜÌÅÍÅÎÔÏ×\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d ÐÕÓÔÙÈ ÜÌÅÍÅÎÔÏ× ÔÁÂÌÉÃÙ\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " ÓÏÚÄÁÎÏ %d ÐÒÏÔÏÔÉÐÏ×\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " ÓÏÚÄÁÎÏ %d ÛÁÂÌÏÎÏ×, %d ÉÓÐÏÌØÚÏ×ÁÎÉÊ\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " ÓÏÚÄÁÎÙ ËÌÁÓÓÙ ÜË×É×ÁÌÅÎÔÎÏÓÔÉ %d/%d\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d ÍÅÔÁÜË×É×ÁÌÅÎÔÎÙÈ ËÌÁÓÓÏ× ÓÏÚÄÁÎÏ\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d ÚÁÐÉÓÁÎÏ) ËÏÌÌÉÚÉÊ ÈÜÛ-ÔÁÂÌÉÃÙ, %d ÜË×É×ÁÌÅÎÔÎÙÈ äëá\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " ÔÒÅÂÕÅÔÓÑ %d ÎÁÂÏÒÏ× ÐÏ×ÔÏÒÎÙÈ ÒÁÚÍÅÝÅÎÉÊ\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " ×ÓÅÇÏ ÔÒÅÂÕÅÔÓÑ %d ÜÌÅÍÅÎÔÏ× ÔÁÂÌÉÃÙ\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ. îÅÐÒÁ×ÉÌØÎÏ ÚÁÄÁÎÙ ËÌÀÞÉ flex.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ -C ËÌÀÞ '%c'" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ ÒÁÚÂÏÒÁ" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "ÎÅÕÄÁÅÔÓÑ ÓÏÚÄÁÔØ ÚÁÐÁÓÎÏÊ ÉÎÆÏÒÍÁÃÉÏÎÎÙÊ ÆÁÊÌ %s" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "ïÐÃÉÑ -l ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó AT&T lex ×ÌÅÞÅÔ ÚÎÁÞÉÔÅÌØÎÏÅ ÓÎÉÖÅÎÉÅ " "ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " É ÔÁËÖÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÔÉÎÎÙÍ ÉÓÔÏÞÎÉËÏÍ ÐÒÏÂÌÅÍ Ó ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØÀ\n" -#: main.c:1504 +#: main.c:1521 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno ×ÌÅÞÅÔ ÚÎÁÞÉÔÅÌØÎÏÅ ÓÎÉÖÅÎÉÅ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (ÉÎÔÅÒÁËÔÉ×ÎÙÊ) ×ÌÅÞÅÔ ÎÅÚÎÁÞÉÔÅÌØÎÏÅ ÓÎÉÖÅÎÉÅ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() ÐÒÉ×ÏÄÉÔ Ë ÎÅÂÏÌØÛÏÍÕ ÓÎÉÖÅÎÉÀ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT ×ÌÅÞÅÔ ÚÎÁÞÉÔÅÌØÎÏÅ ÓÎÉÖÅÎÉÅ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ×ÍÅÓÔÅ Ó -f ÉÌÉ -F" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ Ó REJECT" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass ÉÍÅÅÔ ÓÍÙÓÌ ÔÏÌØËÏ ÄÌÑ ÓËÁÎÅÒÏ× ÎÁ C++" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé] [æáêì]...\n" -#: main.c:1771 +#: main.c:1787 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -747,74 +748,74 @@ msgstr "" msgid "negative range in character class" msgstr "ÏÔÒÉÃÁÔÅÌØÎÙÊ ÄÉÁÐÁÚÏÎ × ËÌÁÓÓÅ ÓÉÍ×ÏÌÏ×" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "óÌÉÛËÏÍ ÄÌÉÎÎÁÑ ×ÈÏÄÎÁÑ ÓÔÒÏËÁ\n" -#: scan.l:149 +#: scan.l:150 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÁÑ '%' ÄÉÒÅËÔÉ×Á" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÁÑ '%' ÄÉÒÅËÔÉ×Á" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "ÎÅÐÏÌÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÉÍÅÎÉ" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ %%option: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "ÎÅ×ÅÒÎÙÊ ËÌÁÓÓ ÓÉÍ×ÏÌÁ" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "ÎÅ×ÅÒÎÏÅ <ÎÁÞÁÌØÎÏÅ ÕÓÌÏ×ÉÅ>: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ËÁ×ÙÞËÉ" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ËÌÁÓÓÁ ÓÉÍ×ÏÌÁ: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ ×ÎÕÔÒÉ {}" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "×ÓÔÒÅÞÅÎ EOF ×ÎÕÔÒÉ ÄÅÊÓÔ×ÉÑ" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s" diff --git a/po/stamp-po b/po/stamp-po new file mode 100644 index 0000000..9788f70 --- /dev/null +++ b/po/stamp-po @@ -0,0 +1 @@ +timestamp Binary files differ@@ -1,13 +1,14 @@ # Swedish messages for flex. -# Copyright (C) 1996, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 2002, 2004 Free Software Foundation, Inc. # Johan Linde <jl@theophys.kth.se>, 1996. -# Christian Rose <menthos@menthos.com>, 2002. +# Christian Rose <menthos@menthos.com>, 2002, 2004. # msgid "" msgstr "" -"Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" -"PO-Revision-Date: 2002-09-07 19:42+0200\n" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2004-03-21 22:51+0100\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n" "Language-Team: Swedish <sv@li.org>\n" "MIME-Version: 1.0\n" @@ -101,9 +102,8 @@ msgid "state # %d accepts: " msgstr "tillstånd %d accepterar: " #: gen.c:1163 -#, fuzzy msgid "Could not write yyacclist_tbl" -msgstr "Kunde inte skriva yyacc_tbl" +msgstr "Kunde inte skriva yyacclist_tbl" #: gen.c:1239 msgid "Could not write yyacc_tbl" @@ -148,361 +148,360 @@ msgid "Could not write ftbl" msgstr "Kunde inte skriva ftbl" #: gen.c:1630 -#, fuzzy msgid "Could not write ssltbl" -msgstr "Kunde inte skriva ecstbl" +msgstr "Kunde inte skriva ssltbl" #: gen.c:1681 -#, fuzzy msgid "Could not write eoltbl" -msgstr "Kunde inte skriva ecstbl" +msgstr "Kunde inte skriva eoltbl" #: gen.c:1741 msgid "Could not write yynultrans_tbl" msgstr "Kunde inte skriva yynultrans_tbl" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "regeln kan inte matchas" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "flaggan -s angiven men standardregeln kan följas" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "-+ kan inte användas tillsammans med flaggan -l" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "-f eller -F kan inte användas tillsammans med flaggan -l" -#: main.c:224 -#, fuzzy +#: main.c:238 msgid "Can't use --reentrant or --bison-bridge with -l option" -msgstr "-R eller -Rb kan inte användas tillsammans med flaggan -l" +msgstr "" +"--reentrant eller --bison-bridge kan inte användas tillsammans med flaggan -l" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF och -Cm kan inte användas tillsammans" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF och -I kan inte användas tillsammans" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF kan inte användas i lex-kompatibilitetsläge" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf och -CF är ömsesidigt uteslutande" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "-+ kan inte användas tillsammans med flaggan -CF" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "%array kan inte användas tillsammans med flaggan -+" -#: main.c:285 -#, fuzzy +#: main.c:299 msgid "Options -+ and --reentrant are mutually exclusive." -msgstr "Flaggorna -+ och -R är ömsesidigt uteslutande." +msgstr "Flaggorna -+ och --reentrant är ömsesidigt uteslutande." -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." -msgstr "" +msgstr "bisonbrygga stöds inte för C++-inläsaren." -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "kunde inte skapa %s" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" msgstr "kunde inte skriva tabellhuvud" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "kan inte öppna mallfilen %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "indatafel vid läsande av mallfilen %s" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "fel vid stängande av mallfilen %s" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "fel vid skapande av huvudfilen %s" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "fel vid skrivande av utfilen %s" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "fel vid stängande av utfilen %s" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "fel vid borttagning av utfilen %s" # "Back up" i det här sammanhanget handlar om att flexmaskinen backar. -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Backar inte.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d säkerhetskopierande (icke-accepterande) tillstånd.\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "Komprimerade tabeller säkerhetskopierar alltid.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "fel när säkerhetskopian %s skulle skrivas" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "fel när säkerhetskopian %s skulle stängas" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Statistik över användning av %s version %s:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " inläsarflaggor: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-tillstånd\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-tillstånd (%d ord)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d regler\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Inget säkerhetskopierande\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d (icke-accepterande) tillstånd för säkerhetskopiering\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr " Komprimerade tabeller säkerhetskopierar alltid\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr " Början-av-rad-mönster använda\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startvillkor\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontillstånd, %d dubbla epsilontillstånd\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr " inga teckenklasser\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d teckenklasser behövde %d/%d ord för lagring, %d återanvända\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d par med tillstånd/nästa-tillstånd skapade\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unika/duplicerade övergångar\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d tabellposter\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d basstandardposter skapade\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max %d) poster för nästa kontroll skapade\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max %d) mallposter för nästa kontroll skapade\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr " %d tomma tabellposter\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr " %d prototyper skapade\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mallar skapade, %d användningar\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalensklasser skapade\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d metaekvivalensklasser skapade\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d sparade) hashkollisioner, %d DFA lika\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d uppsättningar med omallokeringar krävdes\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr " %d tabellposter krävs totalt\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "Internt fel. flexopts är felaktiga.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova \"%s --help\" för mer information.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "okänd flagga till -C \"%c\"" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "allvarligt fel vid tolkningen" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "kunde inte skapa filen %s med säkerhetskopieringsinformation" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "flaggan -l för beteende som AT&T:s lex medför en väsentlig prestandaförlust\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr " och kan vara den egentliga orsaken till andra rapporter om detta\n" -#: main.c:1504 -#, fuzzy, c-format +#: main.c:1521 +#, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -msgstr "%%option yylineno medför en väsentlig prestandaförlust\n" +msgstr "" +"%%option yylineno medför en prestandaförlust ENDAST på regler som kan matcha " +"nyradstecken\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) medför en mindre prestandaförlust\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() medför en mindre prestandaförlust\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "REJECT medför en väsentlig prestandaförlust\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regler för varierbar efterföljande sammanhang medför en väsentlig " "prestandaförlust\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kan inte användas tillsammans med -f eller -F" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kan inte användas tillsammans med REJECT" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "regler för varierbar efterföljande kontext kan inte användas\n" "tillsammans med -f eller -F" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass är bara meningsfull för C++-inläsare" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Användning: %s [FLAGGOR] [FIL]...\n" -#: main.c:1771 -#, fuzzy, c-format +#: main.c:1787 +#, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -614,8 +613,11 @@ msgstr "" " -L, --noline undertryck #line-direktiv i inläsaren\n" " -P, --prefix=STRÄNG använd STRÄNG som prefix istället för \"yy\"\n" " -R, --reentrant generera en återanropbar C-inläsare\n" -" -Rb, --reentrant-bison återanropbar inläsare för bison-tolkare.\n" +" --bison-bridge inläsare för ren bisontolk.\n" +" --bison-locations inkludera stöd för yylloc.\n" " --stdinit initiera yyin/yyout till standard in/ut\n" +" --noansi-definitions funktionsdefinitioner i gammal stil\n" +" --noansi-prototypes tom parameterlista i prototyper\n" " --nounistd inkludera inte <unistd.h>\n" " --noFUNKTION generera inte en speciell FUNKTION\n" "\n" @@ -741,79 +743,80 @@ msgstr "iterationsvärde måste vara positivt" #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" +"teckenintervallet [%c-%c] är tvetydigt i en skiftlägesokänslig inläsare" #: parse.y:832 msgid "negative range in character class" msgstr "negativt intervall i teckenklass" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "För lång indatarad\n" -#: scan.l:149 -#, fuzzy, c-format +#: scan.l:150 +#, c-format msgid "malformed '%top' directive" -msgstr "okänt \"%\"-direktiv" +msgstr "felaktigt \"%top\"-direktiv" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "okänt \"%\"-direktiv" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" -msgstr "" +msgstr "Ensamt \"{\"" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "ofullständig namndefinition" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "okänd %%option: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "otillåten teckenklass" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "odefinierad definition {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "otillåtet <startvillkor>: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "citationstecken saknas" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "otillåtet uttryck för teckenklass: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "otillåtet tecken inom {}" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "} saknas" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "filslut påträffat inuti en handling" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "otillåtet tecken: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "kan inte öppna %s" Binary files differ@@ -1,35 +1,36 @@ -# Turkish translations for GNU flex messages. -# Copyright (C) 2002 Free Software Foundation, Inc. -# Altuð Bayram <altugbayram_2000@yahoo.com>, 2002. +# Translation of 'flex' messages to Turkish +# Copyright (C) 2004 Free Software Foundation, Inc. +# Deniz Akkus Kanca <deniz@arayan.com>, 2004. # msgid "" msgstr "" -"Project-Id-Version: flex 2.5.19\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" -"PO-Revision-Date: 2002-11-06 11:33GMT+200\n" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2004-05-16 18:36+0300\n" "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-9\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 0.9.5\n" +"X-Generator: KBabel 1.0.2\n" #: dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" -msgstr "Durum #%d kabul edilmiyor -\n" +msgstr "Durum #%d kabul etmiyor -\n" #: dfa.c:124 msgid "dangerous trailing context" -msgstr "tehlikeli izleme ortamý" +msgstr "izleyen baÄŸlam tehlikeli" #: dfa.c:166 msgid " associated rule line numbers:" -msgstr " birleþmiþ kural satýr numaralarý:" +msgstr " alakalı kural satır numaraları:" #: dfa.c:202 msgid " out-transitions: " -msgstr " dýþ-geçiþler: " +msgstr " dış-geçiÅŸler: " #: dfa.c:210 msgid "" @@ -37,11 +38,11 @@ msgid "" " jam-transitions: EOF " msgstr "" "\n" -" sýkýþýk-geçiþler: EOF " +" sıkışık-geçiÅŸler: EOF " #: dfa.c:341 msgid "consistency check failed in epsclosure()" -msgstr "epsclosure() içindeki tutarlýlýk kontrolü baþarýsýz" +msgstr "epsclosure() içindeki tutarlılık kontrolü baÅŸarısız" #: dfa.c:429 msgid "" @@ -52,12 +53,12 @@ msgid "" msgstr "" "\n" "\n" -"DFA Dökümü:\n" +"DFA Dökümü:\n" "\n" #: dfa.c:604 msgid "could not create unique end-of-buffer state" -msgstr "tekil tampon sonu durumu yaratýlamadý" +msgstr "tekil tampon sonu durumu yaratılamadı" #: dfa.c:625 #, c-format @@ -66,15 +67,15 @@ msgstr "durum # %d:\n" #: dfa.c:800 msgid "Could not write yynxt_tbl[][]" -msgstr "yynxt_tbl[][] yazýlamadý" +msgstr "yynxt_tbl[][] yazılamadı" #: dfa.c:1023 msgid "consistency check failed in symfollowset" -msgstr "symfollowset içindeki tutarlýk kontrolü baþarýsýz" +msgstr "symfollowset içindeki tutarlık kontrolü baÅŸarısız" #: dfa.c:1071 msgid "bad transition character detected in sympartition()" -msgstr "sympartition() içinde hatalý geçiþ karakterleri saptandý" +msgstr "sympartition() içinde hatalı geçiÅŸ karakterleri saptandı" #: gen.c:484 msgid "" @@ -85,7 +86,7 @@ msgid "" msgstr "" "\n" "\n" -"Denklik Sýnýflarý:\n" +"Denklik Sınıfları:\n" "\n" #: gen.c:668 gen.c:697 gen.c:1221 @@ -99,17 +100,16 @@ msgid "state # %d accepts: " msgstr "durum # %d kabul eder: " #: gen.c:1163 -#, fuzzy msgid "Could not write yyacclist_tbl" -msgstr "yyacc_tbl yazýlamadý" +msgstr "yyacclist_tbl yazılamadı" #: gen.c:1239 msgid "Could not write yyacc_tbl" -msgstr "yyacc_tbl yazýlamadý" +msgstr "yyacc_tbl yazılamadı" #: gen.c:1254 gen.c:1639 gen.c:1662 msgid "Could not write ecstbl" -msgstr "ecstbl yazýlamadý" +msgstr "ecstbl yazılamadı" #: gen.c:1277 msgid "" @@ -119,385 +119,384 @@ msgid "" msgstr "" "\n" "\n" -"Ara-Denklik Sýnýflarý:\n" +"Ara-Denklik Sınıfları:\n" #: gen.c:1299 msgid "Could not write yymeta_tbl" -msgstr "yymeta_tbl yazýlamadý" +msgstr "yymeta_tbl yazılamadı" #: gen.c:1360 msgid "Could not write yybase_tbl" -msgstr "yybase_tbl yazýlamadý" +msgstr "yybase_tbl yazılamadı" #: gen.c:1394 msgid "Could not write yydef_tbl" -msgstr "yydef_tbl yazýlamadý" +msgstr "yydef_tbl yazılamadı" #: gen.c:1434 msgid "Could not write yynxt_tbl" -msgstr "yynxt_tbl yazýlamadý" +msgstr "yynxt_tbl yazılamadı" #: gen.c:1470 msgid "Could not write yychk_tbl" -msgstr "yychk_tbl yazýlamadý" +msgstr "yychk_tbl yazılamadı" #: gen.c:1624 gen.c:1653 msgid "Could not write ftbl" -msgstr "ftbl yazýlamadý" +msgstr "ftbl yazılamadı" #: gen.c:1630 -#, fuzzy msgid "Could not write ssltbl" -msgstr "ecstbl yazýlamadý" +msgstr "ssltbl yazılamadı" #: gen.c:1681 -#, fuzzy msgid "Could not write eoltbl" -msgstr "ecstbl yazýlamadý" +msgstr "eoltbl yazılamadı" #: gen.c:1741 msgid "Could not write yynultrans_tbl" -msgstr "yynultrans_tbl yazýlamadý" +msgstr "yynultrans_tbl yazılamadı" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" -msgstr "kural eþlenemdi" +msgstr "kural eÅŸlenemedi" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" -msgstr "-s seçeneði verilmiþ fakat öntanýmlý kural eþlenebilmeli" +msgstr "-s seçeneÄŸi verilmiÅŸ fakat öntanımlı kural eÅŸlenebiliyor" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" -msgstr "-+'yi -l seçeneði ile kullanma" +msgstr "-+'yi -l seçeneÄŸi ile kullanma" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" -msgstr "-f veya -F'yi -l seçeneði ile kullanma" +msgstr "-f veya -F'yi -l seçeneÄŸi ile kullanma" -#: main.c:224 -#, fuzzy +#: main.c:238 msgid "Can't use --reentrant or --bison-bridge with -l option" -msgstr "-R veya -Rb -l seçeneði ile kullanýlmaz" +msgstr "-l seçeneÄŸi ile --reentrant veya --bison-bridge bir arada kullanılamaz" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" -msgstr "-Cf/-CF ve -Cm birlikte hassas deðillerdir" +msgstr "-Cf/-CF ve -Cm birlikte anlam ifade etmiyor" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" -msgstr "-Cf/-CF ve -I uyumsuzdur" +msgstr "-Cf/-CF ve -I uyumsuz" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" -msgstr "-Cf/-CF lex-uyumluluk kipi ile uyumsuzdur" +msgstr "-Cf/-CF lex-uyumluluk kipi ile uyumsuz" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" -msgstr "-Cf ve -CF karþýlýklý dýþarlayandýr" +msgstr "-Cf ve -CF bir arada kullanılamaz" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" -msgstr "-+ yi -CF seçeneði ile kullanma" +msgstr "-+, -CF seçeneÄŸi ile kullanılamaz" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" -msgstr "%array -+ seçeneði ile uyumsuz" +msgstr "%array, -+ seçeneÄŸi ile uyumsuz" -#: main.c:285 -#, fuzzy +#: main.c:299 msgid "Options -+ and --reentrant are mutually exclusive." -msgstr "-+ ve -R seçenekleri karþýlýklý dýþarlayandýr." +msgstr "-+ ve --reentrant seçenekleri bir arada kullanılamaz" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." -msgstr "" +msgstr "bison bridge, C++ tarayıcısı için desteklenmiyor." -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" -msgstr "%s yaratýlamadý" +msgstr "%s oluÅŸturulamadı" -#: main.c:398 +#: main.c:415 msgid "could not write tables header" -msgstr "tablo baþlýðý yazýlamadý" +msgstr "tablo baÅŸlığı yazılamadı" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" -msgstr "iskelet dosyasý %s açýlamadý" +msgstr "iskelet dosyası %s açılamadı" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" -msgstr "iskelet dosyasý %s okunurken girdi hatasý" +msgstr "iskelet dosyası %s okunurken girdi hatası" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" -msgstr "iskelet dosyasý kapatýlýrken hata: %s" +msgstr "iskelet dosyası %s kapatılırken hata" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" -msgstr "baþlýk dosyasý %s'i oluþtururken hata" +msgstr "baÅŸlık dosyası %s oluÅŸturulurken hata" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" -msgstr "çýktý dosyasý yazýlýrken hata: %s" +msgstr "çıktı dosyası %s yazılırken hata" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" -msgstr "çýktý dosyasý kapatýlýrken hata: %s" +msgstr "çıktı dosyası %s kapatılırken hata" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" -msgstr "çýktý dosyasý %s silinirken hata" +msgstr "çıktı dosyası %s silinirken hata" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "Yedekleme yok.\n" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" -msgstr "%d yedeklenmiþ (kabul-edilmeyen) durum.\n" +msgstr "%d yedeklenen (kabul-etmeyen) durumlar.\n" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" -msgstr "Sýkýþtýrýlmýþ tablolar daima yedeklidir.\n" +msgstr "Sıkıştırılmış tablolar daima yedeklidir.\n" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" -msgstr "yedek dosyasý yazýlýrken hata: %s" +msgstr "yedek dosyası %s yazılırken hata" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" -msgstr "yedek dosyasý kapatýlýrken hata: %s" +msgstr "yedek dosyası %s kapatılırken hata" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" -msgstr "%s sürüm %s kullaným istatistikleri:\n" +msgstr "%s sürüm %s kullanım istatistikleri:\n" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" -msgstr " tarayýcý seçenekleri: -" +msgstr " tarayıcı seçenekleri: -" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA durumu\n" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" -msgstr " %d/%d DFA durumu (%d sözcük)\n" +msgstr " %d/%d DFA durumu (%d sözcük)\n" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d kural\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr " Yedekleme yok\n" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" -msgstr " %d yedeklenmiþ (kabul-edilmeyen) durum\n" +msgstr " %d yedeklenmiÅŸ (kabul-edilmeyen) durum\n" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" -msgstr " Sýkýþtýrýlmýþ tablolar daima yedeklenir\n" +msgstr " Sıkıştırılmış tablolar daima yedeklenir\n" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" -msgstr " Baþlangýç-satýrý kalýplarý kullanýldý\n" +msgstr " BaÅŸlangıç-satırı kalıpları kullanıldı\n" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" -msgstr " %d/%d baþlangýç þartlarý\n" +msgstr " %d/%d baÅŸlangıç ÅŸartları\n" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" -msgstr " %d epsilon durumu, %d çift epsilon durumu\n" +msgstr " %d epsilon durumu, %d çift epsilon durumu\n" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" -msgstr " karakter sýnýflarý yok\n" +msgstr " karakter sınıfı yok\n" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -" %d/%d ihtiyaç duyulan karakter sýnýfý %d/%d depolanan sözcük, %d yeniden " -"kullanýldý\n" +" %d/%d ihtiyaç duyulan karakter sınıfı %d/%d depolanan sözcük, %d yeniden " +"kullanıldı\n" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" -msgstr " %d durumu/sonrakidurum çifti yaratýldý\n" +msgstr " %d durumu/sonrakidurum çifti yaratıldı\n" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" -msgstr " %d/%d tekil/çift geçiþler\n" +msgstr " %d/%d tekil/çift geçiÅŸler\n" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr " %d tablo girdileri\n" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" -msgstr " %d/%d temel-taným girdileri yaratýldý\n" +msgstr " %d/%d temel-tanım girdileri yaratıldı\n" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" -msgstr " %d/%d (en yüksek %d) nxt-chk girdileri yaratýldý\n" +msgstr " %d/%d (en yüksek %d) nxt-chk girdileri yaratıldı\n" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" -msgstr " %d/%d (en yüksek %d) þablon nxt-chk girdileri yaratýldý\n" +msgstr " %d/%d (en yüksek %d) ÅŸablon nxt-chk girdileri yaratıldı\n" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" -msgstr " %d boþ tablo girdileri\n" +msgstr " %d boÅŸ tablo girdileri\n" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" -msgstr " %d prototip yaratýldý\n" +msgstr " %d prototip yaratıldı\n" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" -msgstr " %d aþblon yaratýldý, %d kullanýldý\n" +msgstr " %d ÅŸablon yaratıldı, %d kullanıldı\n" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" -msgstr " %d/%d denk sýnýflar yaratýldý\n" +msgstr " %d/%d denklik sınıfı yaratıldı\n" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" -msgstr " %d/%d ara-denklik sýnýflarý yaratýldý\n" +msgstr " %d/%d ara-denklik sınıfı yaratıldı\n" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" -msgstr " %d (%d kaydedildi) saçýlma çarpýþmasý, %d DFA denk\n" +msgstr " %d (%d kaydedildi) saçılma çarpışması, %d DFA denk\n" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" -msgstr " %d tekrar ayýrým kumesine ihtiyaç var\n" +msgstr " %d tekrar ayırım kümesine ihtiyaç var\n" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" -msgstr " %d toplam tablo girdilerine ihtiyaç var\n" +msgstr " %d toplam tablo girdisine ihtiyaç var\n" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" -msgstr "Ýç hata. flexopt'ler bozuk.\n" +msgstr "İç hata. flexopt'lar bozuk.\n" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "Daha fazla bilgi için `%s --help' yazýn.\n" +msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" -msgstr "bilinmeyen -C seçeneði '%c'" +msgstr "bilinmeyen -C seçeneÄŸi '%c'" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" -msgstr "ölümcül ayrýþtýrma hatasý" +msgstr "ölümcül ayrıştırma hatası" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" -msgstr "yedekleme bilgi dosyasý %s yaratýlamadý" +msgstr "yedekleme bilgi dosyası %s oluÅŸturulamadı" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" -msgstr "-l AT&T lex uyumluluðu seçeneði bir büyük baþarým kaybýna neden olur\n" +msgstr "-l AT&T lex uyumluluÄŸu seçeneÄŸi önemli ölçüde yavaÅŸlamaya yol açar\n" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" -msgstr " ve belki diðer raporlanan baþarým kayýplarýnýn güncel kaynaðý\n" +msgstr "" +" ve belki bildirilen baÅŸka performans kayıplarının da kaynağı olabilir\n" -#: main.c:1504 -#, fuzzy, c-format +#: main.c:1521 +#, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -msgstr "%%option yylineno bir büyük baþarým kaybýna neden olur\n" +msgstr "" +"yylineno %%seçeneÄŸi YALNIZCA yenisatır karakterlerini de eÅŸleyen satırlarda " +"yavaÅŸlar.\n" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" -msgstr "-I (etkileþimli) bir küçük baþarým kaybýna neden olur\n" +msgstr "-I (etkileÅŸimli) küçük ölçekli bir yavaÅŸlamaya neden olur\n" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" -msgstr "yymore() bir küçük baþarým kaybýna neden olur\n" +msgstr "yymore() küçük ölçekli bir yavaÅŸlamaya neden olur\n" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" -msgstr "REJECT bir büyük baþarým kaybýna neden olur\n" +msgstr "REJECT büyük ölçekli bir yavaÅŸlamaya neden olur\n" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -"Deðiþken izleme ortamý kurallarý bir büyük baþarým kaybýna neden olur\n" +"DeÄŸiÅŸken izleyen baÄŸlam kuralları, büyük ölçekli yavaÅŸlamaya neden olur\n" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" -msgstr "REJECT -f veya -F ile kullanýlamadý" +msgstr "REJECT, -f veya -F ile kullanılamaz" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" -msgstr "%option yylineno REJECT ile kullanýlamaz" +msgstr "%option yylineno, REJECT ile birlikte kullanılamaz" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" -msgstr "deðiþken izleme ortamý kurallarý -f veya -F ile kullanýlamaz" +msgstr "deÄŸiÅŸken izleme ortamı kuralları, -f veya -F ile birlikte kullanılamaz" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" -msgstr "%option yyclass sadece C++ tarayýcýlar için anlamlýdýr" +msgstr "%option yyclass, sadece C++ tarayıcıları için anlamlıdır" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" -msgstr "Kullaným: %s [SEÇENEKLER...] [DOSYA...]\n" +msgstr "Kullanım: %s [SEÇENEKLER...] [DOSYA...]\n" -#: main.c:1771 -#, fuzzy, c-format +#: main.c:1787 +#, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -561,107 +560,107 @@ msgid "" " -h, --help produce this help message\n" " -V, --version report %s version\n" msgstr "" -"Metin üzerinde kalýp eþleþtiren yazýlýmlar üretir.\n" -"\n" -"Tablo Sýkýþtýrma:\n" -" -Ca, --align daha iyi bellek hizalamasý için daha büyük tablolardan\n" -" feragat eder\n" -" -Ce, --ecs denklik sýnýflarýný oluþtur\n" -" -Cf tarayýcý tablolarýný sýkýþtýrma; -f gösterimini kullan\n" -" -CF tarayýcý tablolarýný sýkýþtýrma; -F gösterimini kullan\n" -" -Cm, --meta-ecs ara-denklik sýnýflarýný oluþtur\n" -" -Cr, --read tarayýcý girdisi için stdionun yerine read() kullan\n" -" -f, --full hýzlý, geniþ tarayýcýlar oluþtur. -Cfr'ye benzer\n" -" -F, --fast alternatif tablo gösterimlerini kullan. -CFr'ye benzer\n" -" -Cem öntanýmlý sýkýþtýrma (--ecs --meta-ecs ile ayný)\n" -"\n" -"Hata Ayýklama:\n" -" -d, --debug tarayýcý içinde hata ayýklayýcý " -"kipini etkinleþtir\n" -" -b, --backup yedekleme bilgisini %s'e yaz\n" -" -p, --perf-report baþarým raporunu stderr'a yaz\n" -" -s, --nodefault eþlenemeyen metni öntanýmlý kural ECHO'ya bas\n" -" -T, --trace %s izleme kipinde çalýþmalý\n" -" -w, --nowarn uyarýlar üretme\n" -" -v, --verbose tarayýcý istatistiklerinin özetini stdout'a yaz\n" -"\n" -"Dosyalar:\n" -" -o, --outfile=DOSYA çýktý dosya adýný belirle\n" -" -S, --skel=DOSYA iskelet dosyayý belirle\n" -" -t, --stdout tarayýcýlarý %s'in yerine stdout'a yaz\n" -" --yyclass=ÝSÝM C++ sýnýfýnýn adý\n" -" --header-file=DOSYA tarayýcýya ek olarak bir C baþlýk dosyasý\n" -" oluþturur\n" -" --tables-file[=DOSYA] tablolarý DOSYA'ya yazar\n" -"\n" -"Tarayýcý davranýþý:\n" -" -7, --7bit 7-bit tarayýcý oluþtur\n" -" -8, --8bit generate 8-bit scanner\n" -" -B, --batch yýðýn tarayýcýlar üret (-I'nýn karþýtý)\n" -" -i, --case-insensitive kalýplardaki büyük-küçük duyarlýlýðýný ihmal et\n" -" -l, --lex-compat özgün lex ile en yüksek seviyede uyumluluk\n" -" -X, --posix-compat POSIX lex ile en yüksek seviyede uyumluluk\n" -" -I, --interactive etkileþimli tarayýcý üret (-B'nin karþýtý)\n" -" --yylineno yylineno içindeki satýr sayýsýný izle\n" -"\n" -"Üretilen kod:\n" -" -+, --c++ C++ tarayýcý sýnýfý oluþtur\n" -" -Dmacro[=defn] #define makro defn (öntanýmlý defn '1'dir)\n" -" -L, --noline tarayýcý içinde #line bildirimlerini bas\n" -" -P, --prefix=DÝZÝ önek olarak \"yy\"'nin yerine DÝZÝ kullan \n" -" -R, --reentrant yineli girilebilen C tarayýcýsý üret\n" -" -Rb, --reentrant-bison saf bison ayrýþtýrýcýsý için " -"yineli girilebilen tarayýcý.\n" -" --stdinit yyin/yyout'u stdin/stdout'a ayarlý baþlat\n" -" --nounistd <unistd.h> dosyasýný içerme\n" -" --noFUNCTION özel bir FONKSÝYON üretme\n" -"\n" -"Çeþitli:\n" -" -c hiçbirþeyi POSIX seçenekli yapma\n" -" -n hiçbirþeyi POSIX seçenekli yapma\n" +"Metin üzerinde kalıp eÅŸleyen yazılımlar oluÅŸturur.\n" +"\n" +"Tablo Sıkıştırma Seçenekleri:\n" +" -Ca, --align daha iyi bellek hizalaması için daha büyük tablolardan\n" +" vazgeçer.\n" +" -Ce, --ecs eÅŸitlik sınıfları oluÅŸturur\n" +" -Cf tabloları sıkıştırmaz; -f gösterimini kullanır\n" +" -CF tabloları sıkıştırmaz; -F gösterimini kullanır\n" +" -Cm, --meta-ecs üst-eÅŸitlik sınıfları oluÅŸturur\n" +" -Cr, --read tarama girdisi için stdio yerine read() kullanır\n" +" -f, --full hızlı, büyük tarayıcı oluÅŸturur. -Cfr ile aynı\n" +" -F, --fast alternatif tablo gösterimi kullanır. -CFr ile aynı\n" +" -Cem ön tanımlı sıkıştırma (--ecs --meta-ecs ile aynı)\n" +"\n" +"Hata Ayıklama:\n" +" -d, --debug tarayıcıda hata ayıklama kipini etkinleÅŸtirir\n" +" -b, --backup yedekleme bilgisini %s'e yazdırır\n" +" -p, --perf-report performans raporunu standart hataya yazdırır\n" +" -s, --nodefault eÅŸleÅŸmeyen metni göstermek davranışını durdurur\n" +" -T, --trace %s izleme kipinde çalışmalıdır\n" +" -w, --nowarn uyarı bildirmez\n" +" -v, --verbose tarama istatistiklerini standart çıktıya yazdırır\n" +"\n" +"Files:\n" +" -o, --outfile=DOSYA çıktı dosya adını belirtir\n" +" -S, --skel=DOSYA iskelet dosyanın adını belirtir\n" +" -t, --stdout tarayıcıyı %s yerine stdout'a yazdırır\n" +" --yyclass=Ä°SÄ°M C++ sınıfının ismi\n" +" --header-file=DOSYA tarayıcı yanında C baÅŸlık dosyası da oluÅŸturur\n" +" --tables-file[=DOSYA] tabloları DOSYA'ya yazar\n" +"\n" +"Tarayıcı davranışı:\n" +" -7, --7bit 7-bit tarayıcı oluÅŸturur\n" +" -8, --8bit 8-bit tarayıcı oluÅŸturur\n" +" -B, --batch etkileÅŸimsiz tarayıcı oluÅŸturur (-I'nın tersi)\n" +" -i, --case-insensitive kalıplarda büyük/küçük harf gözetmez\n" +" -l, --lex-compat lex ile en fazla uyumluluÄŸu saÄŸlar\n" +" -X, --posix-compat POSIX lex ile en fazla uyumluluÄŸu saÄŸlar\n" +" -I, --interactive etkileÅŸimli tarayıcı oluÅŸturur (-B'nin tersi)\n" +" --yylineno yylineno içinde satır sayısını tutar\n" +"\n" +"OluÅŸturulan kod:\n" +" -+, --c++ C++ tarayıcı sınıfı oluÅŸturur\n" +" -Dmacro[=defn] #define ile makro tanımı (öntanımlı defn, '1')\n" +" -L, --noline tarayıcıda #line yönergeleri oluÅŸturmaz\n" +" -P, --prefix=STRING \"yy\" yerine STRING'i önek olarak kullanır\n" +" -R, --reentrant yeniden giriÅŸli C tarayıcısı oluÅŸturur\n" +" --bison-bridge saf bison ayrıştırıcısı için tarayıcı.\n" +" --bison-locations yylloc desteÄŸini etkinleÅŸtirir.\n" +" --stdinit yyin/yyout'u stdin/stdout'a tanımlar\n" +" --noansi-definitions eski tür iÅŸlev tanımları\n" +" --noansi-prototypes prototiplerde boÅŸ parametre listesi\n" +" --nounistd <unistd.h>'yi içermez\n" +" --noFUNCTION FUNCTION ismindeki iÅŸlevi üretmez\n" +"\n" +"Muhtelif:\n" +" -c hiç bir ÅŸey yapmayan POSIX seçeneÄŸi\n" +" -n hiç bir ÅŸey yapmayan POSIX seçeneÄŸi\n" " -?\n" -" -h, --help bu yardým iletisini üret\n" -" -V, --version %s sürümünü raporlar\n" +" -h, --help bu yardım bilgisini gösterir\n" +" -V, --version %s sürümünü bildirir\n" #: misc.c:100 misc.c:126 #, c-format msgid "name \"%s\" ridiculously long" -msgstr "isim \"%s\" gülünç derecede uzun" +msgstr "\"%s\" ismi gülünç derecede uzun" #: misc.c:175 msgid "memory allocation failed in allocate_array()" -msgstr "allocate_array() içinde hafýza ayýrýmý baþarýsýz" +msgstr "allocate_array() içinde bellek ayırımı baÅŸarısız" #: misc.c:250 #, c-format msgid "bad character '%s' detected in check_char()" -msgstr "check_char() içinde hatalý karakter '%s' saptandý" +msgstr "check_char() içinde hatalı karakter '%s' saptandı" #: misc.c:255 #, c-format msgid "scanner requires -8 flag to use the character %s" -msgstr "tarayýcý %s karakterini kullanmak için -8 bayraðýna ihtiyaç duyar" +msgstr "tarayıcı %s karakterini kullanmak için -8 bayrağına ihtiyaç duyar" #: misc.c:288 msgid "dynamic memory failure in copy_string()" -msgstr "copy_string() içinde dinamik hafýza baþarýsýzlýðý" +msgstr "copy_string() içinde dinamik bellek hatası" #: misc.c:422 #, c-format msgid "%s: fatal internal error, %s\n" -msgstr "%s: ölümcül iç hata, %s\n" +msgstr "%s: ölümcül iç hata, %s\n" #: misc.c:875 msgid "attempt to increase array size failed" -msgstr "dizi boyutunu artýrma çabasý baþarýsýz" +msgstr "dizi boyutunu artırma denemesi baÅŸarısız" #: misc.c:1002 msgid "bad line in skeleton file" -msgstr "iskelet dosya içinde hatalý satýr" +msgstr "iskelet dosya içinde hatalı satır" #: misc.c:1051 msgid "memory allocation failed in yy_flex_xmalloc()" -msgstr "yy_flex_xmalloc() içinde hafýza ayýrýmý baþarýsýz" +msgstr "yy_flex_xmalloc() içinde bellek ayırımı baÅŸarısız" #: nfa.c:104 #, c-format @@ -672,7 +671,7 @@ msgid "" msgstr "" "\n" "\n" -"********** nfa'nýn dökümü baþlangýç durumu %d ile baþlýyor\n" +"********** baÅŸlangıç durumu %d olan nfa'nın dökümüne baÅŸlanıyor\n" #: nfa.c:115 #, c-format @@ -681,42 +680,42 @@ msgstr "durum # %4d\t" #: nfa.c:130 msgid "********** end of dump\n" -msgstr "********** döküm sonu\n" +msgstr "********** döküm sonu\n" #: nfa.c:174 msgid "empty machine in dupmachine()" -msgstr "dupmachine() içinde boþ makine" +msgstr "dupmachine() içinde boÅŸ makine" #: nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" -msgstr "Deðiþken izleme ortamý satýr %d'de\n" +msgstr "%d satırında deÄŸiÅŸken izleyen baÄŸlam kuralı\n" #: nfa.c:353 msgid "bad state type in mark_beginning_as_normal()" -msgstr "mark_beginning_as_normal() içinde hatalý durum tipi" +msgstr "mark_beginning_as_normal() içinde hatalı durum türü" #: nfa.c:598 #, c-format msgid "input rules are too complicated (>= %d NFA states)" -msgstr "girdi kurallarý çok karýþýk (>= %d NFA durumu)" +msgstr "girdi kuralları fazla karışık (>= %d NFA durumu)" #: nfa.c:677 msgid "found too many transitions in mkxtion()" -msgstr "mkxtion() içinde çok fazla geçiþ bulundu" +msgstr "mkxtion() içinde çok fazla geçiÅŸ bulundu" #: nfa.c:703 #, c-format msgid "too many rules (> %d)!" -msgstr "çok fazla kural (> %d)!" +msgstr "çok fazla kural (> %d)!" #: parse.y:183 msgid "unknown error processing section 1" -msgstr "1. bölüm iþlenirken bilinmeyen hata oluþtu" +msgstr "1. bölüm iÅŸlenirken bilinmeyen hata oluÅŸtu" #: parse.y:208 parse.y:373 msgid "bad start condition list" -msgstr "hatalý baþlangýç þart listesi" +msgstr "hatalı baÅŸlangıç ÅŸart listesi" #: parse.y:337 msgid "unrecognized rule" @@ -724,121 +723,123 @@ msgstr "bilinmeyen kural" #: parse.y:456 parse.y:469 parse.y:538 msgid "trailing context used twice" -msgstr "son baðlam iki defa kullanýlmýþ" +msgstr "izleyen baÄŸlam iki defa kullanılmış" #: parse.y:574 parse.y:584 parse.y:657 parse.y:667 msgid "bad iteration values" -msgstr "hatalý yineleme deðerleri" +msgstr "hatalı yineleme deÄŸerleri" #: parse.y:602 parse.y:620 parse.y:685 parse.y:703 msgid "iteration value must be positive" -msgstr "yineleme deðeri pozitif olmalý" +msgstr "yineleme deÄŸeri pozitif olmalı" #: parse.y:817 parse.y:827 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" +"[%c-%c] karakter aralığı, büyük/küçük harf farkı gözetmeyen bir tarayıcıda\n" +"belirsiz anlamlı" #: parse.y:832 msgid "negative range in character class" -msgstr "karakter sýnýflarýnda negatif aralýk" +msgstr "karakter sınıflarında negatif aralık" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" -msgstr "Girdi satýrý fazla uzun\n" +msgstr "Girdi satırı fazla uzun\n" -#: scan.l:149 -#, fuzzy, c-format +#: scan.l:150 +#, c-format msgid "malformed '%top' directive" -msgstr "'%' bildirimi tanýnmadý" +msgstr "hatalı `%top' yönergesi" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" -msgstr "'%' bildirimi tanýnmadý" +msgstr "'%' yönergesi bilinmiyor" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" -msgstr "" +msgstr "'{' eÅŸleÅŸmiyor" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" -msgstr "eksik isim tanýmlamasý" +msgstr "eksik isim tanımlaması" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" -msgstr "geçersiz %%seçenek: %s" +msgstr "geçersiz %%seçenek: %s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" -msgstr "hatalý karakter sýnýfý" +msgstr "hatalı karakter sınıfı" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" -msgstr "belirsiz taným {%s}" +msgstr "belirsiz tanım {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" -msgstr "hatalý <baþlangýç þartý>: %s" +msgstr "hatalı <baÅŸlangıç ÅŸartı>: %s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" -msgstr "eksik çift týrnak" +msgstr "eksik çift tırnak" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" -msgstr "bozuk karakter sýnýfý ifadesi: %s" +msgstr "bozuk karakter sınıfı ifadesi: %s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" -msgstr "{}'ler içinde hatalý karakter" +msgstr "{}'ler içinde hatalı karakter" -#: scan.l:726 +#: scan.l:727 msgid "missing }" -msgstr "kayýp }" +msgstr "eksik }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" -msgstr "bir eylem içinde EOF ile karþýlaþýldý" +msgstr "bir eylem içinde EOF ile karşılaşıldı" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" -msgstr "hatalý karakter: %s" +msgstr "hatalı karakter: %s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" -msgstr "%s açýlamýyor" +msgstr "%s açılamıyor" #: scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" -msgstr "Kullaným: %s [SEÇENEKLER...]\n" +msgstr "Kullanım: %s [SEÇENEKLER...]\n" #: scanopt.c:565 #, c-format msgid "option `%s' doesn't allow an argument\n" -msgstr "`%s' seçeneði argüman kullanmaz\n" +msgstr "`%s' seçeneÄŸi argüman kullanmaz\n" #: scanopt.c:570 #, c-format msgid "option `%s' requires an argument\n" -msgstr "`%s' seçeneði için argüman zorunludur\n" +msgstr "`%s' seçeneÄŸi için argüman zorunludur\n" #: scanopt.c:574 #, c-format msgid "option `%s' is ambiguous\n" -msgstr "`%s' seçeneði belirsiz\n" +msgstr "`%s' seçeneÄŸi belirsiz\n" #: scanopt.c:578 #, c-format msgid "Unrecognized option `%s'\n" -msgstr "Bilinmeyen seçenek: `%s'\n" +msgstr "Bilinmeyen seçenek: `%s'\n" #: scanopt.c:582 #, c-format @@ -847,16 +848,16 @@ msgstr "Bilinmeyen hata=(%d)\n" #: sym.c:100 msgid "symbol table memory allocation failed" -msgstr "simge tablosu hafýza ayýrýmý baþarýsýz" +msgstr "simge tablosu bellek ayırımı baÅŸarısız" #: sym.c:203 msgid "name defined twice" -msgstr "isim iki defa tanýmlandý" +msgstr "isim iki defa tanımlandı" #: sym.c:254 #, c-format msgid "start condition %s declared twice" -msgstr "baþlangýç þartý %s iki defa bildirildi" +msgstr "baÅŸlangıç ÅŸartı %s iki defa bildirildi" #: yylex.c:56 msgid "premature EOF" @@ -864,25 +865,9 @@ msgstr "erken EOF" #: yylex.c:198 msgid "End Marker\n" -msgstr "Bitiþ Ýþaretçisi\n" +msgstr "BitiÅŸ Ä°ÅŸaretçisi\n" #: yylex.c:204 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" -msgstr "*Birþey Anlaþýlmaz* -andaç: %d deðer: %d\n" - -#~ msgid "Can't specify header option if writing to stdout." -#~ msgstr "Eðer stdout'a yazýlacaksa baþlýk seçeneðini belirtme" - -#~ msgid "unknown -R option '%c'" -#~ msgstr "bilinmeyen -R seçeneði '%c'" - -#~ msgid "-Cf/-CF and %option yylineno are incompatible" -#~ msgstr "-Cf/-CF ve %option yylineno uyumsuz" - -#~ msgid "" -#~ "For usage, try\n" -#~ "\t%s --help\n" -#~ msgstr "" -#~ "Kullaným için, aþaðýdakini deneyin\n" -#~ "\t%s --help\n" +msgstr "*Garip Bir Åžey* -andaç: %d deÄŸer: %d\n" diff --git a/po/vi.gmo b/po/vi.gmo Binary files differnew file mode 100644 index 0000000..7fdd05a --- /dev/null +++ b/po/vi.gmo diff --git a/po/vi.po b/po/vi.po new file mode 100644 index 0000000..7e9a510 --- /dev/null +++ b/po/vi.po @@ -0,0 +1,888 @@ +# Vietnamese translation for flex-2.5.31. +# Copyright (C) 2005 Free Software Foundation, Inc. +# Clytie Siddall <clytie@riverland.net.au>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: flex 2.5.31\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" +"PO-Revision-Date: 2005-03-31 16:08+0950\n" +"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" +"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: dfa.c:61 +#, c-format +msgid "State #%d is non-accepting -\n" +msgstr "TÃnh trạng #%d không phải là loại chấp nháºn -\n" + +#: dfa.c:124 +msgid "dangerous trailing context" +msgstr "ngữ cảnh theo sau là nguy hiểm" + +#: dfa.c:166 +msgid " associated rule line numbers:" +msgstr " số dòng quy tắc được thÃch hợp:" + +#: dfa.c:202 +msgid " out-transitions: " +msgstr " việc chuyển tiếp xuất:" + +#: dfa.c:210 +msgid "" +"\n" +" jam-transitions: EOF " +msgstr "" +"\n" +" chuyển tiếp jam (bị trở ngại?): gặp kết thức táºp tin" + +#: dfa.c:341 +msgid "consistency check failed in epsclosure()" +msgstr "kiểm tra sá»± thống nhất trong epsclosure() đã thất bại rồi" + +#: dfa.c:429 +msgid "" +"\n" +"\n" +"DFA Dump:\n" +"\n" +msgstr "" +"\n" +"\n" +"Äổ DFA:\n" +"\n" + +#: dfa.c:604 +msgid "could not create unique end-of-buffer state" +msgstr "không tạo được tÃnh trạng kết thức bá»™ đệm Ä‘á»™c nhất" + +#: dfa.c:625 +#, c-format +msgid "state # %d:\n" +msgstr "tÃnh trạng # %d:\n" + +#: dfa.c:800 +msgid "Could not write yynxt_tbl[][]" +msgstr "Không ghi được yynxt_tbl[][]" + +#: dfa.c:1023 +msgid "consistency check failed in symfollowset" +msgstr "kiểm tra sá»± thống nhất trong symfollowset đã thất bại rồi" + +#: dfa.c:1071 +msgid "bad transition character detected in sympartition()" +msgstr "phát hiện ký tá»± chuyển tiếp sai trong sympartition() rồi" + +#: gen.c:484 +msgid "" +"\n" +"\n" +"Equivalence Classes:\n" +"\n" +msgstr "" +"\n" +"\n" +"Hạng Ä‘á»™ tÆ°Æ¡ng Ä‘Æ°Æ¡ng:\n" +"\n" + +#: gen.c:668 gen.c:697 gen.c:1221 +#, c-format +msgid "state # %d accepts: [%d]\n" +msgstr "tÃnh trạng # %d thì chấp nháºn: [%d]\n" + +#: gen.c:1116 +#, c-format +msgid "state # %d accepts: " +msgstr "tÃnh trạng # %d thì chấp nháºn: " + +#: gen.c:1163 +msgid "Could not write yyacclist_tbl" +msgstr "Không ghi được yyacclist_tbl" + +#: gen.c:1239 +msgid "Could not write yyacc_tbl" +msgstr "Không ghi được yyacc_tbl" + +#: gen.c:1254 gen.c:1639 gen.c:1662 +msgid "Could not write ecstbl" +msgstr "Không ghi được ecstbl" + +#: gen.c:1277 +msgid "" +"\n" +"\n" +"Meta-Equivalence Classes:\n" +msgstr "" +"\n" +"\n" +"Hạng tÃnh loại tÆ°Æ¡ng Ä‘Æ°Æ¡ng mức cao hÆ¡n:\n" + +#: gen.c:1299 +msgid "Could not write yymeta_tbl" +msgstr "Không ghi được yymeta_tbl" + +#: gen.c:1360 +msgid "Could not write yybase_tbl" +msgstr "Không ghi được yybase_tbl" + +#: gen.c:1394 +msgid "Could not write yydef_tbl" +msgstr "Không ghi được yydef_tbl" + +#: gen.c:1434 +msgid "Could not write yynxt_tbl" +msgstr "Không ghi được yynxt_tbl" + +#: gen.c:1470 +msgid "Could not write yychk_tbl" +msgstr "Không ghi được yychk_tbl" + +#: gen.c:1624 gen.c:1653 +msgid "Could not write ftbl" +msgstr "Không ghi được ftbl" + +#: gen.c:1630 +msgid "Could not write ssltbl" +msgstr "Không ghi được ssltbl" + +#: gen.c:1681 +msgid "Could not write eoltbl" +msgstr "Không ghi được eoltbl" + +#: gen.c:1741 +msgid "Could not write yynultrans_tbl" +msgstr "Không ghi được yynultrans_tbl" + +#: main.c:187 +msgid "rule cannot be matched" +msgstr "không thể khá»›p vÆ¡i quy tắc ấy" + +#: main.c:192 +msgid "-s option given but default rule can be matched" +msgstr "Ä‘Æ°a ra tùy chá»n -s nhÆ°ng có thể khá»›p vá»›i quy tắc mặc định" + +#: main.c:231 +msgid "Can't use -+ with -l option" +msgstr "Không thể sá» dụng ký tÆ° -+ vá»›i tùy chá»n -l" + +#: main.c:234 +msgid "Can't use -f or -F with -l option" +msgstr "Không thể sá» dụng cá» -f hoặc -F vá»›i tùy chá»n -l " + +#: main.c:238 +msgid "Can't use --reentrant or --bison-bridge with -l option" +msgstr "" +"Không thể sá» dụng đối số --reentrant (và o lại) hoặc --bison-bridge (chiếc " +"cầu bison) vá»›i tùy chá»n -l" + +#: main.c:275 +msgid "-Cf/-CF and -Cm don't make sense together" +msgstr "Hai tùy chá»n -Cf/-CF và -Cm không có ý nghÄ©a vá»›i nhau" + +#: main.c:278 +msgid "-Cf/-CF and -I are incompatible" +msgstr "Hai tùy chá»n -Cf/-CF và -I không phải là tÆ°Æ¡ng thÃch vá»›i nhau" + +#: main.c:282 +msgid "-Cf/-CF are incompatible with lex-compatibility mode" +msgstr "" +"Tùy chá»n -Cf/-CF không phải là tÆ°Æ¡ng thÃch vá»›i chế Ä‘á»™ lex-compatibility " +"(tÆ°Æ¡ng thÃch vá»›i lex)" + +#: main.c:287 +msgid "-Cf and -CF are mutually exclusive" +msgstr "Hai tùy chá»n -Cf and -CF là loại từ lẫn nhau" + +#: main.c:291 +msgid "Can't use -+ with -CF option" +msgstr "Không thể sá» dụng ký tá»± -+ vá»›i tùy chá»n -CF " + +#: main.c:294 +#, c-format +msgid "%array incompatible with -+ option" +msgstr "%array (mảng) không tÆ°Æ¡ng thÃch vá»›i tùy chá»n -+" + +#: main.c:299 +msgid "Options -+ and --reentrant are mutually exclusive." +msgstr "Hai tùy chá»n -+ và --reentrant (và o lại) là loại từ lẫn nhau." + +#: main.c:302 +msgid "bison bridge not supported for the C++ scanner." +msgstr "không há»— trợ bison bridge (chiếc cầu bison) cho bá»™ quét C++." + +#: main.c:354 main.c:402 +#, c-format +msgid "could not create %s" +msgstr "không tạo được %s" + +#: main.c:415 +msgid "could not write tables header" +msgstr "không ghi được dòng đầu bảng" + +#: main.c:419 +#, c-format +msgid "can't open skeleton file %s" +msgstr "không mở được táºp tin khung sÆ°á»n %s" + +#: main.c:500 +#, c-format +msgid "input error reading skeleton file %s" +msgstr "gặp lá»—i gõ khi Ä‘á»c tâp tin khung sÆ°á»n %s" + +#: main.c:504 +#, c-format +msgid "error closing skeleton file %s" +msgstr "gặp lá»—i khi đóng táºp tin khung sÆ°á»n %s" + +#: main.c:688 +#, c-format +msgid "error creating header file %s" +msgstr "gặp lá»—i khi tạo táºp tin dòng đầu %s" + +#: main.c:696 +#, c-format +msgid "error writing output file %s" +msgstr "gặp lá»—i khi ghi táºp tin xuất %s" + +#: main.c:700 +#, c-format +msgid "error closing output file %s" +msgstr "gặp lá»—i khi đóng táºp tin xuất %s" + +#: main.c:704 +#, c-format +msgid "error deleting output file %s" +msgstr "gặp lá»—i khi xóa bá» táºp tin xuất %s" + +#: main.c:711 +msgid "No backing up.\n" +msgstr "Không lÆ°u trữ.\n" + +#: main.c:715 +#, c-format +msgid "%d backing up (non-accepting) states.\n" +msgstr "%d Ä‘ang lÆ°u trữ tÃnh trạng (loại không chấp nháºn).\n" + +#: main.c:719 +msgid "Compressed tables always back up.\n" +msgstr "Bảng nén luôn luôn lÆ°u trữ.\n" + +#: main.c:722 +#, c-format +msgid "error writing backup file %s" +msgstr "găp lá»—i khi ghi táºp tin lÆ°u trữ %s" + +#: main.c:726 +#, c-format +msgid "error closing backup file %s" +msgstr "gặp lá»—i khi đóng táºp tin lÆ°u trữ %s" + +#: main.c:731 +#, c-format +msgid "%s version %s usage statistics:\n" +msgstr "phiên bản %s thống kê cách sá» dụng %s:\n" + +#: main.c:734 +msgid " scanner options: -" +msgstr " tùy chá»n quét: -" + +#: main.c:813 +#, c-format +msgid " %d/%d NFA states\n" +msgstr " %d/%d tÃnh trạng NFA\n" + +#: main.c:815 +#, c-format +msgid " %d/%d DFA states (%d words)\n" +msgstr " %d/%d tÃnh trạng DFA (%d từ)\n" + +#: main.c:817 +#, c-format +msgid " %d rules\n" +msgstr " %d quy tắc\n" + +#: main.c:822 +msgid " No backing up\n" +msgstr " Không lÆ°u trữ\n" + +#: main.c:826 +#, c-format +msgid " %d backing-up (non-accepting) states\n" +msgstr " %d lÆ°u trữ tÃnh trạng (loại không chấp nháºn)\n" + +#: main.c:831 +msgid " Compressed tables always back-up\n" +msgstr " Bảng nén luôn luôn lÆ°u trữ\n" + +#: main.c:835 +msgid " Beginning-of-line patterns used\n" +msgstr " Sá» dụng mẫu loại đầu dòng\n" + +#: main.c:837 +#, c-format +msgid " %d/%d start conditions\n" +msgstr " %d/%d Ä‘iá»u kiện bắt đầu\n" + +#: main.c:841 +#, c-format +msgid " %d epsilon states, %d double epsilon states\n" +msgstr " %d tÃnh trạng épxilông, %d tÃnh trạng épxilông đôi\n" + +#: main.c:845 +msgid " no character classes\n" +msgstr " không có hạng ký tá»±\n" + +#: main.c:849 +#, c-format +msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" +msgstr " %d/%d hạng ky tá»± cần %d/%d từ sức chứa, %d được sá» dụng lại\n" + +#: main.c:854 +#, c-format +msgid " %d state/nextstate pairs created\n" +msgstr " tạo %d cặp tÃnh trạng/tÃnh trạng tá»›i rồi\n" + +#: main.c:857 +#, c-format +msgid " %d/%d unique/duplicate transitions\n" +msgstr " %d/%d việc chuyên tiếp Ä‘á»™c nhất/bản sao\n" + +#: main.c:862 +#, c-format +msgid " %d table entries\n" +msgstr " %d mục bảng\n" + +#: main.c:870 +#, c-format +msgid " %d/%d base-def entries created\n" +msgstr " tạo %d/%d mục base-def (định nghÄ©a cÆ¡ bản) rồi\n" + +#: main.c:874 +#, c-format +msgid " %d/%d (peak %d) nxt-chk entries created\n" +msgstr " tạo %d/%d (tối Ä‘a %d) mục nxt-chk (kiểm tra tá»›i) rồi\n" + +#: main.c:878 +#, c-format +msgid " %d/%d (peak %d) template nxt-chk entries created\n" +msgstr " tạo %d/%d (tối Ä‘a %d) mục khuôn mẫu nxt-chk (kiểm tra tá»›i) rồi\n" + +#: main.c:882 +#, c-format +msgid " %d empty table entries\n" +msgstr " %d mục bảng trống\n" + +#: main.c:884 +#, c-format +msgid " %d protos created\n" +msgstr " tạo %d proto (váºt đầu tiên) rồi\n" + +#: main.c:887 +#, c-format +msgid " %d templates created, %d uses\n" +msgstr " tạo %d khuôn mẫu, %d lần sá» dụng rồi\n" + +#: main.c:895 +#, c-format +msgid " %d/%d equivalence classes created\n" +msgstr " tạo %d/%d hạng loại tÆ°Æ¡ng Ä‘Æ°Æ¡ng rồi\n" + +#: main.c:903 +#, c-format +msgid " %d/%d meta-equivalence classes created\n" +msgstr " tạo %d/%d hạng loại tÆ°Æ¡ng Ä‘Æ°Æ¡ng mức cao hÆ¡n rồi\n" + +#: main.c:909 +#, c-format +msgid " %d (%d saved) hash collisions, %d DFAs equal\n" +msgstr " %d (%d được lÆ°u) lần va chạm vá»›i băm, %d DFA bằng nhau\n" + +#: main.c:911 +#, c-format +msgid " %d sets of reallocations needed\n" +msgstr " cần %d bá»™ Ä‘iá»u phân chia lại\n" + +#: main.c:913 +#, c-format +msgid " %d total table entries needed\n" +msgstr " cần tổng số %d mục bảng\n" + +#: main.c:988 +msgid "Internal error. flexopts are malformed.\n" +msgstr "Gặp lá»—i ná»™i bá»™ vì những flexopt là khuyết táºt.\n" + +#: main.c:998 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Hãy thá» lệnh `%s --help' để xem thông tin thêm.\n" + +#: main.c:1055 +#, c-format +msgid "unknown -C option '%c'" +msgstr "không biết tùy chá»n -C là '%c'" + +#: main.c:1184 +#, c-format +msgid "%s %s\n" +msgstr "%s %s\n" + +#: main.c:1459 +msgid "fatal parse error" +msgstr "gặp lá»—i phân tách nghiêm trá»ng" + +#: main.c:1491 +#, c-format +msgid "could not create backing-up info file %s" +msgstr "không tạo Ä‘Æ°Æ¡c táºp tin thông tin lÆ°u trữ %s" + +#: main.c:1512 +msgid "-l AT&T lex compatibility option entails a large performance penalty\n" +msgstr "Tùy chá»n loại tÆ°Æ¡ng thÃch -l AT&T lex giảm tốc Ä‘á»™ nhiá»u\n" + +#: main.c:1515 +msgid " and may be the actual source of other reported performance penalties\n" +msgstr " thì có lẽ tháºt gây ra trÆ°á»ng hợp giảm tốc Ä‘á»™ khác\n" + +#: main.c:1521 +#, c-format +msgid "" +"%%option yylineno entails a performance penalty ONLY on rules that can match " +"newline characters\n" +msgstr "" +"%%tùy chá»n yylineno giảm tốc Ä‘á»™ CHỈ vá»›i quy tắc khá»›p vá»›i ký tá»± dòng má»›i " +"thôi\n" + +#: main.c:1528 +msgid "-I (interactive) entails a minor performance penalty\n" +msgstr "Tùy chá»n -I (tÆ°Æ¡ng tác) thì giảm tốc đô má»™t Ãt\n" + +#: main.c:1533 +msgid "yymore() entails a minor performance penalty\n" +msgstr "yymore() thì giảm tốc Ä‘á»™ má»™t Ãt\n" + +#: main.c:1539 +msgid "REJECT entails a large performance penalty\n" +msgstr "REJECT (Ä‘uổi ra) thì giảm tốc Ä‘á»™ nhiá»u\n" + +#: main.c:1544 +msgid "Variable trailing context rules entail a large performance penalty\n" +msgstr "Quy tắc ngữ cảnh theo sau có thể thay đổi thì giảm tốc Ä‘á»™ nhiá»u\n" + +#: main.c:1556 +msgid "REJECT cannot be used with -f or -F" +msgstr "Không thể sá» dụng REJECT (Ä‘uổi ra) vá»›i tùy chá»n -f hoặc -F" + +#: main.c:1559 +#, c-format +msgid "%option yylineno cannot be used with REJECT" +msgstr "Không thể sá» dụng %option (tùy chá»n) yylineno vá»›i REJECT (Ä‘uổi ra)" + +#: main.c:1562 +msgid "variable trailing context rules cannot be used with -f or -F" +msgstr "" +"không thể sá» dụng quy tắc ngữ cảnh theo sau có thể thay đổi vá»›i tùy chá»n -f " +"hoặc-F" + +#: main.c:1677 +#, c-format +msgid "%option yyclass only meaningful for C++ scanners" +msgstr "%option (tùy chá»n) yyclass chỉ có ý nghÄ©a cho bá»™ quét C++ " + +#: main.c:1784 +#, c-format +msgid "Usage: %s [OPTIONS] [FILE]...\n" +msgstr "Cách sá» dụng: %s [TUY_CHỌN] [TẬP_TIN]...\n" + +#: main.c:1787 +#, c-format +msgid "" +"Generates programs that perform pattern-matching on text.\n" +"\n" +"Table Compression:\n" +" -Ca, --align trade off larger tables for better memory alignment\n" +" -Ce, --ecs construct equivalence classes\n" +" -Cf do not compress tables; use -f representation\n" +" -CF do not compress tables; use -F representation\n" +" -Cm, --meta-ecs construct meta-equivalence classes\n" +" -Cr, --read use read() instead of stdio for scanner input\n" +" -f, --full generate fast, large scanner. Same as -Cfr\n" +" -F, --fast use alternate table representation. Same as -CFr\n" +" -Cem default compression (same as --ecs --meta-ecs)\n" +"\n" +"Debugging:\n" +" -d, --debug enable debug mode in scanner\n" +" -b, --backup write backing-up information to %s\n" +" -p, --perf-report write performance report to stderr\n" +" -s, --nodefault suppress default rule to ECHO unmatched text\n" +" -T, --trace %s should run in trace mode\n" +" -w, --nowarn do not generate warnings\n" +" -v, --verbose write summary of scanner statistics to stdout\n" +"\n" +"Files:\n" +" -o, --outfile=FILE specify output filename\n" +" -S, --skel=FILE specify skeleton file\n" +" -t, --stdout write scanner on stdout instead of %s\n" +" --yyclass=NAME name of C++ class\n" +" --header-file=FILE create a C header file in addition to the " +"scanner\n" +" --tables-file[=FILE] write tables to FILE\n" +"\n" +"Scanner behavior:\n" +" -7, --7bit generate 7-bit scanner\n" +" -8, --8bit generate 8-bit scanner\n" +" -B, --batch generate batch scanner (opposite of -I)\n" +" -i, --case-insensitive ignore case in patterns\n" +" -l, --lex-compat maximal compatibility with original lex\n" +" -X, --posix-compat maximal compatibility with POSIX lex\n" +" -I, --interactive generate interactive scanner (opposite of -B)\n" +" --yylineno track line count in yylineno\n" +"\n" +"Generated code:\n" +" -+, --c++ generate C++ scanner class\n" +" -Dmacro[=defn] #define macro defn (default defn is '1')\n" +" -L, --noline suppress #line directives in scanner\n" +" -P, --prefix=STRING use STRING as prefix instead of \"yy\"\n" +" -R, --reentrant generate a reentrant C scanner\n" +" --bison-bridge scanner for bison pure parser.\n" +" --bison-locations include yylloc support.\n" +" --stdinit initialize yyin/yyout to stdin/stdout\n" +" --noansi-definitions old-style function definitions\n" +" --noansi-prototypes empty parameter list in prototypes\n" +" --nounistd do not include <unistd.h>\n" +" --noFUNCTION do not generate a particular FUNCTION\n" +"\n" +"Miscellaneous:\n" +" -c do-nothing POSIX option\n" +" -n do-nothing POSIX option\n" +" -?\n" +" -h, --help produce this help message\n" +" -V, --version report %s version\n" +msgstr "" +"Tạo ra chÆ°Æ¡ng trình thá»±c hiện tiến trình khá»›p mẫu trong văn bản.\n" +"\n" +"Cách nén bảng:\n" +" -Ca, --align \tcó bảng nhá» hÆ¡n còn _canh lá»_ bá»™ nhá»› khá hÆ¡n\n" +" -Ce, --ecs \tcấu tạo hạng loại tÆ°Æ¡ng Ä‘Æ°Æ¡ng\n" +" -Cf \tkhông nén bảng; sá» dụng cách tiêu biểu -f\n" +" -CF \tkhông nén bảng; sá» dụng cách tiêu biểu -F\n" +" -Cm, --meta-ecs cấu tạo hạng loại tÆ°Æ¡ng Ä‘Æ°Æ¡ng mức cao hÆ¡n\n" +" -Cr, --read \tsá» dụng chức năng read() (_Ä‘á»c_) thay thế\n" +"\t\t\t\tthiết bị gõ/xuất chuẩn để gõ và o bá»™ quét\n" +" -f, --full \tcấu tạo bá»™ quét nhanh và lá»›n; bằng tùy chá»n -Cfr (_đầy " +"đủ_)\n" +" -F, --fast \tsá» dụng cách tiêu biểu bảng khác; bằng tùy chá»n -CFr " +"(_nhanh_)\n" +" -Cem \tphÆ°Æ¡ng pháp nén mặc định (bằng tùy chá»n --ecs --meta-ecs)\n" +"\n" +"Gỡ lá»—i:\n" +" -d, --debug \thiệu lá»±c chế Ä‘á»™ _gỡ lá»—i_ trong bá»™ quét\n" +" -b, --backup \tghi thông tin _lÆ°u trữ_ và o %s\n" +" -p, --perf-report \tghi _thông báo tốc Ä‘á»™_ và o thiết bị lá»—i chuẩn\n" +" -s, --nodefault \tthu hồi (_không_) quy tắc _mặc định_ vá»›i văn bản chÆ°a " +"khá»›p ECHO\n" +" -T, --trace \t%s nên chạy trong chế Ä‘á»™ _theo dõi_\n" +" -w, --nowarn \t_không_ cấu tạo lá»i _cảnh báo_\n" +" -v, --verbose \tghi tóm tắt các thống kê bá»™ quét và o thiết bị xuất chuẩn " +"(_chi tiêt_)\n" +"\n" +"Táºp tin:\n" +" -o, --outfile=TẬP_TIN \t\tghi rõ tên _táºp tin xuất_\n" +" -S, --skel=TẬP_TIN \t\tghi rõ táºp tin _khung sÆ°á»n_\n" +" -t, --stdout \t\tghi bá»™ quet trên _thiết bị xuất chuẩn_ thay " +"thế %s\n" +" --yyclass=TÊN \t\t\ttên _hạng_ C++\n" +" --header-file=TẬP_TIN tạo _táºp tin dòng đầu_ C thêm và o bá»™ quét\n" +" --tables-file[=TẬP_TIN] \t\tghi bảng và o TẬP_TIN ấy\n" +"\n" +"Bá»™ quét:\n" +" -7, --7bit \t\tcấu tạo bá»™ quét loại 7-bit\n" +" -8, --8bit \t\tcấu tạo bá»™ quét loại 8-bit\n" +" -B, --batch \tcấu tạo bá»™ quét _theo lô_ (ngược vá»›i tùy chá»n -" +"I)\n" +" -i, --case-insensitive\t\t_bá» qua chữ hoa/thÆ°á»ng_ tront mẫu\n" +" -l, --lex-compat \t\ttối Ä‘a Ä‘á»™ _tÆ°Æ¡ng thÃch_ vá»›i lex gốc\n" +" -X, --posix-compat \ttối Ä‘a Ä‘á»™ _tÆ°Æ¡ng thÃch_ vá»›i lex _POSIX_\n" +" -I, --interactive \tcấu tạo bá»™ quét _tÆ°Æ¡ng tác_ (ngược vá»›i tùy chá»n -" +"B)\n" +" --yylineno \t\ttheo dõi tổng _số dòng_ trong yylineno\n" +"\n" +"Mã đã cấu tạo:\n" +" -+, --c++ \tcấu tạo hang bá»™ quét loại C++\n" +" -Dmacro[=defn] _định nghÄ©a_ macrô #define (lá»i định nghÄ©a mặc " +"định là '1')\n" +" -L, --noline \tthu hồi chỉ thị #line trong bá»™ quét (_không " +"dòng_)\n" +" -P, --prefix=CHUá»–I sá» dụng CHUá»–I ấy là _tiá»n tố_ thay thế \"yy\"\n" +" -R, --reentrant \tcấu tạo bá»™ quét C loại _và o lại_\n" +" --bison-bridge bá»™ quét cho trình phân tách thuần tuý loại bison. " +"(_cầu_)\n" +" --bison-locations \thá»— trợ yylloc (_vị trÃ_).\n" +" --stdinit \tkhởi Ä‘á»™ng yyin/yyout và o thiết bị gõ/xuất " +"chuẩn\n" +" --noansi-definitions \t_sá»± định nghÄ©a_ chức năng kiểu cÅ© (_không " +"ANSI_)\n" +" --noansi-prototypes \tdanh sách tham số trống trong _váºt đầu tiên_ " +"(_không ANSI_)\n" +" --nounistd \t\t_không_ bao gồm <unistd.h>\n" +" --noCHỨC_NÄ‚NG \t\tkhông cấu tạo má»™t CHỨC NÄ‚NG cá biệt\n" +"\n" +"Linh tinh:\n" +" -c \ttùy chá»n POSIX không là m gì\n" +" -n \ttùy chá»n POSIX không là m gì\n" +" -?\n" +" -h, --help \thiển thị _trợ giúp_ nà y\n" +" -V, --version \tthông báo phiên bản %s\n" + +#: misc.c:100 misc.c:126 +#, c-format +msgid "name \"%s\" ridiculously long" +msgstr "tên \"%s\" quá dà i" + +#: misc.c:175 +msgid "memory allocation failed in allocate_array()" +msgstr "" +"việc phân chia bá»™ nhá»› trong allocate_array() (phân chia mảng) đã thất bai rồì" + +#: misc.c:250 +#, c-format +msgid "bad character '%s' detected in check_char()" +msgstr "phát hiện ký tá»± sai '%s' trong check_char() (kiểm tra ký tá»±)" + +#: misc.c:255 +#, c-format +msgid "scanner requires -8 flag to use the character %s" +msgstr "bá»™ quét cần đên cÆ¡ -8 để sá» dụng ký tá»± %s" + +#: misc.c:288 +msgid "dynamic memory failure in copy_string()" +msgstr "bá»™ nhá»› Ä‘á»™ng thất bại trong copy_string() (sao chép chuá»—i)" + +#: misc.c:422 +#, c-format +msgid "%s: fatal internal error, %s\n" +msgstr "%s: gặp lá»—i nôi bá»™ nghiêm trá»ng, %s\n" + +#: misc.c:875 +msgid "attempt to increase array size failed" +msgstr "việc cố tăng cỡ mảng đã thất bại rồi" + +#: misc.c:1002 +msgid "bad line in skeleton file" +msgstr "gặp dòng sai trong táºp tin khung sÆ°á»n" + +#: misc.c:1051 +msgid "memory allocation failed in yy_flex_xmalloc()" +msgstr "việc phân chia bá»™ nhá»› đã thất bại trong yy_flex_xmalloc() rồi" + +#: nfa.c:104 +#, c-format +msgid "" +"\n" +"\n" +"********** beginning dump of nfa with start state %d\n" +msgstr "" +"\n" +"\n" +"********** bắt đầu đổ NFA có tÃnh trạng bắt đầu là %d\n" + +#: nfa.c:115 +#, c-format +msgid "state # %4d\t" +msgstr "tÃnh trạng # %4d\t" + +#: nfa.c:130 +msgid "********** end of dump\n" +msgstr "********** đổ xong rồi\n" + +#: nfa.c:174 +msgid "empty machine in dupmachine()" +msgstr "máy trống trong dupmachine() (trùng máy)" + +#: nfa.c:240 +#, c-format +msgid "Variable trailing context rule at line %d\n" +msgstr "Gặp quy tắc ngữ cảnh theo sau có thể thay đổi tại dòng %d\n" + +#: nfa.c:353 +msgid "bad state type in mark_beginning_as_normal()" +msgstr "" +"loại tÃnh trạng sai trong mark_beginning_as_normal() (đánh dấu cách bắt đầu " +"là thÆ°á»ng)" + +#: nfa.c:598 +#, c-format +msgid "input rules are too complicated (>= %d NFA states)" +msgstr "quy tắc gõ là quá phức tạp (>= %d tÃnh trạng loại NFA)" + +#: nfa.c:677 +msgid "found too many transitions in mkxtion()" +msgstr "gặp quá nhiá»u việc chuyển tiếp mkxtion()" + +#: nfa.c:703 +#, c-format +msgid "too many rules (> %d)!" +msgstr "quá nhiá»u quy tắc (> %d)!" + +#: parse.y:183 +msgid "unknown error processing section 1" +msgstr "gặp lá»—i không biết khi xá» lý phần 1" + +#: parse.y:208 parse.y:373 +msgid "bad start condition list" +msgstr "danh sách Ä‘iá»u kiện bắt đầu là sai" + +#: parse.y:337 +msgid "unrecognized rule" +msgstr "không chấp nhân quy tắc ấy" + +#: parse.y:456 parse.y:469 parse.y:538 +msgid "trailing context used twice" +msgstr "ngữ cảnh theo sau được sá» dụng hai lần rồi" + +#: parse.y:574 parse.y:584 parse.y:657 parse.y:667 +msgid "bad iteration values" +msgstr "giá trị lặp lại sai" + +#: parse.y:602 parse.y:620 parse.y:685 parse.y:703 +msgid "iteration value must be positive" +msgstr "giá trị lặp lại phải là dÆ°Æ¡ng" + +#: parse.y:817 parse.y:827 +#, c-format +msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" +msgstr "phạm vị ký tá»± [%c-%c] là mÆ¡ hồ trong bá»™ quét bá» qua chữ hoa/thÆ°á»ng" + +#: parse.y:832 +msgid "negative range in character class" +msgstr "gặp phạm vị âm trong hạng ký tá»±" + +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 +msgid "Input line too long\n" +msgstr "Dòng gõ quá dà i\n" + +#: scan.l:150 +#, c-format +msgid "malformed '%top' directive" +msgstr "chỉ thị loại '%top' khuyết táºt (_đầu_)" + +#: scan.l:172 +#, no-c-format +msgid "unrecognized '%' directive" +msgstr "không chấp nháºn chỉ thị loại '%'" + +#: scan.l:252 +msgid "Unmatched '{'" +msgstr "ChÆ°a khá»›p '{'" + +#: scan.l:285 +msgid "incomplete name definition" +msgstr "chÆ°a Ä‘inh nghÄ©a xong tên" + +#: scan.l:418 +#, c-format +msgid "unrecognized %%option: %s" +msgstr "không chấp nháºn %%tùy chá»n: %s" + +#: scan.l:559 scan.l:678 +msgid "bad character class" +msgstr "hạng ký tá»± sai" + +#: scan.l:606 +#, c-format +msgid "undefined definition {%s}" +msgstr "chÆ°a định nghÄ©a lá»i định nghÄ©a {%s}" + +#: scan.l:646 +#, c-format +msgid "bad <start condition>: %s" +msgstr "<start condition> (Ä‘iệu kiện bắt đầu) sai: %s" + +#: scan.l:659 +msgid "missing quote" +msgstr "thiếu dấu trÃch dẫn" + +#: scan.l:699 +#, c-format +msgid "bad character class expression: %s" +msgstr "biểu thức hạng ký tá»± sai: %s" + +#: scan.l:721 +msgid "bad character inside {}'s" +msgstr "có ký tá»± sai ở trong hai dấu ngoặc móc {}" + +#: scan.l:727 +msgid "missing }" +msgstr "thiếu }" + +#: scan.l:800 +msgid "EOF encountered inside an action" +msgstr "gặp kết thức táºp tin ở trong hà nh Ä‘á»™ng" + +#: scan.l:820 +#, c-format +msgid "bad character: %s" +msgstr "ký tá»± sai: %s" + +#: scan.l:849 +#, c-format +msgid "can't open %s" +msgstr "không mở được %s" + +#: scanopt.c:291 +#, c-format +msgid "Usage: %s [OPTIONS]...\n" +msgstr "Cách sá» dụng: %s [TÙY_CHỌN]...\n" + +#: scanopt.c:565 +#, c-format +msgid "option `%s' doesn't allow an argument\n" +msgstr "tùy chá»n `%s' không cho phép đối số\n" + +#: scanopt.c:570 +#, c-format +msgid "option `%s' requires an argument\n" +msgstr "tùy chá»n `%s' cần đến đối số\n" + +#: scanopt.c:574 +#, c-format +msgid "option `%s' is ambiguous\n" +msgstr "tùy chá»n `%s' là mÆ¡ hồ\n" + +#: scanopt.c:578 +#, c-format +msgid "Unrecognized option `%s'\n" +msgstr "Không chấp nháºn tùy chá»n `%s'\n" + +#: scanopt.c:582 +#, c-format +msgid "Unknown error=(%d)\n" +msgstr "Không biết lá»—i=(%d)\n" + +#: sym.c:100 +msgid "symbol table memory allocation failed" +msgstr "việc phân chia bá»™ nhá»› của bảng ký tá»± đã thất bại rồi" + +#: sym.c:203 +msgid "name defined twice" +msgstr "định nghÄ©a tên hai lần rồi" + +#: sym.c:254 +#, c-format +msgid "start condition %s declared twice" +msgstr "tuyên bố Ä‘iá»u kiện bắt đầu %s hai lần rồi" + +#: yylex.c:56 +msgid "premature EOF" +msgstr "gặp kết thức táºp tin quá sá»›m" + +#: yylex.c:198 +msgid "End Marker\n" +msgstr "Dấu kết thức\n" + +#: yylex.c:204 +#, c-format +msgid "*Something Weird* - tok: %d val: %d\n" +msgstr "*Äiá»u lạ* - hiệu bà i: %d giá trị: %d\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 4af9489..bf04159 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index a7c0678..80e1987 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.8\n" -"POT-Creation-Date: 2003-04-01 11:33-0500\n" +"Report-Msgid-Bugs-To: lex-help@lists.sourceforge.net\n" +"POT-Creation-Date: 2006-02-20 21:46-0500\n" "PO-Revision-Date: 2002-08-18 10:37+0800\n" "Last-Translator: Wang Li <charles@linux.net.cn>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -155,340 +156,340 @@ msgstr "ÎÞ·¨´´½¨ %s" msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:176 +#: main.c:187 msgid "rule cannot be matched" msgstr "ÎÞ·¨Æ¥Åä¹æÔò" -#: main.c:181 +#: main.c:192 msgid "-s option given but default rule can be matched" msgstr "" -#: main.c:217 +#: main.c:231 msgid "Can't use -+ with -l option" msgstr "" -#: main.c:220 +#: main.c:234 msgid "Can't use -f or -F with -l option" msgstr "" -#: main.c:224 +#: main.c:238 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" -#: main.c:261 +#: main.c:275 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "" -#: main.c:264 +#: main.c:278 msgid "-Cf/-CF and -I are incompatible" msgstr "" -#: main.c:268 +#: main.c:282 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" -#: main.c:273 +#: main.c:287 msgid "-Cf and -CF are mutually exclusive" msgstr "" -#: main.c:277 +#: main.c:291 msgid "Can't use -+ with -CF option" msgstr "" -#: main.c:280 +#: main.c:294 #, c-format msgid "%array incompatible with -+ option" msgstr "" -#: main.c:285 +#: main.c:299 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "" -#: main.c:288 +#: main.c:302 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:340 main.c:385 +#: main.c:354 main.c:402 #, c-format msgid "could not create %s" msgstr "ÎÞ·¨´´½¨ %s" -#: main.c:398 +#: main.c:415 #, fuzzy msgid "could not write tables header" msgstr "ÎÞ·¨´´½¨ %s" -#: main.c:402 +#: main.c:419 #, c-format msgid "can't open skeleton file %s" msgstr "ÎÞ·¨´ò¿ª¹Ç¼ÜÎļþ %s" -#: main.c:483 +#: main.c:500 #, c-format msgid "input error reading skeleton file %s" msgstr "¶ÁÈ¡¹Ç¼ÜÎļþ %s ʱÊäÈë´íÎó" -#: main.c:487 +#: main.c:504 #, c-format msgid "error closing skeleton file %s" msgstr "¹Ø±Õ¹Ç¼ÜÎļþ %s ³ö´í" -#: main.c:671 +#: main.c:688 #, c-format msgid "error creating header file %s" msgstr "´´½¨Í·Îļþ %s ³ö´í" -#: main.c:679 +#: main.c:696 #, c-format msgid "error writing output file %s" msgstr "дÈëÊä³öÎļþ %s ³ö´í" -#: main.c:683 +#: main.c:700 #, c-format msgid "error closing output file %s" msgstr "¹Ø±ÕÊä³öÎļþ %s ³ö´í" -#: main.c:687 +#: main.c:704 #, c-format msgid "error deleting output file %s" msgstr "ɾ³ýÊä³öÎļþ %s ³ö´í" -#: main.c:694 +#: main.c:711 msgid "No backing up.\n" msgstr "" -#: main.c:698 +#: main.c:715 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "" -#: main.c:702 +#: main.c:719 msgid "Compressed tables always back up.\n" msgstr "" -#: main.c:705 +#: main.c:722 #, c-format msgid "error writing backup file %s" msgstr "дÈ뱸·ÝÎļþ %s ³ö´í" -#: main.c:709 +#: main.c:726 #, c-format msgid "error closing backup file %s" msgstr "¹Ø±Õ±¸·ÝÎļþ %s ³ö´í" -#: main.c:714 +#: main.c:731 #, c-format msgid "%s version %s usage statistics:\n" msgstr "" -#: main.c:717 +#: main.c:734 msgid " scanner options: -" msgstr " ɨÃèÆ÷Ñ¡Ï-" -#: main.c:796 +#: main.c:813 #, c-format msgid " %d/%d NFA states\n" msgstr "" -#: main.c:798 +#: main.c:815 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr "" -#: main.c:800 +#: main.c:817 #, c-format msgid " %d rules\n" msgstr " %d Ìõ¹æÔò\n" -#: main.c:805 +#: main.c:822 msgid " No backing up\n" msgstr "" -#: main.c:809 +#: main.c:826 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr "" -#: main.c:814 +#: main.c:831 msgid " Compressed tables always back-up\n" msgstr "" -#: main.c:818 +#: main.c:835 msgid " Beginning-of-line patterns used\n" msgstr "" -#: main.c:820 +#: main.c:837 #, c-format msgid " %d/%d start conditions\n" msgstr "" -#: main.c:824 +#: main.c:841 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: main.c:828 +#: main.c:845 msgid " no character classes\n" msgstr "" -#: main.c:832 +#: main.c:849 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -#: main.c:837 +#: main.c:854 #, c-format msgid " %d state/nextstate pairs created\n" msgstr "" -#: main.c:840 +#: main.c:857 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr "" -#: main.c:845 +#: main.c:862 #, c-format msgid " %d table entries\n" msgstr "" -#: main.c:853 +#: main.c:870 #, c-format msgid " %d/%d base-def entries created\n" msgstr "" -#: main.c:857 +#: main.c:874 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr "" -#: main.c:861 +#: main.c:878 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" -#: main.c:865 +#: main.c:882 #, c-format msgid " %d empty table entries\n" msgstr "" -#: main.c:867 +#: main.c:884 #, c-format msgid " %d protos created\n" msgstr "" -#: main.c:870 +#: main.c:887 #, c-format msgid " %d templates created, %d uses\n" msgstr "" -#: main.c:878 +#: main.c:895 #, c-format msgid " %d/%d equivalence classes created\n" msgstr "" -#: main.c:886 +#: main.c:903 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr "" -#: main.c:892 +#: main.c:909 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" -#: main.c:894 +#: main.c:911 #, c-format msgid " %d sets of reallocations needed\n" msgstr "" -#: main.c:896 +#: main.c:913 #, c-format msgid " %d total table entries needed\n" msgstr "" -#: main.c:971 +#: main.c:988 msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: main.c:981 +#: main.c:998 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: main.c:1038 +#: main.c:1055 #, c-format msgid "unknown -C option '%c'" msgstr "δ֪µÄ -C Ñ¡Ïî¡°%c¡±" -#: main.c:1167 +#: main.c:1184 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1442 +#: main.c:1459 msgid "fatal parse error" msgstr "ÖÂÃüµÄ½âÎö´íÎó" -#: main.c:1474 +#: main.c:1491 #, c-format msgid "could not create backing-up info file %s" msgstr "" -#: main.c:1495 +#: main.c:1512 msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" -#: main.c:1498 +#: main.c:1515 msgid " and may be the actual source of other reported performance penalties\n" msgstr "" -#: main.c:1504 +#: main.c:1521 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -#: main.c:1511 +#: main.c:1528 msgid "-I (interactive) entails a minor performance penalty\n" msgstr "" -#: main.c:1516 +#: main.c:1533 msgid "yymore() entails a minor performance penalty\n" msgstr "" -#: main.c:1522 +#: main.c:1539 msgid "REJECT entails a large performance penalty\n" msgstr "" -#: main.c:1527 +#: main.c:1544 msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: main.c:1539 +#: main.c:1556 msgid "REJECT cannot be used with -f or -F" msgstr "" -#: main.c:1542 +#: main.c:1559 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" -#: main.c:1545 +#: main.c:1562 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: main.c:1661 +#: main.c:1677 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "" -#: main.c:1768 +#: main.c:1784 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Ó÷¨£º%s [Ñ¡Ïî] [Îļþ]...\n" -#: main.c:1771 +#: main.c:1787 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -674,74 +675,74 @@ msgstr "" msgid "negative range in character class" msgstr "" -#: scan.l:70 scan.l:180 scan.l:267 scan.l:409 scan.l:548 scan.l:598 +#: scan.l:71 scan.l:181 scan.l:268 scan.l:410 scan.l:549 scan.l:599 msgid "Input line too long\n" msgstr "" -#: scan.l:149 +#: scan.l:150 #, c-format msgid "malformed '%top' directive" msgstr "" -#: scan.l:171 +#: scan.l:172 #, no-c-format msgid "unrecognized '%' directive" msgstr "" -#: scan.l:251 +#: scan.l:252 msgid "Unmatched '{'" msgstr "" -#: scan.l:284 +#: scan.l:285 msgid "incomplete name definition" msgstr "²»ÍêÕûµÄÃû³Æ¶¨Òå" -#: scan.l:417 +#: scan.l:418 #, c-format msgid "unrecognized %%option: %s" msgstr "²»ÄÜʶ±ðµÄ %%Ñ¡Ï%s" -#: scan.l:558 scan.l:677 +#: scan.l:559 scan.l:678 msgid "bad character class" msgstr "´íÎóµÄ×Ö·ûÀà±ð" -#: scan.l:605 +#: scan.l:606 #, c-format msgid "undefined definition {%s}" msgstr "䶨ÒåµÄ¶¨Òå {%s}" -#: scan.l:645 +#: scan.l:646 #, c-format msgid "bad <start condition>: %s" msgstr "´íÎó <ÆðʼÌõ¼þ>£º%s" -#: scan.l:658 +#: scan.l:659 msgid "missing quote" msgstr "ÒÅ©ÒýºÅ" -#: scan.l:698 +#: scan.l:699 #, c-format msgid "bad character class expression: %s" msgstr "´íÎóµÄ×Ö·ûÀà±ð±í´ïʽ£º%s" -#: scan.l:720 +#: scan.l:721 msgid "bad character inside {}'s" msgstr "" -#: scan.l:726 +#: scan.l:727 msgid "missing }" msgstr "ÒÅ© }" -#: scan.l:799 +#: scan.l:800 msgid "EOF encountered inside an action" msgstr "ÔÚ¶¯×÷ÖÐÎļþ½áÊø" -#: scan.l:819 +#: scan.l:820 #, c-format msgid "bad character: %s" msgstr "´íÎóµÄ×Ö·û£º%s" -#: scan.l:848 +#: scan.l:849 #, c-format msgid "can't open %s" msgstr "ÎÞ·¨´ò¿ª %s" @@ -1,14 +1,12 @@ - -#line 3 "scan.c" - #define YY_INT_ALIGNED short int + /* A lexical scanner generated by flex */ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 +#define YY_FLEX_SUBMINOR_VERSION 28 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -16,13 +14,16 @@ /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ + #include <stdio.h> #include <string.h> #include <errno.h> #include <stdlib.h> + /* end standard C headers. */ + /* flex integer type definitions */ #ifndef FLEXINT_H @@ -76,15 +77,30 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif + #endif /* ! FLEXINT_H */ + + + + + #ifdef __cplusplus +/* C++ compilers don't understand traditional function definitions. */ +#ifdef YY_TRADITIONAL_FUNC_DEFS +#undef YY_TRADITIONAL_FUNC_DEFS +#endif + /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST #else /* ! __cplusplus */ +/* We're not in a C++ compiler, so by default, + we generate C99 function defs, unless you explicitly ask + for traditional defs by defining YY_TRADITIONAL_FUNC_DEFS */ + #if __STDC__ #define YY_USE_CONST @@ -98,6 +114,24 @@ typedef unsigned int flex_uint32_t; #define yyconst #endif +/* For compilers that can't handle prototypes. + * e.g., + * The function prototype + * int foo(int x, char* y); + * + * ...should be written as + * int foo YY_PARAMS((int x, char* y)); + * + * ...which could possibly generate + * int foo (); + */ +#ifdef YY_NO_PROTOS +#define YY_PARAMS(proto) () +#else +#define YY_PARAMS(proto) proto +#endif + + /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -108,24 +142,70 @@ typedef unsigned int flex_uint32_t; */ #define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + + +/* Define these macros to be no-ops. */ +#define YY_G(var) (var) +#define YY_PROTO_LAST_ARG +#define YY_PROTO_ONLY_ARG void +#define YY_DEF_LAST_ARG +#ifdef YY_TRADITIONAL_FUNC_DEFS +#define YY_DEF_ONLY_ARG +#else +#define YY_DEF_ONLY_ARG void +#endif +#define YY_DECL_LAST_ARG +#define YY_CALL_LAST_ARG +#define YY_CALL_ONLY_ARG + + + +/* For compilers that need traditional function definitions. + * e.g., + * The function prototype taking 2 arguments + * int foo (int x, char* y) + * + * ...should be written as + * int foo YYFARGS2(int,x, char*,y) + * + * ...which could possibly generate + * int foo (x,y,yyscanner) + * int x; + * char * y; + * yyscan_t yyscanner; + */ +#ifdef YY_TRADITIONAL_FUNC_DEFS +/* Generate traditional function defs */ +#define YYFARGS0(v) (YY_DEF_ONLY_ARG) YY_DECL_LAST_ARG +#define YYFARGS1(t1,n1) (n1 YY_DEF_LAST_ARG) t1 n1; YY_DECL_LAST_ARG +#define YYFARGS2(t1,n1,t2,n2) (n1,n2 YY_DEF_LAST_ARG) t1 n1; t2 n2; YY_DECL_LAST_ARG +#define YYFARGS3(t1,n1,t2,n2,t3,n3) (n1,n2,n3 YY_DEF_LAST_ARG) t1 n1; t2 n2; t3 n3; YY_DECL_LAST_ARG +#else +/* Generate C99 function defs. */ +#define YYFARGS0(v) (YY_DEF_ONLY_ARG) +#define YYFARGS1(t1,n1) (t1 n1 YY_DEF_LAST_ARG) +#define YYFARGS2(t1,n1,t2,n2) (t1 n1,t2 n2 YY_DEF_LAST_ARG) +#define YYFARGS3(t1,n1,t2,n2,t3,n3) (t1 n1,t2 n2,t3 n3 YY_DEF_LAST_ARG) +#endif + /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN (yy_start) = 1 + 2 * +#define BEGIN YY_G(yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START (((yy_start) - 1) / 2) +#define YY_START ((YY_G(yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) +#define YY_NEW_FILE yyrestart( yyin YY_CALL_LAST_ARG ) #define YY_END_OF_BUFFER_CHAR 0 @@ -134,6 +214,7 @@ typedef unsigned int flex_uint32_t; #define YY_BUF_SIZE 16384 #endif + #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -141,29 +222,63 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; extern int yyleng; + extern FILE *yyin, *yyout; + #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. */ +#ifdef YY_USE_LINENO +/* Note: We specifically omit the test for yy_rule_can_match_eol because it requires + * access to the local variable yy_act. Since yyless() is a macro, it would break + * existing scanners that call yyless() from OUTSIDE yylex. + * One obvious solution it to make yy_act a global. I tried that, and saw + * a 5% performance hit in a non-yylineno scanner, because yy_act is + * normally declared as a register variable-- so it's not worth it. + */ +#define YY_LESS_LINENO(n) \ + do { \ + int yyl;\ + for ( yyl = n; yyl < yyleng; ++yyl )\ + if ( yytext[yyl] == '\n' )\ + --yylineno;\ + }while(0) +#else +#define YY_LESS_LINENO(n) +#endif + +/* The funky do-while in the following #define is used to turn the definition + * int a single C statement (which needs a semi-colon terminator). This + * avoids problems with code like: + * + * if ( condition_holds ) + * yyless( 5 ); + * else + * do_something_else(); + * + * Prior to using the do-while the compiler would get upset at the + * "else" because it interpreted the "if" statement as being all + * done when it reached the ';' after the yyless() call. + */ + +/* Return all but the first 'n' matched characters back to the input stream. */ + #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ int yyless_macro_arg = (n); \ YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ + *yy_cp = YY_G(yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_G(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, (yytext_ptr) ) +#define unput(c) yyunput( c, YY_G(yytext_ptr) YY_CALL_LAST_ARG ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want @@ -179,8 +294,14 @@ typedef unsigned int yy_size_t; #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { + FILE *yy_input_file; + + + + + char *yy_ch_buf; /* input buffer */ char *yy_buf_pos; /* current position in input buffer */ @@ -213,16 +334,12 @@ struct yy_buffer_state */ int yy_at_bol; - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; - #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -236,33 +353,30 @@ struct yy_buffer_state * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 - }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +static YY_BUFFER_STATE yy_current_buffer = 0; +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". - * - * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) +#define YY_CURRENT_BUFFER yy_current_buffer + -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; + static int yy_n_chars; /* number of characters read into yy_ch_buf */ + + int yyleng; /* Points to current character in buffer. */ @@ -274,83 +388,89 @@ static int yy_start = 0; /* start state number */ * instead of setting up a fresh yyin. A bit of a hack ... */ static int yy_did_buffer_switch_on_eof; +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + +void yyrestart YY_PARAMS(( FILE *input_file YY_PROTO_LAST_ARG )); + -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); +void yy_switch_to_buffer YY_PARAMS(( YY_BUFFER_STATE new_buffer YY_PROTO_LAST_ARG )); +void yy_load_buffer_state YY_PARAMS(( YY_PROTO_ONLY_ARG )); +YY_BUFFER_STATE yy_create_buffer YY_PARAMS(( FILE *file, int size YY_PROTO_LAST_ARG )); +void yy_delete_buffer YY_PARAMS(( YY_BUFFER_STATE b YY_PROTO_LAST_ARG )); +void yy_init_buffer YY_PARAMS(( YY_BUFFER_STATE b, FILE *file YY_PROTO_LAST_ARG )); +void yy_flush_buffer YY_PARAMS(( YY_BUFFER_STATE b YY_PROTO_LAST_ARG )); -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_G(yy_current_buffer) YY_CALL_LAST_ARG) -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +YY_BUFFER_STATE yy_scan_buffer YY_PARAMS(( char *base, yy_size_t size YY_PROTO_LAST_ARG )); +YY_BUFFER_STATE yy_scan_string YY_PARAMS(( yyconst char *yy_str YY_PROTO_LAST_ARG )); +YY_BUFFER_STATE yy_scan_bytes YY_PARAMS(( yyconst char *bytes, int len YY_PROTO_LAST_ARG )); -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); + +void *yyalloc YY_PARAMS(( yy_size_t YY_PROTO_LAST_ARG )); +void *yyrealloc YY_PARAMS(( void *, yy_size_t YY_PROTO_LAST_ARG )); +void yyfree YY_PARAMS(( void * YY_PROTO_LAST_ARG )); #define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + if ( ! YY_G(yy_current_buffer) ) \ + YY_G(yy_current_buffer) = \ + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); \ + YY_G(yy_current_buffer)->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + if ( ! YY_G(yy_current_buffer) ) \ + YY_G(yy_current_buffer) = \ + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); \ + YY_G(yy_current_buffer)->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) +#define YY_AT_BOL() (YY_G(yy_current_buffer)->yy_at_bol) /* Begin user sect3 */ - +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ typedef unsigned char YY_CHAR; - +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#ifndef YY_REENTRANT FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; - +#endif +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ typedef int yy_state_type; - +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ extern int yylineno; - +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ int yylineno = 1; - +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ extern char *yytext; #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +static yy_state_type yy_get_previous_state YY_PARAMS(( YY_PROTO_ONLY_ARG )); +static yy_state_type yy_try_NUL_trans YY_PARAMS(( yy_state_type current_state YY_PROTO_LAST_ARG)); +static int yy_get_next_buffer YY_PARAMS(( YY_PROTO_ONLY_ARG )); +static void yy_fatal_error YY_PARAMS(( yyconst char msg[] YY_PROTO_LAST_ARG )); +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ + YY_G(yytext_ptr) = yy_bp; \ yyleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ + YY_G(yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; + YY_G(yy_c_buf_p) = yy_cp; +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ #define YY_NUM_RULES 201 #define YY_END_OF_BUFFER 202 /* This struct is not used in this scanner, @@ -1502,8 +1622,11 @@ int yy_flex_debug = 0; #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET +#ifndef YY_REENTRANT char *yytext; +#endif #line 1 "scan.l" +#define INITIAL 0 /* scan.l - scanner for flex input -*-C-*- */ #line 4 "scan.l" /* Copyright (c) 1990 The Regents of the University of California. */ @@ -1540,6 +1663,7 @@ char *yytext; #include "flexdef.h" #include "parse.h" extern bool tablesverify, tablesext; +extern int trlcontxt; /* Set in parse.y for each rule. */ #define ACTION_ECHO add_action( yytext ) #define ACTION_IFDEF(def, should_define) \ @@ -1593,12 +1717,8 @@ extern bool tablesverify, tablesext; if ( getenv("POSIXLY_CORRECT") ) \ posix_compat = true; - - - -#line 1600 "scan.c" - -#define INITIAL 0 +#define YY_STACK_USED 1 +#define YY_NO_TOP_STATE 1 #define SECT2 1 #define SECT2PROLOG 2 #define SECT3 3 @@ -1608,6 +1728,7 @@ extern bool tablesverify, tablesext; #define CARETISBOL 7 #define NUM 8 #define QUOTE 9 + #define FIRSTCCL 10 #define CCL 11 #define ACTION 12 @@ -1615,71 +1736,173 @@ extern bool tablesverify, tablesext; #define COMMENT 14 #define ACTION_STRING 15 #define PERCENT_BRACE_ACTION 16 + #define OPTION 17 #define LINEDIR 18 #define CODEBLOCK_MATCH_BRACE 19 +#line 1745 "scan.c" +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ +#ifndef YY_NO_UNISTD_H + #include <unistd.h> + + +#endif /* !YY_NO_UNISTD_H */ + #ifndef YY_EXTRA_TYPE #define YY_EXTRA_TYPE void * #endif + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +#ifndef YY_NO_DESTROY +int yylex_destroy YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_GET_DEBUG +int yyget_debug YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_DEBUG +void yyset_debug YY_PARAMS(( int debug_flag YY_PROTO_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_EXTRA +YY_EXTRA_TYPE yyget_extra YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_EXTRA +void yyset_extra YY_PARAMS(( YY_EXTRA_TYPE user_defined YY_PROTO_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_IN +FILE *yyget_in YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_IN +void yyset_in YY_PARAMS(( FILE * in_str YY_PROTO_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_OUT +FILE *yyget_out YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_OUT +void yyset_out YY_PARAMS(( FILE * out_str YY_PROTO_LAST_ARG )); +#endif + +#ifndef YY_NO_GET_LENG +int yyget_leng YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_GET_TEXT +char *yyget_text YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_GET_LINENO +int yyget_lineno YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#ifndef YY_NO_SET_LINENO +void yyset_lineno YY_PARAMS(( int line_number YY_PROTO_LAST_ARG )); +#endif + + /* Macros after this point can all be overridden by user definitions in * section 1. */ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap YY_PARAMS(( YY_PROTO_ONLY_ARG )); #else -extern int yywrap (void ); +extern int yywrap YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif #endif + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#ifndef YY_NO_UNPUT +static void yyunput YY_PARAMS(( int c, char *buf_ptr YY_PROTO_LAST_ARG)); #endif +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + - static void yyunput (int c,char *buf_ptr ); - #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy YY_PARAMS(( char *, yyconst char *, int YY_PROTO_LAST_ARG)); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen YY_PARAMS(( yyconst char * YY_PROTO_LAST_ARG)); #endif #ifndef YY_NO_INPUT +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ #ifdef __cplusplus -static int yyinput (void ); +static int yyinput YY_PARAMS(( YY_PROTO_ONLY_ARG )); #else -static int input (void ); +static int input YY_PARAMS(( YY_PROTO_ONLY_ARG )); #endif +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ #endif - static int yy_start_stack_ptr = 0; - static int yy_start_stack_depth = 0; - static int *yy_start_stack = 0; - - static void yy_push_state (int new_state ); - - static void yy_pop_state (void ); - + + +#if YY_STACK_USED +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +static int yy_start_stack_ptr = 0; +static int yy_start_stack_depth = 0; +static int *yy_start_stack = 0; +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + +#ifndef YY_NO_PUSH_STATE +static void yy_push_state YY_PARAMS(( int new_state YY_PROTO_LAST_ARG)); +#endif +#ifndef YY_NO_POP_STATE +static void yy_pop_state YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif +#ifndef YY_NO_TOP_STATE +static int yy_top_state YY_PARAMS(( YY_PROTO_ONLY_ARG )); +#endif + +#else +#define YY_NO_PUSH_STATE 1 +#define YY_NO_POP_STATE 1 +#define YY_NO_TOP_STATE 1 +#endif + + /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE #define YY_READ_BUF_SIZE 8192 #endif /* Copy whatever the last rule matched to the standard output. */ + #ifndef ECHO + /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ #define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) + #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1687,7 +1910,7 @@ static int input (void ); */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + if ( YY_G(yy_current_buffer)->yy_is_interactive ) \ { \ int c = '*'; \ size_t n; \ @@ -1715,6 +1938,7 @@ static int input (void ); } \ }\ \ +\ #endif @@ -1733,21 +1957,38 @@ static int input (void ); /* Report a fatal error. */ #ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) + +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg YY_CALL_LAST_ARG) + #endif +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ /* end tables serialization structures and prototypes */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL_IS_OURS 1 -extern int yylex (void); -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ +/* If the bison pure parser is used, then bison will provide + one or two additional arguments. */ + + +# define YY_LEX_PROTO YY_PARAMS((YY_PROTO_ONLY_ARG)) +# define YY_LEX_DECLARATION YYFARGS0(void) + + +extern int yylex YY_LEX_PROTO; + +#define YY_DECL int yylex YY_LEX_DECLARATION + +#endif + /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -1763,19 +2004,19 @@ extern int yylex (void); #define YY_RULE_SETUP \ if ( yyleng > 0 ) \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \ + YY_G(yy_current_buffer)->yy_at_bol = \ (yytext[yyleng - 1] == '\n'); \ YY_USER_ACTION -/** The main scanner function which does all the work. - */ +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ YY_DECL -{ + { register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - -#line 119 "scan.l" + +#line 120 "scan.l" +#define YY_TABLES_VERIFY 0 static int bracelevel, didadef, indented_code; static int doing_rule_action = false; @@ -1786,47 +2027,55 @@ YY_DECL Char nmdef[MAXLINE]; -#line 1790 "scan.c" +#line 2031 "scan.c" + - if ( (yy_init) ) + if ( YY_G(yy_init) ) { - (yy_init) = 0; + YY_G(yy_init) = 0; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ +#ifdef YY_USES_REJECT + if ( ! YY_G(yy_state_buf) ) + YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_BUF_SIZE + 2 YY_CALL_LAST_ARG); +#endif + + if ( ! YY_G(yy_start) ) + YY_G(yy_start) = 1; /* first start state */ if ( ! yyin ) + yyin = stdin; + if ( ! yyout ) + yyout = stdout; - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - yy_load_buffer_state( ); + if ( ! YY_G(yy_current_buffer) ) + YY_G(yy_current_buffer) = + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); + + yy_load_buffer_state( YY_CALL_ONLY_ARG ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = (yy_c_buf_p); + yy_cp = YY_G(yy_c_buf_p); /* Support of yytext. */ - *yy_cp = (yy_hold_char); + *yy_cp = YY_G(yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = (yy_start); + yy_current_state = YY_G(yy_start); yy_current_state += YY_AT_BOL(); yy_match: do @@ -1834,8 +2083,8 @@ yy_match: register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + YY_G(yy_last_accepting_state) = yy_current_state; + YY_G(yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1852,53 +2101,65 @@ yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + yy_cp = YY_G(yy_last_accepting_cpos); + yy_current_state = YY_G(yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; +#ifdef YY_USE_LINENO + if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) + { + int yyl; + for ( yyl = 0; yyl < yyleng; ++yyl ) + if ( yytext[yyl] == '\n' ) + ++yylineno; + } +#endif + do_action: /* This label is used only to access EOF actions. */ + switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + *yy_cp = YY_G(yy_hold_char); + yy_cp = YY_G(yy_last_accepting_cpos); + yy_current_state = YY_G(yy_last_accepting_state); goto yy_find_action; + case 1: YY_RULE_SETUP -#line 130 "scan.l" +#line 131 "scan.l" indented_code = true; BEGIN(CODEBLOCK); YY_BREAK case 2: YY_RULE_SETUP -#line 131 "scan.l" +#line 132 "scan.l" ACTION_ECHO; yy_push_state( COMMENT ); YY_BREAK case 3: YY_RULE_SETUP -#line 132 "scan.l" +#line 133 "scan.l" yy_push_state( LINEDIR ); YY_BREAK case 4: YY_RULE_SETUP -#line 133 "scan.l" +#line 134 "scan.l" return SCDECL; YY_BREAK case 5: YY_RULE_SETUP -#line 134 "scan.l" +#line 135 "scan.l" return XSCDECL; YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 135 "scan.l" +#line 136 "scan.l" { ++linenum; line_directive_out( (FILE *) 0, 1 ); @@ -1909,7 +2170,7 @@ YY_RULE_SETUP case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 141 "scan.l" +#line 142 "scan.l" { brace_start_line = linenum; ++linenum; @@ -1920,17 +2181,17 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 149 "scan.l" +#line 150 "scan.l" synerr( _("malformed '%top' directive") ); YY_BREAK case 9: YY_RULE_SETUP -#line 151 "scan.l" +#line 152 "scan.l" /* discard */ YY_BREAK case 10: YY_RULE_SETUP -#line 153 "scan.l" +#line 154 "scan.l" { sectnum = 2; bracelevel = 0; @@ -1943,42 +2204,42 @@ YY_RULE_SETUP case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 162 "scan.l" +#line 163 "scan.l" yytext_is_array = false; ++linenum; YY_BREAK case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 163 "scan.l" +#line 164 "scan.l" yytext_is_array = true; ++linenum; YY_BREAK case 13: YY_RULE_SETUP -#line 165 "scan.l" +#line 166 "scan.l" BEGIN(OPTION); return OPTION_OP; YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 167 "scan.l" +#line 168 "scan.l" ++linenum; /* ignore */ YY_BREAK case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 168 "scan.l" +#line 169 "scan.l" ++linenum; /* ignore */ YY_BREAK /* xgettext: no-c-format */ case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 171 "scan.l" +#line 172 "scan.l" synerr( _( "unrecognized '%' directive" ) ); YY_BREAK case 17: YY_RULE_SETUP -#line 173 "scan.l" +#line 174 "scan.l" { if(yyleng < MAXLINE) { @@ -1996,42 +2257,42 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 188 "scan.l" +#line 189 "scan.l" RETURNNAME; YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 189 "scan.l" +#line 190 "scan.l" ++linenum; /* allows blank lines in section 1 */ YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 190 "scan.l" +#line 191 "scan.l" ACTION_ECHO; ++linenum; /* maybe end of comment line */ YY_BREAK case 21: YY_RULE_SETUP -#line 195 "scan.l" +#line 196 "scan.l" ACTION_ECHO; yy_pop_state(); YY_BREAK case 22: YY_RULE_SETUP -#line 196 "scan.l" +#line 197 "scan.l" ACTION_ECHO; YY_BREAK case 23: YY_RULE_SETUP -#line 197 "scan.l" +#line 198 "scan.l" ACTION_ECHO; YY_BREAK case 24: /* rule 24 can match eol */ YY_RULE_SETUP -#line 198 "scan.l" +#line 199 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK @@ -2039,17 +2300,17 @@ YY_RULE_SETUP case 25: /* rule 25 can match eol */ YY_RULE_SETUP -#line 202 "scan.l" +#line 203 "scan.l" yy_pop_state(); YY_BREAK case 26: YY_RULE_SETUP -#line 203 "scan.l" +#line 204 "scan.l" linenum = myctoi( yytext ); YY_BREAK case 27: YY_RULE_SETUP -#line 205 "scan.l" +#line 206 "scan.l" { flex_free( (void *) infilename ); infilename = copy_string( yytext + 1 ); @@ -2058,7 +2319,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 210 "scan.l" +#line 211 "scan.l" /* ignore spurious characters */ YY_BREAK @@ -2066,18 +2327,18 @@ YY_RULE_SETUP case 29: /* rule 29 can match eol */ YY_RULE_SETUP -#line 214 "scan.l" +#line 215 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 30: YY_RULE_SETUP -#line 216 "scan.l" +#line 217 "scan.l" ACTION_ECHO; YY_BREAK case 31: /* rule 31 can match eol */ YY_RULE_SETUP -#line 218 "scan.l" +#line 219 "scan.l" { ++linenum; ACTION_ECHO; @@ -2089,7 +2350,7 @@ YY_RULE_SETUP case 32: YY_RULE_SETUP -#line 227 "scan.l" +#line 228 "scan.l" { if( --brace_depth == 0){ /* TODO: Matched. */ @@ -2100,7 +2361,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 235 "scan.l" +#line 236 "scan.l" { brace_depth++; buf_strnappend(&top_buf, yytext, yyleng); @@ -2109,7 +2370,7 @@ YY_RULE_SETUP case 34: /* rule 34 can match eol */ YY_RULE_SETUP -#line 240 "scan.l" +#line 241 "scan.l" { ++linenum; buf_strnappend(&top_buf, yytext, yyleng); @@ -2117,13 +2378,13 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 245 "scan.l" +#line 246 "scan.l" { buf_strnappend(&top_buf, yytext, yyleng); } YY_BREAK case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE): -#line 249 "scan.l" +#line 250 "scan.l" { linenum = brace_start_line; synerr(_("Unmatched '{'")); @@ -2134,12 +2395,12 @@ case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE): case 36: YY_RULE_SETUP -#line 258 "scan.l" +#line 259 "scan.l" /* separates name and definition */ YY_BREAK case 37: YY_RULE_SETUP -#line 260 "scan.l" +#line 261 "scan.l" { if(yyleng < MAXLINE) { @@ -2165,7 +2426,7 @@ YY_RULE_SETUP case 38: /* rule 38 can match eol */ YY_RULE_SETUP -#line 282 "scan.l" +#line 283 "scan.l" { if ( ! didadef ) synerr( _( "incomplete name definition" ) ); @@ -2178,42 +2439,42 @@ YY_RULE_SETUP case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 292 "scan.l" +#line 293 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 40: YY_RULE_SETUP -#line 293 "scan.l" +#line 294 "scan.l" option_sense = true; YY_BREAK case 41: YY_RULE_SETUP -#line 295 "scan.l" +#line 296 "scan.l" return '='; YY_BREAK case 42: YY_RULE_SETUP -#line 297 "scan.l" +#line 298 "scan.l" option_sense = ! option_sense; YY_BREAK case 43: YY_RULE_SETUP -#line 299 "scan.l" +#line 300 "scan.l" csize = option_sense ? 128 : 256; YY_BREAK case 44: YY_RULE_SETUP -#line 300 "scan.l" +#line 301 "scan.l" csize = option_sense ? 256 : 128; YY_BREAK case 45: YY_RULE_SETUP -#line 302 "scan.l" +#line 303 "scan.l" long_align = option_sense; YY_BREAK case 46: YY_RULE_SETUP -#line 303 "scan.l" +#line 304 "scan.l" { ACTION_M4_IFDEF( "M4""_YY_ALWAYS_INTERACTIVE", option_sense ); interactive = option_sense; @@ -2221,74 +2482,74 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 307 "scan.l" +#line 308 "scan.l" yytext_is_array = option_sense; YY_BREAK case 48: YY_RULE_SETUP -#line 308 "scan.l" +#line 309 "scan.l" ansi_func_defs = option_sense; YY_BREAK case 49: YY_RULE_SETUP -#line 309 "scan.l" +#line 310 "scan.l" ansi_func_protos = option_sense; YY_BREAK case 50: YY_RULE_SETUP -#line 310 "scan.l" +#line 311 "scan.l" backing_up_report = option_sense; YY_BREAK case 51: YY_RULE_SETUP -#line 311 "scan.l" +#line 312 "scan.l" interactive = ! option_sense; YY_BREAK case 52: YY_RULE_SETUP -#line 312 "scan.l" +#line 313 "scan.l" bison_bridge_lval = option_sense; YY_BREAK case 53: YY_RULE_SETUP -#line 313 "scan.l" +#line 314 "scan.l" { if((bison_bridge_lloc = option_sense)) bison_bridge_lval = true; } YY_BREAK case 54: YY_RULE_SETUP -#line 316 "scan.l" +#line 317 "scan.l" C_plus_plus = option_sense; YY_BREAK case 55: YY_RULE_SETUP -#line 317 "scan.l" +#line 318 "scan.l" caseins = ! option_sense; YY_BREAK case 56: YY_RULE_SETUP -#line 318 "scan.l" +#line 319 "scan.l" caseins = option_sense; YY_BREAK case 57: YY_RULE_SETUP -#line 319 "scan.l" +#line 320 "scan.l" ddebug = option_sense; YY_BREAK case 58: YY_RULE_SETUP -#line 320 "scan.l" +#line 321 "scan.l" spprdflt = ! option_sense; YY_BREAK case 59: YY_RULE_SETUP -#line 321 "scan.l" +#line 322 "scan.l" useecs = option_sense; YY_BREAK case 60: YY_RULE_SETUP -#line 322 "scan.l" +#line 323 "scan.l" { useecs = usemecs = false; use_read = fullspd = true; @@ -2296,7 +2557,7 @@ YY_RULE_SETUP YY_BREAK case 61: YY_RULE_SETUP -#line 326 "scan.l" +#line 327 "scan.l" { useecs = usemecs = false; use_read = fulltbl = true; @@ -2304,27 +2565,27 @@ YY_RULE_SETUP YY_BREAK case 62: YY_RULE_SETUP -#line 330 "scan.l" +#line 331 "scan.l" ACTION_IFDEF("YY_NO_INPUT", ! option_sense); YY_BREAK case 63: YY_RULE_SETUP -#line 331 "scan.l" +#line 332 "scan.l" interactive = option_sense; YY_BREAK case 64: YY_RULE_SETUP -#line 332 "scan.l" +#line 333 "scan.l" lex_compat = option_sense; YY_BREAK case 65: YY_RULE_SETUP -#line 333 "scan.l" +#line 334 "scan.l" posix_compat = option_sense; YY_BREAK case 66: YY_RULE_SETUP -#line 334 "scan.l" +#line 335 "scan.l" { ACTION_M4_IFDEF( "M4""_YY_MAIN", option_sense); /* Override yywrap */ @@ -2334,12 +2595,12 @@ YY_RULE_SETUP YY_BREAK case 67: YY_RULE_SETUP -#line 340 "scan.l" +#line 341 "scan.l" usemecs = option_sense; YY_BREAK case 68: YY_RULE_SETUP -#line 341 "scan.l" +#line 342 "scan.l" { ACTION_M4_IFDEF( "M4""_YY_NEVER_INTERACTIVE", option_sense ); interactive = !option_sense; @@ -2347,232 +2608,232 @@ YY_RULE_SETUP YY_BREAK case 69: YY_RULE_SETUP -#line 345 "scan.l" +#line 346 "scan.l" performance_report += option_sense ? 1 : -1; YY_BREAK case 70: YY_RULE_SETUP -#line 346 "scan.l" +#line 347 "scan.l" yytext_is_array = ! option_sense; YY_BREAK case 71: YY_RULE_SETUP -#line 347 "scan.l" +#line 348 "scan.l" use_read = option_sense; YY_BREAK case 72: YY_RULE_SETUP -#line 348 "scan.l" +#line 349 "scan.l" reentrant = option_sense; YY_BREAK case 73: YY_RULE_SETUP -#line 349 "scan.l" +#line 350 "scan.l" reject_really_used = option_sense; YY_BREAK case 74: YY_RULE_SETUP -#line 350 "scan.l" +#line 351 "scan.l" ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense ); YY_BREAK case 75: YY_RULE_SETUP -#line 351 "scan.l" +#line 352 "scan.l" do_stdinit = option_sense; YY_BREAK case 76: YY_RULE_SETUP -#line 352 "scan.l" +#line 353 "scan.l" use_stdout = option_sense; YY_BREAK case 77: YY_RULE_SETUP -#line 353 "scan.l" +#line 354 "scan.l" ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense); YY_BREAK case 78: YY_RULE_SETUP -#line 354 "scan.l" +#line 355 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense); YY_BREAK case 79: YY_RULE_SETUP -#line 355 "scan.l" +#line 356 "scan.l" printstats = option_sense; YY_BREAK case 80: YY_RULE_SETUP -#line 356 "scan.l" +#line 357 "scan.l" nowarn = ! option_sense; YY_BREAK case 81: YY_RULE_SETUP -#line 357 "scan.l" +#line 358 "scan.l" do_yylineno = option_sense; ACTION_M4_IFDEF("M4""_YY_USE_LINENO", option_sense); YY_BREAK case 82: YY_RULE_SETUP -#line 358 "scan.l" +#line 359 "scan.l" yymore_really_used = option_sense; YY_BREAK case 83: YY_RULE_SETUP -#line 359 "scan.l" +#line 360 "scan.l" do_yywrap = option_sense; YY_BREAK case 84: YY_RULE_SETUP -#line 361 "scan.l" +#line 362 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_PUSH_STATE", ! option_sense); YY_BREAK case 85: YY_RULE_SETUP -#line 362 "scan.l" +#line 363 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_POP_STATE", ! option_sense); YY_BREAK case 86: YY_RULE_SETUP -#line 363 "scan.l" +#line 364 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_TOP_STATE", ! option_sense); YY_BREAK case 87: YY_RULE_SETUP -#line 365 "scan.l" +#line 366 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BUFFER", ! option_sense); YY_BREAK case 88: YY_RULE_SETUP -#line 366 "scan.l" +#line 367 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BYTES", ! option_sense); YY_BREAK case 89: YY_RULE_SETUP -#line 367 "scan.l" +#line 368 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SCAN_STRING", ! option_sense); YY_BREAK case 90: YY_RULE_SETUP -#line 369 "scan.l" +#line 370 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_FLEX_ALLOC", ! option_sense); YY_BREAK case 91: YY_RULE_SETUP -#line 370 "scan.l" +#line 371 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_FLEX_REALLOC", ! option_sense); YY_BREAK case 92: YY_RULE_SETUP -#line 371 "scan.l" +#line 372 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_FLEX_FREE", ! option_sense); YY_BREAK case 93: YY_RULE_SETUP -#line 373 "scan.l" +#line 374 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_DEBUG", ! option_sense); YY_BREAK case 94: YY_RULE_SETUP -#line 374 "scan.l" +#line 375 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_DEBUG", ! option_sense); YY_BREAK case 95: YY_RULE_SETUP -#line 375 "scan.l" +#line 376 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_EXTRA", ! option_sense); YY_BREAK case 96: YY_RULE_SETUP -#line 376 "scan.l" +#line 377 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense); YY_BREAK case 97: YY_RULE_SETUP -#line 377 "scan.l" +#line 378 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense); YY_BREAK case 98: YY_RULE_SETUP -#line 378 "scan.l" +#line 379 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense); YY_BREAK case 99: YY_RULE_SETUP -#line 379 "scan.l" +#line 380 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense); YY_BREAK case 100: YY_RULE_SETUP -#line 380 "scan.l" +#line 381 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense); YY_BREAK case 101: YY_RULE_SETUP -#line 381 "scan.l" +#line 382 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense); YY_BREAK case 102: YY_RULE_SETUP -#line 382 "scan.l" +#line 383 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_IN", ! option_sense); YY_BREAK case 103: YY_RULE_SETUP -#line 383 "scan.l" +#line 384 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_OUT", ! option_sense); YY_BREAK case 104: YY_RULE_SETUP -#line 384 "scan.l" +#line 385 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_OUT", ! option_sense); YY_BREAK case 105: YY_RULE_SETUP -#line 385 "scan.l" +#line 386 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LVAL", ! option_sense); YY_BREAK case 106: YY_RULE_SETUP -#line 386 "scan.l" +#line 387 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_LVAL", ! option_sense); YY_BREAK case 107: YY_RULE_SETUP -#line 387 "scan.l" +#line 388 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense); YY_BREAK case 108: YY_RULE_SETUP -#line 388 "scan.l" +#line 389 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense); YY_BREAK case 109: YY_RULE_SETUP -#line 390 "scan.l" +#line 391 "scan.l" return OPT_OUTFILE; YY_BREAK case 110: YY_RULE_SETUP -#line 391 "scan.l" +#line 392 "scan.l" return OPT_PREFIX; YY_BREAK case 111: YY_RULE_SETUP -#line 392 "scan.l" +#line 393 "scan.l" return OPT_YYCLASS; YY_BREAK case 112: YY_RULE_SETUP -#line 393 "scan.l" +#line 394 "scan.l" return OPT_HEADER; YY_BREAK case 113: YY_RULE_SETUP -#line 394 "scan.l" +#line 395 "scan.l" return OPT_TABLES; YY_BREAK case 114: YY_RULE_SETUP -#line 395 "scan.l" +#line 396 "scan.l" { tablesverify = option_sense; if(!tablesext && option_sense) @@ -2581,7 +2842,7 @@ YY_RULE_SETUP YY_BREAK case 115: YY_RULE_SETUP -#line 402 "scan.l" +#line 403 "scan.l" { if(yyleng-1 < MAXLINE) { @@ -2598,7 +2859,7 @@ YY_RULE_SETUP YY_BREAK case 116: YY_RULE_SETUP -#line 416 "scan.l" +#line 417 "scan.l" { format_synerr( _( "unrecognized %%option: %s" ), yytext ); @@ -2609,28 +2870,28 @@ YY_RULE_SETUP case 117: /* rule 117 can match eol */ YY_RULE_SETUP -#line 423 "scan.l" +#line 424 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 118: YY_RULE_SETUP -#line 427 "scan.l" +#line 428 "scan.l" ++bracelevel; yyless( 2 ); /* eat only %{ */ YY_BREAK case 119: YY_RULE_SETUP -#line 428 "scan.l" +#line 429 "scan.l" --bracelevel; yyless( 2 ); /* eat only %} */ YY_BREAK case 120: YY_RULE_SETUP -#line 430 "scan.l" +#line 431 "scan.l" ACTION_ECHO; /* indented code in prolog */ YY_BREAK case 121: YY_RULE_SETUP -#line 432 "scan.l" +#line 433 "scan.l" { /* non-indented code */ if ( bracelevel <= 0 ) { /* not in %{ ... %} */ @@ -2645,17 +2906,17 @@ YY_RULE_SETUP YY_BREAK case 122: YY_RULE_SETUP -#line 444 "scan.l" +#line 445 "scan.l" ACTION_ECHO; YY_BREAK case 123: /* rule 123 can match eol */ YY_RULE_SETUP -#line 445 "scan.l" +#line 446 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK case YY_STATE_EOF(SECT2PROLOG): -#line 447 "scan.l" +#line 448 "scan.l" { mark_prolog(); sectnum = 0; @@ -2667,12 +2928,12 @@ case YY_STATE_EOF(SECT2PROLOG): case 124: /* rule 124 can match eol */ YY_RULE_SETUP -#line 455 "scan.l" +#line 456 "scan.l" ++linenum; /* allow blank lines in section 2 */ YY_BREAK case 125: YY_RULE_SETUP -#line 457 "scan.l" +#line 458 "scan.l" { indented_code = false; doing_codeblock = true; @@ -2682,25 +2943,25 @@ YY_RULE_SETUP YY_BREAK case 126: YY_RULE_SETUP -#line 464 "scan.l" +#line 465 "scan.l" BEGIN(SC); return '<'; YY_BREAK case 127: YY_RULE_SETUP -#line 465 "scan.l" +#line 466 "scan.l" return '^'; YY_BREAK case 128: YY_RULE_SETUP -#line 466 "scan.l" +#line 467 "scan.l" BEGIN(QUOTE); return '"'; YY_BREAK case 129: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +*yy_cp = YY_G(yy_hold_char); /* undo effects of setting up yytext */ +YY_G(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 467 "scan.l" +#line 468 "scan.l" { BEGIN(NUM); if ( lex_compat || posix_compat ) @@ -2711,16 +2972,16 @@ YY_RULE_SETUP YY_BREAK case 130: /* rule 130 can match eol */ -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +*yy_cp = YY_G(yy_hold_char); /* undo effects of setting up yytext */ +YY_G(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 474 "scan.l" +#line 475 "scan.l" return '$'; YY_BREAK case 131: YY_RULE_SETUP -#line 476 "scan.l" +#line 477 "scan.l" { bracelevel = 1; BEGIN(PERCENT_BRACE_ACTION); @@ -2736,12 +2997,12 @@ YY_RULE_SETUP case 132: /* rule 132 can match eol */ YY_RULE_SETUP -#line 487 "scan.l" +#line 488 "scan.l" continued_action = true; ++linenum; return '\n'; YY_BREAK case 133: YY_RULE_SETUP -#line 489 "scan.l" +#line 490 "scan.l" { yyless( yyleng - 2 ); /* put back '/', '*' */ bracelevel = 0; @@ -2751,12 +3012,12 @@ YY_RULE_SETUP YY_BREAK case 134: YY_RULE_SETUP -#line 496 "scan.l" +#line 497 "scan.l" /* allow indented rules */ YY_BREAK case 135: YY_RULE_SETUP -#line 498 "scan.l" +#line 499 "scan.l" { /* This rule is separate from the one below because * otherwise we get variable trailing context, so @@ -2777,7 +3038,7 @@ YY_RULE_SETUP case 136: /* rule 136 can match eol */ YY_RULE_SETUP -#line 515 "scan.l" +#line 516 "scan.l" { bracelevel = 0; continued_action = false; @@ -2793,15 +3054,15 @@ YY_RULE_SETUP } YY_BREAK case 137: -#line 530 "scan.l" +#line 531 "scan.l" case 138: YY_RULE_SETUP -#line 530 "scan.l" +#line 531 "scan.l" return EOF_OP; YY_BREAK case 139: YY_RULE_SETUP -#line 532 "scan.l" +#line 533 "scan.l" { sectnum = 3; BEGIN(SECT3); @@ -2811,7 +3072,7 @@ YY_RULE_SETUP YY_BREAK case 140: YY_RULE_SETUP -#line 539 "scan.l" +#line 540 "scan.l" { int cclval; @@ -2861,7 +3122,7 @@ YY_RULE_SETUP case 141: /* rule 141 can match eol */ YY_RULE_SETUP -#line 585 "scan.l" +#line 586 "scan.l" { register Char *nmdefptr; int end_is_ws, end_ch; @@ -2893,7 +3154,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ if ( lex_compat || nmdefptr[0] == '^' || (len > 0 && nmdefptr[len - 1] == '$') - || end_is_ws) + || (end_is_ws && trlcontxt)) { /* don't use ()'s after all */ PUT_BACK_STRING((char *) nmdefptr, 0); @@ -2912,12 +3173,12 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ YY_BREAK case 142: YY_RULE_SETUP -#line 633 "scan.l" +#line 634 "scan.l" return (unsigned char) yytext[0]; YY_BREAK case 143: YY_RULE_SETUP -#line 634 "scan.l" +#line 635 "scan.l" RETURNCHAR; YY_BREAK @@ -2925,35 +3186,35 @@ RETURNCHAR; case 144: /* rule 144 can match eol */ YY_RULE_SETUP -#line 639 "scan.l" +#line 640 "scan.l" ++linenum; /* Allow blank lines & continuations */ YY_BREAK case 145: YY_RULE_SETUP -#line 640 "scan.l" +#line 641 "scan.l" return (unsigned char) yytext[0]; YY_BREAK case 146: YY_RULE_SETUP -#line 641 "scan.l" +#line 642 "scan.l" BEGIN(SECT2); return '>'; YY_BREAK case 147: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +*yy_cp = YY_G(yy_hold_char); /* undo effects of setting up yytext */ +YY_G(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 642 "scan.l" +#line 643 "scan.l" BEGIN(CARETISBOL); return '>'; YY_BREAK case 148: YY_RULE_SETUP -#line 643 "scan.l" +#line 644 "scan.l" RETURNNAME; YY_BREAK case 149: YY_RULE_SETUP -#line 644 "scan.l" +#line 645 "scan.l" { format_synerr( _( "bad <start condition>: %s" ), yytext ); @@ -2962,24 +3223,24 @@ YY_RULE_SETUP case 150: YY_RULE_SETUP -#line 650 "scan.l" +#line 651 "scan.l" BEGIN(SECT2); return '^'; YY_BREAK case 151: YY_RULE_SETUP -#line 654 "scan.l" +#line 655 "scan.l" RETURNCHAR; YY_BREAK case 152: YY_RULE_SETUP -#line 655 "scan.l" +#line 656 "scan.l" BEGIN(SECT2); return '"'; YY_BREAK case 153: /* rule 153 can match eol */ YY_RULE_SETUP -#line 657 "scan.l" +#line 658 "scan.l" { synerr( _( "missing quote" ) ); BEGIN(SECT2); @@ -2990,50 +3251,50 @@ YY_RULE_SETUP case 154: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +*yy_cp = YY_G(yy_hold_char); /* undo effects of setting up yytext */ +YY_G(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 667 "scan.l" +#line 668 "scan.l" BEGIN(CCL); return '^'; YY_BREAK case 155: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +*yy_cp = YY_G(yy_hold_char); /* undo effects of setting up yytext */ +YY_G(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 668 "scan.l" +#line 669 "scan.l" return '^'; YY_BREAK case 156: YY_RULE_SETUP -#line 669 "scan.l" +#line 670 "scan.l" BEGIN(CCL); RETURNCHAR; YY_BREAK case 157: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +*yy_cp = YY_G(yy_hold_char); /* undo effects of setting up yytext */ +YY_G(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 673 "scan.l" +#line 674 "scan.l" return '-'; YY_BREAK case 158: YY_RULE_SETUP -#line 674 "scan.l" +#line 675 "scan.l" RETURNCHAR; YY_BREAK case 159: YY_RULE_SETUP -#line 675 "scan.l" +#line 676 "scan.l" BEGIN(SECT2); return ']'; YY_BREAK case 160: /* rule 160 can match eol */ YY_RULE_SETUP -#line 676 "scan.l" +#line 677 "scan.l" { synerr( _( "bad character class" ) ); BEGIN(SECT2); @@ -3044,67 +3305,67 @@ YY_RULE_SETUP case 161: YY_RULE_SETUP -#line 684 "scan.l" +#line 685 "scan.l" BEGIN(CCL); return CCE_ALNUM; YY_BREAK case 162: YY_RULE_SETUP -#line 685 "scan.l" +#line 686 "scan.l" BEGIN(CCL); return CCE_ALPHA; YY_BREAK case 163: YY_RULE_SETUP -#line 686 "scan.l" +#line 687 "scan.l" BEGIN(CCL); return CCE_BLANK; YY_BREAK case 164: YY_RULE_SETUP -#line 687 "scan.l" +#line 688 "scan.l" BEGIN(CCL); return CCE_CNTRL; YY_BREAK case 165: YY_RULE_SETUP -#line 688 "scan.l" +#line 689 "scan.l" BEGIN(CCL); return CCE_DIGIT; YY_BREAK case 166: YY_RULE_SETUP -#line 689 "scan.l" +#line 690 "scan.l" BEGIN(CCL); return CCE_GRAPH; YY_BREAK case 167: YY_RULE_SETUP -#line 690 "scan.l" +#line 691 "scan.l" BEGIN(CCL); return CCE_LOWER; YY_BREAK case 168: YY_RULE_SETUP -#line 691 "scan.l" +#line 692 "scan.l" BEGIN(CCL); return CCE_PRINT; YY_BREAK case 169: YY_RULE_SETUP -#line 692 "scan.l" +#line 693 "scan.l" BEGIN(CCL); return CCE_PUNCT; YY_BREAK case 170: YY_RULE_SETUP -#line 693 "scan.l" +#line 694 "scan.l" BEGIN(CCL); return CCE_SPACE; YY_BREAK case 171: YY_RULE_SETUP -#line 694 "scan.l" +#line 695 "scan.l" BEGIN(CCL); return CCE_UPPER; YY_BREAK case 172: YY_RULE_SETUP -#line 695 "scan.l" +#line 696 "scan.l" BEGIN(CCL); return CCE_XDIGIT; YY_BREAK case 173: YY_RULE_SETUP -#line 696 "scan.l" +#line 697 "scan.l" { format_synerr( _( "bad character class expression: %s" ), @@ -3116,7 +3377,7 @@ YY_RULE_SETUP case 174: YY_RULE_SETUP -#line 705 "scan.l" +#line 706 "scan.l" { yylval = myctoi( yytext ); return NUMBER; @@ -3124,12 +3385,12 @@ YY_RULE_SETUP YY_BREAK case 175: YY_RULE_SETUP -#line 710 "scan.l" +#line 711 "scan.l" return ','; YY_BREAK case 176: YY_RULE_SETUP -#line 711 "scan.l" +#line 712 "scan.l" { BEGIN(SECT2); if ( lex_compat || posix_compat ) @@ -3140,7 +3401,7 @@ YY_RULE_SETUP YY_BREAK case 177: YY_RULE_SETUP -#line 719 "scan.l" +#line 720 "scan.l" { synerr( _( "bad character inside {}'s" ) ); BEGIN(SECT2); @@ -3150,7 +3411,7 @@ YY_RULE_SETUP case 178: /* rule 178 can match eol */ YY_RULE_SETUP -#line 725 "scan.l" +#line 726 "scan.l" { synerr( _( "missing }" ) ); BEGIN(SECT2); @@ -3162,18 +3423,18 @@ YY_RULE_SETUP case 179: YY_RULE_SETUP -#line 735 "scan.l" +#line 736 "scan.l" bracelevel = 0; YY_BREAK case 180: YY_RULE_SETUP -#line 737 "scan.l" +#line 738 "scan.l" ACTION_ECHO; yy_push_state( COMMENT ); YY_BREAK case 181: YY_RULE_SETUP -#line 740 "scan.l" +#line 741 "scan.l" { ACTION_ECHO; CHECK_REJECT(yytext); @@ -3181,7 +3442,7 @@ YY_RULE_SETUP YY_BREAK case 182: YY_RULE_SETUP -#line 744 "scan.l" +#line 745 "scan.l" { ACTION_ECHO; CHECK_YYMORE(yytext); @@ -3190,13 +3451,13 @@ YY_RULE_SETUP case 183: YY_RULE_SETUP -#line 750 "scan.l" +#line 751 "scan.l" ACTION_ECHO; YY_BREAK case 184: /* rule 184 can match eol */ YY_RULE_SETUP -#line 751 "scan.l" +#line 752 "scan.l" { ++linenum; ACTION_ECHO; @@ -3216,38 +3477,38 @@ YY_RULE_SETUP case 185: YY_RULE_SETUP -#line 769 "scan.l" +#line 770 "scan.l" ACTION_ECHO; ++bracelevel; YY_BREAK case 186: YY_RULE_SETUP -#line 770 "scan.l" +#line 771 "scan.l" ACTION_ECHO; --bracelevel; YY_BREAK case 187: YY_RULE_SETUP -#line 771 "scan.l" +#line 772 "scan.l" ACTION_ECHO; YY_BREAK case 188: YY_RULE_SETUP -#line 772 "scan.l" +#line 773 "scan.l" ACTION_ECHO; YY_BREAK case 189: YY_RULE_SETUP -#line 773 "scan.l" +#line 774 "scan.l" ACTION_ECHO; /* character constant */ YY_BREAK case 190: YY_RULE_SETUP -#line 774 "scan.l" +#line 775 "scan.l" ACTION_ECHO; BEGIN(ACTION_STRING); YY_BREAK case 191: /* rule 191 can match eol */ YY_RULE_SETUP -#line 775 "scan.l" +#line 776 "scan.l" { ++linenum; ACTION_ECHO; @@ -3263,42 +3524,42 @@ YY_RULE_SETUP YY_BREAK case 192: YY_RULE_SETUP -#line 787 "scan.l" +#line 788 "scan.l" ACTION_ECHO; YY_BREAK case 193: YY_RULE_SETUP -#line 791 "scan.l" +#line 792 "scan.l" ACTION_ECHO; YY_BREAK case 194: YY_RULE_SETUP -#line 792 "scan.l" +#line 793 "scan.l" ACTION_ECHO; YY_BREAK case 195: /* rule 195 can match eol */ YY_RULE_SETUP -#line 793 "scan.l" +#line 794 "scan.l" ++linenum; ACTION_ECHO; BEGIN(ACTION); YY_BREAK case 196: YY_RULE_SETUP -#line 794 "scan.l" +#line 795 "scan.l" ACTION_ECHO; BEGIN(ACTION); YY_BREAK case 197: YY_RULE_SETUP -#line 795 "scan.l" +#line 796 "scan.l" ACTION_ECHO; YY_BREAK case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(ACTION): case YY_STATE_EOF(ACTION_STRING): -#line 798 "scan.l" +#line 799 "scan.l" { synerr( _( "EOF encountered inside an action" ) ); yyterminate(); @@ -3306,7 +3567,7 @@ case YY_STATE_EOF(ACTION_STRING): YY_BREAK case 198: YY_RULE_SETUP -#line 804 "scan.l" +#line 805 "scan.l" { yylval = myesc( (Char *) yytext ); @@ -3320,26 +3581,26 @@ YY_RULE_SETUP case 199: /* rule 199 can match eol */ YY_RULE_SETUP -#line 815 "scan.l" +#line 816 "scan.l" ECHO; YY_BREAK case YY_STATE_EOF(SECT3): -#line 816 "scan.l" +#line 817 "scan.l" sectnum = 0; yyterminate(); YY_BREAK case 200: /* rule 200 can match eol */ YY_RULE_SETUP -#line 819 "scan.l" +#line 820 "scan.l" format_synerr( _( "bad character: %s" ), yytext ); YY_BREAK case 201: YY_RULE_SETUP -#line 821 "scan.l" +#line 822 "scan.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 3343 "scan.c" +#line 3604 "scan.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SECT2): case YY_STATE_EOF(CODEBLOCK): @@ -3359,26 +3620,26 @@ case YY_STATE_EOF(LINEDIR): case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - YY_G(yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); + *yy_cp = YY_G(yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_G(yy_current_buffer)->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our + * consistency between yy_current_buffer and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_n_chars; + YY_G(yy_current_buffer)->yy_input_file = yyin; + YY_G(yy_current_buffer)->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -3388,13 +3649,13 @@ case YY_STATE_EOF(LINEDIR): * end-of-buffer state). Contrast this with the test * in input(). */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + if ( YY_G(yy_c_buf_p) <= &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -3405,32 +3666,32 @@ case YY_STATE_EOF(LINEDIR): * will run more slowly). */ - yy_next_state = yy_try_NUL_trans( yy_current_state ); + yy_next_state = yy_try_NUL_trans( yy_current_state YY_CALL_LAST_ARG); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); + yy_cp = ++YY_G(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = (yy_c_buf_p); + yy_cp = YY_G(yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer( ) ) + else switch ( yy_get_next_buffer( YY_CALL_ONLY_ARG ) ) { case EOB_ACT_END_OF_FILE: { - (yy_did_buffer_switch_on_eof) = 0; + YY_G(yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( YY_CALL_ONLY_ARG ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -3441,7 +3702,7 @@ case YY_STATE_EOF(LINEDIR): * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -3449,30 +3710,30 @@ case YY_STATE_EOF(LINEDIR): else { - if ( ! (yy_did_buffer_switch_on_eof) ) + if ( ! YY_G(yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; + YY_G(yy_c_buf_p) = + YY_G(yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG ); - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_cp = YY_G(yy_c_buf_p); + yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; + YY_G(yy_c_buf_p) = + &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)]; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG ); - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_cp = YY_G(yy_c_buf_p); + yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -3483,7 +3744,13 @@ case YY_STATE_EOF(LINEDIR): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ -} /* end of yylex */ + } /* end of yylex */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ + /* yy_get_next_buffer - try to read in a new buffer * @@ -3492,20 +3759,24 @@ case YY_STATE_EOF(LINEDIR): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) -{ - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); + + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ +static int yy_get_next_buffer YYFARGS0(void) + + { + register char *dest = YY_G(yy_current_buffer)->yy_ch_buf; + register char *source = YY_G(yytext_ptr); register int number_to_move, i; int ret_val; - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) + if ( YY_G(yy_c_buf_p) > &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + if ( YY_G(yy_current_buffer)->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) + if ( YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -3525,30 +3796,34 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_G(yy_current_buffer)->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars) = 0; else { size_t num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + YY_G(yy_current_buffer)->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ +#ifdef YY_USES_REJECT + YY_FATAL_ERROR( +"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); +#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_G(yy_current_buffer); int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); + (int) (YY_G(yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -3561,7 +3836,8 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + b->yy_buf_size + 2 YY_CALL_LAST_ARG ); } else /* Can't grow it, we don't own it. */ @@ -3571,35 +3847,35 @@ static int yy_get_next_buffer (void) YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + YY_G(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + num_to_read = YY_G(yy_current_buffer)->yy_buf_size - number_to_move - 1; - +#endif } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + YY_INPUT( (&YY_G(yy_current_buffer)->yy_ch_buf[number_to_move]), + YY_G(yy_n_chars), num_to_read ); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars); } - if ( (yy_n_chars) == 0 ) + if ( YY_G(yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin YY_CALL_LAST_ARG); } else { ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_G(yy_current_buffer)->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -3607,32 +3883,36 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; + YY_G(yy_n_chars) += number_to_move; + YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + YY_G(yytext_ptr) = &YY_G(yy_current_buffer)->yy_ch_buf[0]; return ret_val; -} + } +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) -{ + +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ + static yy_state_type yy_get_previous_state YYFARGS0(void) + + { register yy_state_type yy_current_state; register char *yy_cp; - - yy_current_state = (yy_start); + + yy_current_state = YY_G(yy_start); yy_current_state += YY_AT_BOL(); - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) + for ( yy_cp = YY_G(yytext_ptr) + YY_MORE_ADJ; yy_cp < YY_G(yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + YY_G(yy_last_accepting_state) = yy_current_state; + YY_G(yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -3644,23 +3924,26 @@ static int yy_get_next_buffer (void) } return yy_current_state; -} + } + /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ + + static yy_state_type yy_try_NUL_trans YYFARGS1( yy_state_type, yy_current_state) + + { register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + register char *yy_cp = YY_G(yy_c_buf_p); register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + YY_G(yy_last_accepting_state) = yy_current_state; + YY_G(yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -3672,73 +3955,85 @@ static int yy_get_next_buffer (void) yy_is_jam = (yy_current_state == 972); return yy_is_jam ? 0 : yy_current_state; -} + } + - static void yyunput (int c, register char * yy_bp ) -{ - register char *yy_cp; - - yy_cp = (yy_c_buf_p); + +#ifndef YY_NO_UNPUT + static void yyunput YYFARGS2( int,c, register char *,yy_bp) + + { + register char *yy_cp = YY_G(yy_c_buf_p); /* undo effects of setting up yytext */ - *yy_cp = (yy_hold_char); + *yy_cp = YY_G(yy_hold_char); - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + if ( yy_cp < YY_G(yy_current_buffer)->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + register int number_to_move = YY_G(yy_n_chars) + 2; + register char *dest = &YY_G(yy_current_buffer)->yy_ch_buf[ + YY_G(yy_current_buffer)->yy_buf_size + 2]; register char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + &YY_G(yy_current_buffer)->yy_ch_buf[number_to_move]; - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + while ( source > YY_G(yy_current_buffer)->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + YY_G(yy_current_buffer)->yy_n_chars = + YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_buf_size; - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + if ( yy_cp < YY_G(yy_current_buffer)->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; - (yytext_ptr) = yy_bp; - (yy_hold_char) = *yy_cp; - (yy_c_buf_p) = yy_cp; -} +#ifdef YY_USE_LINENO + if ( c == '\n' ) + --yylineno; +#endif + YY_G(yytext_ptr) = yy_bp; + YY_G(yy_hold_char) = *yy_cp; + YY_G(yy_c_buf_p) = yy_cp; + } + +#endif /* ifndef YY_NO_UNPUT */ + + #ifndef YY_NO_INPUT #ifdef __cplusplus - static int yyinput (void) + static int yyinput YYFARGS0(void) #else - static int input (void) + static int input YYFARGS0(void) #endif -{ + + + { int c; - - *(yy_c_buf_p) = (yy_hold_char); - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + *YY_G(yy_c_buf_p) = YY_G(yy_hold_char); + + if ( *YY_G(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + if ( YY_G(yy_c_buf_p) < &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] ) /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; + *YY_G(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); + int offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr); + ++YY_G(yy_c_buf_p); - switch ( yy_get_next_buffer( ) ) + switch ( yy_get_next_buffer( YY_CALL_ONLY_ARG ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -3752,113 +4047,99 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin YY_CALL_LAST_ARG); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( YY_CALL_ONLY_ARG ) ) return EOF; - if ( ! (yy_did_buffer_switch_on_eof) ) + if ( ! YY_G(yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus - return yyinput(); + return yyinput(YY_CALL_ONLY_ARG); #else - return input(); + return input(YY_CALL_ONLY_ARG); #endif } case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; + YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + offset; break; } } } - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); + c = *(unsigned char *) YY_G(yy_c_buf_p); /* cast for 8-bit char's */ + *YY_G(yy_c_buf_p) = '\0'; /* preserve yytext */ + YY_G(yy_hold_char) = *++YY_G(yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n'); + YY_G(yy_current_buffer)->yy_at_bol = (c == '\n'); return c; -} + } + #endif /* ifndef YY_NO_INPUT */ -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + + + void yyrestart YYFARGS1( FILE *,input_file) + + { + if ( ! YY_G(yy_current_buffer) ) + YY_G(yy_current_buffer) = + yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); + + yy_init_buffer( YY_G(yy_current_buffer), input_file YY_CALL_LAST_ARG); + yy_load_buffer_state( YY_CALL_ONLY_ARG ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); -} -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) + void yy_switch_to_buffer YYFARGS1( YY_BUFFER_STATE ,new_buffer) + + { + if ( YY_G(yy_current_buffer) == new_buffer ) return; - if ( YY_CURRENT_BUFFER ) + if ( YY_G(yy_current_buffer) ) { /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + *YY_G(yy_c_buf_p) = YY_G(yy_hold_char); + YY_G(yy_current_buffer)->yy_buf_pos = YY_G(yy_c_buf_p); + YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars); } - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + YY_G(yy_current_buffer) = new_buffer; + yy_load_buffer_state( YY_CALL_ONLY_ARG ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - (yy_did_buffer_switch_on_eof) = 1; -} + YY_G(yy_did_buffer_switch_on_eof) = 1; + } -static void yy_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) -{ + + void yy_load_buffer_state YYFARGS0(void) + + { + YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_n_chars; + YY_G(yytext_ptr) = YY_G(yy_c_buf_p) = YY_G(yy_current_buffer)->yy_buf_pos; + yyin = YY_G(yy_current_buffer)->yy_input_file; + YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); + } + + + YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, int ,size) + + { YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) YY_CALL_LAST_ARG ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -3867,75 +4148,75 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( b->yy_buf_size + 2 YY_CALL_LAST_ARG ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file YY_CALL_LAST_ARG); return b; -} + } -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * - */ - void yy_delete_buffer (YY_BUFFER_STATE b ) -{ - + + void yy_delete_buffer YYFARGS1( YY_BUFFER_STATE ,b) + + { if ( ! b ) return; - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + if ( b == YY_G(yy_current_buffer) ) + YY_G(yy_current_buffer) = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf YY_CALL_LAST_ARG ); + + yyfree( (void *) b YY_CALL_LAST_ARG ); + } - yyfree((void *) b ); -} + +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE #ifndef __cplusplus -extern int isatty (int ); +extern int isatty YY_PARAMS(( int )); #endif /* __cplusplus */ - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) +#endif /* !YY_NEVER_INTERACTIVE */ +#endif /* !YY_ALWAYS_INTERACTIVE */ -{ + + + void yy_init_buffer YYFARGS2( YY_BUFFER_STATE ,b, FILE *,file) + + + { int oerrno = errno; - - yy_flush_buffer(b ); + + yy_flush_buffer( b YY_CALL_LAST_ARG); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - +#if YY_ALWAYS_INTERACTIVE + b->yy_is_interactive = 1; +#else +#if YY_NEVER_INTERACTIVE + b->yy_is_interactive = 0; +#else + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; +#endif +#endif + errno = oerrno; -} + } -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void yy_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) + + void yy_flush_buffer YYFARGS1( YY_BUFFER_STATE ,b) + + { + if ( ! b ) return; b->yy_n_chars = 0; @@ -3952,121 +4233,24 @@ extern int isatty (int ); b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void yypop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; + if ( b == YY_G(yy_current_buffer) ) + yy_load_buffer_state( YY_CALL_ONLY_ARG ); } -} -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (void) -{ - int num_to_alloc; - - if (!(yy_buffer_stack)) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} +#ifndef YY_NO_SCAN_BUFFER -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) -{ +YY_BUFFER_STATE yy_scan_buffer YYFARGS2( char *,base, yy_size_t ,size) + { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) YY_CALL_LAST_ARG ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -4080,42 +4264,40 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b YY_CALL_LAST_ARG ); return b; -} + } -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * str ) -{ - - return yy_scan_bytes(str,strlen(str) ); -} +#endif -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) -{ + +#ifndef YY_NO_SCAN_STRING + +YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str) + { + int len; + for ( len = 0; yy_str[len]; ++len ) + ; + + return yy_scan_bytes( yy_str, len YY_CALL_LAST_ARG); + } + +#endif + + +#ifndef YY_NO_SCAN_BYTES + +YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,bytes, int ,len) + { YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; - buf = (char *) yyalloc(n ); + buf = (char *) yyalloc( n YY_CALL_LAST_ARG ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -4124,7 +4306,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n YY_CALL_LAST_ARG); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -4134,50 +4316,75 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) b->yy_is_our_buffer = 1; return b; -} + } - static void yy_push_state (int new_state ) -{ - if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) ) +#endif + + +#ifndef YY_NO_PUSH_STATE + + static void yy_push_state YYFARGS1( int ,new_state) + + { + if ( YY_G(yy_start_stack_ptr) >= YY_G(yy_start_stack_depth) ) { yy_size_t new_size; - (yy_start_stack_depth) += YY_START_STACK_INCR; - new_size = (yy_start_stack_depth) * sizeof( int ); + YY_G(yy_start_stack_depth) += YY_START_STACK_INCR; + new_size = YY_G(yy_start_stack_depth) * sizeof( int ); - if ( ! (yy_start_stack) ) - (yy_start_stack) = (int *) yyalloc(new_size ); + if ( ! YY_G(yy_start_stack) ) + YY_G(yy_start_stack) = (int *) yyalloc( new_size YY_CALL_LAST_ARG ); else - (yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size ); + YY_G(yy_start_stack) = (int *) yyrealloc( + (void *) YY_G(yy_start_stack), new_size YY_CALL_LAST_ARG ); - if ( ! (yy_start_stack) ) + if ( ! YY_G(yy_start_stack) ) YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); } - (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; + YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START; BEGIN(new_state); -} + } +#endif - static void yy_pop_state (void) -{ - if ( --(yy_start_stack_ptr) < 0 ) + +#ifndef YY_NO_POP_STATE + + static void yy_pop_state YYFARGS0(void) + + { + if ( --YY_G(yy_start_stack_ptr) < 0 ) YY_FATAL_ERROR( "start-condition stack underflow" ); - BEGIN((yy_start_stack)[(yy_start_stack_ptr)]); -} + BEGIN(YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)]); + } +#endif + + +#ifndef YY_NO_TOP_STATE + + static int yy_top_state YYFARGS0(void) + + { + return YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr) - 1]; + } +#endif #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); + +static void yy_fatal_error YYFARGS1(yyconst char*, msg) + { + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); -} + } + /* Redefine yyless() so it works in section 3 code. */ @@ -4188,147 +4395,156 @@ static void yy_fatal_error (yyconst char* msg ) /* Undo effects of setting up yytext. */ \ int yyless_macro_arg = (n); \ YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ + yytext[yyleng] = YY_G(yy_hold_char); \ + YY_G(yy_c_buf_p) = yytext + yyless_macro_arg; \ + YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); \ + *YY_G(yy_c_buf_p) = '\0'; \ yyleng = yyless_macro_arg; \ } \ while ( 0 ) + + /* Accessor methods (get/set functions) to struct members. */ -/** Get the current line number. - * - */ -int yyget_lineno (void) + + +#ifndef YY_NO_GET_LINENO +int yyget_lineno YYFARGS0(void) { - return yylineno; } +#endif /* !YY_NO_GET_LINENO */ -/** Get the input stream. - * - */ -FILE *yyget_in (void) +#ifndef YY_NO_GET_IN +FILE *yyget_in YYFARGS0(void) { - return yyin; + return yyin; } +#endif /* !YY_NO_GET_IN */ -/** Get the output stream. - * - */ -FILE *yyget_out (void) +#ifndef YY_NO_GET_OUT +FILE *yyget_out YYFARGS0(void) { - return yyout; + return yyout; } +#endif /* !YY_NO_GET_OUT */ -/** Get the length of the current token. - * - */ -int yyget_leng (void) +#ifndef YY_NO_GET_LENG +int yyget_leng YYFARGS0(void) { - return yyleng; + return yyleng; } +#endif /* !YY_NO_GET_LENG */ -/** Get the current token. - * - */ - -char *yyget_text (void) +#ifndef YY_NO_GET_TEXT +char *yyget_text YYFARGS0(void) { - return yytext; + return yytext; } +#endif /* !YY_NO_GET_TEXT */ -/** Set the current line number. - * @param line_number - * - */ -void yyset_lineno (int line_number ) + +#ifndef YY_NO_SET_LINENO +void yyset_lineno YYFARGS1( int ,line_number) { - yylineno = line_number; } +#endif /* !YY_NO_SET_LINENO */ -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str ) + +#ifndef YY_NO_SET_IN +void yyset_in YYFARGS1( FILE * ,in_str) { - yyin = in_str ; + yyin = in_str ; } +#endif /* !YY_NO_SET_IN */ -void yyset_out (FILE * out_str ) +#ifndef YY_NO_SET_OUT +void yyset_out YYFARGS1( FILE * ,out_str) { - yyout = out_str ; + yyout = out_str ; } +#endif /* !YY_NO_SET_OUT */ + -int yyget_debug (void) +#ifndef YY_NO_GET_DEBUG +int yyget_debug YYFARGS0(void) { - return yy_flex_debug; + return yy_flex_debug; } +#endif /* !YY_NO_GET_DEBUG */ -void yyset_debug (int bdebug ) +#ifndef YY_NO_SET_DEBUG +void yyset_debug YYFARGS1( int ,bdebug) { - yy_flex_debug = bdebug ; + yy_flex_debug = bdebug ; } +#endif /* !YY_NO_SET_DEBUG */ + + + /* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) +int yylex_destroy YYFARGS0(void) { - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; + /* Destroy the current (main) buffer. */ + yy_delete_buffer( YY_G(yy_current_buffer) YY_CALL_LAST_ARG ); + YY_G(yy_current_buffer) = NULL; +#if defined(YY_STACK_USED) || defined(YY_REENTRANT) /* Destroy the start condition stack. */ - yyfree((yy_start_stack) ); - (yy_start_stack) = NULL; + if (YY_G(yy_start_stack) ){ + yyfree( YY_G(yy_start_stack) YY_CALL_LAST_ARG ); + YY_G(yy_start_stack) = NULL; + } +#endif + +#ifdef YY_USES_REJECT + yyfree ( YY_G(yy_state_buf) YY_CALL_LAST_ARG); +#endif return 0; } -/* - * Internal utility routines. - */ + + +/* Internal utility routines. */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ +static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n) + { register int i; - for ( i = 0; i < n; ++i ) + for ( i = 0; i < n; ++i ) s1[i] = s2[i]; -} + } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ +static int yy_flex_strlen YYFARGS1( yyconst char *,s) + { register int n; - for ( n = 0; s[n]; ++n ) + for ( n = 0; s[n]; ++n ) ; return n; -} + } #endif -void *yyalloc (yy_size_t size ) -{ +/* You may override yyalloc by defining YY_NO_FLEX_ALLOC and linking to + * your own version */ +#ifndef YY_NO_FLEX_ALLOC +void *yyalloc YYFARGS1( yy_size_t ,size) + { return (void *) malloc( size ); -} + } +#endif -void *yyrealloc (void * ptr, yy_size_t size ) -{ +/* You may override yyrealloc by defining YY_NO_FLEX_REALLOC and linking + * to your own version. */ +#ifndef YY_NO_FLEX_REALLOC +void *yyrealloc YYFARGS2( void *,ptr, yy_size_t ,size) + { /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -4337,29 +4553,34 @@ void *yyrealloc (void * ptr, yy_size_t size ) * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); -} + } +#endif -void yyfree (void * ptr ) -{ +/* You may override yyfree by defining YY_NO_FLEX_FREE and linking to + * your own version.*/ +#ifndef YY_NO_FLEX_FREE +void yyfree YYFARGS1( void *,ptr) + { free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} + } +#endif #define YYTABLES_NAME "yytables" -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef yytext_ptr -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif -#line 821 "scan.l" +#if YY_MAIN +int main YY_PARAMS((void)); + +int main () + { + yylex(); + + return 0; + } +#endif +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ +#line 822 "scan.l" +#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */ @@ -4421,4 +4642,4 @@ void *ptr; if ( ptr ) free( ptr ); } - +#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */ @@ -35,6 +35,7 @@ #include "flexdef.h" #include "parse.h" extern bool tablesverify, tablesext; +extern int trlcontxt; /* Set in parse.y for each rule. */ #define ACTION_ECHO add_action( yytext ) #define ACTION_IFDEF(def, should_define) \ @@ -613,7 +614,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ if ( lex_compat || nmdefptr[0] == '^' || (len > 0 && nmdefptr[len - 1] == '$') - || end_is_ws) + || (end_is_ws && trlcontxt)) { /* don't use ()'s after all */ PUT_BACK_STRING((char *) nmdefptr, 0); @@ -62,7 +62,7 @@ const char *skel[] = { "#define FLEX_SCANNER", "#define YY_FLEX_MAJOR_VERSION 2", "#define YY_FLEX_MINOR_VERSION 5", - "#define YY_FLEX_SUBMINOR_VERSION 31", + "#define YY_FLEX_SUBMINOR_VERSION 33", "#if YY_FLEX_SUBMINOR_VERSION > 0", "#define FLEX_BETA", "#endif", @@ -71,6 +71,10 @@ const char *skel[] = { "m4_ifdef( [[M4_YY_IN_HEADER]], , [[m4_define([[M4_YY_NOT_IN_HEADER]], [[]])]])", "m4_ifdef( [[M4_YY_REENTRANT]], , [[m4_define([[M4_YY_NOT_REENTRANT]], [[]])]])", "", + "%# This is the m4 way to say \"(stack_used || is_reentrant)", + "m4_ifdef( [[M4_YY_STACK_USED]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]])", + "m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]])", + "", "%# Prefixes.", "%# The complexity here is necessary so that m4 preserves", "%# the argument lists to each C function.", @@ -82,7 +86,10 @@ const char *skel[] = { "", "%if-c++-only", " /* The c++ scanner is a mess. The FlexLexer.h header file relies on the", - " * following macro.", + " * following macro. This is required in order to pass the c++-multiple-scanners", + " * test in the regression suite. We get reports that it breaks inheritance.", + " * We will address this in a future release of flex, or omit the C++ scanner", + " * altogether.", " */", " #define yyFlexLexer M4_YY_PREFIX[[FlexLexer]]", "%endif", @@ -172,6 +179,7 @@ const char *skel[] = { "%endif", "", "%if-tables-serialization", + "#include <sys/types.h>", "#include <netinet/in.h>", "%endif", "/* end standard C headers. */", @@ -184,7 +192,15 @@ const char *skel[] = { "", "/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */", "", - "#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L", + "#if __STDC_VERSION__ >= 199901L", + "", + "/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,", + " * if you want the limit (max/min) macros for int types. ", + " */", + "#ifndef __STDC_LIMIT_MACROS", + "#define __STDC_LIMIT_MACROS 1", + "#endif", + "", "#include <inttypes.h>", "typedef int8_t flex_int8_t;", "typedef uint8_t flex_uint8_t;", @@ -404,19 +420,19 @@ const char *skel[] = { "%# yyscan_t yyscanner;", "%#", "%# Generate traditional function defs", - " m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)", + " m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]", " M4_YY_DECL_LAST_ARG]])", - " m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)", - " $1 $2;", + " m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]", + " $1 $2; [[\\]]", " M4_YY_DECL_LAST_ARG]])", - " m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)", - " $1 $2;", - " $3 $4;", + " m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]", + " $1 $2; [[\\]]", + " $3 $4; [[\\]]", " M4_YY_DECL_LAST_ARG]])", - " m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)", - " $1 $2;", - " $3 $4;", - " $5 $6;", + " m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]", + " $1 $2; [[\\]]", + " $3 $4; [[\\]]", + " $5 $6; [[\\]]", " M4_YY_DECL_LAST_ARG]])", "]],", "[[", @@ -469,6 +485,10 @@ const char *skel[] = { "#ifndef YY_BUF_SIZE", "#define YY_BUF_SIZE 16384", "#endif", + "", + "/* The state buf must be large enough to hold one state per character in the main buffer.", + " */", + "#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))", "]])", "", "", @@ -668,7 +688,7 @@ const char *skel[] = { "", "/* Points to current character in buffer. */", "static char *yy_c_buf_p = (char *) 0;", - "static int yy_init = 1; /* whether we need to initialize */", + "static int yy_init = 0; /* whether we need to initialize */", "static int yy_start = 0; /* start state number */", "", "/* Flag which is used to allow yywrap()'s to do buffer switches", @@ -783,6 +803,7 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_NO_UNISTD_H]],,", "[[", + "#ifndef YY_NO_UNISTD_H", "/* Special case for \"unistd.h\", since it is non-ANSI. We include it way", " * down here because we want the user's section 1 to have been scanned first.", " * The user has a chance to override it with an option.", @@ -793,6 +814,7 @@ const char *skel[] = { "%if-c++-only", "#include <unistd.h>", "%endif", + "#endif", "]])", "", "#ifndef YY_EXTRA_TYPE", @@ -867,10 +889,12 @@ const char *skel[] = { "]])", "", "", - "m4_ifdef( [[M4_YY_IN_HEADER]],", + "%if-c-only", + "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],", "[[", "static int yy_init_globals M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );", "]])", + "%endif", "", "%if-reentrant", "", @@ -1034,7 +1058,7 @@ const char *skel[] = { " [[", " static int yy_start_stack_ptr = 0;", " static int yy_start_stack_depth = 0;", - " static int *yy_start_stack = 0;", + " static int *yy_start_stack = NULL;", " ]])", "]])", "", @@ -1303,7 +1327,7 @@ const char *skel[] = { "/** A tables-reader object to maintain some state in the read. */", "struct yytbl_reader {", " FILE * fp; /**< input stream */", - " uint32_t bread; /**< bytes read since beginning of current tableset */", + " flex_uint32_t bread; /**< bytes read since beginning of current tableset */", "};", "", "%endif", @@ -1409,9 +1433,9 @@ const char *skel[] = { " yylloc = yylloc_param;", "]])", "", - " if ( YY_G(yy_init) )", + " if ( !YY_G(yy_init) )", " {", - " YY_G(yy_init) = 0;", + " YY_G(yy_init) = 1;", "", "#ifdef YY_USER_INIT", " YY_USER_INIT;", @@ -1419,8 +1443,9 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_USES_REJECT]],", "[[", + " /* Create the reject buffer large enough to save one state per allowed character. */", " if ( ! YY_G(yy_state_buf) )", - " YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_BUF_SIZE + 2 M4_YY_CALL_LAST_ARG);", + " YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE M4_YY_CALL_LAST_ARG);", "]])", "", " if ( ! YY_G(yy_start) )", @@ -1618,7 +1643,7 @@ const char *skel[] = { " yyin = arg_yyin;", " yyout = arg_yyout;", " yy_c_buf_p = 0;", - " yy_init = 1;", + " yy_init = 0;", " yy_start = 0;", " yy_flex_debug = 0;", " yylineno = 1; // this will only get updated if %option yylineno", @@ -1631,7 +1656,7 @@ const char *skel[] = { " yy_more_offset = yy_prev_more_offset = 0;", "", " yy_start_stack_ptr = yy_start_stack_depth = 0;", - " yy_start_stack = 0;", + " yy_start_stack = NULL;", "", " YY_G(yy_buffer_stack) = 0;", " YY_G(yy_buffer_stack_top) = 0;", @@ -1640,7 +1665,7 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_USES_REJECT]],", "[[", - " yy_state_buf = new yy_state_type[YY_BUF_SIZE + 2];", + " yy_state_buf = new yy_state_type[YY_STATE_BUF_SIZE];", "]],", "[[", " yy_state_buf = 0;", @@ -1764,7 +1789,7 @@ const char *skel[] = { "", " else", " {", - " size_t num_to_read =", + " int num_to_read =", " YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;", "", " while ( num_to_read <= 0 )", @@ -1887,7 +1912,7 @@ const char *skel[] = { "%endif", "{", " register int yy_is_jam;", - " M4_YY_DECL_GUTS_VAR();", + " M4_YY_DECL_GUTS_VAR(); /* This var may be unused depending upon options. */", "%% [17.0] code to find the next state, and perhaps do backing up, goes here", "", " return yy_is_jam ? 0 : yy_current_state;", @@ -2454,11 +2479,11 @@ const char *skel[] = { " * @note If you want to scan bytes that may contain NUL values, then use", " * yy_scan_bytes() instead.", " */", - "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)", + "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *, yystr)", "{", " m4_dnl M4_YY_DECL_GUTS_VAR();", "", - " return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);", + " return yy_scan_bytes( yystr, strlen(yystr) M4_YY_CALL_LAST_ARG);", "}", "%endif", "]])", @@ -2474,7 +2499,7 @@ const char *skel[] = { " * M4_YY_DOC_PARAM", " * @return the newly allocated buffer state object.", " */", - "YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,bytes, int ,len)", + "YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, int ,_yybytes_len)", "{", " YY_BUFFER_STATE b;", " char *buf;", @@ -2483,15 +2508,15 @@ const char *skel[] = { " m4_dnl M4_YY_DECL_GUTS_VAR();", "", " /* Get memory for full buffer, including space for trailing EOB's. */", - " n = len + 2;", + " n = _yybytes_len + 2;", " buf = (char *) yyalloc( n M4_YY_CALL_LAST_ARG );", " if ( ! buf )", " YY_FATAL_ERROR( \"out of dynamic memory in yy_scan_bytes()\" );", "", - " for ( i = 0; i < len; ++i )", - " buf[i] = bytes[i];", + " for ( i = 0; i < _yybytes_len; ++i )", + " buf[i] = yybytes[i];", "", - " buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;", + " buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;", "", " b = yy_scan_buffer( buf, n M4_YY_CALL_LAST_ARG);", " if ( ! b )", @@ -2869,11 +2894,48 @@ const char *skel[] = { "%endif", "", "", + "/* User-visible API */", + "", + "/* yylex_init is special because it creates the scanner itself, so it is", + " * the ONLY reentrant function that doesn't take the scanner as the last argument.", + " * That's why we explicitly handle the declaration, instead of using our macros.", + " */", + "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],", + "[[", + "int yylex_init( ptr_yy_globals )", + " yyscan_t* ptr_yy_globals;", + "]],", + "[[", + "int yylex_init(yyscan_t* ptr_yy_globals)", + "]])", + "{", + " if (ptr_yy_globals == NULL){", + " errno = EINVAL;", + " return 1;", + " }", + "", + " *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );", + "", + " if (*ptr_yy_globals == NULL){", + " errno = ENOMEM;", + " return 1;", + " }", + "", + " /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */", + " memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));", + "", + " return yy_init_globals ( *ptr_yy_globals );", + "}", + "", + "%endif", + "", + "%if-c-only", "static int yy_init_globals YYFARGS0(void)", "{", " M4_YY_DECL_GUTS_VAR();", " /* Initialization is the same as for the non-reentrant scanner.", - " This function is called once per scanner lifetime. */", + " * This function is called from yylex_destroy(), so don't allocate here.", + " */", "", "m4_ifdef( [[M4_YY_USE_LINENO]],", "[[", @@ -2887,11 +2949,15 @@ const char *skel[] = { " YY_G(yy_buffer_stack_top) = 0;", " YY_G(yy_buffer_stack_max) = 0;", " YY_G(yy_c_buf_p) = (char *) 0;", - " YY_G(yy_init) = 1;", + " YY_G(yy_init) = 0;", " YY_G(yy_start) = 0;", + "", + "m4_ifdef( [[M4_YY_HAS_START_STACK_VARS]],", + "[[", " YY_G(yy_start_stack_ptr) = 0;", " YY_G(yy_start_stack_depth) = 0;", - " YY_G(yy_start_stack) = (int *) 0;", + " YY_G(yy_start_stack) = NULL;", + "]])", "", "m4_ifdef( [[M4_YY_USES_REJECT]],", "[[", @@ -2922,41 +2988,9 @@ const char *skel[] = { " */", " return 0;", "}", - "", - "/* User-visible API */", - "", - "/* yylex_init is special because it creates the scanner itself, so it is", - " * the ONLY reentrant function that doesn't take the scanner as the last argument.", - " * That's why we explicitly handle the declaration, instead of using our macros.", - " */", - "m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],", - "[[", - "int yylex_init( ptr_yy_globals )", - " yyscan_t* ptr_yy_globals;", - "]],", - "[[", - "int yylex_init(yyscan_t* ptr_yy_globals)", - "]])", - "{", - " if (ptr_yy_globals == NULL){", - " errno = EINVAL;", - " return 1;", - " }", - "", - " *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );", - "", - " if (*ptr_yy_globals == NULL){", - " errno = ENOMEM;", - " return 1;", - " }", - "", - " memset(*ptr_yy_globals,0,sizeof(struct yyguts_t));", - "", - " return yy_init_globals ( *ptr_yy_globals );", - "}", - "", "%endif", "", + "", "%if-c-only SNIP! this currently causes conflicts with the c++ scanner", "/* yylex_destroy is for both reentrant and non-reentrant scanners. */", "int yylex_destroy YYFARGS0(void)", @@ -2974,10 +3008,7 @@ const char *skel[] = { " yyfree(YY_G(yy_buffer_stack) M4_YY_CALL_LAST_ARG);", " YY_G(yy_buffer_stack) = NULL;", "", - "%# This is the m4 way to say \"if (stack_used || is_reentrant){ destroy_stack }\"", - "m4_ifdef( [[M4_YY_STACK_USED]], [[m4_define([[M4_YY_DESTROY_START_STACK]])]])", - "m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_DESTROY_START_STACK]])]])", - "m4_ifdef( [[M4_YY_DESTROY_START_STACK]],", + "m4_ifdef( [[M4_YY_HAS_START_STACK_VARS]],", "[[", " /* Destroy the start condition stack. */", " yyfree( YY_G(yy_start_stack) M4_YY_CALL_LAST_ARG );", @@ -2987,11 +3018,17 @@ const char *skel[] = { "m4_ifdef( [[M4_YY_USES_REJECT]],", "[[", " yyfree ( YY_G(yy_state_buf) M4_YY_CALL_LAST_ARG);", + " YY_G(yy_state_buf) = NULL;", "]])", "", + " /* Reset the globals. This is important in a non-reentrant scanner so the next time", + " * yylex() is called, initialization will occur. */", + " yy_init_globals( M4_YY_CALL_ONLY_ARG);", + "", "%if-reentrant", " /* Destroy the main struct (reentrant only). */", " yyfree ( yyscanner M4_YY_CALL_LAST_ARG );", + " yyscanner = NULL;", "%endif", " return 0;", "}", @@ -3011,7 +3048,6 @@ const char *skel[] = { "static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n)", "{", " register int i;", - " M4_YY_DECL_GUTS_VAR();", " for ( i = 0; i < n; ++i )", " s1[i] = s2[i];", "}", @@ -3024,7 +3060,6 @@ const char *skel[] = { "static int yy_flex_strlen YYFARGS1( yyconst char *,s)", "{", " register int n;", - " M4_YY_DECL_GUTS_VAR();", " for ( n = 0; s[n]; ++n )", " ;", "", @@ -3140,35 +3175,35 @@ const char *skel[] = { "static int yytbl_read8 (void *v, struct yytbl_reader * rd)", "{", " errno = 0;", - " if (fread (v, sizeof (uint8_t), 1, rd->fp) != 1){", + " if (fread (v, sizeof (flex_uint8_t), 1, rd->fp) != 1){", " errno = EIO;", " return -1;", " }", - " rd->bread += sizeof(uint8_t);", + " rd->bread += sizeof(flex_uint8_t);", " return 0;", "}", "", "static int yytbl_read16 (void *v, struct yytbl_reader * rd)", "{", " errno = 0;", - " if (fread (v, sizeof (uint16_t), 1, rd->fp) != 1){", + " if (fread (v, sizeof (flex_uint16_t), 1, rd->fp) != 1){", " errno = EIO;", " return -1;", " }", - " *((uint16_t *) v) = ntohs (*((uint16_t *) v));", - " rd->bread += sizeof(uint16_t);", + " *((flex_uint16_t *) v) = ntohs (*((flex_uint16_t *) v));", + " rd->bread += sizeof(flex_uint16_t);", " return 0;", "}", "", "static int yytbl_read32 (void *v, struct yytbl_reader * rd)", "{", " errno = 0;", - " if (fread (v, sizeof (uint32_t), 1, rd->fp) != 1){", + " if (fread (v, sizeof (flex_uint32_t), 1, rd->fp) != 1){", " errno = EIO;", " return -1;", " }", - " *((uint32_t *) v) = ntohl (*((uint32_t *) v));", - " rd->bread += sizeof(uint32_t);", + " *((flex_uint32_t *) v) = ntohl (*((flex_uint32_t *) v));", + " rd->bread += sizeof(flex_uint32_t);", " return 0;", "}", "", @@ -3301,22 +3336,22 @@ const char *skel[] = { " * YYTD_STRUCT for the yy_transition array.", " */", " for (j = 0; j < inner_loop_count; j++, i++) {", - " int32_t t32;", + " flex_int32_t t32;", "", " /* read into t32 no matter what the real size is. */", " {", - " int16_t t16;", - " int8_t t8;", + " flex_int16_t t16;", + " flex_int8_t t8;", "", " switch (YYTDFLAGS2BYTES (td.td_flags)) {", - " case sizeof (int32_t):", + " case sizeof (flex_int32_t):", " rv = yytbl_read32 (&t32, rd);", " break;", - " case sizeof (int16_t):", + " case sizeof (flex_int16_t):", " rv = yytbl_read16 (&t16, rd);", " t32 = t16;", " break;", - " case sizeof (int8_t):", + " case sizeof (flex_int8_t):", " rv = yytbl_read8 (&t8, rd);", " t32 = t8;", " break;", @@ -3338,26 +3373,26 @@ const char *skel[] = { " : &(((struct yy_trans_info *) p)->yy_nxt);", "", " switch (dmap->dm_sz) {", - " case sizeof (int32_t):", + " case sizeof (flex_int32_t):", " if (M4_YY_TABLES_VERIFY){", - " if( ((int32_t *) v)[0] != (int32_t) t32)", - " yy_fatal_error(\"tables verification failed at YYTD_STRUCT int32_t\" M4_YY_CALL_LAST_ARG);", + " if( ((flex_int32_t *) v)[0] != (flex_int32_t) t32)", + " yy_fatal_error(\"tables verification failed at YYTD_STRUCT flex_int32_t\" M4_YY_CALL_LAST_ARG);", " }else", - " ((int32_t *) v)[0] = (int32_t) t32;", + " ((flex_int32_t *) v)[0] = (flex_int32_t) t32;", " break;", - " case sizeof (int16_t):", + " case sizeof (flex_int16_t):", " if (M4_YY_TABLES_VERIFY ){", - " if(((int16_t *) v)[0] != (int16_t) t32)", - " yy_fatal_error(\"tables verification failed at YYTD_STRUCT int16_t\" M4_YY_CALL_LAST_ARG);", + " if(((flex_int16_t *) v)[0] != (flex_int16_t) t32)", + " yy_fatal_error(\"tables verification failed at YYTD_STRUCT flex_int16_t\" M4_YY_CALL_LAST_ARG);", " }else", - " ((int16_t *) v)[0] = (int16_t) t32;", + " ((flex_int16_t *) v)[0] = (flex_int16_t) t32;", " break;", - " case sizeof(int8_t):", + " case sizeof(flex_int8_t):", " if (M4_YY_TABLES_VERIFY ){", - " if( ((int8_t *) v)[0] != (int8_t) t32)", - " yy_fatal_error(\"tables verification failed at YYTD_STRUCT int8_t\" M4_YY_CALL_LAST_ARG);", + " if( ((flex_int8_t *) v)[0] != (flex_int8_t) t32)", + " yy_fatal_error(\"tables verification failed at YYTD_STRUCT flex_int8_t\" M4_YY_CALL_LAST_ARG);", " }else", - " ((int8_t *) v)[0] = (int8_t) t32;", + " ((flex_int8_t *) v)[0] = (flex_int8_t) t32;", " break;", " default:", " yy_fatal_error(\"invalid dmap->dm_sz for struct\" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);", @@ -3395,29 +3430,29 @@ const char *skel[] = { " else {", " /* t32 is a plain int. copy data, then incrememnt p. */", " switch (dmap->dm_sz) {", - " case sizeof (int32_t):", + " case sizeof (flex_int32_t):", " if(M4_YY_TABLES_VERIFY ){", - " if( ((int32_t *) p)[0] != (int32_t) t32)", - " yy_fatal_error(\"tables verification failed at int32_t\" M4_YY_CALL_LAST_ARG);", + " if( ((flex_int32_t *) p)[0] != (flex_int32_t) t32)", + " yy_fatal_error(\"tables verification failed at flex_int32_t\" M4_YY_CALL_LAST_ARG);", " }else", - " ((int32_t *) p)[0] = (int32_t) t32;", - " p = ((int32_t *) p) + 1;", + " ((flex_int32_t *) p)[0] = (flex_int32_t) t32;", + " p = ((flex_int32_t *) p) + 1;", " break;", - " case sizeof (int16_t):", + " case sizeof (flex_int16_t):", " if(M4_YY_TABLES_VERIFY ){", - " if( ((int16_t *) p)[0] != (int16_t) t32)", - " yy_fatal_error(\"tables verification failed at int16_t\" M4_YY_CALL_LAST_ARG);", + " if( ((flex_int16_t *) p)[0] != (flex_int16_t) t32)", + " yy_fatal_error(\"tables verification failed at flex_int16_t\" M4_YY_CALL_LAST_ARG);", " }else", - " ((int16_t *) p)[0] = (int16_t) t32;", - " p = ((int16_t *) p) + 1;", + " ((flex_int16_t *) p)[0] = (flex_int16_t) t32;", + " p = ((flex_int16_t *) p) + 1;", " break;", - " case sizeof (int8_t):", + " case sizeof (flex_int8_t):", " if(M4_YY_TABLES_VERIFY ){", - " if( ((int8_t *) p)[0] != (int8_t) t32)", - " yy_fatal_error(\"tables verification failed at int8_t\" M4_YY_CALL_LAST_ARG);", + " if( ((flex_int8_t *) p)[0] != (flex_int8_t) t32)", + " yy_fatal_error(\"tables verification failed at flex_int8_t\" M4_YY_CALL_LAST_ARG);", " }else", - " ((int8_t *) p)[0] = (int8_t) t32;", - " p = ((int8_t *) p) + 1;", + " ((flex_int8_t *) p)[0] = (flex_int8_t) t32;", + " p = ((flex_int8_t *) p) + 1;", " break;", " default:", " yy_fatal_error(\"invalid dmap->dm_sz for plain int\" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);", @@ -3433,7 +3468,7 @@ const char *skel[] = { " int pad;", " pad = yypad64(rd->bread);", " while(--pad >= 0){", - " int8_t t8;", + " flex_int8_t t8;", " if(yytbl_read8(&t8,rd) != 0)", " return -1;", " }", @@ -3548,17 +3583,19 @@ const char *skel[] = { "]])", "", "%ok-for-header", + "m4_ifdef( [[M4_YY_IN_HEADER]],", + "[[", "#undef YY_NEW_FILE", "#undef YY_FLUSH_BUFFER", "#undef yy_set_bol", "#undef yy_new_buffer", "#undef yy_set_interactive", - "#undef yytext_ptr", "#undef YY_DO_BEFORE_ACTION", "", "#ifdef YY_DECL_IS_OURS", "#undef YY_DECL_IS_OURS", "#undef YY_DECL", "#endif", + "]])", 0 }; diff --git a/tests/Makefile.am b/tests/Makefile.am index f3b78ef..ef8b473 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,8 @@ dist_noinst_SCRIPTS = \ create-test DIST_SUBDIRS = \ + test-rescan-r \ + test-rescan-nr \ test-basic-nr \ test-basic-r \ test-bison-yylloc \ @@ -67,6 +69,8 @@ DIST_SUBDIRS = \ test-table-opts SUBDIRS = \ + test-rescan-r \ + test-rescan-nr \ test-basic-nr \ test-basic-r \ test-bison-yylloc \ diff --git a/tests/Makefile.in b/tests/Makefile.in index b14aa23..e02f649 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -170,6 +172,8 @@ dist_noinst_SCRIPTS = \ DIST_SUBDIRS = \ + test-rescan-r \ + test-rescan-nr \ test-basic-nr \ test-basic-r \ test-bison-yylloc \ @@ -212,6 +216,8 @@ DIST_SUBDIRS = \ SUBDIRS = \ + test-rescan-r \ + test-rescan-nr \ test-basic-nr \ test-basic-r \ test-bison-yylloc \ @@ -252,6 +258,7 @@ SUBDIRS = \ test-table-opts subdir = tests +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -355,9 +362,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -399,9 +412,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ diff --git a/tests/TEMPLATE/Makefile.in b/tests/TEMPLATE/Makefile.in index a3ede97..2579993 100644 --- a/tests/TEMPLATE/Makefile.in +++ b/tests/TEMPLATE/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -176,6 +178,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = TEMPLATE subdir = tests/TEMPLATE +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -204,9 +207,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -232,7 +237,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-array-nr/Makefile.in b/tests/test-array-nr/Makefile.in index 8090100..31c0f6f 100644 --- a/tests/test-array-nr/Makefile.in +++ b/tests/test-array-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-array-nr subdir = tests/test-array-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-array-r/Makefile.in b/tests/test-array-r/Makefile.in index 0800f37..2b34f7b 100644 --- a/tests/test-array-r/Makefile.in +++ b/tests/test-array-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-array-r subdir = tests/test-array-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-basic-nr/Makefile.in b/tests/test-basic-nr/Makefile.in index ad73ad5..515c13f 100644 --- a/tests/test-basic-nr/Makefile.in +++ b/tests/test-basic-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-basic-nr subdir = tests/test-basic-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-basic-r/Makefile.in b/tests/test-basic-r/Makefile.in index 2ab47f4..2c369de 100644 --- a/tests/test-basic-r/Makefile.in +++ b/tests/test-basic-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-basic-r subdir = tests/test-basic-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-bison-nr/Makefile.in b/tests/test-bison-nr/Makefile.in index 2b9fd98..c8b97a0 100644 --- a/tests/test-bison-nr/Makefile.in +++ b/tests/test-bison-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -175,6 +177,7 @@ YFLAGS = --defines --output=parser.c --name-prefix="test" testname = test-bison-nr subdir = tests/test-bison-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,9 +206,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -231,7 +236,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-bison-yylloc/Makefile.in b/tests/test-bison-yylloc/Makefile.in index c4bda5a..77d2705 100644 --- a/tests/test-bison-yylloc/Makefile.in +++ b/tests/test-bison-yylloc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -175,6 +177,7 @@ YFLAGS = --defines --output=parser.c --name-prefix="test" testname = test-bison-yylloc subdir = tests/test-bison-yylloc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,9 +206,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -231,7 +236,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-bison-yylval/Makefile.in b/tests/test-bison-yylval/Makefile.in index c94a1ed..29e9e4f 100644 --- a/tests/test-bison-yylval/Makefile.in +++ b/tests/test-bison-yylval/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -175,6 +177,7 @@ YFLAGS = --defines --output=parser.c --name-prefix="test" testname = test-bison-yylval subdir = tests/test-bison-yylval +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,9 +206,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -231,7 +236,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-c++-basic/Makefile.in b/tests/test-c++-basic/Makefile.in index 92b5b66..8c13b22 100644 --- a/tests/test-c++-basic/Makefile.in +++ b/tests/test-c++-basic/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ LFLAGS = -+ #LDFLAGS = testname = test-c++-basic subdir = tests/test-c++-basic +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-c++-multiple-scanners/Makefile.in b/tests/test-c++-multiple-scanners/Makefile.in index 289ea56..1a1ef13 100644 --- a/tests/test-c++-multiple-scanners/Makefile.in +++ b/tests/test-c++-multiple-scanners/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-c++-multiple-scanners subdir = tests/test-c++-multiple-scanners +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-c-cpp-nr/Makefile.in b/tests/test-c-cpp-nr/Makefile.in index a8b7da8..37fb0a7 100644 --- a/tests/test-c-cpp-nr/Makefile.in +++ b/tests/test-c-cpp-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-c-cpp-nr subdir = tests/test-c-cpp-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-c-cpp-r/Makefile.in b/tests/test-c-cpp-r/Makefile.in index a74cf9b..d4a870d 100644 --- a/tests/test-c-cpp-r/Makefile.in +++ b/tests/test-c-cpp-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-c-cpp-r subdir = tests/test-c-cpp-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-debug-nr/Makefile.in b/tests/test-debug-nr/Makefile.in index c42d2eb..20e2a54 100644 --- a/tests/test-debug-nr/Makefile.in +++ b/tests/test-debug-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -172,6 +174,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #LDFLAGS = $(top_srcdir)/libfl.a testname = test-debug-nr subdir = tests/test-debug-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -200,9 +203,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -228,7 +233,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-debug-r/Makefile.in b/tests/test-debug-r/Makefile.in index 2fcec8d..711853e 100644 --- a/tests/test-debug-r/Makefile.in +++ b/tests/test-debug-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -172,6 +174,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #LDFLAGS = $(top_srcdir)/libfl.a testname = test-debug-r subdir = tests/test-debug-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -200,9 +203,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -228,7 +233,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-header-nr/Makefile.in b/tests/test-header-nr/Makefile.in index d7aa724..8ba266c 100644 --- a/tests/test-header-nr/Makefile.in +++ b/tests/test-header-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -175,6 +177,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #YFLAGS = --defines --output=parser.c testname = test-header-nr subdir = tests/test-header-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,9 +206,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -231,7 +236,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-header-r/Makefile.in b/tests/test-header-r/Makefile.in index 91bb2fa..976c38f 100644 --- a/tests/test-header-r/Makefile.in +++ b/tests/test-header-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -176,6 +178,7 @@ LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c testname = test-header-r subdir = tests/test-header-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -204,9 +207,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -232,7 +237,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-include-by-buffer/Makefile.in b/tests/test-include-by-buffer/Makefile.in index dc8301a..f829ede 100644 --- a/tests/test-include-by-buffer/Makefile.in +++ b/tests/test-include-by-buffer/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-include-by-buffer subdir = tests/test-include-by-buffer +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-include-by-push/Makefile.in b/tests/test-include-by-push/Makefile.in index cdbbe3f..0bfd5a4 100644 --- a/tests/test-include-by-push/Makefile.in +++ b/tests/test-include-by-push/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-include-by-push subdir = tests/test-include-by-push +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-include-by-reentrant/Makefile.in b/tests/test-include-by-reentrant/Makefile.in index 8a20111..39376b1 100644 --- a/tests/test-include-by-reentrant/Makefile.in +++ b/tests/test-include-by-reentrant/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-include-by-reentrant subdir = tests/test-include-by-reentrant +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-linedir-r/Makefile.in b/tests/test-linedir-r/Makefile.in index 27ead4d..c712342 100644 --- a/tests/test-linedir-r/Makefile.in +++ b/tests/test-linedir-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -176,6 +178,7 @@ LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c testname = test-linedir-r subdir = tests/test-linedir-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -204,9 +207,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -232,7 +237,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-lineno-nr/Makefile.in b/tests/test-lineno-nr/Makefile.in index e5fa855..989d626 100644 --- a/tests/test-lineno-nr/Makefile.in +++ b/tests/test-lineno-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -171,6 +173,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) testname = test-lineno-nr subdir = tests/test-lineno-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -199,9 +202,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -227,7 +232,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-lineno-r/Makefile.in b/tests/test-lineno-r/Makefile.in index 7c0835c..377fe4b 100644 --- a/tests/test-lineno-r/Makefile.in +++ b/tests/test-lineno-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -171,6 +173,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) testname = test-lineno-r subdir = tests/test-lineno-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -199,9 +202,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -227,7 +232,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-mem-nr/Makefile.in b/tests/test-mem-nr/Makefile.in index bb25883..52d7c6e 100644 --- a/tests/test-mem-nr/Makefile.in +++ b/tests/test-mem-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -172,6 +174,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #LDFLAGS = $(top_srcdir)/libfl.a testname = test-mem-nr subdir = tests/test-mem-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -200,9 +203,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -228,7 +233,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-mem-nr/scanner.l b/tests/test-mem-nr/scanner.l index 42a2355..d03996a 100644 --- a/tests/test-mem-nr/scanner.l +++ b/tests/test-mem-nr/scanner.l @@ -88,7 +88,6 @@ static void dump_mem(FILE* fp){ void * yyalloc(yy_size_t n) { void * p; - struct memsz * old; int i; total_mem += n; diff --git a/tests/test-mem-r/Makefile.in b/tests/test-mem-r/Makefile.in index 4508ce7..46c30a5 100644 --- a/tests/test-mem-r/Makefile.in +++ b/tests/test-mem-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -172,6 +174,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #LDFLAGS = $(top_srcdir)/libfl.a testname = test-mem-r subdir = tests/test-mem-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -200,9 +203,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -228,7 +233,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-mem-r/scanner.l b/tests/test-mem-r/scanner.l index c478edf..ba6e0b5 100644 --- a/tests/test-mem-r/scanner.l +++ b/tests/test-mem-r/scanner.l @@ -88,7 +88,6 @@ static void dump_mem(FILE* fp){ void * yyalloc(yy_size_t n , void* yyscanner) { void * p; - struct memsz * old; int i; total_mem += n; diff --git a/tests/test-multiple-scanners-nr/Makefile.in b/tests/test-multiple-scanners-nr/Makefile.in index 32ee0e3..c307c3a 100644 --- a/tests/test-multiple-scanners-nr/Makefile.in +++ b/tests/test-multiple-scanners-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -175,6 +177,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #YFLAGS = --defines --output=parser.c testname = test-multiple-scanners-nr subdir = tests/test-multiple-scanners-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,9 +206,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -231,7 +236,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-multiple-scanners-r/Makefile.in b/tests/test-multiple-scanners-r/Makefile.in index 4641938..6d52d08 100644 --- a/tests/test-multiple-scanners-r/Makefile.in +++ b/tests/test-multiple-scanners-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -178,6 +180,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) #YFLAGS = --defines --output=parser.c testname = test-multiple-scanners-r subdir = tests/test-multiple-scanners-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -206,9 +209,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -234,7 +239,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-noansi-nr/Makefile.in b/tests/test-noansi-nr/Makefile.in index 3635a7f..c7f9afa 100644 --- a/tests/test-noansi-nr/Makefile.in +++ b/tests/test-noansi-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-noansi-nr subdir = tests/test-noansi-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-noansi-r/Makefile.in b/tests/test-noansi-r/Makefile.in index ae3f896..fc3b019 100644 --- a/tests/test-noansi-r/Makefile.in +++ b/tests/test-noansi-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-noansi-r subdir = tests/test-noansi-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-posix/Makefile.in b/tests/test-posix/Makefile.in index b002c5f..aa94e92 100644 --- a/tests/test-posix/Makefile.in +++ b/tests/test-posix/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #LFLAGS = --header="scanner.h" testname = test-posix subdir = tests/test-posix +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-posixly-correct/Makefile.in b/tests/test-posixly-correct/Makefile.in index d545273..2e9b4d1 100644 --- a/tests/test-posixly-correct/Makefile.in +++ b/tests/test-posixly-correct/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #LFLAGS = --header="scanner.h" testname = test-posixly-correct subdir = tests/test-posixly-correct +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-prefix-nr/Makefile.in b/tests/test-prefix-nr/Makefile.in index 5fb50dd..eb35737 100644 --- a/tests/test-prefix-nr/Makefile.in +++ b/tests/test-prefix-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-prefix-nr subdir = tests/test-prefix-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-prefix-r/Makefile.in b/tests/test-prefix-r/Makefile.in index d110331..3033f11 100644 --- a/tests/test-prefix-r/Makefile.in +++ b/tests/test-prefix-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-prefix-r subdir = tests/test-prefix-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-pthread/Makefile.in b/tests/test-pthread/Makefile.in index 90ab314..02596d0 100644 --- a/tests/test-pthread/Makefile.in +++ b/tests/test-pthread/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -173,6 +175,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-pthread subdir = tests/test-pthread +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -201,9 +204,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -229,7 +234,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-reject/Makefile.in b/tests/test-reject/Makefile.in index 9bd8f66..e58032d 100644 --- a/tests/test-reject/Makefile.in +++ b/tests/test-reject/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -176,6 +178,7 @@ tests = test-reject-nr$(EXEEXT) test-reject-r$(EXEEXT) \ testname = test-reject subdir = tests/test-reject +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -204,9 +207,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -232,7 +237,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-rescan-nr/Makefile.am b/tests/test-rescan-nr/Makefile.am new file mode 100644 index 0000000..326c582 --- /dev/null +++ b/tests/test-rescan-nr/Makefile.am @@ -0,0 +1,47 @@ +# This file is part of flex. + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: + +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. + +# Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. + +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE. + +FLEX = $(top_builddir)/flex + +builddir = @builddir@ + +EXTRA_DIST = scanner.l test.input +CLEANFILES = scanner.c scanner.h test-rescan-nr OUTPUT $(OBJS) +OBJS = scanner.o + +AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) +#LDFLAGS = $(top_srcdir)/libfl.a +#LFLAGS = --header="scanner.h" +#YFLAGS = --defines --output=parser.c + +testname = test-rescan-nr + +scanner.c: $(srcdir)/scanner.l + $(FLEX) $(LFLAGS) $< + +$(testname)$(EXEEXT): $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) + +test: $(testname)$(EXEEXT) + ./$(testname)$(EXEEXT) $(srcdir)/test.input + +.c.o: + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-rescan-nr/Makefile.in b/tests/test-rescan-nr/Makefile.in new file mode 100644 index 0000000..7ed4a96 --- /dev/null +++ b/tests/test-rescan-nr/Makefile.in @@ -0,0 +1,332 @@ +# Makefile.in generated by automake 1.7.5 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is part of flex. + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: + +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. + +# Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. + +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE. + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GMSGFMT = @GMSGFMT@ +HELP2MAN = @HELP2MAN@ +INDENT = @INDENT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ + +FLEX = $(top_builddir)/flex + +builddir = @builddir@ + +EXTRA_DIST = scanner.l test.input +CLEANFILES = scanner.c scanner.h test-rescan-nr OUTPUT $(OBJS) +OBJS = scanner.o + +AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) + +#LDFLAGS = $(top_srcdir)/libfl.a +#LFLAGS = --header="scanner.h" +#YFLAGS = --defines --output=parser.c +testname = test-rescan-nr +subdir = tests/test-rescan-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/test-rescan-nr/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile + +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +scanner.c: $(srcdir)/scanner.l + $(FLEX) $(LFLAGS) $< + +$(testname)$(EXEEXT): $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) + +test: $(testname)$(EXEEXT) + ./$(testname)$(EXEEXT) $(srcdir)/test.input + +.c.o: + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/test-rescan-nr/scanner.l b/tests/test-rescan-nr/scanner.l new file mode 100644 index 0000000..a4ac521 --- /dev/null +++ b/tests/test-rescan-nr/scanner.l @@ -0,0 +1,70 @@ +/* + * This file is part of flex. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + +%{ +/* A template scanner file to build "scanner.c". */ +#include <stdio.h> +#include <stdlib.h> +%} + +%option 8bit outfile="scanner.c" prefix="test" +%option nounput nomain noyywrap +%option warn stack never-interactive +%x STATE_1 + +%% + +<INITIAL>{ +0 yy_push_state (STATE_1); +.|\n return 1; +} +<STATE_1>{ +1 yy_pop_state(); +.|\n return yy_top_state() + 1; +} + +%% + +int +main (int argc, char* const argv[]) +{ + FILE* fp; + int i; + + if ((fp = fopen(argv[1],"r")) == NULL){ + perror("Failed to open input file."); + return 1; + } + + yyset_out ( stdout); + + for (i=0; i < 4; ++i){ + rewind(fp); + yyset_in ( fp); + while( yylex() ) + ; + yylex_destroy(); + } + printf("TEST RETURNING OK.\n"); + return 0; +} diff --git a/tests/test-rescan-nr/test.input b/tests/test-rescan-nr/test.input new file mode 100644 index 0000000..7288a40 --- /dev/null +++ b/tests/test-rescan-nr/test.input @@ -0,0 +1,2 @@ +0000 foo 1111 foo 0000 bar +0000 foo 1111 foo 0000 bar diff --git a/tests/test-rescan-r/Makefile.am b/tests/test-rescan-r/Makefile.am new file mode 100644 index 0000000..9ff7735 --- /dev/null +++ b/tests/test-rescan-r/Makefile.am @@ -0,0 +1,47 @@ +# This file is part of flex. + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: + +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. + +# Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. + +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE. + +FLEX = $(top_builddir)/flex + +builddir = @builddir@ + +EXTRA_DIST = scanner.l test.input +CLEANFILES = scanner.c scanner.h test-rescan-r OUTPUT $(OBJS) +OBJS = scanner.o # parser.o + +AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) +#LDFLAGS = $(top_srcdir)/libfl.a +#LFLAGS = --header="scanner.h" +#YFLAGS = --defines --output=parser.c + +testname = test-rescan-r + +scanner.c: $(srcdir)/scanner.l + $(FLEX) $(LFLAGS) $< + +$(testname)$(EXEEXT): $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) + +test: $(testname)$(EXEEXT) + ./$(testname)$(EXEEXT) $(srcdir)/test.input + +.c.o: + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-rescan-r/Makefile.in b/tests/test-rescan-r/Makefile.in new file mode 100644 index 0000000..d17ae0b --- /dev/null +++ b/tests/test-rescan-r/Makefile.in @@ -0,0 +1,332 @@ +# Makefile.in generated by automake 1.7.5 from Makefile.am. +# @configure_input@ + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is part of flex. + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: + +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. + +# Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. + +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE. + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = @host@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GMSGFMT = @GMSGFMT@ +HELP2MAN = @HELP2MAN@ +INDENT = @INDENT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ + +FLEX = $(top_builddir)/flex + +builddir = @builddir@ + +EXTRA_DIST = scanner.l test.input +CLEANFILES = scanner.c scanner.h test-rescan-r OUTPUT $(OBJS) +OBJS = scanner.o # parser.o + +AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) + +#LDFLAGS = $(top_srcdir)/libfl.a +#LFLAGS = --header="scanner.h" +#YFLAGS = --defines --output=parser.c +testname = test-rescan-r +subdir = tests/test-rescan-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/test-rescan-r/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile + +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +scanner.c: $(srcdir)/scanner.l + $(FLEX) $(LFLAGS) $< + +$(testname)$(EXEEXT): $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) + +test: $(testname)$(EXEEXT) + ./$(testname)$(EXEEXT) $(srcdir)/test.input + +.c.o: + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/test-rescan-r/scanner.l b/tests/test-rescan-r/scanner.l new file mode 100644 index 0000000..3357ce8 --- /dev/null +++ b/tests/test-rescan-r/scanner.l @@ -0,0 +1,95 @@ +/* + * This file is part of flex. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + +%{ +/* A template scanner file to build "scanner.c". */ +#include <stdio.h> +#include <stdlib.h> +%} + +%option 8bit outfile="scanner.c" prefix="test" +%option nounput nomain noyywrap reentrant +%option warn stack never-interactive +%x STATE_1 + +%% + +<INITIAL>{ +0 yy_push_state (STATE_1, yyscanner); +.|\n return 1; +} +<STATE_1>{ +1 yy_pop_state(yyscanner); +.|\n return yy_top_state(yyscanner) + 1; +} + +%% + +int +main (int argc, char* const argv[]) +{ + FILE* fp; + int i; + yyscan_t yyscanner; + + if ((fp = fopen(argv[1],"r")) == NULL){ + perror("Failed to open input file."); + return 1; + } + + printf("Test 1: Reusing same scanner.\n"); + yylex_init( &yyscanner ); + yyset_out ( stdout, yyscanner); + + for (i=0; i < 4; ++i){ + + rewind(fp); + yyset_in ( fp, yyscanner); + + while( yylex(yyscanner) ) + ; + } + yylex_destroy( yyscanner ); + printf("Test 1 OK\n\n"); + + printf("Test 2: Rescanning with new scanner each time.\n"); + + memset(&yyscanner,0,sizeof(yyscanner)); // Just to be clean about it. + + for (i=0; i < 4; ++i){ + yyscan_t s; + yylex_init( &s ); + yyset_out ( stdout, s); + rewind(fp); + yyset_in ( fp, s); + + while( yylex(s) ) + ; + yylex_destroy( s ); + } + printf("Test 2 OK\n\n"); + + + printf("TEST RETURNING OK.\n"); + return 0; +} diff --git a/tests/test-rescan-r/test.input b/tests/test-rescan-r/test.input new file mode 100644 index 0000000..7288a40 --- /dev/null +++ b/tests/test-rescan-r/test.input @@ -0,0 +1,2 @@ +0000 foo 1111 foo 0000 bar +0000 foo 1111 foo 0000 bar diff --git a/tests/test-string-nr/Makefile.in b/tests/test-string-nr/Makefile.in index afc0fbb..aef8ef7 100644 --- a/tests/test-string-nr/Makefile.in +++ b/tests/test-string-nr/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-string-nr subdir = tests/test-string-nr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-string-r/Makefile.in b/tests/test-string-r/Makefile.in index 3bc7cae..3e9da61 100644 --- a/tests/test-string-r/Makefile.in +++ b/tests/test-string-r/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-string-r subdir = tests/test-string-r +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-table-opts/Makefile.in b/tests/test-table-opts/Makefile.in index c15ca8f..d5e9538 100644 --- a/tests/test-table-opts/Makefile.in +++ b/tests/test-table-opts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -105,6 +105,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -141,6 +142,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -209,6 +211,7 @@ CLEANFILES = scanner.c OUTPUT test-*.o test-*.c test-*.tables \ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) subdir = tests/test-table-opts +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -237,9 +240,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -265,7 +270,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-top/Makefile.in b/tests/test-top/Makefile.in index 29f120a..5c0fd39 100644 --- a/tests/test-top/Makefile.in +++ b/tests/test-top/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -176,6 +178,7 @@ LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c testname = test-top subdir = tests/test-top +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -204,9 +207,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -232,7 +237,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tests/test-yyextra/Makefile.in b/tests/test-yyextra/Makefile.in index 17cc2c9..41a2250 100644 --- a/tests/test-yyextra/Makefile.in +++ b/tests/test-yyextra/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -132,6 +133,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -174,6 +176,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) #YFLAGS = --defines --output=parser.c testname = test-yyextra subdir = tests/test-yyextra +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -202,9 +205,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -230,7 +235,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tools/Makefile.in b/tools/Makefile.in index 7384747..9f9893b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.7.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -75,6 +75,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ @@ -111,6 +112,7 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ bindir = @bindir@ build = @build@ @@ -144,6 +146,7 @@ EXTRA_DIST = \ cvs2cl.pl subdir = tools +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -171,9 +174,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -199,7 +204,6 @@ check: check-am all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am diff --git a/tools/cvsauthors b/tools/cvsauthors index 1168c30..0c19a14 100644 --- a/tools/cvsauthors +++ b/tools/cvsauthors @@ -1,3 +1,3 @@ millaway:'John Millaway <millaway@acm.org>' -wlestes:'Will Estes <wlestes@uncg.edu>' +wlestes:'Will Estes <wlestes@users.sourceforge.net>' vern:'Vern Paxson <vern@ee.lbl.gov>' |