diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:51:30 -0800 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:51:30 -0800 |
commit | f753f2b7b6d97014110dbe418861353a2f3f445d (patch) | |
tree | 7f248ce2f59fbb79cab24b4727955e37e9a5ab81 | |
parent | 306163051847aaaabe7ae0f4cfc7d23f15923f3a (diff) | |
parent | a646b6cd438dc4bd957c6c6afd89b5e8e59468fe (diff) |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# INSTALL
# Makefile.in
# aclocal.m4
# build-aux/compile
# build-aux/config.guess
# build-aux/config.sub
# build-aux/depcomp
# build-aux/install-sh
# build-aux/mdate-sh
# build-aux/texinfo.tex
# configure
# doc/Makefile.in
# doc/flex.1
# doc/flex.info
# doc/flex.info-1
# doc/flex.info-2
# doc/flex.pdf
# doc/stamp-vti
# doc/version.texi
# examples/Makefile.in
# examples/fastwc/Makefile.in
# examples/manual/Makefile.in
# src/config.h.in
# tests/Makefile.in
# tests/test-bison-nr/Makefile.am
# tests/test-bison-yylloc/Makefile.am
# tests/test-bison-yylval/Makefile.am
# tools/Makefile.in
-rw-r--r-- | ChangeLog | 911 | ||||
-rw-r--r-- | Makefile.am | 154 | ||||
-rw-r--r-- | NEWS | 38 | ||||
-rwxr-xr-x | autogen.sh | 3 | ||||
-rwxr-xr-x | build-aux/config.rpath (renamed from config.rpath) | 106 | ||||
-rw-r--r-- | build-aux/ltmain.sh (renamed from ltmain.sh) | 5446 | ||||
-rwxr-xr-x | build-aux/missing | 215 | ||||
-rwxr-xr-x | build-aux/test-driver | 148 | ||||
-rwxr-xr-x | build-aux/ylwrap | 247 | ||||
-rw-r--r-- | configure.ac | 69 | ||||
-rw-r--r-- | doc/Makefile.am | 4 | ||||
-rw-r--r-- | doc/flex.texi | 32 | ||||
-rw-r--r-- | examples/fastwc/mywc.c | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/Makefile.in | 271 | ||||
-rwxr-xr-x | lib/malloc.c | 34 | ||||
-rw-r--r-- | lib/realloc.c | 2 | ||||
-rw-r--r-- | m4/gettext.m4 | 58 | ||||
-rw-r--r-- | m4/iconv.m4 | 110 | ||||
-rw-r--r-- | m4/intlmacosx.m4 | 25 | ||||
-rw-r--r-- | m4/lib-ld.m4 | 77 | ||||
-rw-r--r-- | m4/lib-link.m4 | 43 | ||||
-rw-r--r-- | m4/lib-prefix.m4 | 2 | ||||
-rw-r--r-- | m4/libtool.m4 | 2588 | ||||
-rw-r--r-- | m4/ltoptions.m4 | 127 | ||||
-rw-r--r-- | m4/ltsugar.m4 | 7 | ||||
-rw-r--r-- | m4/ltversion.m4 | 12 | ||||
-rw-r--r-- | m4/lt~obsolete.m4 | 7 | ||||
-rw-r--r-- | m4/nls.m4 | 2 | ||||
-rw-r--r-- | m4/po.m4 | 38 | ||||
-rw-r--r-- | m4/progtest.m4 | 21 | ||||
-rw-r--r-- | po/Makefile.in.in | 53 | ||||
-rw-r--r-- | po/POTFILES.in | 36 | ||||
-rw-r--r-- | po/Rules-quot | 15 | ||||
-rw-r--r-- | po/ca.gmo | bin | 22812 -> 16594 bytes | |||
-rw-r--r-- | po/ca.po | 338 | ||||
-rw-r--r-- | po/da.gmo | bin | 20439 -> 15431 bytes | |||
-rw-r--r-- | po/da.po | 364 | ||||
-rw-r--r-- | po/de.gmo | bin | 22489 -> 16395 bytes | |||
-rw-r--r-- | po/de.po | 338 | ||||
-rw-r--r-- | po/en@boldquot.gmo | bin | 20846 -> 21013 bytes | |||
-rw-r--r-- | po/en@boldquot.po | 344 | ||||
-rw-r--r-- | po/en@quot.gmo | bin | 20746 -> 20913 bytes | |||
-rw-r--r-- | po/en@quot.po | 344 | ||||
-rw-r--r-- | po/eo.gmo | bin | 21307 -> 15423 bytes | |||
-rw-r--r-- | po/eo.po | 338 | ||||
-rw-r--r-- | po/es.gmo | bin | 12837 -> 12837 bytes | |||
-rw-r--r-- | po/es.po | 336 | ||||
-rw-r--r-- | po/fi.gmo | bin | 22521 -> 16373 bytes | |||
-rw-r--r-- | po/fi.po | 338 | ||||
-rw-r--r-- | po/flex.pot | 338 | ||||
-rw-r--r-- | po/fr.gmo | bin | 22862 -> 16648 bytes | |||
-rw-r--r-- | po/fr.po | 338 | ||||
-rw-r--r-- | po/ga.gmo | bin | 21372 -> 15344 bytes | |||
-rw-r--r-- | po/ga.po | 338 | ||||
-rw-r--r-- | po/hr.gmo | bin | 3452 -> 3452 bytes | |||
-rw-r--r-- | po/hr.po | 336 | ||||
-rw-r--r-- | po/ko.gmo | bin | 10358 -> 10358 bytes | |||
-rw-r--r-- | po/ko.po | 336 | ||||
-rw-r--r-- | po/nl.gmo | bin | 21936 -> 15948 bytes | |||
-rw-r--r-- | po/nl.po | 338 | ||||
-rw-r--r-- | po/pl.gmo | bin | 21748 -> 15684 bytes | |||
-rw-r--r-- | po/pl.po | 338 | ||||
-rw-r--r-- | po/pt_BR.gmo | bin | 22391 -> 16272 bytes | |||
-rw-r--r-- | po/pt_BR.po | 338 | ||||
-rw-r--r-- | po/ro.gmo | bin | 20688 -> 14677 bytes | |||
-rw-r--r-- | po/ro.po | 338 | ||||
-rw-r--r-- | po/ru.gmo | bin | 28728 -> 20969 bytes | |||
-rw-r--r-- | po/ru.po | 338 | ||||
-rw-r--r-- | po/sr.gmo | bin | 27696 -> 20024 bytes | |||
-rw-r--r-- | po/sr.po | 338 | ||||
-rw-r--r-- | po/sv.gmo | bin | 20279 -> 14344 bytes | |||
-rw-r--r-- | po/sv.po | 338 | ||||
-rw-r--r-- | po/tr.gmo | bin | 20716 -> 14562 bytes | |||
-rw-r--r-- | po/tr.po | 338 | ||||
-rw-r--r-- | po/vi.gmo | bin | 24368 -> 17740 bytes | |||
-rw-r--r-- | po/vi.po | 338 | ||||
-rw-r--r-- | po/zh_CN.gmo | bin | 3972 -> 14852 bytes | |||
-rw-r--r-- | po/zh_CN.po | 754 | ||||
-rw-r--r-- | po/zh_TW.gmo | bin | 20665 -> 14947 bytes | |||
-rw-r--r-- | po/zh_TW.po | 338 | ||||
-rw-r--r-- | src/FlexLexer.h (renamed from FlexLexer.h) | 41 | ||||
-rw-r--r-- | src/Makefile.am | 144 | ||||
-rw-r--r-- | src/Makefile.in | 1010 | ||||
-rw-r--r-- | src/buf.c (renamed from buf.c) | 3 | ||||
-rw-r--r-- | src/ccl.c (renamed from ccl.c) | 8 | ||||
-rw-r--r-- | src/dfa.c (renamed from dfa.c) | 32 | ||||
-rw-r--r-- | src/ecs.c (renamed from ecs.c) | 4 | ||||
-rw-r--r-- | src/filter.c (renamed from filter.c) | 19 | ||||
-rw-r--r-- | src/flex.skl (renamed from flex.skl) | 238 | ||||
-rw-r--r-- | src/flexdef.h (renamed from flexdef.h) | 34 | ||||
-rw-r--r-- | src/flexint.h (renamed from flexint.h) | 0 | ||||
-rw-r--r-- | src/gen.c (renamed from gen.c) | 110 | ||||
-rw-r--r-- | src/gettext.h (renamed from gettext.h) | 0 | ||||
-rw-r--r-- | src/libmain.c (renamed from libmain.c) | 9 | ||||
-rw-r--r-- | src/libyywrap.c (renamed from libyywrap.c) | 2 | ||||
-rw-r--r-- | src/main.c (renamed from main.c) | 56 | ||||
-rw-r--r-- | src/misc.c (renamed from misc.c) | 76 | ||||
-rwxr-xr-x | src/mkskel.sh (renamed from mkskel.sh) | 0 | ||||
-rw-r--r-- | src/nfa.c (renamed from nfa.c) | 6 | ||||
-rw-r--r-- | src/options.c (renamed from options.c) | 2 | ||||
-rw-r--r-- | src/options.h (renamed from options.h) | 1 | ||||
-rw-r--r-- | src/parse.c (renamed from parse.c) | 1692 | ||||
-rw-r--r-- | src/parse.h (renamed from parse.h) | 134 | ||||
-rw-r--r-- | src/parse.y (renamed from parse.y) | 3 | ||||
-rw-r--r-- | src/regex.c (renamed from regex.c) | 1 | ||||
-rw-r--r-- | src/scan.c (renamed from scan.c) | 651 | ||||
-rw-r--r-- | src/scan.l (renamed from scan.l) | 6 | ||||
-rw-r--r-- | src/scanflags.c (renamed from scanflags.c) | 3 | ||||
-rw-r--r-- | src/scanopt.c (renamed from scanopt.c) | 25 | ||||
-rw-r--r-- | src/scanopt.h (renamed from scanopt.h) | 0 | ||||
-rw-r--r-- | src/skel.c (renamed from skel.c) | 244 | ||||
-rw-r--r-- | src/sym.c (renamed from sym.c) | 26 | ||||
-rw-r--r-- | src/tables.c (renamed from tables.c) | 8 | ||||
-rw-r--r-- | src/tables.h (renamed from tables.h) | 0 | ||||
-rw-r--r-- | src/tables_shared.c (renamed from tables_shared.c) | 2 | ||||
-rw-r--r-- | src/tables_shared.h (renamed from tables_shared.h) | 0 | ||||
-rw-r--r-- | src/tblcmp.c (renamed from tblcmp.c) | 36 | ||||
-rw-r--r-- | src/version.h (renamed from version.h) | 0 | ||||
-rw-r--r-- | src/yylex.c (renamed from yylex.c) | 15 | ||||
-rw-r--r-- | tests/Makefile.am | 581 | ||||
-rw-r--r-- | tests/README | 74 | ||||
-rw-r--r-- | tests/TEMPLATE/Makefile.am | 50 | ||||
-rw-r--r-- | tests/TEMPLATE/parser.y | 61 | ||||
-rw-r--r-- | tests/TEMPLATE/scanner.l | 54 | ||||
-rw-r--r-- | tests/alloc_extra.l (renamed from tests/test-alloc-extra/scanner.l) | 4 | ||||
-rw-r--r-- | tests/alloc_extra.txt (renamed from tests/test-alloc-extra/test.input) | 0 | ||||
-rw-r--r-- | tests/array_nr.l (renamed from tests/test-array-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/array_nr.txt (renamed from tests/TEMPLATE/test.input) | 0 | ||||
-rw-r--r-- | tests/array_r.l (renamed from tests/test-array-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/array_r.txt (renamed from tests/test-array-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/basic_nr.l (renamed from tests/test-basic-nr/scanner.l) | 6 | ||||
-rw-r--r-- | tests/basic_nr.txt (renamed from tests/test-basic-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/basic_r.l (renamed from tests/test-basic-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/basic_r.txt (renamed from tests/test-basic-r/test.input) | 0 | ||||
-rw-r--r-- | tests/bison_nr.txt (renamed from tests/test-bison-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/bison_nr_main.c (renamed from tests/test-bison-nr/main.c) | 7 | ||||
-rw-r--r-- | tests/bison_nr_parser.y (renamed from tests/test-bison-nr/parser.y) | 6 | ||||
-rw-r--r-- | tests/bison_nr_scanner.l (renamed from tests/test-bison-nr/scanner.l) | 8 | ||||
-rw-r--r-- | tests/bison_yylloc.txt (renamed from tests/test-bison-yylloc/test.input) | 0 | ||||
-rw-r--r-- | tests/bison_yylloc_main.c (renamed from tests/test-bison-yylval/main.c) | 9 | ||||
-rw-r--r-- | tests/bison_yylloc_parser.y (renamed from tests/test-bison-yylloc/parser.y) | 12 | ||||
-rw-r--r-- | tests/bison_yylloc_scanner.l (renamed from tests/test-bison-yylloc/scanner.l) | 8 | ||||
-rw-r--r-- | tests/bison_yylval.txt (renamed from tests/test-bison-yylval/test.input) | 0 | ||||
-rw-r--r-- | tests/bison_yylval_main.c (renamed from tests/test-bison-yylloc/main.c) | 9 | ||||
-rw-r--r-- | tests/bison_yylval_parser.y (renamed from tests/test-bison-yylval/parser.y) | 6 | ||||
-rw-r--r-- | tests/bison_yylval_scanner.l (renamed from tests/test-bison-yylval/scanner.l) | 8 | ||||
-rw-r--r-- | tests/c_cxx_nr.lll (renamed from tests/test-c-cpp-nr/scanner.l) | 2 | ||||
-rw-r--r-- | tests/c_cxx_nr.txt (renamed from tests/test-array-r/test.input) | 0 | ||||
-rw-r--r-- | tests/c_cxx_r.lll (renamed from tests/test-c-cpp-r/scanner.l) | 2 | ||||
-rw-r--r-- | tests/c_cxx_r.txt (renamed from tests/test-c++-basic/test.input) | 0 | ||||
-rw-r--r-- | tests/ccl.l (renamed from tests/test-ccl/scanner.l) | 4 | ||||
-rw-r--r-- | tests/ccl.txt (renamed from tests/test-ccl/test.input) | 0 | ||||
-rwxr-xr-x | tests/create-test | 33 | ||||
-rw-r--r-- | tests/cxx_basic.ll (renamed from tests/test-c++-basic/scanner.l) | 5 | ||||
-rw-r--r-- | tests/cxx_basic.txt (renamed from tests/test-c++-yywrap/test.input) | 0 | ||||
-rw-r--r-- | tests/cxx_multiple_scanners.txt (renamed from tests/test-c++-multiple-scanners/test.input) | 0 | ||||
-rw-r--r-- | tests/cxx_multiple_scanners_1.ll (renamed from tests/test-c++-multiple-scanners/scanner-1.l) | 2 | ||||
-rw-r--r-- | tests/cxx_multiple_scanners_2.ll (renamed from tests/test-c++-multiple-scanners/scanner-2.l) | 2 | ||||
-rw-r--r-- | tests/cxx_multiple_scanners_main.cc (renamed from tests/test-c++-multiple-scanners/main.cpp) | 0 | ||||
-rw-r--r-- | tests/cxx_yywrap.ll (renamed from tests/test-c++-yywrap/scanner.l) | 2 | ||||
-rw-r--r-- | tests/cxx_yywrap.txt (renamed from tests/test-c-cpp-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/debug_nr.l (renamed from tests/test-debug-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/debug_nr.txt (renamed from tests/test-debug-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/debug_r.l (renamed from tests/test-debug-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/debug_r.txt (renamed from tests/test-debug-r/test.input) | 0 | ||||
-rw-r--r-- | tests/extended.l (renamed from tests/test-extended/scanner.l) | 4 | ||||
-rw-r--r-- | tests/extended.txt (renamed from tests/test-extended/test.input) | 0 | ||||
-rw-r--r-- | tests/header_nr.txt (renamed from tests/test-header-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/header_nr_main.c (renamed from tests/test-header-nr/main.c) | 5 | ||||
-rw-r--r-- | tests/header_nr_scanner.l (renamed from tests/test-header-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/header_r.txt (renamed from tests/test-header-r/test.input) | 0 | ||||
-rw-r--r-- | tests/header_r_main.c (renamed from tests/test-header-r/main.c) | 12 | ||||
-rw-r--r-- | tests/header_r_scanner.l (renamed from tests/test-header-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/include_by_buffer.direct.l (renamed from tests/test-include-by-buffer/scanner.l) | 8 | ||||
-rw-r--r-- | tests/include_by_buffer.direct.txt | 3 | ||||
-rw-r--r-- | tests/include_by_buffer.direct_2.txt | 3 | ||||
-rw-r--r-- | tests/include_by_buffer.direct_3.txt | 2 | ||||
-rw-r--r-- | tests/include_by_push.direct.l (renamed from tests/test-include-by-push/scanner.l) | 6 | ||||
-rw-r--r-- | tests/include_by_push.direct.txt | 3 | ||||
-rw-r--r-- | tests/include_by_push.direct_2.txt | 3 | ||||
-rw-r--r-- | tests/include_by_push.direct_3.txt | 2 | ||||
-rw-r--r-- | tests/include_by_reentrant.direct.l (renamed from tests/test-include-by-reentrant/scanner.l) | 6 | ||||
-rw-r--r-- | tests/include_by_reentrant.direct.txt | 3 | ||||
-rw-r--r-- | tests/include_by_reentrant.direct_2.txt | 3 | ||||
-rw-r--r-- | tests/include_by_reentrant.direct_3.txt | 2 | ||||
-rw-r--r-- | tests/lineno_nr.l (renamed from tests/test-lineno-nr/scanner.l) | 6 | ||||
-rw-r--r-- | tests/lineno_nr.one.txt (renamed from tests/test-lineno-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/lineno_r.l (renamed from tests/test-lineno-r/scanner.l) | 6 | ||||
-rw-r--r-- | tests/lineno_r.one.txt (renamed from tests/test-lineno-r/test.input) | 0 | ||||
-rw-r--r-- | tests/lineno_trailing.l (renamed from tests/test-lineno-trailing/scanner.l) | 6 | ||||
-rw-r--r-- | tests/lineno_trailing.one.txt (renamed from tests/test-lineno-trailing/test.input) | 0 | ||||
-rw-r--r-- | tests/mem_nr.l (renamed from tests/test-mem-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/mem_nr.txt (renamed from tests/test-mem-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/mem_r.l (renamed from tests/test-mem-r/scanner.l) | 10 | ||||
-rw-r--r-- | tests/mem_r.txt (renamed from tests/test-mem-r/test.input) | 0 | ||||
-rw-r--r-- | tests/multiple_scanners_nr_1.l (renamed from tests/test-multiple-scanners-nr/scanner-1.l) | 6 | ||||
-rw-r--r-- | tests/multiple_scanners_nr_2.l (renamed from tests/test-multiple-scanners-nr/scanner-2.l) | 6 | ||||
-rw-r--r-- | tests/multiple_scanners_nr_main.c (renamed from tests/test-multiple-scanners-nr/main.c) | 10 | ||||
-rw-r--r-- | tests/multiple_scanners_r_1.l (renamed from tests/test-multiple-scanners-r/scanner-1.l) | 7 | ||||
-rw-r--r-- | tests/multiple_scanners_r_2.l (renamed from tests/test-multiple-scanners-r/scanner-2.l) | 7 | ||||
-rw-r--r-- | tests/multiple_scanners_r_main.c (renamed from tests/test-multiple-scanners-r/main.c) | 30 | ||||
-rw-r--r-- | tests/noansi_nr.l (renamed from tests/test-noansi-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/noansi_nr.txt (renamed from tests/test-noansi-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/noansi_r.l (renamed from tests/test-noansi-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/noansi_r.txt (renamed from tests/test-noansi-r/test.input) | 0 | ||||
-rwxr-xr-x | tests/options.cn | 5 | ||||
-rw-r--r-- | tests/posix.l (renamed from tests/test-posix/scanner.l) | 4 | ||||
-rw-r--r-- | tests/posixly_correct.l (renamed from tests/test-posixly-correct/scanner.l) | 4 | ||||
-rw-r--r-- | tests/prefix_nr.l (renamed from tests/test-prefix-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/prefix_nr.txt (renamed from tests/test-prefix-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/prefix_r.l (renamed from tests/test-prefix-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/prefix_r.txt (renamed from tests/test-prefix-r/test.input) | 0 | ||||
-rw-r--r-- | tests/pthread.l (renamed from tests/test-pthread/scanner.l) | 12 | ||||
-rw-r--r-- | tests/pthread_1.txt (renamed from tests/test-pthread/test-1.input) | 0 | ||||
-rw-r--r-- | tests/pthread_2.txt (renamed from tests/test-pthread/test-2.input) | 0 | ||||
-rw-r--r-- | tests/pthread_3.txt (renamed from tests/test-pthread/test-3.input) | 0 | ||||
-rw-r--r-- | tests/pthread_4.txt (renamed from tests/test-pthread/test-4.input) | 0 | ||||
-rw-r--r-- | tests/pthread_5.txt (renamed from tests/test-pthread/test-5.input) | 0 | ||||
-rw-r--r-- | tests/quotes.l (renamed from tests/test-quotes/scanner.l) | 4 | ||||
-rw-r--r-- | tests/quotes.txt (renamed from tests/test-c-cpp-r/test.input) | 0 | ||||
-rw-r--r-- | tests/reject.l4 (renamed from tests/test-reject/scanner.l) | 4 | ||||
-rw-r--r-- | tests/reject.txt (renamed from tests/test-quotes/test.input) | 0 | ||||
-rw-r--r-- | tests/rescan_nr.direct.l (renamed from tests/test-rescan-nr/scanner.l) | 6 | ||||
-rw-r--r-- | tests/rescan_nr.direct.txt (renamed from tests/test-reject/test.input) | 0 | ||||
-rw-r--r-- | tests/rescan_r.direct.l (renamed from tests/test-rescan-r/scanner.l) | 6 | ||||
-rw-r--r-- | tests/rescan_r.direct.txt (renamed from tests/test-rescan-nr/test.input) | 0 | ||||
-rw-r--r-- | tests/string_nr.l (renamed from tests/test-string-nr/scanner.l) | 4 | ||||
-rw-r--r-- | tests/string_r.l (renamed from tests/test-string-r/scanner.l) | 4 | ||||
-rw-r--r-- | tests/tableopts.am | 333 | ||||
-rw-r--r-- | tests/tableopts.l4 (renamed from tests/test-table-opts/scanner.l) | 4 | ||||
-rwxr-xr-x | tests/tableopts.sh | 44 | ||||
-rw-r--r-- | tests/tableopts.txt (renamed from tests/test-table-opts/test.input) | 0 | ||||
-rw-r--r-- | tests/test-alloc-extra/Makefile.am | 49 | ||||
-rw-r--r-- | tests/test-array-nr/Makefile.am | 48 | ||||
-rw-r--r-- | tests/test-array-r/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-basic-nr/Makefile.am | 48 | ||||
-rw-r--r-- | tests/test-basic-r/Makefile.am | 48 | ||||
-rw-r--r-- | tests/test-bison-nr/Makefile.am | 55 | ||||
-rw-r--r-- | tests/test-bison-yylloc/Makefile.am | 55 | ||||
-rw-r--r-- | tests/test-bison-yylval/Makefile.am | 55 | ||||
-rw-r--r-- | tests/test-c++-basic/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-c++-multiple-scanners/Makefile.am | 53 | ||||
-rw-r--r-- | tests/test-c++-yywrap/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-c-cpp-nr/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-c-cpp-r/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-ccl/Makefile.am | 44 | ||||
-rw-r--r-- | tests/test-concatenated-options/Makefile.am | 33 | ||||
-rw-r--r-- | tests/test-debug-nr/Makefile.am | 44 | ||||
-rw-r--r-- | tests/test-debug-r/Makefile.am | 44 | ||||
-rw-r--r-- | tests/test-extended/Makefile.am | 44 | ||||
-rw-r--r-- | tests/test-header-nr/Makefile.am | 53 | ||||
-rw-r--r-- | tests/test-header-r/Makefile.am | 54 | ||||
-rw-r--r-- | tests/test-include-by-buffer/Makefile.am | 49 | ||||
-rw-r--r-- | tests/test-include-by-buffer/test-1.input | 3 | ||||
-rw-r--r-- | tests/test-include-by-buffer/test-2.input | 3 | ||||
-rw-r--r-- | tests/test-include-by-buffer/test-3.input | 2 | ||||
-rw-r--r-- | tests/test-include-by-push/Makefile.am | 49 | ||||
-rw-r--r-- | tests/test-include-by-push/test-1.input | 3 | ||||
-rw-r--r-- | tests/test-include-by-push/test-2.input | 3 | ||||
-rw-r--r-- | tests/test-include-by-push/test-3.input | 2 | ||||
-rw-r--r-- | tests/test-include-by-reentrant/Makefile.am | 49 | ||||
-rw-r--r-- | tests/test-include-by-reentrant/test-1.input | 3 | ||||
-rw-r--r-- | tests/test-include-by-reentrant/test-2.input | 3 | ||||
-rw-r--r-- | tests/test-include-by-reentrant/test-3.input | 2 | ||||
-rw-r--r-- | tests/test-linedir-r/Makefile.am | 56 | ||||
-rw-r--r-- | tests/test-linedir-r/check-lines.awk | 7 | ||||
-rw-r--r-- | tests/test-linedir-r/main.c | 58 | ||||
-rw-r--r-- | tests/test-linedir-r/scanner.l | 45 | ||||
-rw-r--r-- | tests/test-lineno-nr/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-lineno-r/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-lineno-trailing/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-lineno-trailing/Makefile.in | 458 | ||||
-rw-r--r-- | tests/test-mem-nr/Makefile.am | 44 | ||||
-rw-r--r-- | tests/test-mem-r/Makefile.am | 44 | ||||
-rw-r--r-- | tests/test-multiple-scanners-nr/Makefile.am | 54 | ||||
-rw-r--r-- | tests/test-multiple-scanners-r/Makefile.am | 56 | ||||
-rw-r--r-- | tests/test-noansi-nr/Makefile.am | 48 | ||||
-rw-r--r-- | tests/test-noansi-r/Makefile.am | 48 | ||||
-rw-r--r-- | tests/test-posix/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-posixly-correct/Makefile.am | 45 | ||||
-rw-r--r-- | tests/test-prefix-nr/Makefile.am | 49 | ||||
-rw-r--r-- | tests/test-prefix-nr/README | 2 | ||||
-rw-r--r-- | tests/test-prefix-r/Makefile.am | 49 | ||||
-rw-r--r-- | tests/test-prefix-r/README | 2 | ||||
-rw-r--r-- | tests/test-pthread/Makefile.am | 46 | ||||
-rw-r--r-- | tests/test-quotes/Makefile.am | 47 | ||||
-rw-r--r-- | tests/test-reject/Makefile.am | 80 | ||||
-rw-r--r-- | tests/test-rescan-nr/Makefile.am | 47 | ||||
-rw-r--r-- | tests/test-rescan-r/Makefile.am | 47 | ||||
-rw-r--r-- | tests/test-rescan-r/test.input | 2 | ||||
-rw-r--r-- | tests/test-string-nr/Makefile.am | 46 | ||||
-rw-r--r-- | tests/test-string-r/Makefile.am | 46 | ||||
-rw-r--r-- | tests/test-table-opts/Makefile.am | 132 | ||||
-rw-r--r-- | tests/test-top/Makefile.am | 54 | ||||
-rw-r--r-- | tests/test-top/test.input | 3 | ||||
-rw-r--r-- | tests/test-yyextra/Makefile.am | 49 | ||||
-rwxr-xr-x | tests/testwrapper.sh | 53 | ||||
-rw-r--r-- | tests/top.l (renamed from tests/test-top/scanner.l) | 4 | ||||
-rw-r--r-- | tests/top.txt (renamed from tests/test-linedir-r/test.input) | 0 | ||||
-rw-r--r-- | tests/top_main.c (renamed from tests/test-top/main.c) | 12 | ||||
-rw-r--r-- | tests/yyextra.l (renamed from tests/test-yyextra/scanner.l) | 4 | ||||
-rw-r--r-- | tests/yyextra.txt (renamed from tests/test-yyextra/test.input) | 0 | ||||
-rw-r--r-- | tools/Makefile.am | 2 | ||||
-rwxr-xr-x | tools/git2cl | 372 | ||||
-rwxr-xr-x | ylwrap | 226 |
306 files changed, 15893 insertions, 13449 deletions
@@ -1,3 +1,914 @@ +2015-11-17 Will Estes <westes575@gmail.com> + + * configure.ac: Declared version 2.6.0 + +2015-11-17 Will Estes <westes575@gmail.com> + + * NEWS: Dated, described flex release 2.6.0 + +2015-11-13 Will Estes <westes575@gmail.com> + + * NEWS, configure.ac: Declared version 2.6.0rc1 + +2015-11-13 lukeallardyce <lukeallardyce@users.sourceforge.net> + + * src/Makefile.am: Supplied versioning information in flex + libraries. Resolves sourceforge bug #182. On OSX, and possibly other platforms, + building the libfl libraries without versioning information caused a + build failures. + +2015-11-12 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: Cleaned up more precisely after make check. BUILT_SOURCES is now just the list of headers built as per the + automake manual. We provide the list of files to clean to make + rebuilding the test suite programs easier. We then use the + CLEANFILES list in a dist-hook to clean up the distribution that + automake gathers since not distributing flex generated files is + foreign to automake's mindset, but we need exactly that. Additionally, we locate inputs to the tables-related tests more + precisely. Some files are in srcdir and some are in builddir, which + the arguments to the log compiler are now made aware of. + +2015-11-11 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: Pulled out scripts in tests/Makefile.am + +2015-11-11 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: Added srcdir to tableopts.am include + +2015-11-11 Will Estes <westes575@gmail.com> + + * doc/Makefile.am: Changed man page dependencies. The man page is just the --help output as reformatted by help2man. + The --help option is most likely to change when the flex skeleton + changes or one of the option parsing files changes or the + configure.ac script itself changes. The dependencies reflect this + now. It is still necessary, under some circumstances, to rebuild flex + explicitly before building the man page. In theory, it's possible to + have automake arrange to do this all the time, but doing so works + out to be fragile, given the rest of the build system. + +2015-11-10 Will Estes <westes575@gmail.com> + + * autogen.sh: Called libtoolize directly because autoreconf fails to + pick up LT_INIT properly + +2015-11-10 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: Added tableopts.sh to EXTRA_DIST + +2015-11-08 Mightyjo <mightyjo@gmail.com> + + * tests/Makefile.am: Made tests depend on the built flex binary. + +2015-11-08 Mightyjo <mightyjo@gmail.com> + + * : commit cf6cb4dce791c26567cc506770ca96b4f4118024 Author: Mightyjo + <mightyjo@gmail.com> Date: Sat Nov 7 23:11:35 2015 -0800 + +2015-11-04 Mightyjo <mightyjo@gmail.com> + + * doc/flex.texi: Updated documentation to reflect the revisions to + FlexLexer.h + +2015-10-26 Mightyjo <mightyjo@gmail.com> + + * src/FlexLexer.h, src/flex.skl: Changed several pointers to istream + (and ostream) to references in c++-only sections of the skeleton. Patched up a variety of expected errors caused by changing istream* + to istream&. Added a stray 'make' at line 545. Oops. Changed the buffer_state struct to store std::streambuf* instead of + std::istream* for C++ mode. Changed interfaces in FlexLexer.h to + take std::istream& instead of *. Backward compatibility temporarily + broken. Patched up backward compatibility with reasonable behavior in the + presence of null pointers. Re-added backward-compatible versions of the yyFlexLexer methods + that take iostream pointers. All tests passing. + +2015-09-29 Translation Project <coordinator@translationproject.org> + + * po/zh_CN.po: new zh_CN translation from the translation project + +2015-07-27 Jaska Uimonen <jaska.uimonen@helsinki.fi> + + * src/gen.c: fix possible resource leak with yynultrans_tbl + +2015-07-27 Jaska Uimonen <jaska.uimonen@helsinki.fi> + + * src/dfa.c: fix possible uninitialized array values + +2015-08-05 Will Estes <westes575@gmail.com> + + * doc/flex.texi: add %{...%} block to example in manual + +2015-07-15 Will Estes <westes575@gmail.com> + + * configure.ac: initialize libtool earlier in build system + generation + +2015-05-08 Translation Project <translation@translationproject.org> + + * po/da.po: new da translation from the Translation Project + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/gen.c, src/scan.l, tests/bison_nr_parser.y, + tests/bison_yylloc_parser.y, tests/bison_yylval_parser.y, + tests/multiple_scanners_nr_main.c: Fix `label unused` warning + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/flex.skl: Fix two "signed/unsigned" warnings + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * tests/alloc_extra.l, tests/array_nr.l, tests/array_r.l, + tests/basic_nr.l, tests/basic_r.l, tests/bison_nr_scanner.l, + tests/bison_yylloc_scanner.l, tests/bison_yylval_scanner.l, + tests/ccl.l, tests/cxx_basic.ll, tests/debug_nr.l, tests/debug_r.l, + tests/extended.l, tests/header_nr_scanner.l, + tests/header_r_scanner.l, tests/include_by_buffer.direct.l, + tests/include_by_push.direct.l, + tests/include_by_reentrant.direct.l, tests/lineno_nr.l, + tests/lineno_r.l, tests/lineno_trailing.l, tests/mem_nr.l, + tests/mem_r.l, tests/multiple_scanners_nr_1.l, + tests/multiple_scanners_nr_2.l, tests/multiple_scanners_r_1.l, + tests/multiple_scanners_r_2.l, tests/noansi_nr.l, tests/noansi_r.l, + tests/posix.l, tests/posixly_correct.l, tests/prefix_nr.l, + tests/prefix_r.l, tests/pthread.l, tests/quotes.l, tests/reject.l4, + tests/rescan_nr.direct.l, tests/rescan_r.direct.l, + tests/string_nr.l, tests/string_r.l, tests/tableopts.l4, + tests/top.l, tests/yyextra.l: Fix `unused function` warnings in + tests + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * tests/bison_nr_parser.y, tests/bison_yylloc_parser.y, + tests/bison_yylval_parser.y: Fix `implicit function declaration` + warnings in tests + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * tests/header_r_main.c, tests/multiple_scanners_nr_main.c, + tests/reject.l4, tests/tableopts.l4, tests/top_main.c: Remove a few + `unused variable` warnings + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/filter.c: Remove unused variable from + src/filter.c:filter_fix_linedirs + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/scanopt.c: Remove unused argument and variable from + src/scanopt.c:scanopt_err + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/flex.skl, src/libmain.c, src/parse.y, tests/bison_nr_main.c, + tests/bison_yylloc_main.c, tests/bison_yylloc_parser.y, + tests/bison_yylval_main.c, tests/bison_yylval_parser.y, + tests/header_nr_main.c, tests/header_r_main.c, tests/lineno_nr.l, + tests/lineno_r.l, tests/lineno_trailing.l, tests/mem_r.l, + tests/multiple_scanners_nr_main.c, + tests/multiple_scanners_r_main.c, tests/pthread.l, + tests/rescan_nr.direct.l, tests/rescan_r.direct.l, tests/top_main.c: + Fix a few "unused parameter" warnings + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/main.c: Fix warning about redefined macro when multiple + scanners are used. + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * tests/bison_nr_parser.y: Avoid passing `const char*` argument as + `char*` in test-bison-nr + +2014-11-21 Alexis La Goutte <alexis.lagoutte@gmail.com> + + * src/misc.c, src/regex.c, src/tables.c, src/tables_shared.c: Fix + -Wdocumentation warnings + +2014-11-16 Will Estes <westes575@gmail.com> + + * tests/README: document new suite layout + +2014-11-16 Will Estes <westes575@gmail.com> + + * tests/TEMPLATE/.gitignore, tests/TEMPLATE/Makefile.am, + tests/TEMPLATE/cvsignore, tests/TEMPLATE/parser.y, + tests/TEMPLATE/scanner.l, tests/TEMPLATE/test.input, + tests/create-test, tests/descriptions: remove unused files after + test suite refactor + +2014-11-14 Will Estes <westes575@gmail.com> + + * .gitignore, doc/.gitignore: Ignore directories build-aux/, m4/ Since build-aux/ now contains a number of files previously at the + top level, we ignore build-aux/. Therefore, it's not necessary to + list any files that are now kept in it. Also, explicitly mark m4/ as + a directory to ignore. + +2014-11-14 Will Estes <westes575@gmail.com> + + * configure.ac: added back call to AC_CONFIG_AUX_DIR. In an effort to reduce top level directory clutter, reintroduced the + call to AC_CONFIG_AUX_DIR. Moved the call to LT_INIT to after that + call so configure will be able to find its files. + +2014-07-18 Will Estes <westes575@gmail.com> + + * tests/tableopts.sh, tests/testwrapper.sh: use unofficial bash + strict mode and cleanups in supporting bash scripts + +2014-07-18 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/tableopts.am, + tests/tableopts.l4, tests/tableopts.sh, tests/tableopts.txt, + tests/test-table-opts/.gitignore, + tests/test-table-opts/Makefile.am, tests/test-table-opts/scanner.l, + tests/test-table-opts/test.input: split apart table options tests + into tests per threading, table option, serialization and + verification + +2014-07-17 Will Estes <westes575@gmail.com> + + * tests/tableopts.sh: add tableopts.sh script + +2014-07-02 Will Estes <westes575@gmail.com> + + * configure.ac, tests/Makefile.am: use automake conditional around + pthread test + +2014-07-01 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/lineno_trailing.l, + tests/lineno_trailing.one.txt, + tests/test-lineno-trailing/.gitignore, + tests/test-lineno-trailing/Makefile.am, + tests/test-lineno-trailing/scanner.l, + tests/test-lineno-trailing/test.input: refactor lineno_trailing test + for new test suite layout + +2014-07-01 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/lineno_r.l, + tests/lineno_r.one.txt, tests/test-lineno-r/.gitignore, + tests/test-lineno-r/Makefile.am, tests/test-lineno-r/scanner.l, + tests/test-lineno-r/test.input: refactor lineno_r test for new test + suite layout + +2014-07-01 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/lineno_nr.l, + tests/lineno_nr.one.txt, tests/test-lineno-nr/.gitignore, + tests/test-lineno-nr/Makefile.am, tests/test-lineno-nr/scanner.l, + tests/test-lineno-nr/test.input, tests/testwrapper.sh: refactor + lineno_nr test for new test suite layout + +2014-06-30 Will Estes <westes575@gmail.com> + + * tests/test-linedir-r/.gitignore, + 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: + Remove linedir_r test. The linedir_r test tested the implementation of line number + tracking, not its results. + +2014-06-24 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/pthread.l, + tests/pthread_1.txt, tests/pthread_2.txt, tests/pthread_3.txt, + tests/pthread_4.txt, tests/pthread_5.txt, + tests/test-pthread/.gitignore, tests/test-pthread/Makefile.am, + tests/test-pthread/scanner.l, tests/test-pthread/test-1.input, + tests/test-pthread/test-2.input, tests/test-pthread/test-3.input, + tests/test-pthread/test-4.input, tests/test-pthread/test-5.input: + refactor pthread test for new test suite layout + +2014-06-24 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: build reject_[vs]er tests explicitly to pass + proper compiler flags + +2014-06-24 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/cxx_yywrap.ll, + tests/cxx_yywrap.txt, tests/test-c++-yywrap/.gitignore, + tests/test-c++-yywrap/Makefile.am, tests/test-c++-yywrap/scanner.l, + tests/test-c++-yywrap/test.input, tests/testwrapper.sh: refactor + cxx_yywrap test for new test suite layout + +2014-06-17 Will Estes <westes575@gmail.com> + + * tests/Makefile.am, tests/options.cn, + tests/test-concatenated-options/.gitignore, + tests/test-concatenated-options/Makefile.am: refactor concatenated + options test for new test suite layout + +2014-06-17 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, + tests/include_by_buffer.direct.l, + tests/include_by_buffer.direct.txt, + tests/include_by_buffer.direct_2.txt, + tests/include_by_buffer.direct_3.txt, + tests/include_by_push.direct.l, tests/include_by_push.direct.txt, + tests/include_by_push.direct_2.txt, + tests/include_by_push.direct_3.txt, + tests/include_by_reentrant.direct.l, + tests/include_by_reentrant.direct.txt, + tests/include_by_reentrant.direct_2.txt, + tests/include_by_reentrant.direct_3.txt, + tests/test-include-by-buffer/.gitignore, + tests/test-include-by-buffer/Makefile.am, + tests/test-include-by-buffer/scanner.l, + tests/test-include-by-buffer/test-1.input, + tests/test-include-by-buffer/test-2.input, + tests/test-include-by-buffer/test-3.input, + tests/test-include-by-push/.gitignore, + 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, + tests/test-include-by-reentrant/.gitignore, + tests/test-include-by-reentrant/Makefile.am, + tests/test-include-by-reentrant/scanner.l, + tests/test-include-by-reentrant/test-1.input, + tests/test-include-by-reentrant/test-2.input, + tests/test-include-by-reentrant/test-3.input: refactor include_by_* + tests for new test suite layout + +2014-06-16 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/rescan_nr.direct.l, + tests/rescan_nr.direct.txt, tests/rescan_nr.l, tests/rescan_nr.txt, + tests/rescan_r.direct.l, tests/rescan_r.direct.txt, + tests/test-rescan-r/.gitignore, tests/test-rescan-r/Makefile.am, + tests/test-rescan-r/scanner.l, tests/test-rescan-r/test.input, + tests/testwrapper.sh: refactor rescan_r test for new test suite + layout + +2014-06-16 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/rescan_nr.l, + tests/rescan_nr.txt, tests/test-rescan-nr/.gitignore, + tests/test-rescan-nr/Makefile.am, tests/test-rescan-nr/scanner.l, + tests/test-rescan-nr/test.input, tests/testwrapper.sh: Refactor + rescan_nr test for new test suite layout. Also add -r option to testwrapper.sh to support passing input file + as a command line argument to the test scanner without using shell + redirection. + +2014-06-16 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: correct use of objext to OBJEXT + +2014-06-16 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/quotes.l, + tests/quotes.txt, tests/test-quotes/.gitignore, + tests/test-quotes/Makefile.am, tests/test-quotes/scanner.l, + tests/test-quotes/test.input: refactor quotes test for new test + suite layout + +2014-06-16 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/reject.l4, + tests/reject.txt, tests/test-reject/.gitignore, + tests/test-reject/Makefile.am, tests/test-reject/scanner.l, + tests/test-reject/test.input, tests/testwrapper.sh: Refactor reject + test for new test suite layout. Split out reject test into its constituant tests. Add .reject tests + and .table tests for automake test log generation. Rewrite + testwrapper.sh to handle running with a tables file and specifying + optional input using command line options rather than positional + parameters. + +2014-06-15 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, + tests/multiple_scanners_r_1.l, tests/multiple_scanners_r_2.l, + tests/multiple_scanners_r_main.c, + tests/test-multiple-scanners-r/.gitignore, + tests/test-multiple-scanners-r/Makefile.am, + tests/test-multiple-scanners-r/main.c, + tests/test-multiple-scanners-r/scanner-1.l, + tests/test-multiple-scanners-r/scanner-2.l: Refactor + multiple_scanners_r test for new test suite layout. Also, remove the use of table files from this test as that tests two + features at once and we want to be as close to testing one feature + at a time as we can be. + +2014-06-15 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, + tests/multiple_scanners_nr_1.l, tests/multiple_scanners_nr_2.l, + tests/multiple_scanners_nr_main.c, + tests/test-multiple-scanners-nr/.gitignore, + tests/test-multiple-scanners-nr/Makefile.am, + tests/test-multiple-scanners-nr/main.c, + tests/test-multiple-scanners-nr/scanner-1.l, + tests/test-multiple-scanners-nr/scanner-2.l: refactor + multiple_scanners_nr test for new test suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, + tests/cxx_multiple_scanners.txt, tests/cxx_multiple_scanners_1.ll, + tests/cxx_multiple_scanners_2.ll, + tests/cxx_multiple_scanners_main.cc, + tests/test-c++-multiple-scanners/.gitignore, + 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: refactor + cxx_multiple_scanners test for new test suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/c_cxx_nr.lll, + tests/c_cxx_nr.txt, tests/c_cxx_r.lll, tests/c_cxx_r.txt, + tests/test-c-cpp-nr/.gitignore, tests/test-c-cpp-nr/Makefile.am, + tests/test-c-cpp-nr/scanner.l, tests/test-c-cpp-nr/test.input, + tests/test-c-cpp-r/.gitignore, tests/test-c-cpp-r/Makefile.am, + tests/test-c-cpp-r/scanner.l, tests/test-c-cpp-r/test.input: + refactor c_cxx_nr, c_cxx_r tests for new test suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/cxx_basic.ll, + tests/cxx_basic.txt, tests/test-c++-basic/.gitignore, + tests/test-c++-basic/Makefile.am, tests/test-c++-basic/scanner.l, + tests/test-c++-basic/test.input: refactor cxx_basic test for new + test suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/posixly_correct.l, + tests/test-posixly-correct/.gitignore, + tests/test-posixly-correct/Makefile.am, + tests/test-posixly-correct/scanner.l: refactor posixly_correct test + for new test suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, + tests/test-yyextra/.gitignore, tests/test-yyextra/Makefile.am, + tests/test-yyextra/scanner.l, tests/test-yyextra/test.input, + tests/yyextra.l, tests/yyextra.txt: refactor yyextra test for new + test suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/test-top/.gitignore, + tests/test-top/Makefile.am, tests/test-top/main.c, + tests/test-top/scanner.l, tests/test-top/test.input, tests/top.l, + tests/top.txt, tests/top_main.c: refactor top test for new test + suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/string_r.l, + tests/test-string-r/.gitignore, tests/test-string-r/Makefile.am, + tests/test-string-r/scanner.l: refactor string_r test for new test + suite layout + +2014-06-14 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/string_nr.l, + tests/test-string-nr/.gitignore, tests/test-string-nr/Makefile.am, + tests/test-string-nr/scanner.l: refactor string_nr test for new test + suite layout + +2014-06-12 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/prefix_r.l, + tests/prefix_r.txt, tests/test-prefix-r/.gitignore, + tests/test-prefix-r/Makefile.am, tests/test-prefix-r/README, + tests/test-prefix-r/scanner.l, tests/test-prefix-r/test.input: + refactor prefix_r test for new test suite layout + +2014-06-12 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/prefix_nr.l, + tests/prefix_nr.txt, tests/test-prefix-nr/.gitignore, + tests/test-prefix-nr/Makefile.am, tests/test-prefix-nr/README, + tests/test-prefix-nr/scanner.l, tests/test-prefix-nr/test.input: + refactor prefix_nr for new test suite layout + +2014-06-12 Will Estes <westes575@gmail.com> + + * tests/testwrapper.sh: Check if test input file exists. Not all tests have input files, so check if one exists and run the + test program accordingly. + +2014-06-12 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/posix.l, + tests/test-posix/.gitignore, tests/test-posix/Makefile.am, + tests/test-posix/scanner.l: refactor posix test for new test suite + layout + +2014-06-12 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/noansi_r.l, + tests/noansi_r.txt, tests/test-noansi-r/.gitignore, + tests/test-noansi-r/Makefile.am, tests/test-noansi-r/scanner.l, + tests/test-noansi-r/test.input: refactor noansi_r test for new test + suite layout + +2014-06-12 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/noansi_nr.l, + tests/noansi_nr.txt, tests/test-noansi-nr/.gitignore, + tests/test-noansi-nr/Makefile.am, tests/test-noansi-nr/scanner.l, + tests/test-noansi-nr/test.input: refactor noansi_nr for new test + suite layout + +2014-06-05 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/mem_r.l, + tests/mem_r.txt, tests/test-mem-r/.gitignore, + tests/test-mem-r/Makefile.am, tests/test-mem-r/scanner.l, + tests/test-mem-r/test.input: refactor mem_r test for new test suite + layout + +2014-06-05 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/mem_nr.l, + tests/mem_nr.txt, tests/test-mem-nr/.gitignore, + tests/test-mem-nr/Makefile.am, tests/test-mem-nr/scanner.l, + tests/test-mem-nr/test.input: refactor mem_nr test for new test + suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/header_r.txt, + tests/header_r_main.c, tests/header_r_scanner.l, + tests/test-header-r/.gitignore, tests/test-header-r/Makefile.am, + tests/test-header-r/main.c, tests/test-header-r/scanner.l, + tests/test-header-r/test.input: refactor header_r test for new test + suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/header_nr.txt, + tests/header_nr_main.c, tests/header_nr_scanner.l, + tests/test-header-nr/.gitignore, tests/test-header-nr/Makefile.am, + tests/test-header-nr/main.c, tests/test-header-nr/scanner.l, + tests/test-header-nr/test.input: refactor header_nr test for new + test suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/extended.l, + tests/extended.txt, tests/test-extended/.gitignore, + tests/test-extended/Makefile.am, tests/test-extended/scanner.l, + tests/test-extended/test.input: refactor extended test for new test + suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/debug_r.l, + tests/debug_r.txt, tests/test-debug-r/.gitignore, + tests/test-debug-r/Makefile.am, tests/test-debug-r/scanner.l, + tests/test-debug-r/test.input: refactor debug_r test for new test + suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/debug_nr.l, + tests/debug_nr.txt, tests/test-debug-nr/.gitignore, + tests/test-debug-nr/Makefile.am, tests/test-debug-nr/scanner.l, + tests/test-debug-nr/test.input: refactor debug_nr test for new test + suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/ccl.l, tests/ccl.txt, + tests/test-ccl/.gitignore, tests/test-ccl/Makefile.am, + tests/test-ccl/scanner.l, tests/test-ccl/test.input: refactor ccl + test for new test suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/alloc-extra.l, + tests/alloc-extra.txt, tests/alloc_extra.l, tests/alloc_extra.txt, + tests/array-nr.l, tests/array-nr.txt, tests/array-r.l, + tests/array-r.txt, tests/array_nr.l, tests/array_nr.txt, + tests/array_r.l, tests/array_r.txt, tests/basic-nr.l, + tests/basic-nr.txt, tests/basic-r.l, tests/basic-r.txt, + tests/basic_nr.l, tests/basic_nr.txt, tests/basic_r.l, + tests/basic_r.txt, tests/bison-nr-main.c, tests/bison-nr-parser.y, + tests/bison-nr-scanner.l, tests/bison-nr.txt, + tests/bison-yylloc-main.c, tests/bison-yylloc-parser.y, + tests/bison-yylloc-scanner.l, tests/bison-yylloc.txt, + tests/bison-yylval-main.c, tests/bison-yylval-parser.y, + tests/bison-yylval-scanner.l, tests/bison-yylval.txt, + tests/bison_nr.txt, tests/bison_nr_main.c, tests/bison_nr_parser.y, + tests/bison_nr_scanner.l, tests/bison_yylloc.txt, + tests/bison_yylloc_main.c, tests/bison_yylloc_parser.y, + tests/bison_yylloc_scanner.l, tests/bison_yylval.txt, + tests/bison_yylval_main.c, tests/bison_yylval_parser.y, + tests/bison_yylval_scanner.l: use underscores in test file names to + silence automake warnings + +2014-06-04 Will Estes <westes575@gmail.com> + + * .gitignore, m4/.gitignore, m4/Makefile.am: do not track m4 + subdirectory any more + +2014-06-04 Will Estes <westes575@gmail.com> + + * .gitignore, configure.ac: upgrade automake version to 1.14.1 Unfortunately, automake 1.14.1 does not play nicely with + AC_CONFIG_AUX_DIR, so upgrading the used automake version required + removing the build-aux directory and letting autoconf's installed + helper files live more over the tree. + +2014-06-04 Will Estes <westes575@gmail.com> + + * doc/.gitignore: ignore more files generated by texinfo + +2014-06-04 Will Estes <westes575@gmail.com> + + * configure.ac: update gettext version to 0.19 + +2014-06-04 Will Estes <westes575@gmail.com> + + * configure.ac: call LT_INIT earlier in configure.ac + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/bison-yylval-main.c, + tests/bison-yylval-parser.y, tests/bison-yylval-scanner.l, + tests/bison-yylval.txt, tests/test-bison-yylval/.gitignore, + tests/test-bison-yylval/Makefile.am, + tests/test-bison-yylval/main.c, tests/test-bison-yylval/parser.y, + tests/test-bison-yylval/scanner.l, + tests/test-bison-yylval/test.input: refactor bison-yylval test for + new test suite layout + +2014-06-04 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/bison-yylloc-main.c, + tests/bison-yylloc-parser.y, tests/bison-yylloc-scanner.l, + tests/bison-yylloc.txt, tests/test-bison-yylloc/.gitignore, + tests/test-bison-yylloc/Makefile.am, + tests/test-bison-yylloc/main.c, tests/test-bison-yylloc/parser.y, + tests/test-bison-yylloc/scanner.l, + tests/test-bison-yylloc/test.input: refactor bison-yylloc test for + new test suite layout + +2014-06-03 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/bison-nr-main.c, + tests/bison-nr-parser.y, tests/bison-nr-scanner.l, + tests/bison-nr.txt, tests/test-bison-nr/.gitignore, + tests/test-bison-nr/Makefile.am, tests/test-bison-nr/main.c, + tests/test-bison-nr/parser.y, tests/test-bison-nr/scanner.l, + tests/test-bison-nr/test.input: refactor bison-nr test for new test + suite layout + +2014-06-01 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/array-r.l, + tests/array-r.txt, tests/test-array-r/.gitignore, + tests/test-array-r/Makefile.am, tests/test-array-r/scanner.l, + tests/test-array-r/test.input: refactor array-r test for new test + suite layout + +2014-06-01 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: list tests/README with other EXTRA_DIST files + in tests/ + +2014-06-01 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/array-nr.l, + tests/array-nr.txt, tests/test-array-nr/.gitignore, + tests/test-array-nr/Makefile.am, tests/test-array-nr/scanner.l, + tests/test-array-nr/test.input: refactor array-nr test for new test + suite layout + +2014-06-01 Will Estes <westes575@gmail.com> + + * tests/Makefile.am, tests/testwrapper.sh: make tests/testwrapper.sh + more verbose; find input in srcdir Since output is redirected by the automake parallel test suite + driver, turn on both -v and -x in bash for the testwrapper.sh shell + script. This helps a ton in debugging problems with the test harness + itself. In general, the input files are in automake's srcdir and the name of + the test includes the relative path to it (even though that's + supposed to be ./). Therefore, pass srcdir in AM_LOG_FLAGS and + prepend that to the test name as part of constructing the input + file's name. + +2014-06-01 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: distribute tests/testwrapper.sh + +2014-06-01 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/alloc-extra.l, + tests/alloc-extra.txt, tests/test-alloc-extra/.gitignore, + tests/test-alloc-extra/Makefile.am, + tests/test-alloc-extra/scanner.l, tests/test-alloc-extra/test.input: + refacter alloc-extra for new test suite layout + +2014-05-29 Will Estes <westes575@gmail.com> + + * tests/.gitignore, tests/Makefile.am, tests/basic-r.l, + tests/basic-r.txt, tests/test-basic-r/.gitignore, + tests/test-basic-r/Makefile.am, tests/test-basic-r/scanner.l, + tests/test-basic-r/test.input: refactor basic-r test for new test + suite layout + +2014-04-22 Will Estes <westes575@gmail.com> + + * tests/Makefile.am, tests/basic-nr.l, tests/basic-nr.txt, + tests/test-basic-nr/.gitignore, tests/test-basic-nr/Makefile.am, + tests/test-basic-nr/scanner.l, tests/test-basic-nr/test.input, + tests/testwrapper.sh: refactor basic-nr test for new test suite + layout + +2014-04-22 Will Estes <westes575@gmail.com> + + * configure.ac: remove old tests/ subdirectories from build system + +2014-04-22 Will Estes <westes575@gmail.com> + + * configure.ac: add parallel test suite option to build system + +2014-04-22 Will Estes <westes575@gmail.com> + + * tests/.gitignore: ignore files for new test suite layout + +2014-04-22 Will Estes <westes575@gmail.com> + + * tests/Makefile.am: use automake parallel test suite option to + build test suite + +2014-04-09 Manoj Srivastava <srivasta@golden-gryphon.com> + + * tests/test-bison-yylloc/parser.y, + tests/test-bison-yylval/parser.y: Do not use obsolete bison + constructs in tests. In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been + removed (deprecated in Bison 1.875): use %lex-param, %parse-param, + or %param. This commit fixes the tests so they still work. Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com> + +2014-10-31 Christos Zoulas <christos@zoulas.com> + + * src/buf.c, src/filter.c, src/flex.skl, src/flexdef.h, src/gen.c, + src/libmain.c, src/libyywrap.c, src/main.c, src/misc.c, src/nfa.c, + src/scan.l, src/scanflags.c, src/scanopt.c, src/yylex.c: NetBSD + downstream patches. const fixes. -Wconversion fixes for the skeleton files. param namespace protection (add _ to inline function parameters). unused variable/code removal. rename warn to lwarn to avoid conflict with <err.h>. ctype.h function argument correction. merged the error functions lerrif and lerrsf -> lerr. + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/flexdef.h, src/misc.c, src/scanflags.c: Allow error reporting + routines to accept varying number of arguments in modern style + +2014-07-25 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/buf.c: Fix warning on assigning from `const char*` to `char*` + +2014-07-24 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/main.c: Add disambiguation braces in main.c + +2014-07-17 Yuri <yuri@tsoft.com> + + * doc/flex.texi, examples/fastwc/mywc.c, src/ccl.c, src/dfa.c, + src/ecs.c, src/flex.skl, src/flexdef.h, src/gen.c, src/misc.c, + src/nfa.c, src/parse.y, src/scan.l, src/sym.c, src/tblcmp.c: Removed + deprecated 'register' storage class specifier. clang-3.5.0 now + complains about them: warning: 'register' storage class specifier is + deprecated [-Wdeprecated-register] + +2014-06-21 Mariusz Pluciński <mplucinski@mplucinski.com> + + * src/flexdef.h, src/main.c, src/misc.c, src/options.c, + src/options.h, src/yylex.c: Change output formats from octal to + hexadecimal + +2014-06-11 Will Estes <westes575@gmail.com> + + * NEWS, configure.ac: update version number to 2.6.0-pre + +2014-05-03 Will Estes <westes575@gmail.com> + + * src/ecs.c: check limits before using array index cclp; resolves + sf-166 + +2014-04-02 Sean McBride <sean@rogue-research.com> + + * src/flex.skl: Suppress clang warning about empty @param paragraph; + resolves sf#158 Signed-off-by: Will Estes <westes575@gmail.com> + +2014-04-02 Will Estes <westes575@gmail.com> + + * doc/flex.texi: fix punction when talking about colon-bracket + delimiters; resolves sf#167 + +2014-04-02 Will Estes <westes575@gmail.com> + + * doc/flex.texi: remove proofreading comment + +2014-04-02 Will Estes <westes575@gmail.com> + + * doc/flex.texi: Put angle brackets around start condition name; + resolves bug #168. + +2014-04-02 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> + + * lib/Makefile.am, lib/realloc.c: Fix malloc/realloc replacement, + bug#151. Signed-off-by: Will Estes <westes575@gmail.com> + +2014-04-02 Will Estes <westes575@gmail.com> + + * lib/malloc.c: change crlf line ending to lf + +2014-03-26 Will Estes <westes575@gmail.com> + + * NEWS: mention flex 2.5.39 release in NEWS file + +2014-03-26 Will Estes <westes575@gmail.com> + + * control.ac: initial default control file for shipper + +2014-03-05 Cyril Brulebois <kibi@debian.org> + + * src/flex.skl: Adjust buffer sizes on ia64. From the debian change entry: > Finish fixing the ia64 buffer issue. Previous commits increased + YY_READ_BUF_SIZE (where __ia64__ is defined) but left YY_BUF_SIZE + unchanged, so that didn't fix the problem in the end. In the general + case, the latter is twice the former. Therefore set it to the same + ratio in the ia64 case. In general, this sort of architecture specific fix is not the path + we want to take, but the cleanup should be done in a more organized + way in the future and getting it working would be preferrable now. + +2014-02-18 Will Estes <westes575@gmail.com> + + * Makefile.am, src/Makefile.am: move m4 make variable to + src/Makefile.am. This prevents an error when building skel.c caused by the $(m4) make + variable not being defined. Particularly nasty since skel.c would + still be created, thus causing make to think skel.c was up to date. + +2014-02-18 Will Estes <westes575@gmail.com> + + * devel/00EXTRACT-ALL-SYMS.sh, devel/README, devel/dump-tables.pl, + devel/tables.pl: remove unused devel/ subdirectory from codebase + +2014-02-15 Will Estes <westes575@gmail.com> + + * po/Rules-getpo: Add make rule to rsync latest .po files from + translation project. The rule assumes that rsync is on the path and that there is exactly + one domain listed in the DOMAIN make variable. The intent is that + the rule will work with vpath builds. + +2014-02-14 Will Estes <westes575@gmail.com> + + * .gitignore: git ignore directories of the form flex-* + +2014-02-14 Will Estes <westes575@gmail.com> + + * po/POTFILES.in: list source files for translation as now being in + src/ + +2014-02-14 Will Estes <westes575@gmail.com> + + * Makefile.am, configure.ac, tools/Makefile.am: Add tools/ + directory. Since tools/git2cl is a dependency of ChangeLog, not distributing + tools/git2cl with flex causes the "make dist" target to fail in the + distributed tar ball. + +2014-02-14 Will Estes <westes575@gmail.com> + + * Makefile.am: removes extraneous files from EXTRA_DIST as automake + picks them up better without mentioning them + +2014-02-14 Will Estes <westes575@gmail.com> + + * NEWS: mention version 2.6.0 in release news + +2014-02-14 Will Estes <westes575@gmail.com> + + * .gitignore, FlexLexer.h, Makefile.am, buf.c, ccl.c, configure.ac, + dfa.c, doc/.gitignore, doc/Makefile.am, ecs.c, filter.c, flex.skl, + flexdef.h, flexint.h, gen.c, gettext.h, lib/.gitignore, libmain.c, + libyywrap.c, main.c, misc.c, mkskel.sh, nfa.c, options.c, + options.h, parse.y, regex.c, scan.l, scanflags.c, scanopt.c, + scanopt.h, src/.gitignore, src/FlexLexer.h, src/Makefile.am, + src/buf.c, src/ccl.c, src/dfa.c, src/ecs.c, src/filter.c, + src/flex.skl, src/flexdef.h, src/flexint.h, src/gen.c, + src/gettext.h, src/libmain.c, src/libyywrap.c, src/main.c, + src/misc.c, src/mkskel.sh, src/nfa.c, src/options.c, src/options.h, + src/parse.y, src/regex.c, src/scan.l, src/scanflags.c, + src/scanopt.c, src/scanopt.h, src/sym.c, src/tables.c, + src/tables.h, src/tables_shared.c, src/tables_shared.h, + src/tblcmp.c, src/version.h, src/yylex.c, sym.c, tables.c, + tables.h, tables_shared.c, tables_shared.h, tblcmp.c, version.h, + yylex.c: move flex program sources into src/ directory The *.[chly] sources are now in the src directory. This implies a + bunch of changes in Makefile.am and friends to account for the new + location. The .gitignore files are now more local to places where + various object files and generated source files occur. + +2014-02-13 Will Estes <westes575@gmail.com> + + * configure.ac: increment flex version to 2.6.0 + 2014-02-16 Translation Project <coordinator@translationproject.org> * po/ru.po: update ru translation from the translation project diff --git a/Makefile.am b/Makefile.am index fc51921..076ccad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,128 +33,28 @@ # For MS-DOS, add "-DMS_DOS" to DEFS. See the directory MISC/MSDOS for # additional info. -AM_YFLAGS = -d ACLOCAL_AMFLAGS = -I m4 -m4 = @M4@ indent = @INDENT@ -bin_PROGRAMS = flex -lib_LTLIBRARIES = \ - libfl.la \ - libfl_pic.la - -flex_SOURCES = \ - ccl.c \ - dfa.c \ - ecs.c \ - scanflags.c \ - gen.c \ - main.c \ - misc.c \ - nfa.c \ - parse.y \ - scan.l \ - skel.c \ - sym.c \ - tblcmp.c \ - yylex.c \ - options.c \ - scanopt.c \ - buf.c \ - tables.c \ - tables_shared.c \ - filter.c \ - regex.c - - -LDADD = lib/libcompat.la - -libfl_la_SOURCES = \ - libmain.c \ - libyywrap.c - -libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ - -libfl_pic_la_SOURCES = \ - libmain.c \ - libyywrap.c - -libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ - -noinst_HEADERS = \ - flexdef.h \ - flexint.h \ - version.h \ - options.h \ - scanopt.h \ - tables.h \ - tables_shared.h - -include_HEADERS = \ - FlexLexer.h - dist_doc_DATA = \ AUTHORS \ COPYING \ NEWS \ ONEWS \ - README \ - TODO + README EXTRA_DIST = \ .indent.pro \ - ABOUT-NLS \ - INSTALL \ - autogen.sh \ - flex.skl \ - mkskel.sh \ - config.rpath \ - gettext.h - -BUILT_SOURCES = \ - skel.c + autogen.sh SUBDIRS = \ lib \ - . \ + src \ doc \ examples \ po \ - tests - -localedir = $(datadir)/locale -AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -LIBS = @LIBINTL@ @LIBS@ - -skel.c: flex.skl mkskel.sh flexint.h tables_shared.h - sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh >skel.c - -# Explicitly describe dependencies. -# You can recreate this with `gcc -I. -MM *.c' -buf.o: buf.c flexdef.h flexint.h -ccl.o: ccl.c flexdef.h flexint.h -dfa.o: dfa.c flexdef.h flexint.h tables.h tables_shared.h -ecs.o: ecs.c flexdef.h flexint.h -scanflags.o: scanflags.c flexdef.h flexint.h -gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h -libmain.o: libmain.c -libyywrap.o: libyywrap.c -main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \ - tables.h tables_shared.h -misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h -nfa.o: nfa.c flexdef.h flexint.h -options.o: options.c options.h scanopt.h flexdef.h flexint.h -parse.o: parse.c flexdef.h flexint.h tables.h tables_shared.h -scan.o: scan.c flexdef.h flexint.h parse.h -scanopt.o: scanopt.c flexdef.h flexint.h scanopt.h -skel.o: skel.c flexdef.h flexint.h -sym.o: sym.c flexdef.h flexint.h -tables.o: tables.c flexdef.h flexint.h tables.h tables_shared.h -tables_shared.o: tables_shared.c flexdef.h flexint.h tables.h \ - tables_shared.h -tblcmp.o: tblcmp.c flexdef.h flexint.h -yylex.o: yylex.c flexdef.h flexint.h parse.h -filter.o: filter.c flexdef.h flexint.h + tests \ + tools # Create the ChangeLog, but only if we're inside a git working directory @@ -163,50 +63,6 @@ ChangeLog: $(srcdir)/tools/git2cl $(srcdir)/tools/git2cl > $@ \ ; fi -# Run GNU indent on sources. Don't run this unless all the sources compile cleanly. -# -# Whole idea: -# 1. Check for .indent.pro, otherwise indent will use unknown -# settings, or worse, the GNU defaults.) -# 2. Check that this is GNU indent. -# 3. Make sure to process only the NON-generated .c and .h files. -# 4. Run indent twice per file. The first time is a test. -# Otherwise, indent overwrites your file even if it fails! -indentfiles = \ - buf.c \ - ccl.c \ - dfa.c \ - ecs.c \ - scanflags.c \ - filter.c \ - flexdef.h \ - gen.c \ - libmain.c \ - libyywrap.c \ - main.c \ - misc.c \ - nfa.c \ - options.c \ - options.h \ - regex.c \ - scanopt.c \ - scanopt.h \ - sym.c \ - tables.c \ - tables.h \ - tables_shared.c \ - tables_shared.h \ - tblcmp.c - -indent: - if [ -f .indent.pro ] ; then \ - for f in $(indentfiles);\ - do\ - echo indenting $$f ;\ - $(indent) < $$f >/dev/null && indent $$f || echo $$f FAILED to indent ;\ - done \ - fi - install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(LN_S) -f flex$(EXEEXT) flex++$(EXEEXT) @@ -3,7 +3,43 @@ changes between releases of flex. See the file COPYING for copying conditions. -* flex version 2.5.39 +* version 2.6.0 released 2015-11-17 + +** User Visible Changes + +*** C++ scanners now use references instead of pointers. See the manual for details. + +*** A number of compiler warnings were addressed, so flex generated scanners should be quieter under compiler warning scenarios. + +*** Allow error reporting routines to accept varying number of arguments + +*** Removed deprecated 'register' storage class specifier + +*** Changeed output formats from octal to hexadecimal + +*** check limits before using array index cclp; resolves sf-166 + +*** Suppress clang warning about empty @param paragraph; resolves sf#158 + +*** Fixed malloc/realloc replacement, resolves sf bug#151. + +*** Adjusted buffer sizes on ia64. + +*** various documentation and code clean up fixes: resolves sf bugs #167, #168, among other patches. + +** Flex Internals + +*** flex is now organized into subdirectories. This keeps the tree neater at the top level and puts like things near each other and unlike things away from each other. + +*** The test suite has been reorganized and is now run with the parallel test suite harness from automake. + +*** Cleaned up the automake parts of the build system to better reflect what automake does on its own. Also added a call to libtoolize in autogen.sh because autoreconf gets confused without a prior run of libtoolize. + +*** po/Makefile now includes a rule to fetch the latest translations from the translation project. "make -f po/Makefile getpo" from the top level of the flex tree will fetch the files. + +*** New da translation from the translation project + +* flex version 2.5.39 released 2014-03-26 ** no user visible changes in this release @@ -29,4 +29,5 @@ #Makefile first.) touch ChangeLog -autoreconf --install --verbose --force +libtoolize --install --force +autoreconf --install --force diff --git a/config.rpath b/build-aux/config.rpath index 17298f2..ab6fd99 100755 --- a/config.rpath +++ b/build-aux/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-2010 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -25,7 +25,7 @@ # 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 MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -57,13 +57,6 @@ else aix*) wl='-Wl,' ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) @@ -72,9 +65,7 @@ else irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - newsos6) - ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in ecc*) wl='-Wl,' @@ -85,17 +76,26 @@ else lf95*) wl='-Wl,' ;; - pgcc | pgf77 | pgf90) + nagfor*) + wl='-Wl,-Wl,,' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; *Sun\ C*) wl='-Wl,' ;; @@ -103,13 +103,24 @@ else ;; esac ;; + newsos6) + ;; + *nto* | *qnx*) + ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; rdos*) ;; solaris*) - wl='-Wl,' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + wl='-Qoption ld ' + ;; + *) + wl='-Wl,' + ;; + esac ;; sunos4*) wl='-Qoption ld ' @@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; + haiku*) + ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - gnu* | linux* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -325,10 +337,14 @@ else fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) ;; @@ -342,24 +358,15 @@ else ;; darwin* | rhapsody*) hardcode_direct=no - if test "$GCC" = yes ; then + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then : else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -420,6 +427,8 @@ else hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; + *nto* | *qnx*) + ;; openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes @@ -515,7 +524,12 @@ case "$host_os" in library_names_spec='$libname$shrext' ;; amigaos*) - library_names_spec='$libname.a' + case "$host_cpu" in + powerpc*) + library_names_spec='$libname$shrext' ;; + m68k) + library_names_spec='$libname.a' ;; + esac ;; beos*) library_names_spec='$libname$shrext' @@ -534,8 +548,6 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) @@ -547,6 +559,9 @@ case "$host_os" in gnu*) library_names_spec='$libname$shrext' ;; + haiku*) + library_names_spec='$libname$shrext' + ;; hpux9* | hpux10* | hpux11*) case $host_cpu in ia64*) @@ -582,7 +597,7 @@ case "$host_os" in ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) library_names_spec='$libname$shrext' ;; knetbsd*-gnu) @@ -594,7 +609,7 @@ case "$host_os" in newsos6) library_names_spec='$libname$shrext' ;; - nto-qnx*) + *nto* | *qnx*) library_names_spec='$libname$shrext' ;; openbsd*) @@ -625,6 +640,9 @@ case "$host_os" in sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) library_names_spec='$libname$shrext' ;; + tpf*) + library_names_spec='$libname$shrext' + ;; uts4*) library_names_spec='$libname$shrext' ;; diff --git a/ltmain.sh b/build-aux/ltmain.sh index 0096fe6..0f0a2da 100644 --- a/ltmain.sh +++ b/build-aux/ltmain.sh @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to <bug-libtool@gnu.org>. -# GNU libtool home page: <http://www.gnu.org/software/libtool/>. -# General help using GNU software: <http://www.gnu.org/gethelp/>. PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu2" -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES 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, see <http://www.gnu.org/licenses/>. + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" + +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## -dirname="s,/[^/]*$,," -basename="s,^.*/,," +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +## ----------------- ## +## Global variables. ## +## ----------------- ## -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' +## ----------------- ## +## Standard options. ## +## ----------------- ## -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () { - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='[0m' + tc_bold='[1m'; tc_standout='[7m' + tc_red='[31m'; tc_green='[32m' + tc_blue='[34m'; tc_cyan='[36m' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } + + require_term_colors=: } -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () + +## ----------------- ## +## Function library. ## +## ----------------- ## + +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. + + +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. + + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () { - $opt_verbose && func_echo ${1+"$@"} + $debug_cmd - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac } -# func_echo_all arg... + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd + + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- # Invoke $ECHO with all args, space-separated. func_echo_all () { $ECHO "$*" } -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () { - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS } -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () { - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + $debug_cmd - # bash bug again: - : + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 } -# func_fatal_error arg... + +# func_fatal_error ARG... +# ----------------------- # Echo program name prefixed message to standard error, and exit. func_fatal_error () { - func_error ${1+"$@"} - exit $EXIT_FAILURE -} + $debug_cmd -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" + func_error "$*" + exit $EXIT_FAILURE } -help="Try \`$progname --help' for more information." ## default -# func_grep expression filename +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ - save_mktempdir_umask=`umask` + func_mktempdir_umask=`umask` umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" fi - $ECHO "$my_tmpdir" + $ECHO "$_G_tmpdir" } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. ;; *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result } -# func_quote_for_expand arg +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- # Aesthetically quote ARG to be evaled later; same as above, # but do not quote variable references. func_quote_for_expand () { + $debug_cmd + case $1 in *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; *) - my_arg="$1" ;; + _G_arg=$1 ;; esac - case $my_arg in + case $_G_arg in # Double-quote args containing shell metacharacters to delay # word splitting and command substitution for a subsequent eval. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" + _G_arg=\"$_G_arg\" ;; esac - func_quote_for_expand_result="$my_arg" + func_quote_for_expand_result=$_G_arg } -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP # is given, then evaluate it. func_show_eval () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_cmd=$1 + _G_fail_exp=${2-':'} - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" fi - fi + } } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP # is given, then evaluate it. Use the saved locale for evaluation. func_show_eval_locale () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" eval "func_echo $func_quote_for_expand_result" } - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" fi - fi + } } + # func_tr_sh +# ---------- # Turn $1 into a string suitable for a shell variable name. # Result is stored in $func_tr_sh_result. All characters # not in the set a-zA-Z0-9_ are replaced with '_'. Further, # if $1 begins with a digit, a '_' is prepended as well. func_tr_sh () { - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac } -# func_version -# Echo version message to standard output and exit. -func_version () +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () { - $opt_debug + $debug_cmd - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? + $opt_verbose && func_echo "$*" + + : } -# func_usage -# Echo short help message to standard output and exit. -func_usage () + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 3 of the License, 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, see <http://www.gnu.org/licenses/>. + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '<hooked_function_name>_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd + + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} + + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} + + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result +} + + +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () +{ + $debug_cmd + + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result +} + + +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () +{ + $debug_cmd + + func_parse_options_result= + + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift + + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break + + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; + + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result +} + + +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () +{ + $debug_cmd + + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + func_run_hooks func_validate_options ${1+"$@"} + + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result +} + + + +## ----------------- ## +## Helper functions. ## +## ----------------- ## + +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + $debug_cmd + + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + + func_usage_message + $ECHO "$long_help_message + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to <bug-libtool@gnu.org>. +GNU libtool home page: <http://www.gnu.org/software/libtool/>. +General help using GNU software: <http://www.gnu.org/gethelp/>." + exit 0 +} -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } -# func_fatal_configuration arg... + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi + + +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ func_config () exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ func_features () exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () { - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done + $debug_cmd - # Validate options: + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; + + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + $opt_help || { + # Sanity checks first: + func_check_version_match + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } + + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ func_enable_tag "$optarg" ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ func_lalib_unsafe_p () for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ func_lalib_unsafe_p () # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname () { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ func_ltwrapper_p () # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ func_execute_cmds () # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ func_resolve_sysroot () # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ func_replace_sysroot () # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ func_infer_tag () for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ func_infer_tag () # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ func_infer_tag () # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ func_write_libtool_object () $opt_dry_run || { cat >${write_libobj}T <<EOF # $write_libobj - a libtool object file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -1462,7 +2739,7 @@ pic_object=$write_lobj non_pic_object=$write_oldobj EOF - $MV "${write_libobj}T" "${write_libobj}" + $MV "${write_libobj}T" "$write_libobj" } } @@ -1482,8 +2759,9 @@ EOF # be empty on error (or when ARG is empty) func_convert_core_file_wine_to_w32 () { - $opt_debug - func_convert_core_file_wine_to_w32_result="$1" + $debug_cmd + + func_convert_core_file_wine_to_w32_result=$1 if test -n "$1"; then # Unfortunately, winepath does not exit with a non-zero error code, so we # are forced to check the contents of stdout. On the other hand, if the @@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 () # *an error message* to stdout. So we must check for both error code of # zero AND non-empty stdout, which explains the odd construction: func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 () # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 () # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ func_cygpath () fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ func_cygpath () # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 () # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ func_convert_file_check () # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_convert_path_check () func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ func_convert_path_check () # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep () ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep () # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ func_to_host_file () # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ func_to_tool_file () # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ func_convert_file_noop () # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 () # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 () # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 () # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin () # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin () ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin () to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd () # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ func_to_host_path () # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ func_convert_path_noop () # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 () func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 () # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 () # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 () # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin () # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin () func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin () # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ func_mode_compile () case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ func_mode_compile () case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_mode_compile () func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ func_mode_compile () # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_mode_compile () func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ func_mode_compile () case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ func_mode_compile () for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_mode_compile () func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ func_mode_compile () pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ func_mode_compile () # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ func_mode_compile () This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ compiler." qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ compiler." func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ $srcfile This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ compiler." fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ compiler." func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ $srcfile This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ compiler." func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ compiler." } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ func_mode_help () Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ This mode accepts the following additional options: -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ This mode accepts the following additional options: -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries. Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed." Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially: -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially: -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially: -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created." Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ if $opt_help; then for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ if $opt_help; then func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ fi # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ func_mode_execute () # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ func_mode_execute () if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ func_mode_execute () *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ func_mode_execute () # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ func_mode_execute () if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_mode_execute () func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ func_mode_execute () done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ func_mode_finish () if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ func_mode_finish () # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ func_mode_finish () fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ func_mode_finish () echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ func_mode_finish () exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ func_mode_install () opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ func_mode_install () fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_mode_install () func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ func_mode_install () dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ func_mode_install () case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ func_mode_install () # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ func_mode_install () # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ func_mode_install () fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ func_mode_install () # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ func_mode_install () if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ func_mode_install () fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ func_mode_install () # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ func_mode_install () staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_mode_install () func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ func_mode_install () *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ func_mode_install () # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_mode_install () func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ func_mode_install () for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ func_mode_install () done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"} # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ func_generate_dlsyms () "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_generate_dlsyms () func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ extern \"C\" { progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ extern \"C\" { # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ extern \"C\" { } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ extern \"C\" { fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen <import library>. $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ extern \"C\" { fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ extern \"C\" { echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ typedef struct { void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() { *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() { func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() { esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() { fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() { # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ func_win32_libid () # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ func_win32_libid () # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib () # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core () /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core () $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p () # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback () # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ func_extract_an_archive () fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ func_extract_an_archive () # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ func_extract_archives () esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ func_extract_archives () cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ func_extract_archives () my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ func_extract_archives () # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ func_emit_wrapper () #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ _LTECHO_EOF' # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ func_parse_lt_options () # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ func_lt_dump_args () lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ func_exec_program_core () *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ func_exec_program_core () *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ func_exec_program () test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ func_exec_program () if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ func_exec_program () fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ func_exec_program () fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src () cat <<EOF /* $cwrappersource - temporary wrapper executable for $objdir/$outputname - Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION + Generated by $PROGRAM (GNU $PACKAGE) $VERSION The $output program cannot be directly executed until all the libtool libraries that it depends on are installed. @@ -4175,47 +5550,45 @@ EOF #include <fcntl.h> #include <sys/stat.h> +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int); # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int); #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f); EOF cat <<EOF -volatile const char * MAGIC_EXE = "$magic_exe"; +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) +# define externally_visible volatile +#else +# define externally_visible __attribute__((externally_visible)) volatile +#endif +externally_visible const char * MAGIC_EXE = "$magic_exe"; const char * LIB_PATH_VARNAME = "$shlibpath_var"; EOF - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then func_to_host_path "$temp_rpath" cat <<EOF const char * LIB_PATH_VALUE = "$func_to_host_path_result"; @@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = ""; EOF fi - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then cat <<EOF const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */ EOF @@ -4357,12 +5735,12 @@ main (int argc, char *argv[]) char *actual_cwrapper_name; char *target_name; char *lt_argv_zero; - intptr_t rval = 127; + int rval = 127; int i; program_name = (char *) xstrdup (base_name (argv[0])); - newargz = XMALLOC (char *, argc + 1); + newargz = XMALLOC (char *, (size_t) argc + 1); /* very simple arg parsing; don't want to rely on getopt * also, copy all non cwrapper options to newargz, except @@ -4371,10 +5749,10 @@ main (int argc, char *argv[]) newargc=0; for (i = 1; i < argc; i++) { - if (strcmp (argv[i], dumpscript_opt) == 0) + if (STREQ (argv[i], dumpscript_opt)) { EOF - case "$host" in + case $host in *mingw* | *cygwin* ) # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" @@ -4385,12 +5763,12 @@ EOF lt_dump_script (stdout); return 0; } - if (strcmp (argv[i], debug_opt) == 0) + if (STREQ (argv[i], debug_opt)) { lt_debug = 1; continue; } - if (strcmp (argv[i], ltwrapper_option_prefix) == 0) + if (STREQ (argv[i], ltwrapper_option_prefix)) { /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX namespace, but it is not one of the ones we know about and @@ -4413,7 +5791,7 @@ EOF EOF cat <<EOF /* The GNU banner must be the first non-error debug message */ - lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n"); EOF cat <<"EOF" lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); @@ -4524,7 +5902,7 @@ EOF cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ newargz = prepare_spawn (newargz); - rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); + rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ @@ -4569,7 +5947,7 @@ base_name (const char *name) { const char *base; -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +#if defined HAVE_DOS_BASED_FILE_SYSTEM /* Skip over the disk name in MSDOS pathnames. */ if (isalpha ((unsigned char) name[0]) && name[1] == ':') name += 2; @@ -4628,7 +6006,7 @@ find_executable (const char *wrapper) const char *p_next; /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; - int tmp_len; + size_t tmp_len; char *concat_name; lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", @@ -4638,7 +6016,7 @@ find_executable (const char *wrapper) return NULL; /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +#if defined HAVE_DOS_BASED_FILE_SYSTEM if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') { concat_name = xstrdup (wrapper); @@ -4656,7 +6034,7 @@ find_executable (const char *wrapper) return concat_name; XFREE (concat_name); } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +#if defined HAVE_DOS_BASED_FILE_SYSTEM } #endif @@ -4679,7 +6057,7 @@ find_executable (const char *wrapper) for (q = p; *q; q++) if (IS_PATH_SEPARATOR (*q)) break; - p_len = q - p; + p_len = (size_t) (q - p); p_next = (*q == '\0' ? q : q + 1); if (p_len == 0) { @@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat) if (patlen <= len) { str += len - patlen; - if (strcmp (str, pat) == 0) + if (STREQ (str, pat)) *str = '\0'; } return str; @@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value) char *str = xstrdup (value); setenv (name, str, 1); #else - int len = strlen (name) + 1 + strlen (value) + 1; + size_t len = strlen (name) + 1 + strlen (value) + 1; char *str = XMALLOC (char, len); sprintf (str, "%s=%s", name, value); if (putenv (str) != EXIT_SUCCESS) @@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) char *new_value; if (orig_value && *orig_value) { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); + size_t orig_value_len = strlen (orig_value); + size_t add_len = strlen (add); new_value = XMALLOC (char, add_len + orig_value_len + 1); if (to_end) { @@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value) { char *new_value = lt_extend_str (getenv (name), value, 0); /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ EOF # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ func_mode_link () module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ func_mode_link () vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ func_mode_link () do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ func_mode_link () # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ func_mode_link () case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ func_mode_link () continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ func_mode_link () continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ func_mode_link () esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ func_mode_link () continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ func_mode_link () if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ func_mode_link () fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ func_mode_link () # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ func_mode_link () if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_mode_link () func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_mode_link () func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ func_mode_link () continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ func_mode_link () esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ func_mode_link () -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ func_mode_link () if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_mode_link () func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ func_mode_link () *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ func_mode_link () ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ func_mode_link () ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ func_mode_link () ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ func_mode_link () continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ func_mode_link () ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ func_mode_link () *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ func_mode_link () continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_mode_link () func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_mode_link () func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ func_mode_link () # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ func_mode_link () # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ func_mode_link () if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ func_mode_link () fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ func_mode_link () # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ func_mode_link () if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_mode_link () func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ func_mode_link () # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ func_mode_link () # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ func_mode_link () done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ func_mode_link () oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_mode_link () func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ func_mode_link () case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ func_mode_link () prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,32 +7549,29 @@ func_mode_link () for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6151,26 +7592,26 @@ func_mode_link () esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6180,13 +7621,13 @@ func_mode_link () continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6194,31 +7635,22 @@ func_mode_link () for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6226,19 +7658,19 @@ func_mode_link () old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6247,15 +7679,25 @@ func_mode_link () *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6268,18 +7710,18 @@ func_mode_link () case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6290,13 +7732,13 @@ func_mode_link () func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6314,7 +7756,7 @@ func_mode_link () lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6325,21 +7767,26 @@ func_mode_link () case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6347,18 +7794,13 @@ func_mode_link () echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6369,10 +7811,10 @@ func_mode_link () esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6385,22 +7827,20 @@ func_mode_link () continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6430,36 +7870,36 @@ func_mode_link () done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -6467,26 +7907,26 @@ func_mode_link () # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6500,40 +7940,40 @@ func_mode_link () # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6542,11 +7982,11 @@ func_mode_link () name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6590,9 +8030,9 @@ func_mode_link () if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6602,14 +8042,14 @@ func_mode_link () fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6621,14 +8061,14 @@ func_mode_link () ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6638,15 +8078,15 @@ func_mode_link () continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6675,9 +8115,9 @@ func_mode_link () esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6686,19 +8126,19 @@ func_mode_link () link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6708,24 +8148,24 @@ func_mode_link () # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6753,43 +8193,43 @@ func_mode_link () # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6797,58 +8237,58 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6857,10 +8297,10 @@ func_mode_link () ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6868,7 +8308,7 @@ func_mode_link () *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6878,15 +8318,15 @@ func_mode_link () *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6895,33 +8335,33 @@ func_mode_link () fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6930,10 +8370,10 @@ func_mode_link () ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6941,43 +8381,43 @@ func_mode_link () test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6990,11 +8430,11 @@ func_mode_link () fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7008,12 +8448,12 @@ func_mode_link () *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7023,7 +8463,7 @@ func_mode_link () func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7032,12 +8472,12 @@ func_mode_link () func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7045,12 +8485,12 @@ func_mode_link () dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7058,35 +8498,35 @@ func_mode_link () case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7098,23 +8538,23 @@ func_mode_link () fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7124,12 +8564,12 @@ func_mode_link () esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7187,62 +8627,93 @@ func_mode_link () eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7251,10 +8722,10 @@ func_mode_link () eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7268,8 +8739,8 @@ func_mode_link () esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7278,21 +8749,21 @@ func_mode_link () fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7301,20 +8772,20 @@ func_mode_link () fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7322,45 +8793,42 @@ func_mode_link () case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7368,30 +8836,30 @@ func_mode_link () case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7406,26 +8874,36 @@ func_mode_link () # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7436,69 +8914,74 @@ func_mode_link () nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7512,42 +8995,45 @@ func_mode_link () verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7556,8 +9042,8 @@ func_mode_link () case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7573,11 +9059,11 @@ func_mode_link () fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7598,13 +9084,13 @@ func_mode_link () *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7614,7 +9100,7 @@ func_mode_link () done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7623,7 +9109,7 @@ func_mode_link () esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7647,7 +9133,7 @@ func_mode_link () ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7663,9 +9149,9 @@ func_mode_link () # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7694,20 +9180,20 @@ EOF -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7737,20 +9223,20 @@ EOF $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7787,24 +9273,24 @@ EOF -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7822,25 +9308,25 @@ EOF # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7848,7 +9334,7 @@ EOF echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7871,30 +9357,30 @@ EOF -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7902,7 +9388,7 @@ EOF echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7918,18 +9404,18 @@ EOF done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7953,8 +9439,8 @@ EOF ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7963,12 +9449,12 @@ EOF if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7979,14 +9465,14 @@ EOF echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8032,7 +9518,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8040,25 +9526,25 @@ EOF dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8083,7 +9569,7 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8097,8 +9583,8 @@ EOF test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8108,19 +9594,19 @@ EOF eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8134,7 +9620,7 @@ EOF delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8143,31 +9629,31 @@ EOF cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8181,7 +9667,7 @@ EOF try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8192,7 +9678,7 @@ EOF output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8215,8 +9701,8 @@ EOF break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8224,16 +9710,16 @@ EOF fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8252,11 +9738,11 @@ EOF ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8267,7 +9753,7 @@ EOF eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8276,18 +9762,18 @@ EOF fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8305,7 +9791,7 @@ EOF fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8338,8 +9824,8 @@ EOF last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8351,14 +9837,14 @@ EOF func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8373,7 +9859,7 @@ EOF else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8385,13 +9871,13 @@ EOF func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8401,10 +9887,10 @@ EOF reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8416,9 +9902,9 @@ EOF # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8426,9 +9912,9 @@ EOF output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8437,16 +9923,16 @@ EOF if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8454,7 +9940,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8463,7 +9949,7 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8471,18 +9957,18 @@ EOF fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8491,7 +9977,7 @@ EOF export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8505,7 +9991,7 @@ EOF # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8527,7 +10013,7 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8535,11 +10021,12 @@ EOF test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8547,7 +10034,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8556,10 +10043,10 @@ EOF exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8579,39 +10066,39 @@ EOF done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8619,7 +10106,7 @@ EOF ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8632,17 +10119,19 @@ EOF # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8651,12 +10140,12 @@ EOF fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8668,7 +10157,7 @@ EOF exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8678,12 +10167,12 @@ EOF # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8700,16 +10189,14 @@ EOF output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8723,11 +10210,11 @@ EOF *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8763,7 +10250,7 @@ EOF *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8787,7 +10274,7 @@ EOF if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8810,7 +10297,7 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8827,10 +10314,10 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8838,7 +10325,7 @@ EOF if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8863,45 +10350,43 @@ EOF # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8914,12 +10399,12 @@ EOF fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8949,9 +10434,9 @@ EOF fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8968,27 +10453,28 @@ EOF exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9045,8 +10531,8 @@ EOF func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9067,7 +10553,7 @@ EOF trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9090,25 +10576,27 @@ EOF # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9116,13 +10604,13 @@ EOF fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9143,7 +10631,7 @@ EOF : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9152,7 +10640,7 @@ EOF for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9221,18 +10709,18 @@ EOF else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9249,7 +10737,7 @@ EOF case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9264,31 +10752,31 @@ EOF fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9304,23 +10792,23 @@ EOF *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9330,34 +10818,34 @@ EOF # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9373,10 +10861,9 @@ EOF case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9385,7 +10872,7 @@ EOF esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9399,7 +10886,7 @@ library_names='$library_names' # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9425,7 +10912,7 @@ dlpreopen='$dlprefiles' # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9440,27 +10927,29 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9473,18 +10962,18 @@ func_mode_uninstall () for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9499,11 +10988,11 @@ func_mode_uninstall () elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9517,7 +11006,7 @@ func_mode_uninstall () done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9528,12 +11017,12 @@ func_mode_uninstall () uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9549,21 +11038,19 @@ func_mode_uninstall () func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9590,12 +11077,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9604,7 +11091,7 @@ func_mode_uninstall () func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9614,16 +11101,17 @@ func_mode_uninstall () exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9634,7 +11122,7 @@ exit $exit_status # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9657,5 +11145,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff --git a/build-aux/missing b/build-aux/missing new file mode 100755 index 0000000..f62bbae --- /dev/null +++ b/build-aux/missing @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + +# 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, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/build-aux/test-driver b/build-aux/test-driver new file mode 100755 index 0000000..8e575b0 --- /dev/null +++ b/build-aux/test-driver @@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2014 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, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + *) break;; + esac + shift +done + +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/build-aux/ylwrap b/build-aux/ylwrap new file mode 100755 index 0000000..7c2d927 --- /dev/null +++ b/build-aux/ylwrap @@ -0,0 +1,247 @@ +#! /bin/sh +# ylwrap - wrapper for lex/yacc invocations. + +scriptversion=2013-01-12.17; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# Written by Tom Tromey <tromey@cygnus.com>. +# +# 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, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +get_dirname () +{ + case $1 in + */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';; + # Otherwise, we want the empty string (not "."). + esac +} + +# guard FILE +# ---------- +# The CPP macro used to guard inclusion of FILE. +guard () +{ + printf '%s\n' "$1" \ + | sed \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' \ + -e 's/__*/_/g' +} + +# quote_for_sed [STRING] +# ---------------------- +# Return STRING (or stdin) quoted to be used as a sed pattern. +quote_for_sed () +{ + case $# in + 0) cat;; + 1) printf '%s\n' "$1";; + esac \ + | sed -e 's|[][\\.*]|\\&|g' +} + +case "$1" in + '') + echo "$0: No files given. Try '$0 --help' for more information." 1>&2 + exit 1 + ;; + --basedir) + basedir=$2 + shift 2 + ;; + -h|--h*) + cat <<\EOF +Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... + +Wrapper for lex/yacc invocations, renaming files as desired. + + INPUT is the input file + OUTPUT is one file PROG generates + DESIRED is the file we actually want instead of OUTPUT + PROGRAM is program to run + ARGS are passed to PROG + +Any number of OUTPUT,DESIRED pairs may be used. + +Report bugs to <bug-automake@gnu.org>. +EOF + exit $? + ;; + -v|--v*) + echo "ylwrap $scriptversion" + exit $? + ;; +esac + + +# The input. +input=$1 +shift +# We'll later need for a correct munging of "#line" directives. +input_sub_rx=`get_dirname "$input" | quote_for_sed` +case $input in + [\\/]* | ?:[\\/]*) + # Absolute path; do nothing. + ;; + *) + # Relative path. Make it absolute. + input=`pwd`/$input + ;; +esac +input_rx=`get_dirname "$input" | quote_for_sed` + +# Since DOS filename conventions don't allow two dots, +# the DOS version of Bison writes out y_tab.c instead of y.tab.c +# and y_tab.h instead of y.tab.h. Test to see if this is the case. +y_tab_nodot=false +if test -f y_tab.c || test -f y_tab.h; then + y_tab_nodot=true +fi + +# The parser itself, the first file, is the destination of the .y.c +# rule in the Makefile. +parser=$1 + +# A sed program to s/FROM/TO/g for all the FROM/TO so that, for +# instance, we rename #include "y.tab.h" into #include "parse.h" +# during the conversion from y.tab.c to parse.c. +sed_fix_filenames= + +# Also rename header guards, as Bison 2.7 for instance uses its header +# guard in its implementation file. +sed_fix_header_guards= + +while test $# -ne 0; do + if test x"$1" = x"--"; then + shift + break + fi + from=$1 + # Handle y_tab.c and y_tab.h output by DOS + if $y_tab_nodot; then + case $from in + "y.tab.c") from=y_tab.c;; + "y.tab.h") from=y_tab.h;; + esac + fi + shift + to=$1 + shift + sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;" + sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;" +done + +# The program to run. +prog=$1 +shift +# Make any relative path in $prog absolute. +case $prog in + [\\/]* | ?:[\\/]*) ;; + *[\\/]*) prog=`pwd`/$prog ;; +esac + +dirname=ylwrap$$ +do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' +trap "ret=129; $do_exit" 1 +trap "ret=130; $do_exit" 2 +trap "ret=141; $do_exit" 13 +trap "ret=143; $do_exit" 15 +mkdir $dirname || exit 1 + +cd $dirname + +case $# in + 0) "$prog" "$input" ;; + *) "$prog" "$@" "$input" ;; +esac +ret=$? + +if test $ret -eq 0; then + for from in * + do + to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"` + if test -f "$from"; then + # If $2 is an absolute path name, then just use that, + # otherwise prepend '../'. + case $to in + [\\/]* | ?:[\\/]*) target=$to;; + *) target=../$to;; + esac + + # Do not overwrite unchanged header files to avoid useless + # recompilations. Always update the parser itself: it is the + # destination of the .y.c rule in the Makefile. Divert the + # output of all other files to a temporary file so we can + # compare them to existing versions. + if test $from != $parser; then + realtarget=$target + target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` + fi + + # Munge "#line" or "#" directives. Don't let the resulting + # debug information point at an absolute srcdir. Use the real + # output file name, not yy.lex.c for instance. Adjust the + # include guards too. + sed -e "/^#/!b" \ + -e "s|$input_rx|$input_sub_rx|" \ + -e "$sed_fix_filenames" \ + -e "$sed_fix_header_guards" \ + "$from" >"$target" || ret=$? + + # Check whether files must be updated. + if test "$from" != "$parser"; then + if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then + echo "$to is unchanged" + rm -f "$target" + else + echo "updating $to" + mv -f "$target" "$realtarget" + fi + fi + else + # A missing file is only an error for the parser. This is a + # blatant hack to let us support using "yacc -d". If -d is not + # specified, don't fail when the header file is "missing". + if test "$from" = "$parser"; then + ret=1 + fi + fi + done +fi + +# Remove the directory. +cd .. +rm -rf $dirname + +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure.ac b/configure.ac index 871082f..4c519dc 100644 --- a/configure.ac +++ b/configure.ac @@ -24,27 +24,28 @@ # autoconf requirements and initialization -AC_INIT([the fast lexical analyser generator], [2.5.39], +AC_INIT([the fast lexical analyser generator], [2.6.0], [flex-help@lists.sourceforge.net], [flex]) +AC_CONFIG_SRCDIR([src/scan.l]) +AC_CONFIG_AUX_DIR([build-aux]) +LT_INIT +AM_INIT_AUTOMAKE([gnu check-news std-options dist-bzip2 dist-xz parallel-tests 1.14.1]) +AC_CONFIG_HEADER([src/config.h]) +AC_CONFIG_LIBOBJ_DIR([lib]) +AC_CONFIG_MACRO_DIR([m4]) SHARED_VERSION_INFO="2:0:0" AC_SUBST(SHARED_VERSION_INFO) -AC_CONFIG_SRCDIR([scan.l]) -AM_INIT_AUTOMAKE([gnu check-news std-options dist-bzip2 dist-xz 1.10]) -AC_CONFIG_HEADER([config.h:conf.in]) -AC_CONFIG_LIBOBJ_DIR([lib]) - # checks for programs AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19]) AC_PROG_YACC AM_PROG_LEX AC_PROG_CC AC_PROG_CXX AM_PROG_CC_C_O AC_PROG_LN_S -LT_INIT AC_PROG_AWK AC_PROG_INSTALL @@ -93,6 +94,7 @@ AC_DEFINE([HAVE_LIBPTHREAD], 1, [pthread library] ), AC_DEFINE([HAVE_LIBPTHREAD], 0, [pthread library] ) ) AC_CHECK_HEADERS([pthread.h]) +AM_CONDITIONAL([want_pthread], [test x$ac_cv_lib_pthread_pthread_mutex_lock = xyes]) AC_CHECK_LIB(m, log10) @@ -118,56 +120,9 @@ examples/fastwc/Makefile examples/manual/Makefile lib/Makefile po/Makefile.in +src/Makefile +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-alloc-extra/Makefile -tests/test-lineno-nr/Makefile -tests/test-lineno-trailing/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 -tests/test-quotes/Makefile -tests/test-ccl/Makefile -tests/test-extended/Makefile -tests/test-c++-yywrap/Makefile -tests/test-concatenated-options/Makefile -dnl --new-test-here-- This line is processed by tests/create-test. ) AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am index 0e23dca..e776c18 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,9 +23,9 @@ CLEANFILES = \ flex.vr \ flex.vrs -$(dist_man_MANS): $(top_srcdir)/main.c +$(dist_man_MANS): $(top_srcdir)/configure.ac $(top_srcdir)/src/flex.skl $(top_srcdir)/src/options.c $(top_srcdir)/src/options.h for i in $(dist_man_MANS) ; do \ $(help2man) --name='$(PACKAGE_NAME)' \ --section=`echo $$i | sed -e 's/.*\.\([^.]*\)$$/\1/'` \ - ../flex$(EXEEXT) > $$i || rm -f $$i ; \ + $(top_srcdir)/src/flex$(EXEEXT) > $$i || rm -f $$i ; \ done diff --git a/doc/flex.texi b/doc/flex.texi index 07ce3ac..9b7d83f 100644 --- a/doc/flex.texi +++ b/doc/flex.texi @@ -895,7 +895,7 @@ And to match a sequence of zero or more repetitions of @samp{foo} and @cindex character classes in patterns In addition to characters and ranges of characters, character classes can also contain @dfn{character class expressions}. These are -expressions enclosed inside @samp{[}: and @samp{:]} delimiters (which +expressions enclosed inside @samp{[:} and @samp{:]} delimiters (which themselves must appear between the @samp{[} and @samp{]} of the character class. Other elements may occur inside the character class, too). The valid expressions are: @@ -1404,7 +1404,7 @@ example, the following is one way to eat up C comments: @verbatim %% "/*" { - register int c; + int c; for ( ; ; ) { @@ -1601,7 +1601,6 @@ Any rule whose pattern is prefixed with @samp{<sc>} will only be active when the scanner is in the @dfn{start condition} named @code{sc}. For example, -@c proofread edit stopped here @example @verbatim <STRING>[^"]* { /* eat up the string body ... */ @@ -1934,9 +1933,9 @@ condition @dfn{scope}. A start condition scope is begun with: @end verbatim @end example -where @code{SCs} is a list of one or more start conditions. Inside the +where @code{<SCs>} is a list of one or more start conditions. Inside the start condition scope, every rule automatically has the prefix -@code{SCs>} applied to it, until a @samp{@}} which matches the initial +@code{<SCs>} applied to it, until a @samp{@}} which matches the initial @samp{@{}. So, for example, @cindex extended scope of start conditions @@ -3765,8 +3764,7 @@ defaults to generating the scanner to the file @file{lex.yy.cc} instead of @file{lex.yy.c}. The generated scanner includes the header file @file{FlexLexer.h}, which defines the interface to two C++ classes. -The first class, -@code{FlexLexer}, +The first class in @file{FlexLexer.h}, @code{FlexLexer}, provides an abstract base class defining the general scanner class interface. It provides the following member functions: @@ -3800,10 +3798,10 @@ returns the current setting of the debugging flag. Also provided are member functions equivalent to @code{yy_switch_to_buffer()}, @code{yy_create_buffer()} (though the -first argument is an @code{istream*} object pointer and not a +first argument is an @code{istream&} object reference and not a @code{FILE*)}, @code{yy_flush_buffer()}, @code{yy_delete_buffer()}, and -@code{yyrestart()} (again, the first argument is a @code{istream*} -object pointer). +@code{yyrestart()} (again, the first argument is a @code{istream&} +object reference). @tindex yyFlexLexer (C++ only) @tindex FlexLexer (C++ only) @@ -3814,9 +3812,12 @@ additional member functions: @table @code @findex yyFlexLexer constructor (C++ only) @item yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 ) +@item yyFlexLexer( istream& arg_yyin, ostream& arg_yyout ) constructs a @code{yyFlexLexer} object using the given streams for input and output. If not specified, the streams default to @code{cin} and -@code{cout}, respectively. +@code{cout}, respectively. @code{yyFlexLexer} does not take ownership of +its stream arguments. It's up to the user to ensure the streams pointed +to remain alive at least as long as the @code{yyFlexLexer} instance. @findex yylex (C++ version) @item virtual int yylex() @@ -3833,11 +3834,13 @@ instead of @code{yyFlexLexer}. In this case, rather than generating @findex switch_streams (C++ only) @item virtual void switch_streams(istream* new_in = 0, ostream* new_out = 0) +@item virtual void switch_streams(istream& new_in, ostream& new_out) reassigns @code{yyin} to @code{new_in} (if non-null) and @code{yyout} to @code{new_out} (if non-null), deleting the previous input buffer if @code{yyin} is reassigned. @item int yylex( istream* new_in, ostream* new_out = 0 ) +@item int yylex( istream& new_in, ostream& new_out ) first switches the input streams via @code{switch_streams( new_in, new_out )} and then returns the value of @code{yylex()}. @end table @@ -3894,7 +3897,7 @@ Here is an example of a simple C++ scanner: int mylineno = 0; %} - %option noyywrap + %option noyywrap c++ string \"[^\n"]+\" @@ -3939,6 +3942,9 @@ Here is an example of a simple C++ scanner: %% + // This include is required if main() is an another source file. + //#include <FlexLexer.h> + int main( int /* argc */, char** /* argv */ ) { FlexLexer* lexer = new yyFlexLexer; @@ -4911,8 +4917,10 @@ custom allocator through @code{yyextra}. %option reentrant /* Initialize the allocator. */ +%{ #define YY_EXTRA_TYPE struct allocator* #define YY_USER_INIT yyextra = allocator_create(); +%} %% .|\n ; diff --git a/examples/fastwc/mywc.c b/examples/fastwc/mywc.c index 92e5a36..b07d5f0 100644 --- a/examples/fastwc/mywc.c +++ b/examples/fastwc/mywc.c @@ -5,7 +5,7 @@ main() { - register int c, cc = 0, wc = 0, lc = 0; + int c, cc = 0, wc = 0, lc = 0; FILE *f = stdin; while ((c = getc(f)) != EOF) { diff --git a/lib/Makefile.am b/lib/Makefile.am index 391465f..011163e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ noinst_LTLIBRARIES = libcompat.la libcompat_la_SOURCES = lib.c -libcompat_la_LIBADD = $(LIBOBJS) +libcompat_la_LIBADD = $(LTLIBOBJS) diff --git a/lib/Makefile.in b/lib/Makefile.in index 7cd9f29..158a047 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 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. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in malloc.c \ - realloc.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -65,27 +100,53 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libcompat_la_DEPENDENCIES = $(LIBOBJS) +libcompat_la_DEPENDENCIES = $(LTLIBOBJS) am_libcompat_la_OBJECTS = lib.lo libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libcompat_la_SOURCES) DIST_SOURCES = $(libcompat_la_SOURCES) am__can_run_installinfo = \ @@ -93,12 +154,32 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp malloc.c realloc.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -154,6 +235,7 @@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ M4 = @M4@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -244,7 +326,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libcompat.la libcompat_la_SOURCES = lib.c -libcompat_la_LIBADD = $(LIBOBJS) +libcompat_la_LIBADD = $(LTLIBOBJS) all: all-am .SUFFIXES: @@ -261,7 +343,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -282,14 +363,17 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES) - $(LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -297,30 +381,30 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -328,26 +412,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -359,15 +432,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -376,6 +445,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -517,18 +601,21 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/malloc.c b/lib/malloc.c index d4c605f..75e8ef9 100755 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,17 +1,17 @@ - #include <config.h>
- #undef malloc
-
- #include <sys/types.h>
-
- void *malloc ();
-
- /* Allocate an N-byte block of memory from the heap.
- If N is zero, allocate a 1-byte block. */
-
- void *
- rpl_malloc (size_t n)
- {
- if (n == 0)
- n = 1;
- return malloc (n);
- }
+ #include <config.h> + #undef malloc + + #include <sys/types.h> + + void *malloc (); + + /* Allocate an N-byte block of memory from the heap. + If N is zero, allocate a 1-byte block. */ + + void * + rpl_malloc (size_t n) + { + if (n == 0) + n = 1; + return malloc (n); + } diff --git a/lib/realloc.c b/lib/realloc.c index d7bb629..79bfd28 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -1,4 +1,6 @@ #include <config.h> +#undef realloc +#undef malloc #include <stdlib.h> diff --git a/m4/gettext.m4 b/m4/gettext.m4 index f84e6a5..be247bf 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 63 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +# gettext.m4 serial 66 (gettext-0.18.2) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. +dnl the value '$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled @@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. gt_INTL_MACOSX dnl Set USE_NLS. @@ -157,12 +157,18 @@ changequote([,])dnl fi AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_TRY_LINK([#include <libintl.h> + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], +extern int *_nl_domain_bindings; + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ]])], [eval "$gt_func_gnugettext_libc=yes"], [eval "$gt_func_gnugettext_libc=no"])]) @@ -183,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include <libintl.h> + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <libintl.h> + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) diff --git a/m4/iconv.m4 b/m4/iconv.m4 index e2041b9..4b29c5f 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 11 (gettext-0.18.1) -dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. +# iconv.m4 serial 18 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,27 +30,35 @@ AC_DEFUN([AM_ICONV_LINK], dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <stdlib.h> +#include <iconv.h> + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <stdlib.h> +#include <iconv.h> + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], [am_cv_lib_iconv=yes] [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" @@ -58,16 +66,19 @@ AC_DEFUN([AM_ICONV_LINK], ]) if test "$am_cv_func_iconv" = yes; then AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ - dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, + dnl Solaris 10. am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - AC_TRY_RUN([ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include <iconv.h> #include <string.h> int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -84,7 +95,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); } } /* Test against Solaris 10 bug: Failures are not distinguishable from @@ -103,7 +115,27 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -122,7 +154,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -136,13 +169,19 @@ int main () && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in + result |= 16; + return result; +}]])], + [am_cv_func_iconv_works=yes], + [am_cv_func_iconv_works=no], + [ +changequote(,)dnl + case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; - esac]) + esac +changequote([,])dnl + ]) LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in @@ -183,32 +222,47 @@ m4_define([gl_iconv_AC_DEFUN], m4_version_prereq([2.64], [[AC_DEFUN_ONCE( [$1], [$2])]], - [[AC_DEFUN( - [$1], [$2])]])) + [m4_ifdef([gl_00GNULIB], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])])) gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) AC_CACHE_VAL([am_cv_proto_iconv], [ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include <stdlib.h> #include <iconv.h> extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif -], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) + ]], + [[]])], + [am_cv_proto_iconv_arg1=""], + [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([ $am_cv_proto_iconv]) AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi + ]) fi ]) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index dd91025..8a045f6 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 3 (gettext-0.18) -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,35 +13,40 @@ 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 special options needed on MacOS X. +dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. AC_DEFUN([gt_INTL_MACOSX], [ - dnl Check for API introduced in MacOS X 10.2. + dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], - [CFPreferencesCopyAppValue(NULL, NULL)], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <CoreFoundation/CFPreferences.h>]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi - dnl Check for API introduced in MacOS X 10.3. + dnl Check for API introduced in Mac OS X 10.3. AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <CoreFoundation/CFLocale.h>]], + [[CFLocaleCopyCurrent();]])], [gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index ebb3052..ddc569f 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,50 +1,56 @@ -# lib-ld.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; + acl_cv_prog_gnu_ld=yes + ;; *) - acl_cv_prog_gnu_ld=no ;; + acl_cv_prog_gnu_ld=no + ;; esac]) with_gnu_ld=$acl_cv_prog_gnu_ld ]) -dnl From libtool-1.4. Sets the variable LD. +dnl From libtool-2.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH([gnu-ld], -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl +[AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld [default=no]])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])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 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) + AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -54,11 +60,11 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -79,23 +85,26 @@ else fi AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break + ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break + ;; esac fi done - IFS="$ac_save_ifs" + IFS="$acl_save_ifs" else acl_cv_path_LD="$LD" # Let the user override the test with a path. fi]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index c73bd8e..3522d99 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 21 (gettext-0.18) -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. +# lib-link.m4 serial 26 (gettext-0.18.2) +dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[m4_translit([$1],[./+-], [____])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" @@ -58,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[m4_translit([$1],[./+-], [____])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -85,7 +85,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; *) LIBS="$LIB[]NAME $LIBS" ;; esac - AC_TRY_LINK([$3], [$4], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[$3]], [[$4]])], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" @@ -115,6 +116,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Determine the platform dependent parameters needed to use rpath: dnl acl_libext, dnl acl_shlibext, +dnl acl_libname_spec, +dnl acl_library_names_spec, dnl acl_hardcode_libdir_flag_spec, dnl acl_hardcode_libdir_separator, dnl acl_hardcode_direct, @@ -157,15 +160,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar dnl macro call that searches for libname. AC_DEFUN([AC_LIB_FROMPACKAGE], [ - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_frompackage_]NAME, [$2]) popdef([NAME]) pushdef([PACK],[$2]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) popdef([PACKUP]) popdef([PACK]) ]) @@ -178,14 +181,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ @@ -242,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 1601cea..31f49e4 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 828104c..a3bc337 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool 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 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool 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 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ esac # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], []) dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ aix3*) # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g' # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh" # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames], # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ AS_SHELL_SANITIZE _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ do lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT" # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ m4_defun([_LT_CONFIG], _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_LIBTOOL_TAG_VARS _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ _LT_EOF sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ _LT_EOF [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _LT_EOF _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ _LT_EOF ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ else _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ m4_define([_LT_SHELL_INIT], # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ fi # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ case ${with_sysroot} in #( no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK], [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,9 +1386,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1363,19 +1438,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1383,7 +1459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1392,7 +1468,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1408,7 +1484,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1427,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1439,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1470,7 +1546,7 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1506,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1533,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2], $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1555,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION], m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1574,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2], fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1598,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN], AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1638,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1688,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1719,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1747,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN], # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1794,9 +1871,9 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1822,7 +1899,7 @@ int main () return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1843,7 +1920,7 @@ rm -fr conftest* # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1853,44 +1930,52 @@ else case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1899,21 +1984,21 @@ else ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1923,7 +2008,7 @@ else lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1933,9 +2018,9 @@ else ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2027,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS], m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2038,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2066,8 +2151,8 @@ objdir=$lt_cv_objdir _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2079,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH], _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2101,12 +2186,12 @@ else fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2130,7 +2215,7 @@ else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2148,6 +2233,47 @@ _LT_DECL([], [striplib], [1]) ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2158,17 +2284,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2184,28 +2311,35 @@ if test "$GCC" = yes; then ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2219,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} { # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2228,7 +2362,7 @@ fi]) library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2245,14 +2379,17 @@ hardcode_into_libs=no # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2260,41 +2397,91 @@ aix[[4-9]]*) need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib<name>.so # instead of lib<name>.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2304,18 +2491,18 @@ amigaos*) powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2323,8 +2510,8 @@ beos*) bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2336,7 +2523,7 @@ bsdi[[45]]*) cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2345,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*) # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2362,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2381,8 +2568,8 @@ m4_if([$1], [],[ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2409,7 +2596,7 @@ m4_if([$1], [],[ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2422,8 +2609,8 @@ m4_if([$1], [],[ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2436,7 +2623,7 @@ m4_if([$1], [],[ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2449,8 +2636,8 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2463,8 +2650,8 @@ dgux*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2482,12 +2669,13 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2512,26 +2700,15 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2549,14 +2726,15 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2564,8 +2742,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2574,8 +2752,8 @@ hpux9* | hpux10* | hpux11*) dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2588,8 +2766,8 @@ interix[[3-9]]*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2600,7 +2778,7 @@ irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2608,8 +2786,8 @@ irix5* | irix6* | nonstopux*) esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2628,8 +2806,8 @@ irix5* | irix6* | nonstopux*) esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2638,13 +2816,33 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2669,7 +2867,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -2684,29 +2887,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2716,7 +2907,7 @@ netbsd*) newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2725,58 +2916,68 @@ newsos6) version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH 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" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2787,8 +2988,8 @@ solaris*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2798,11 +2999,11 @@ solaris*) sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2810,8 +3011,8 @@ sunos4*) sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2832,24 +3033,24 @@ sysv4 | sysv4.3*) ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2867,7 +3068,7 @@ tpf*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2875,8 +3076,8 @@ tpf*) uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2885,20 +3086,30 @@ uts4*) ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2931,39 +3142,41 @@ _LT_DECL([], [hardcode_into_libs], [0], [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2986,11 +3199,11 @@ _LT_EOF break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3008,7 +3221,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3035,16 +3248,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3058,7 +3271,7 @@ if test "$GCC" = yes; then while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3069,37 +3282,37 @@ if test "$GCC" = yes; then with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break + test no != "$with_gnu_ld" && break ;; *) - test "$with_gnu_ld" != yes && break + test yes != "$with_gnu_ld" && break ;; esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs else - lt_cv_path_LD="$LD" # Let the user override the test with a path. + lt_cv_path_LD=$LD # Let the user override the test with a path. fi]) -LD="$lt_cv_path_LD" +LD=$lt_cv_path_LD if test -n "$LD"; then AC_MSG_RESULT($LD) else @@ -3153,13 +3366,13 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -3170,6 +3383,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD +# _LT_PATH_DD +# ----------- +# find a working dd +m4_defun([_LT_PATH_DD], +[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3185,13 +3435,13 @@ lt_cv_deplibs_check_method='unknown' # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3218,8 +3468,7 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3255,10 +3504,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,11 +3542,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3319,8 +3564,8 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3373,6 +3618,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3413,33 +3661,38 @@ AC_DEFUN([LT_PATH_NM], AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3450,21 +3703,21 @@ else esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3472,8 +3725,8 @@ else esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3519,8 +3772,8 @@ lt_cv_sharedlib_from_linklib_cmd, case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3532,7 +3785,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3559,13 +3812,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3577,11 +3845,11 @@ case $host in # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3600,7 +3868,7 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3652,7 +3920,7 @@ cygwin* | mingw* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3685,14 +3953,44 @@ case `$NM -V 2>&1` in symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3710,21 +4008,24 @@ for ac_symprfx in "" "_"; do # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3764,11 +4065,11 @@ _LT_EOF if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3794,7 +4095,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] = { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3814,9 +4115,9 @@ _LT_EOF mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3837,7 +4138,7 @@ _LT_EOF rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3864,12 +4165,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3885,17 +4190,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)= m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3906,8 +4212,8 @@ m4_if([$1], [CXX], [ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3923,6 +4229,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3972,7 +4283,7 @@ m4_if([$1], [CXX], [ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4013,14 +4324,14 @@ m4_if([$1], [CXX], [ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4049,7 +4360,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4057,7 +4368,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4113,7 +4424,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4202,17 +4513,18 @@ m4_if([$1], [CXX], [ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4223,8 +4535,8 @@ m4_if([$1], [CXX], [ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4241,6 +4553,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4311,7 +4628,7 @@ m4_if([$1], [CXX], [ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4319,11 +4636,30 @@ m4_if([$1], [CXX], [ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4339,7 +4675,7 @@ m4_if([$1], [CXX], [ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4348,9 +4684,9 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4375,6 +4711,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4472,7 +4814,7 @@ m4_if([$1], [CXX], [ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4501,7 +4843,7 @@ m4_if([$1], [CXX], [ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4567,17 +4909,21 @@ m4_if([$1], [CXX], [ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4590,9 +4936,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4626,9 +4969,9 @@ m4_if([$1], [CXX], [ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4644,7 +4987,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4652,12 +4995,9 @@ dnl Note also adjust exclude_expsyms for C++ above. # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4665,7 +5005,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4687,24 +5027,24 @@ dnl Note also adjust exclude_expsyms for C++ above. esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4717,7 +5057,7 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4736,7 +5076,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4752,7 +5092,7 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach <jrb3@best.com> says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4762,7 +5102,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4770,61 +5110,89 @@ _LT_EOF _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4835,42 +5203,47 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4879,13 +5252,13 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4903,8 +5276,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4916,7 +5289,7 @@ _LT_EOF _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4931,9 +5304,9 @@ _LT_EOF # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4950,15 +5323,15 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4974,7 +5347,7 @@ _LT_EOF # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4982,34 +5355,57 @@ _LT_EOF ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5028,13 +5424,21 @@ _LT_EOF _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5053,62 +5457,80 @@ _LT_EOF ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5117,7 +5539,7 @@ _LT_EOF case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5147,16 +5569,17 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5165,18 +5588,18 @@ _LT_EOF # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5185,7 +5608,7 @@ _LT_EOF # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5235,33 +5658,33 @@ _LT_EOF ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5269,25 +5692,25 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5295,14 +5718,14 @@ _LT_EOF # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5313,7 +5736,7 @@ _LT_EOF *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5324,16 +5747,16 @@ _LT_EOF ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5346,22 +5769,32 @@ _LT_EOF end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5375,7 +5808,7 @@ _LT_EOF newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5383,27 +5816,19 @@ _LT_EOF *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5414,33 +5839,53 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5451,24 +5896,24 @@ _LT_EOF solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5478,11 +5923,11 @@ _LT_EOF solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5492,10 +5937,10 @@ _LT_EOF ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5544,43 +5989,43 @@ _LT_EOF ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5595,17 +6040,17 @@ _LT_EOF ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5622,7 +6067,7 @@ x|xyes) # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5702,12 +6147,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5748,10 +6193,10 @@ dnl [Compiler flag to generate thread safe objects]) # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5791,18 +6236,18 @@ if test -n "$compiler"; then LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5810,8 +6255,12 @@ if test -n "$compiler"; then ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5819,13 +6268,13 @@ if test -n "$compiler"; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5833,14 +6282,14 @@ CC="$lt_save_CC" # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5882,7 +6331,7 @@ _LT_TAGVAR(objext, $1)=$objext # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5924,35 +6373,35 @@ if test "$_lt_caught_CXX_error" != yes; then if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5988,18 +6437,30 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6009,6 +6470,13 @@ if test "$_lt_caught_CXX_error" != yes; then ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6027,13 +6495,21 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6051,64 +6527,84 @@ if test "$_lt_caught_CXX_error" != yes; then fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6118,7 +6614,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach <jrb3@best.com> says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6146,57 +6642,58 @@ if test "$_lt_caught_CXX_error" != yes; then # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6207,6 +6704,34 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6241,18 +6766,15 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6264,7 +6786,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6273,11 +6795,11 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6287,15 +6809,15 @@ if test "$_lt_caught_CXX_error" != yes; then ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6321,13 +6843,13 @@ if test "$_lt_caught_CXX_error" != yes; then aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6338,20 +6860,20 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6366,22 +6888,22 @@ if test "$_lt_caught_CXX_error" != yes; then interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6390,22 +6912,22 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6413,8 +6935,8 @@ if test "$_lt_caught_CXX_error" != yes; then # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6423,10 +6945,10 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6440,59 +6962,59 @@ if test "$_lt_caught_CXX_error" != yes; then # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6506,18 +7028,18 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6525,10 +7047,10 @@ if test "$_lt_caught_CXX_error" != yes; then *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6586,22 +7108,17 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6617,9 +7134,9 @@ if test "$_lt_caught_CXX_error" != yes; then # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6637,17 +7154,17 @@ if test "$_lt_caught_CXX_error" != yes; then cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6662,21 +7179,21 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6722,9 +7239,9 @@ if test "$_lt_caught_CXX_error" != yes; then # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6732,7 +7249,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6749,30 +7266,30 @@ if test "$_lt_caught_CXX_error" != yes; then ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6780,11 +7297,11 @@ if test "$_lt_caught_CXX_error" != yes; then output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6793,52 +7310,52 @@ if test "$_lt_caught_CXX_error" != yes; then ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6869,10 +7386,10 @@ if test "$_lt_caught_CXX_error" != yes; then esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6899,7 +7416,7 @@ if test "$_lt_caught_CXX_error" != yes; then lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6921,13 +7438,14 @@ AC_REQUIRE([_LT_DECL_SED]) AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7011,13 +7529,13 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7033,16 +7551,16 @@ if AC_TRY_EVAL(ac_compile); then case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7050,9 +7568,9 @@ if AC_TRY_EVAL(ac_compile); then esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7067,15 +7585,15 @@ if AC_TRY_EVAL(ac_compile); then continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7106,51 +7624,6 @@ interix[[3-9]]*) _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7159,7 +7632,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7179,10 +7652,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7219,7 +7692,7 @@ _LT_TAGVAR(objext, $1)=$objext # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7241,7 +7714,7 @@ if test "$_lt_disable_F77" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7255,21 +7728,25 @@ if test "$_lt_disable_F77" != yes; then AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7277,11 +7754,11 @@ if test "$_lt_disable_F77" != yes; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7298,9 +7775,9 @@ if test "$_lt_disable_F77" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7310,11 +7787,11 @@ AC_LANG_POP # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7351,7 +7828,7 @@ _LT_TAGVAR(objext, $1)=$objext # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7373,7 +7850,7 @@ if test "$_lt_disable_FC" != yes; then _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7389,21 +7866,25 @@ if test "$_lt_disable_FC" != yes; then AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7411,11 +7892,11 @@ if test "$_lt_disable_FC" != yes; then AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7435,7 +7916,7 @@ if test "$_lt_disable_FC" != yes; then GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7445,7 +7926,7 @@ AC_LANG_POP # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7479,7 +7960,7 @@ CC=${GCJ-"gcj"} CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7516,7 +7997,7 @@ CFLAGS=$lt_save_CFLAGS # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7550,7 +8031,7 @@ CC=${GOC-"gccgo"} CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7587,7 +8068,7 @@ CFLAGS=$lt_save_CFLAGS # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7603,7 +8084,7 @@ _LT_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7613,7 +8094,7 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7642,7 +8123,7 @@ AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7753,7 +8234,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7770,9 +8251,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7796,27 +8277,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], []) # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7840,102 +8301,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 5d9acd8..94b0829 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file 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. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION], [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL], _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared], *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], []) # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ AC_ARG_ENABLE([static], *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], []) # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install], *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC], *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 9000a05..48bc934 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ m4_define([_lt_join], # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ m4_define([lt_unquote], $1) # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 07a8602..fa04b52 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c573da9..c6b26f8 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -1,5 +1,5 @@ -# po.m4 serial 17 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +# po.m4 serial 22 (gettext-0.19) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,19 +17,20 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ([2.60]) 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_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -102,7 +103,7 @@ changequote([,])dnl 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_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. @@ -118,7 +119,8 @@ changequote([,])dnl 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" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -129,12 +131,12 @@ changequote([,])dnl 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" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -226,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], changequote(,)dnl # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|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. @@ -254,6 +256,7 @@ EOT fi # A sed script that extracts the value of VARIABLE from a Makefile. + tab=`printf '\t'` sed_x_variable=' # Test if the hold space is empty. x @@ -261,9 +264,9 @@ s/P/P/ x ta # Yes it was empty. Look if we have the expected variable definition. -/^[ ]*VARIABLE[ ]*=/{ +/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ # Seen the first line of the variable definition. - s/^[ ]*VARIABLE[ ]*=// + s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// ba } bd @@ -315,7 +318,7 @@ changequote([,])dnl sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -405,14 +408,15 @@ changequote([,])dnl fi sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + tab=`printf '\t'` if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` cat >> "$ac_file.tmp" <<EOF $frobbedlang.msg: $lang.po - @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ - \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } +${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ +${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } EOF done fi @@ -422,8 +426,8 @@ EOF frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` cat >> "$ac_file.tmp" <<EOF $frobbedlang/\$(DOMAIN).resources.dll: $lang.po - @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ - \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } +${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ +${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } EOF done fi diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 2d804ac..b499f79 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 6 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. +# progtest.m4 serial 7 (gettext-0.18.2) +dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,15 +27,14 @@ 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 + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 83d8838..65184f6 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -8,13 +8,14 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.18 -GETTEXT_MACRO_VERSION = 0.18 +# Origin: gettext-0.19 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -76,6 +77,16 @@ POTFILES = \ CATALOGS = @CATALOGS@ +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) + +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) + # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: @@ -96,14 +107,14 @@ CATALOGS = @CATALOGS@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +134,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -137,11 +149,29 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # 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. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ - package_gnu='GNU '; \ + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ else \ - package_gnu=''; \ + package_prefix=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -161,7 +191,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_gnu}@PACKAGE@" \ + --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ @@ -189,9 +219,10 @@ $(srcdir)/$(DOMAIN).pot: # 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 +$(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ @@ -352,7 +383,7 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4b03de7..1e820a2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,18 +1,18 @@ -buf.c -ccl.c -dfa.c -ecs.c -gen.c -libmain.c -libyywrap.c -main.c -misc.c -nfa.c -options.c -parse.y -scan.l -scanopt.c -skel.c -sym.c -tblcmp.c -yylex.c +src/buf.c +src/ccl.c +src/dfa.c +src/ecs.c +src/gen.c +src/libmain.c +src/libyywrap.c +src/main.c +src/misc.c +src/nfa.c +src/options.c +src/parse.y +src/scan.l +src/scanopt.c +src/skel.c +src/sym.c +src/tblcmp.c +src/yylex.c diff --git a/po/Rules-quot b/po/Rules-quot index af52487..7b92c7e 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,3 +1,4 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot @@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-12-04 17:36+0100\n" "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Ha fallat l'assignació d'un búfer per imprimir la cadena" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Ha fallat l'assignació d'un buffer per a la directiva de lÃnia" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Ha fallat l'assignació d'un búfer per la definició m4" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Ha fallat l'assignació d'un búfer per la indefinició m4" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "L'estat #%d és no-acceptar -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "Context posterior perillós" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " números de lÃnia associats a la regla:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " fi de transicions: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " transicions de bloqueig: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "la comprovació de consistència ha fallat en epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,24 +76,24 @@ msgstr "" "Bolcat AFD:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "no s'ha pogut crear un estat únic de final-de-búfer" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "estat # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "No s'ha pogut escriure yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "carà cter de transició incorrecte detectat en sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -105,29 +105,29 @@ msgstr "" "Classes d'equivalència:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "l'estat # %d accepta: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "l'estat # %d accepta: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "No s'ha pogut escriure yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "No s'ha pogut escriure yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "No s'ha pogut escriure ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,289 +137,289 @@ msgstr "" "\n" "Classes de metaequivalència:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "No s'ha pogut escriure yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "No s'ha pogut escriure yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "No s'ha pogut escriure yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "No s'ha pogut escriure yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "No s'ha pogut escriure yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "No s'ha pogut escriure ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "No s'ha pogut escriure ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "No s'ha pogut escriure eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "No s'ha pogut escriure yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "no es pot satisfer la regla" -#: main.c:196 +#: src/main.c:197 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:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "No es pot fer servir -+ amb l'opció -l" -#: main.c:239 +#: src/main.c:240 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:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "No es pot fer servir --reentrant o --bison-bridge amb l'opció -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF i -Cm no tenen sentit juntes" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF i -I són incompatibles" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF són incompatibles amb el mode de compatibilitat amb lex" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf i -CF són mútuament excloents" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "No es pot fer servir -+ amb l'opció -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array és incompatible amb l'opció -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Les opcions -+ i --reentrant són mútuament excloents" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "No es suporta «bison bridge» per a l'analitzador de C++" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "no s'ha pogut crear %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "no s'ha pogut crear la capçalera de les taules" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "No es pot obrir el fitxer d'esquema %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "Ha fallat l'assignació de la definició de la macro" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "error d'entrada al llegir el fitxer d'esquema %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "s'ha produït un error en tancar el fitxer d'esquema %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "s'ha produït un error en crear el fitxer de capçalera %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "s'ha produït un error en escriure el fitxer d'eixida %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "s'ha produït un error en tancar el fitxer d'eixida %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "s'ha produït un error en suprimir el fitxer d'eixida %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "No hi ha retrocés.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d estats de retrocés (no-acceptació).\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Les taules comprimides sempre impliquen un retard.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "s'ha produït un error en escriure el fitxer de còpia de seguretat %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "s'ha produït un error en tancar el fitxer de còpia de seguretat %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "estadÃstiques d'ús de %s versió %s:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " opcions de l'analitzador: -" # NFA == Autómata finit no-determinista. jm -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estats AFN\n" # DFA == Autómata finit deterministic. jm -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estats AFD (%d paraules)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d regles\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Sense retrocés\n" -#: main.c:831 +#: src/main.c:832 #, 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:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Sempre es realitza còpia de seguretat de les taules comprimides\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Utilitzats patrons de principi-de-lÃnia\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condicions d'activació\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estats èpsilon, %d estats doble èpsilon\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " sense classes de carà cter\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d parells estat/estat-següent creats\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transicions úniques/duplicades\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d entrades de la taula\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entrades base-def creades\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pic %d) entrades nxt-chk creades\n" -#: main.c:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d entrades de la tabla buides\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototips creats\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d plantilles creades, %d usos\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes d'equivalència creades\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de meta-equivalència creades\n" @@ -428,65 +428,65 @@ 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:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d desades) col·lisions d'ubicació («hash»), %d AFD iguals\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " es necessiten %d conjunts de relocalització\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " es necessiten %d entrades totals de la taula\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Error intern. Els flexopts estan malformats.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Proveu «%s --help» per a obtindre més informació.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "opció de -C desconeguda «%c»" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" # Hmm. No se si açò està be. jm -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "s'ha produït un error fatal d'anà lisi sintà ctic" -#: main.c:1498 +#: src/main.c:1500 #, 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:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -495,48 +495,48 @@ 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:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactiu) implica una xicoteta penalització del rendiment\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() implica una xicoteta penalització del rendiment\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT implica una penalització del rendiment molt gran\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT no es pot fer servir amb -f o -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "l'%opció yylineno no es pot fer servir amb REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "l'%opció yyclass només té sentit per a analitzadors de C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Forma d'ús: %s [OPCIONS] [FITXER]...\n" @@ -545,8 +545,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:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -569,6 +569,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -682,51 +684,51 @@ msgstr "" " -h, --help mostra aquest missatge d'ajuda\n" " -V, --version informa de la versió de %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "Ha fallat l'assignació de «sko_stack»" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "el nom «%s» és ridÃculament llarg" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "ha fallat l'assignació de memòria en allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "carà cter incorrecte «%s» detectat en check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "l'analitzador requereix l'opció -8 per a fer servir el carà cter %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "errada de la memòria dinà mica en copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: error intern fatal, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "ha fallat l'intent d'augmentar la mida de la matriu" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "lÃnia incorrecta en el fitxer d'esquema" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "ha fallat l'assignació de memòria en yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -737,232 +739,232 @@ msgstr "" "\n" "********** s'està començant el bolcat de l'afn amb l'estat inicial %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "estat # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** final del bolcat\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "mà quina buida en dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Regla de context posterior variable en la lÃnia %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "tipus d'estat incorrecte en mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "les regles d'entrada són massa complicades (>= %d estats AFN)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "s'han trobat massa transicions en mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "massa regles (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "s'ha produït un error desconegut en processar la secció 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "condició de començament incorrecta" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regla no reconeguda" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "s'ha utilitzat el context posterior dos vegades" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valors d'iteració incorrectes" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "el valor d'iteració ha de ser positiu" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "rang negatiu en classe de carà cter" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] és ambigu en un analitzador insensible a les majúscules i " "minúscules" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] és ambigu en un analitzador insensible a les majúscules i " "minúscules" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "La lÃnia d'entrada és massa llarga\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "directiva «%top» malformada" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "directiva «%» no reconeguda" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "El nom de la definició és massa llarg\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "«|» no emparellat" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "El valor de la definició de {%s} és massa llarg\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "definició del nom incompleta" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "La lÃnia d'opcions és massa llarga\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opció no reconeguda: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "classe de carà cter incorrecta" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "definició no definida {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "<condició d'activació> incorrecta: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "manca una cometa" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "expressió de la classe de carà cters incorrecta: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "carà cter incorrecte dins de {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "manca una }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "s'ha trobat un EOF dins d'una acció" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "s'ha trobat un EOF dins d'un patró" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "carà cter incorrecte: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "no es pot obrir %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Forma d'ús: %s [OPCIONS]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "l'opció «%s» no accepta arguments\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "l'opció «%s» requereix un argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "l'opció «%s» és ambÃgua\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Opció no reconeguda «%s»\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Error desconegut=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "ha fallat l'assignació de memòria per a la taula de sÃmbols" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "el nom ha sigut definit dos vegades" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "la condició d'activació %s ha sigut declarada dos vegades" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "EOF prematur" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Marcador de fi\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Quelcom estrany* - terminal: %d val: %d\n" Binary files differ@@ -2,14 +2,14 @@ # Copyright (C) 2007 The Flex Project (msgids) # This file is distributed under the same license as the flex package. # Johan Linde <jl@theophys.kth.se>, 1996. -# Keld Simonsen <keld@keldix.com>, 2000-2011. +# Keld Simonsen <keld@keldix.com>, 2000-2011, 2015. # msgid "" msgstr "" -"Project-Id-Version: flex-2.5.35\n" +"Project-Id-Version: flex-2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" -"PO-Revision-Date: 2011-01-11 09:12+0100\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" +"PO-Revision-Date: 2015-04-26 09:12+0200\n" "Last-Translator: Keld Simonsen <keld@keldix.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\n" @@ -17,42 +17,42 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" -msgstr "" +msgstr "Tildeling af buffer til udskrivningsstreng mislykkedes" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" -msgstr "" +msgstr "Tildeling af buffer til linjedirektiv mislykkedes" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" -msgstr "" +msgstr "Tildeling af buffer til m4 def mislykkedes" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" -msgstr "" +msgstr "Tildeling af buffer til m4 undef mislykkedes" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Tilstand %d er ikke-accepterende -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "farlig efterfølgende kontekst" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " linjenummer for associeret regel:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " ud-overgange: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -61,11 +61,11 @@ msgstr "" "\n" " stopovergange: filslut " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "konsistenskontrollen mislykkedes i epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -77,26 +77,26 @@ msgstr "" "DFA-udskrift:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "kunne ikke oprette en unik buffersluttilstand" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "tilstand %d:\n" # Dette er ju helt sjukt. Har buggrapporteret dette at det bør # erstatas med %s -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Kunne ikke skrive yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "forkert overgangstegn fundet i sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -108,29 +108,29 @@ msgstr "" "Ækvivalensklasser:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "tilstand %d accepterer: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "tilstand %d accepterer: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Kunne ikke skrive yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Kunne ikke skrive yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Kunne ikke skrive esctbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -140,344 +140,344 @@ msgstr "" "\n" "Meta-ækvivalensklasser:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Kunne ikke skrive yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "kunne ikke oprette yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Kunne ikke oprette yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Kunne ikke skrive yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Kunne ikke skrive yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Kunne ikke skrive ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Kunne ikke skrive ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Kunne ikke skrive eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Kunne ikke skrive yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "reglen kan ikke matches" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "flaget -s angivet, men standardreglen kan følges" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "-+ kan ikke bruges sammen med flaget -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "-f eller -F kan ikke bruges sammen med -l" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Kan ikke bruge --reentrant eller --bison-bridge sammen med flaget -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF og -Cm kan ikke bruges sammen" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF og -I kan ikke bruges sammen" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF kan ikke bruges i lex-kompatibilitetstilstand" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf og -CF er gensidigt udelukkende" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "-+ kan ikke bruges sammen med flaget -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "-+ kan ikke bruges sammen med %array" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Flagene -+ og --reentrant er gensidigt udelukkende." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bisonbro understøttes ikke for C++-skanneren." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "kunne ikke oprette %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "kunne ikke skrive tabellhoved" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "kan ikke åbne skabelonfilen %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" -msgstr "" +msgstr "tildeling af makro-definition mislykkedes" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "fejl ved læsning af skabelonsfilen %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "fejl ved lukning af skabelonfilen %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "fejl ved oprettelsen af headerfilen %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "fejl ved skrivning af udfilen %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "fejl ved lukning af udfilen %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "fejl ved sletning af udfilen %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Ingen sikkerhedskopiering.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d sikkerhedskopierer (ikke-accepterende) tilstande.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Komprimerete tabeller backer alltid tillbaka.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "fejl ved skrivning af sikkerhedskopifilen %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "fejl ved lukning af sikerhedskopifilen %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Statistik over brugaf %s version %s:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " fortolkningsflag: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-tilstand\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-tilstand (%d ord)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d regler\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Ingen sikkerhedskopiering\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d sikkerhedskopierer (ikke-accepterende) tilstande.\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Komprimerede tabeller bakker altid tilbake\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Begyndelse-af-linje-mønster brugt\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startbetingelse\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontilstande, %d dobbelte epsilontilstande\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " ingen tegnklasser\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d par med tilstand/næste-tilstand oprettede\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unikke/duplikerede overgange\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d tabelposter\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base/standard-poster oprettede\n" -#: main.c:879 +#: src/main.c:880 #, 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:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d tomme tabelposter\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototyper oprettede\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d skabloner oprettede, %d formål\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ækvivalensklasser oprettet\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-ækvivalensklasser oprettede\n" -#: main.c:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d opsætninger med omallokeringer krævedes\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d totale tabelposter kræves\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Intern fejl. flexopts er fejlbehæftede.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "ukendt flag til -C '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "uoprettelig fejl ved analysen" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "kunne ikke oprette sikkerhedskopi af info-fil %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -486,55 +486,55 @@ msgstr "" "%%option yylineno medfører et præstationstab KUN på regler der kan matche " "nylinje-tegn\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) medfører et mindre præstationstab\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() medfører et mindre præstationstab\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT medfører et væsentligt præstationstab\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kan ikke bruges sammen med -f eller -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kan ikke bruges sammen med REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass er kun meningsfyldt for C++-fortolkere" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Brug: %s [FLAG] [FIL]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -557,6 +557,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -662,51 +664,51 @@ msgstr "" " -h, --help udskriv denne hjælpebesked\n" " -V, --version udskriv %s version\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" -msgstr "" +msgstr "tildeling af sko_stack mislykkedes" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "navnet '%s' er latterligt langt" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "hukommelsestildelingen mislykkedes i allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "forkert tegn '%s' fundet i check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "skanneren kræver flaget -8 for at kunne bruge tegnet %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "dynamisk hukommelsesfejl i copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: uoprettelig intern fejl, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "forsøg på at øge arraystørrelse mislykkedes" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "forkert linje i skeletfilen" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "hukommelsestildelingen mislykkedes i yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -717,228 +719,226 @@ msgstr "" "\n" "********** begynder udskrift af nfa med starttilstand %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "tilstand %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** slut på udskrift\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "tom maskine i dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Regel for variabel efterfølgende kontekst på linje %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "forkert tilstandstype i mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "inddatareglerne er for komplicerede (>= %d NFA-tilstand)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "fandt for mange overgange i mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "for mange regler (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "ukendt fejl ved tolkning af sektion 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "forkert liste af startbetingelser" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "ukendt regel" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "efterfølgende kontekst brugt to gange" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "fejlagtige iterationsværdier" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iterationsværdi skal være positiv" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "tegnintervallet [%c-%c] er flertydigt i en versalufølsom skanner" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativt interval i tegnklasse" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] er flertydigt i en versalufølsom skanner" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] er flertydigt i en versalufølsom skanner" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "For lang inddatalinje\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "fejlagtigt '%top'-direktiv" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "ukendt '%'-direktiv" -#: scan.l:192 -#, fuzzy +#: src/scan.l:192 msgid "Definition name too long\n" -msgstr "For lang inddatalinje\n" +msgstr "For langt definitionsnavn\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Ensomt '{'" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" -msgstr "" +msgstr "Definitionsværdi for (%s) for langt\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "ufuldstændig navnedefinition" -#: scan.l:443 -#, fuzzy +#: src/scan.l:443 msgid "Option line too long\n" -msgstr "For lang inddatalinje\n" +msgstr "For lang valgmulighedslinje\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "ukendt %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "forkert tegnklasse" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "udefinieret definition {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "forkert <startbetingelse>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "citationstegn savnes" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "forkert udtryk for tegnklasse: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "forkert tegn imellem {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "} savnes" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "filslutning mødt inden i en handling" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "filslutning mødt inden i et mønster" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "forkert tegn: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "kan ikke åbne %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Brug: %s [FLAG]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "flaget '%s' tager ikke noget argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "flaget '%s' kræver et argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "flaget '%s' er flertydig\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Ukendt flag: '%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Ukendt fejl=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "hukommelsestildeling for symboltabel mislykkedes" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "navnet defineret to gange" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "startbetingelse %s deklareret to gange" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "for tidlig filslut" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Slutmarkering\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Noget mærkeligt* - tegn: %d værdi: %d\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.36\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-08-03 13:42+0200\n" "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Anlegen des Puffers zur Ausgabe der Zeichenkette fehlgeschlagen" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Anlegen des Puffers für Zeilen-Direktive fehlgeschlagen" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Anlegen des Puffers für m4 def fehlgeschlagen" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Anlegen des Puffers für m4 undef fehlgeschlagen" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Zustand #%d ist nicht-akzeptierend –\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "gefährlicher folgender Kontext" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " verbundene Regelzeilennummern" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " Aus-Ãœbergänge: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " Hemm-Ãœbergänge: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "Konsistenzprüfung fehlgeschlagen in epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,24 +76,24 @@ msgstr "" "DFA-Ausgabe:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "konnte keinen einzigartigen Ende-des-Puffers-Zustand erzeugen" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "Zustand # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Konnte yynxt_tbl[][] nicht schreiben" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "ungültiges Ãœbergangszeichen in sympartition() entdeckt" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -105,29 +105,29 @@ msgstr "" "Äquivalenz-Klassen:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "Zustand # %d akzeptiert: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "Zustand # %d akzeptiert: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Konnte yyacclist_tbl nicht schreiben" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Konnte yyacc_tbl nicht schreiben" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Konnte ecstbl nicht schreiben" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,347 +137,347 @@ msgstr "" "\n" "Meta-Äquivalenz-Klassen:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Konnte yymeta_tbl nicht schreiben" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Konnte yybase_tbl nicht schreiben" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Konnte yydef_tbl nicht schreiben" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Konnte yynxt_tbl nicht schreiben" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Konnte yychk_tbl nicht schreiben" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Konnte ftbl nicht schreiben" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Konnte ssltbl nicht schreiben" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Konnte eoltbl nicht schreiben" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Konnte yynultrans_tbl nicht schreiben" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "Regel kann nicht passen" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "„-s“-Option gegeben, aber Vorgabe-Regel kann nicht passen" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Kann nicht „-+“ zusammen mit „-l“-Option verwenden" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Kann nicht „-f“ oder „-F“ zusammen mit „-l“-Option verwenden" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" "Kann nicht „--reentrant“ oder „--bison-bridge“ mit „-l“-Option verwenden" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "„-Cf“/„-CF“ und „-Cm“ sind zusammen nicht sinnvoll" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "„-Cf“/„-CF“ und „-I“ sind inkompatibel" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "„-Cf“/„-CF“ sind inkompatibel mit lex-Kompatibilitätsmodus" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "„-Cf“ und „-CF“ schließen sich gegenseitig aus" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Kann nicht „-+“ zusammen mit „-CF“-Option verwenden" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "„%array“ inkompatibel mit „-+“-Option" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Optionen „-+“ und „--reentrant“ schließen sich gegenseitig aus." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "Brücke zu Bison für den C++-Scanner nicht unterstützt." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "konnte %s nicht erzeugen" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "konnte Tabellenköpfe nicht schreiben" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "kann Skelett-Datei %s nicht öffnen" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "Anlegen der Makrodefinition fehlgeschlagen" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "Eingabefehler beim Lesen der Skelett-Datei %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "Fehler beim Schließen der Skelett-Datei %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "Fehler beim Erstellen der Header-Datei %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "Fehler beim Schreiben der Ausgabe-Datei %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "Fehler beim Schließen der Ausgabe-Datei %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "Fehler beim Löschen der Ausgabe-Datei %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Kein Backing-up.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d Zustände mit Backing-up (nicht akzeptierend).\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Komprimierte Tabellen benutzen immer Backing-up.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "Fehler beim Schreiben der Backup-Datei %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "Fehler beim Schließen der Backup-Datei %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s Version %s Benutzungsstatistiken:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " Scanner-Optionen: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-Zustände\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-Zustände (%d Wörter)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d Regeln\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Kein Backing-up.\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d Zustände mit Backing-up (nicht akzeptierend).\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Komprimierte Tabellen benutzen immer Backing-up.\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Zeilenanfang-Muster benutzt\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d Startbedingungen\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d Epsilon-Zustände, %d Doppel-Epsilon-Zustände\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " keine Zeichenklassen\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d Zustand/Nächster-Zustand-Paare erzeugt\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d einzigartige/doppelte Ãœbergänge\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d Tabelleneinträge\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d Einträge „base-def“ erzeugt\n" -#: main.c:879 +#: src/main.c:880 #, 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:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d leere Tabelleneinträge\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d Protos erzeugt\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d Schablonen erzeugt, %d Benutzungen\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d Äquivalenz-Klassen erzeugt\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d Meta-Äquivalenz-Klassen erzeugt\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d gespeichert) Hash-Kollisionen, %d DFAs gleich\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d Sätze von Neuallozierungen benötigt\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d Tabelleneinträge insgesamt benötigt\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Interner Fehler. flexopts sind missgestaltet.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Versuchen Sie es mit „%s --help“ für mehr Informationen.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "unbekannte „-C“-Option „%c“" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "fataler Parse-Fehler" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "konnte Datei %s mit Informationen zum Backing-up nicht erzeugen" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -486,55 +486,55 @@ msgstr "" "%%option yylineno führt zu Geschwindigkeitseinbußen NUR für Regeln, die auf " "einen Zeilenvorschub passen können\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) führt zu kleineren Geschwindigkeitseinbußen\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() führt zu kleineren Geschwindigkeitseinbußen\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT führt zu großen Geschwindigkeitseinbußen\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kann nicht mit „-f“ oder „-F“ zusammen verwendet werden" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kann nicht mit REJECT zusammen verwendet werden" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass ist nur bei C++-Scannern sinnvoll" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Aufruf: %s [OPTIONEN...] [DATEI...]\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -557,6 +557,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -665,51 +667,51 @@ msgstr "" " -h, --help produziere diese Hilfenachricht\n" " -V, --version melde %s-Version\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "Anlegen des sko_stack fehlgeschlagen" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "name „%s“ ist lächerlich lang" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "Speicheranforderung in allocate_array() fehlgeschlagen" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "ungültiges Zeichen „%s“ in check_char() entdeckt" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "Scanner erfordert Option „-8“, um das Zeichen %s benutzen zu können" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "Fehler beim dynamischen Speicher in copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: fataler interner Fehler, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "Versuch, die Feldgröße zu erhöhen, fehlgeschlagen" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "ungültige Zeile in Skelettdatei" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "Speicheranforderung in yy_flex_xmalloc() fehlgeschlagen" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -720,232 +722,232 @@ msgstr "" "\n" "********** beginne Ausgabe von NFA mit Startzustand %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "Zustand # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** end der Ausgabe\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "leere Maschine in dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Regel mit veränderlichem folgenden Kontext in Zeile %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "ungültiger Zustandstyp in mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "Eingaberegeln sind zu kompliziert (>= %d NFA-Zustände)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "zu viele Ãœbergänge in mkxtion() gefunden" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "zu viele Regeln (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "unbekannter Fehler beim Bearbeiten von Abschnitt 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "ungültige Startbedingungs-Liste" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "nicht erkannte Regel" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "folgender Kontext doppelt verwendet" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "ungültige Iterationswerte" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "Iterationswerte müssen positiv sein" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "der Zeichenbereich [%c-%c] ist in Scannern ohne Beachtung von Groß-/" "Kleinschreibung mehrdeutig" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativer Bereich in Zeichenklasse" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] ist in Scannern ohne Beachtung von Groß-/Kleinschreibung " "mehrdeutig" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] ist in Scannern ohne Beachtung von Groß-/Kleinschreibung " "mehrdeutig" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Eingabezeile zu lang\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "falsch geformte „%top“-Direktive" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "nicht erkannte „%“-Direktive" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Definitionsname zu lang\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Unbalancierte „{“" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definitionswert für {%s} ist zu lang\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "unvollständige Namensdefinition" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Optionszeile zu lang\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "nicht erkannte %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "ungültige Zeichenklasse" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "undefinierte Definitione {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "ungültige <Startbedingung>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "fehlendes Anführungszeichen" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "ungültiger Zeichenklassenausdruck: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "ungültiges Zeichen innerhalb von {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "fehlende }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF innerhalb einer Aktion angetroffen" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "EOF innerhalb eines Musters angetroffen" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "ungültiges Zeichen: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "kann %s nicht öffnen" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Aufruf: %s [OPTIONEN...]\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "Option „%s“ erlaubt kein Argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "Option „%s“ verlangt ein Argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "Option „%s“ ist mehrdeutig\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "nicht erkannte Option „%s“\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Unbekannter Fehler=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "Speicheranforderung für Symboltabelle fehlgeschlagen" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "Name zweimal definiert" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "Startbedingung %s zweimal definiert" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "vorzeitiges EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Endemarkierung\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Etwas Seltsames* - tok: %d val: %d\n" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo Binary files differindex d2e51de..3e64130 100644 --- a/po/en@boldquot.gmo +++ b/po/en@boldquot.gmo diff --git a/po/en@boldquot.po b/po/en@boldquot.po index c4bfe27..a039178 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,6 +1,6 @@ # English translations for flex package. # This file is put in the public domain. -# Automatically generated, 2014. +# Automatically generated, 2015. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -29,10 +29,10 @@ # msgid "" msgstr "" -"Project-Id-Version: flex 2.5.39\n" +"Project-Id-Version: flex 2.6.0\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" -"PO-Revision-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" +"PO-Revision-Date: 2015-11-17 11:17-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@boldquot\n" @@ -41,42 +41,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Allocation of buffer to print string failed" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Allocation of buffer for line directive failed" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Allocation of buffer for m4 def failed" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Allocation of buffer for m4 undef failed" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "State #%d is non-accepting -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "dangerous trailing context" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " associated rule line numbers:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " out-transitions: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -85,11 +85,11 @@ msgstr "" "\n" " jam-transitions: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "consistency check failed in epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -101,24 +101,24 @@ msgstr "" "DFA Dump:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "could not create unique end-of-buffer state" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "state # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Could not write yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "bad transition character detected in sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -130,29 +130,29 @@ msgstr "" "Equivalence Classes:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "state # %d accepts: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "state # %d accepts: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Could not write yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Could not write yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Could not write ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -162,344 +162,344 @@ msgstr "" "\n" "Meta-Equivalence Classes:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Could not write yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Could not write yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Could not write yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Could not write yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Could not write yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Could not write ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Could not write ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Could not write eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Could not write yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "rule cannot be matched" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "-s option given but default rule can be matched" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Can't use -+ with -l option" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Can't use -f or -F with -l option" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Can't use --reentrant or --bison-bridge with -l option" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF and -Cm don't make sense together" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF and -I are incompatible" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF are incompatible with lex-compatibility mode" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf and -CF are mutually exclusive" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Can't use -+ with -CF option" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible with -+ option" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Options -+ and --reentrant are mutually exclusive." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge not supported for the C++ scanner." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "could not create %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "could not write tables header" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "can't open skeleton file %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "allocation of macro definition failed" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "input error reading skeleton file %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "error closing skeleton file %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "error creating header file %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "error writing output file %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "error closing output file %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "error deleting output file %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "No backing up.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d backing up (non-accepting) states.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Compressed tables always back up.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "error writing backup file %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "error closing backup file %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s version %s usage statistics:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " scanner options: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA states\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA states (%d words)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d rules\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " No backing up\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d backing-up (non-accepting) states\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Compressed tables always back-up\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Beginning-of-line patterns used\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d start conditions\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon states, %d double epsilon states\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " no character classes\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d character classes needed %d/%d words of storage, %d reused\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d state/nextstate pairs created\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unique/duplicate transitions\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d table entries\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def entries created\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (peak %d) nxt-chk entries created\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (peak %d) template nxt-chk entries created\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d empty table entries\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d protos created\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d templates created, %d uses\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d equivalence classes created\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-equivalence classes created\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d saved) hash collisions, %d DFAs equal\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d sets of reallocations needed\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d total table entries needed\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Internal error. flexopts are malformed.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘[1m%s --help[0m’ for more information.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "unknown -C option ‘[1m%c[0m’" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "fatal parse error" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "could not create backing-up info file %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex compatibility option entails a large performance penalty\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " and may be the actual source of other reported performance penalties\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -508,50 +508,50 @@ msgstr "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactive) entails a minor performance penalty\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() entails a minor performance penalty\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entails a large performance penalty\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Variable trailing context rules entail a large performance penalty\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT cannot be used with -f or -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno cannot be used with REJECT" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "variable trailing context rules cannot be used with -f or -F" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass only meaningful for C++ scanners" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Usage: %s [OPTIONS] [FILE]...\n" -#: main.c:1802 +#: src/main.c:1809 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -575,6 +575,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -637,6 +639,8 @@ msgstr "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -678,51 +682,51 @@ msgstr "" " -h, --help produce this help message\n" " -V, --version report %s version\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "allocation of sko_stack failed" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "name “[1m%s[0m†ridiculously long" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "memory allocation failed in allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "bad character ‘[1m%s[0m’ detected in check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scanner requires -8 flag to use the character %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "dynamic memory failure in copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: fatal internal error, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "attempt to increase array size failed" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "bad line in skeleton file" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "memory allocation failed in yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -733,226 +737,226 @@ msgstr "" "\n" "********** beginning dump of nfa with start state %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "state # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** end of dump\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "empty machine in dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Variable trailing context rule at line %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "bad state type in mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "input rules are too complicated (>= %d NFA states)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "found too many transitions in mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "too many rules (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "unknown error processing section 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "bad start condition list" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "unrecognized rule" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "trailing context used twice" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "bad iteration values" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteration value must be positive" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "the character range [%c-%c] is ambiguous in a case-insensitive scanner" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negative range in character class" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] is ambiguous in case insensitive scanner" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] ambiguous in case insensitive scanner" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Input line too long\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "malformed ‘[1m%top[0m’ directive" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "unrecognized ‘[1m%[0m’ directive" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Definition name too long\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Unmatched ‘[1m{[0m’" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definition value for {%s} too long\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "incomplete name definition" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Option line too long\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "unrecognized %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "bad character class" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "undefined definition {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "bad <start condition>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "missing quote" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "bad character class expression: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "bad character inside {}'s" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "missing }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF encountered inside an action" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "EOF encountered inside pattern" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "bad character: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "can't open %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Usage: %s [OPTIONS]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "option ‘[1m%s[0m’ doesn't allow an argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "option ‘[1m%s[0m’ requires an argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "option ‘[1m%s[0m’ is ambiguous\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Unrecognized option ‘[1m%s[0m’\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Unknown error=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "symbol table memory allocation failed" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "name defined twice" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "start condition %s declared twice" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "premature EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "End Marker\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Something Weird* - tok: %d val: %d\n" diff --git a/po/en@quot.gmo b/po/en@quot.gmo Binary files differindex 182adab..2494287 100644 --- a/po/en@quot.gmo +++ b/po/en@quot.gmo diff --git a/po/en@quot.po b/po/en@quot.po index b2aaf62..8c129be 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,6 +1,6 @@ # English translations for flex package. # This file is put in the public domain. -# Automatically generated, 2014. +# Automatically generated, 2015. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -26,10 +26,10 @@ # msgid "" msgstr "" -"Project-Id-Version: flex 2.5.39\n" +"Project-Id-Version: flex 2.6.0\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" -"PO-Revision-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" +"PO-Revision-Date: 2015-11-17 11:17-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@quot\n" @@ -38,42 +38,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Allocation of buffer to print string failed" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Allocation of buffer for line directive failed" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Allocation of buffer for m4 def failed" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Allocation of buffer for m4 undef failed" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "State #%d is non-accepting -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "dangerous trailing context" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " associated rule line numbers:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " out-transitions: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -82,11 +82,11 @@ msgstr "" "\n" " jam-transitions: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "consistency check failed in epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -98,24 +98,24 @@ msgstr "" "DFA Dump:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "could not create unique end-of-buffer state" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "state # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Could not write yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "bad transition character detected in sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -127,29 +127,29 @@ msgstr "" "Equivalence Classes:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "state # %d accepts: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "state # %d accepts: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Could not write yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Could not write yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Could not write ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -159,344 +159,344 @@ msgstr "" "\n" "Meta-Equivalence Classes:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Could not write yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Could not write yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Could not write yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Could not write yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Could not write yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Could not write ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Could not write ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Could not write eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Could not write yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "rule cannot be matched" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "-s option given but default rule can be matched" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Can't use -+ with -l option" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Can't use -f or -F with -l option" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Can't use --reentrant or --bison-bridge with -l option" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF and -Cm don't make sense together" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF and -I are incompatible" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF are incompatible with lex-compatibility mode" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf and -CF are mutually exclusive" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Can't use -+ with -CF option" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible with -+ option" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Options -+ and --reentrant are mutually exclusive." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge not supported for the C++ scanner." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "could not create %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "could not write tables header" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "can't open skeleton file %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "allocation of macro definition failed" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "input error reading skeleton file %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "error closing skeleton file %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "error creating header file %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "error writing output file %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "error closing output file %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "error deleting output file %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "No backing up.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d backing up (non-accepting) states.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Compressed tables always back up.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "error writing backup file %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "error closing backup file %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s version %s usage statistics:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " scanner options: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA states\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA states (%d words)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d rules\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " No backing up\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d backing-up (non-accepting) states\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Compressed tables always back-up\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Beginning-of-line patterns used\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d start conditions\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon states, %d double epsilon states\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " no character classes\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d character classes needed %d/%d words of storage, %d reused\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d state/nextstate pairs created\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unique/duplicate transitions\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d table entries\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def entries created\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (peak %d) nxt-chk entries created\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (peak %d) template nxt-chk entries created\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d empty table entries\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d protos created\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d templates created, %d uses\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d equivalence classes created\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-equivalence classes created\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d saved) hash collisions, %d DFAs equal\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d sets of reallocations needed\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d total table entries needed\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Internal error. flexopts are malformed.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "unknown -C option ‘%c’" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "fatal parse error" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "could not create backing-up info file %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex compatibility option entails a large performance penalty\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " and may be the actual source of other reported performance penalties\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -505,50 +505,50 @@ msgstr "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactive) entails a minor performance penalty\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() entails a minor performance penalty\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entails a large performance penalty\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Variable trailing context rules entail a large performance penalty\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT cannot be used with -f or -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno cannot be used with REJECT" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "variable trailing context rules cannot be used with -f or -F" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass only meaningful for C++ scanners" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Usage: %s [OPTIONS] [FILE]...\n" -#: main.c:1802 +#: src/main.c:1809 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -572,6 +572,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -634,6 +636,8 @@ msgstr "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -675,51 +679,51 @@ msgstr "" " -h, --help produce this help message\n" " -V, --version report %s version\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "allocation of sko_stack failed" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "name “%s†ridiculously long" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "memory allocation failed in allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "bad character ‘%s’ detected in check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scanner requires -8 flag to use the character %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "dynamic memory failure in copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: fatal internal error, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "attempt to increase array size failed" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "bad line in skeleton file" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "memory allocation failed in yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -730,226 +734,226 @@ msgstr "" "\n" "********** beginning dump of nfa with start state %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "state # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** end of dump\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "empty machine in dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Variable trailing context rule at line %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "bad state type in mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "input rules are too complicated (>= %d NFA states)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "found too many transitions in mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "too many rules (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "unknown error processing section 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "bad start condition list" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "unrecognized rule" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "trailing context used twice" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "bad iteration values" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteration value must be positive" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "the character range [%c-%c] is ambiguous in a case-insensitive scanner" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negative range in character class" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] is ambiguous in case insensitive scanner" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] ambiguous in case insensitive scanner" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Input line too long\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "malformed ‘%top’ directive" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "unrecognized ‘%’ directive" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Definition name too long\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Unmatched ‘{’" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definition value for {%s} too long\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "incomplete name definition" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Option line too long\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "unrecognized %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "bad character class" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "undefined definition {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "bad <start condition>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "missing quote" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "bad character class expression: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "bad character inside {}'s" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "missing }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF encountered inside an action" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "EOF encountered inside pattern" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "bad character: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "can't open %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Usage: %s [OPTIONS]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "option ‘%s’ doesn't allow an argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "option ‘%s’ requires an argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "option ‘%s’ is ambiguous\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Unrecognized option ‘%s’\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Unknown error=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "symbol table memory allocation failed" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "name defined twice" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "start condition %s declared twice" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "premature EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "End Marker\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Something Weird* - tok: %d val: %d\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-09-08 07:15-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Rezervo de bufro por printi ĉenon fiaskis" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Rezervo de bufro por linia instrukcio fiaskis" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Rezervo de bufro por 'm4 def' fiaskis" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Rezervo de bufro por 'm4 undef' fiaskis" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Stato #%d estas ne-akceptanta -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "danÄera vosta kunteksto" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " lini-numeroj de asociita regulo:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " for-transigoj: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " ĵam-transigoj: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "kontrolo pri kohereco fiaskis ĉe epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,24 +76,24 @@ msgstr "" "Nekropsio DFA:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "ne eblis krei unikan staton de bufro-fino" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "stato * %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Ne eblis skribi yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "malÄusta transiga signo estis detektata en sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -105,29 +105,29 @@ msgstr "" "Ekvivalentecaj Klasoj:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "stato # %d akceptas: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "stato # %d akceptas: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Ne eblis skribi yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Ne eblis skribi yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Ne eblis skribi ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,347 +137,347 @@ msgstr "" "\n" "Meta-Ekvivalentecaj Klasoj:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Ne eblis skribi yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Ne eblis skribi yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Ne eblis skribi yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Ne eblis skribi yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Ne eblis skribi yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Ne eblis skribi ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Ne eblis skribi ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Ne eblis skribi eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Ne eblis skribi yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "regulo ne povas esti korespondata" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "" "la modifilo -s estis indikata sed la apriora regulo povas esti korespondata" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Ne eblas uzi -+ kun la modifilo -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Ne eblas uzi -f aÅ -F kun la modifilo -l" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Ne eblas uzi --reentrant aÅ --bison-bridge kun la modifilo -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "Sensencas -Cf/-CF kaj -Cm kune" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF kaj -I malakordas" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF malakordas kun lex-akorda reÄimo" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf kaj -CF estas reciproke ekskluzivaj" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Ne eblas uzi -+ kun la modifilo -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array malakordas kun modifilo -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Modifiloj -+ kaj --reentrant estas reciproke ekskluzivaj." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison-ponto ne estas subtenata por la skanilo C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "ne eblis krei %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "ne eblis skribi tabel-kapojn" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "ne eblas malfermi la skeletan dosieron %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "rezervo de makroa difino fiaskis" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "eniga eraro dum lego de la skeleta dosiero %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "eraro dum fermo de la skeleta dosiero %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "eraro dum kreo de la kap-dosiero %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "eraro dum skribo de la eliga dosiero %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "eraro dum fermo de la eliga dosiero %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "eraro dum forigo de eliga dosiero %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Sen savkopiado.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d savkopiadas (ne-akceptantajn) statojn.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Densigitaj tabeloj ĉiam estas savkopiataj.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "eraro dum skribo de la savkopia dosiero %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "eraro dum fermo de la savkopia dosiero %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versio %s statistikoj pri usado:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " skanilaj modifiloj: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d statoj NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d statoj DFA (%d vortoj)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d reguloj\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Sen savkopiado\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d savkopianta (ne-akceptantajn) statojn\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Densigitaj tabeloj ĉiam savkopiite\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " modeloj komenco-de-linio estas uzataj\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d komencaj kondiĉoj\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilonaj statoj, %d duoblaj epsilonaj statoj\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " neniu signo-klaso\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d signo-klasoj bezonis %d/%d vortojn da memoro, %d reuzitaj\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d stato/sekvstato-paroj estis kreataj\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unikaj/duobligitaj transigoj\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d tabel-enigoj\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d bazo-def enigoj estis kreataj\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pinto %d) enigoj nxt-chk estis kreataj\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pinto %d) Åablonaj enigoj nxt-chk estis kreataj\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d malplenaj tabel-enigoj\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d protoj estis kreataj\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d Åablonoj estis kreataj, %d uzoj\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalento-klasoj estis kreataj\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d metaekvivalento-klasoj estis kreataj\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d konservitaj) haketaj kolizioj, %d DFA egalaj\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d aroj de relokigoj estas bezonataj\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " entute %d tabel-enigoj estas bezonataj\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Interna eraro. 'flexopt' estas misformitaj.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Provu '%s --help' por pli da informo.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "nekonata modifilo -C '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "neriparebla analiz-eraro" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "ne eblis krei savkopiad-informan dosieron %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "La modifilo -l AT&T de akordigo al lex alportas grandan malaltigon de " "rendimento\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " kaj povas esti la vera fonto de aliaj raportitaj malaltigoj de rendimento\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -486,51 +486,51 @@ msgstr "" "%%option yylineno alportas malaltigon de rendimento NUR kun reguloj kiuj " "povas akordiÄi kun novliniaj signoj\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interage) alportas etan malaltigon de rendimento\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() alportas etan malaltigon de rendimento\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT alportas grandan malaltigon de rendimento\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Variabla vosta kunteksto alportas grandan malaltigon de rendimento\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ne povas esti uzata kun -f aÅ F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ne povas esti uzata kun REJECT" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "variablaj vostaj kuntekstaj reguloj ne povas esti uzataj kun -f aÅ F" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass nur koheras por skaniloj C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uzado: %s [MODIFILOJ] [DOSIERO]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -553,6 +553,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -659,51 +661,51 @@ msgstr "" " -h, --help produkti tiun ĉi help-mesaÄon\n" " -V, --version raporti la version de %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "rezervo de sko_stack fiaskis" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "la nomo \"%s\" estas ridinde longa" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "rezervo de memoro fiaskis en allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "malÄusta signo '%s' estis detektata en check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "la skanilo postulas la flagon -8 por uzi la signon %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "fiasko de dinamika memoro en copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: neriparebla interna eraro, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "provo pliigi grandon de tabelo fiaskis" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "malÄusta linio en skeleta dosiero" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "rezervo de memoro fiaskis en yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -714,226 +716,226 @@ msgstr "" "\n" "********** komenco de Åuto de nfa kun ekstato %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "stato # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** fino de Åuto\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "malplena maÅino en dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Variabla vosta kunteksta regulo ĉe linio %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "malÄusta stat-tipo en mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "enigaj reguloj estas tro komplikaj (>= %d statoj NFA)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "tro multe da transigoj estis trovataj en mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "tro multe da reguoloj (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "Nekonata erar-proceza sekcio 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "malÄusta komenc-kondiĉa listo" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "nerekonata regulo" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "vosta kunteksto estis uzata duoble" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "malÄustaj iteraciaj valoroj" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteracia valoro devas esti pozitiva" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "la signara intervalo [%c-%c] estas dusenca en sen-uskleca skanilo" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativa intervalo en signo-klaso" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] estas dusenca en sen-uskleca skanilo" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] estas dusenca en sen-uskleca skanilo" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Eniga linio tro longas\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "misformita instrukcio '%top'" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "nerekonita instrukcio '%'" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Nom-difino tro longas\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Senpara '{'" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Valor-difino por {%s} tro longas\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "nekompleta nom-difino" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Linio de modifiloj tro longas\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "nerekonita %%modifilo: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "malÄusta signo-klaso" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "nedifinita difino {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "malÄusta <komenca kondiĉo>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "mankas citilo" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "malÄusta signo-klasa esprimo: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "malÄusta signo interne de {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "mankas }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF estis trovata interne de ago" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "EOF estis trovata interne de modelo" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "malÄusta signo: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "ne eblas malfermi %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Uzado: %s [MODIFILOJ]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "la modifilo '%s' ne permesas argumenton\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "la modifilo '%s' postulas argumenton\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "la modifilo '%s' estas dusenca\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Nerekonita modifilo '%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Nekonata eraro=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "rezervo de simbol-tabela memoro fiaskis" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "nomo estis difinata duoble" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "la komenca kondiĉo %s estis deklarata duoble" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "tro frua EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Fino-markilo\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Io Stranga* - ero: %d val: %d\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU flex 2.5.8\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-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" @@ -16,43 +16,43 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" # El estado (?) sv -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "El estado #%d es no-aceptar -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "contexto posterior peligroso" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " números de línea asociados a la regla:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " fin de transiciones: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -72,13 +72,13 @@ msgstr "" # pues el verbo es testar, ¿cómo te suena? ng+ # # Sugiero usar prueba o comprobación. sv -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "el teste de consistencia falló en `epsclosure()'" # ¿Qué tal volcado? em # ok, a mí tampoco me gustaba descarga ng -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -90,24 +90,24 @@ msgstr "" "Volcado AFD:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "no se pudo crear un estado único de final-de-buffer" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "estado # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "carácter de transición erróneo detectado en sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -119,32 +119,32 @@ msgstr "" "Clases de equivalencia:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "el estado # %d acepta: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "el estado # %d acepta: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 #, fuzzy msgid "Could not write ecstbl" msgstr "no se pudo crear %s" # ¿No sería mejor "MetaEquivalencia" o "Meta-Equivalencia"? sv # yo prefiero como está, es el mismo caso de metafísica ng+ -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -154,43 +154,43 @@ msgstr "" "\n" "Clases de metaequivalencia:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "" -#: gen.c:1354 +#: src/gen.c:1376 #, fuzzy msgid "Could not write yybase_tbl" msgstr "no se pudo crear %s" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 #, fuzzy msgid "Could not write ftbl" msgstr "no se pudo crear %s" -#: gen.c:1624 +#: src/gen.c:1646 #, fuzzy msgid "Could not write ssltbl" msgstr "no se pudo crear %s" -#: gen.c:1675 +#: src/gen.c:1697 #, fuzzy msgid "Could not write eoltbl" msgstr "no se pudo crear %s" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "" @@ -201,25 +201,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:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "la regla no se puede aplicar" # ## re-redacto el mensaje. sv -#: main.c:196 +#: src/main.c:197 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:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "No se puede usar -+ con la opción -l" -#: main.c:239 +#: src/main.c:240 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:243 +#: src/main.c:244 #, 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" @@ -227,7 +227,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:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF y -Cm no tienen sentido juntos" @@ -236,42 +236,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:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF e -I son incompatibles" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF son incompatibles con el modo de compatibilidad con lex" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf y -CF son mutuamente excluyentes" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "No se puede usar -+ con la opción -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible con la opción -+" -#: main.c:299 +#: src/main.c:300 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "-+ y -R son mutuamente excluyentes" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "no se pudo crear %s" -#: main.c:416 +#: src/main.c:417 #, fuzzy msgid "could not write tables header" msgstr "no se pudo crear %s" @@ -280,12 +280,12 @@ msgstr "no se pudo crear %s" # lo mismo de antes ng # Lo mismo que antes :) em # idem ng+ -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "no se puede abrir el archivo de esquema %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" @@ -305,46 +305,46 @@ msgstr "" # que decida una tercera persona # # ## Cambio "leyendo" por "al leer", como en otras traducciones. sv -#: main.c:504 +#: src/main.c:505 #, 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:508 +#: src/main.c:509 #, 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:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "error al crear el archivo de cabecera %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "error al escribir el archivo de salida %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "error al cerrar el archivo de salida %s" -#: main.c:709 +#: src/main.c:710 #, 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:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Sin retroceso.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d estados de retroceso (no-aceptación).\n" @@ -354,13 +354,13 @@ 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:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Las tablas comprimidas siempre implican un retraso.\n" # Lo mismo, archivo de seguridad? em -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "error al escribir el archivo de seguridad %s" @@ -368,47 +368,47 @@ 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:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "error al cerrar el archivo de copia de seguridad %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versión %s estadísticas de uso:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " opciones del analizador: -" # NFA significa non-deterministic finite automata, así que lo he traducido # por AFN -#: main.c:818 +#: src/main.c:819 #, 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:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estados AFD {%d palabras}\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d reglas\n" # Otra vez ;) em # modificado como en la anterior ng -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Sin retroceso\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d estados de retroceso (no-aceptación)\n" @@ -416,18 +416,18 @@ 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:836 +#: src/main.c:837 #, c-format 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:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Usados patrones de comienzo-de-línea\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condiciones de activación\n" @@ -440,17 +440,17 @@ 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:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estados épsilon, %d estados doble épsilon\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " sin clases de caracteres\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" @@ -461,13 +461,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:859 +#: src/main.c:860 #, 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:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transiciones únicas/duplicadas\n" @@ -476,50 +476,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:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d entradas en la tabla\n" # ## pongo `comillas' en el base-def. sv -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entradas `base-def' creadas\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas nxt-chk creadas\n" -#: main.c:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d entradas en la tabla vacías\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototipos creados\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d plantillas creadas, %d usos\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d clases de equivalencia creadas\n" # "se han creado..." sv -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d clases de metaequivalencia creadas\n" @@ -537,40 +537,40 @@ 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:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, 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:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " se necesitan %d entradas totales en la tabla\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Error interno. flexopts mal formadas.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "opción -C desconocida '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" @@ -587,7 +587,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:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "error muy grave en el analizador sintáctico" @@ -610,28 +610,28 @@ 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:1498 +#: src/main.c:1500 #, 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:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -639,53 +639,53 @@ msgid "" msgstr "" "la %%opción yylineno implica una penalización del rendimiento muy alta\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactivo) implica una pequeña penalización del rendimiento\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() implica un pequeña penalización del rendimiento\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT implica una penalización del rendimiento muy alta\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT no se puede usar con -f o -F" -#: main.c:1566 +#: src/main.c:1568 #, 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:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, 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:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uso: %s [OPCIONES] [FICHERO]...\n" -#: main.c:1802 +#: src/main.c:1809 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -709,6 +709,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -813,11 +815,11 @@ msgstr "" " -h, --help produce este mensaje de ayuda\n" " -V, --version informa de la versión %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nombre \"%s\" ridículamente grande" @@ -827,45 +829,45 @@ msgstr "nombre \"%s\" ridículamente grande" # Sí, pero creo que sólo por mí. Normalmente esos mensajes # los dá la biblioteca C antes em # ok ng+ -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "falló la asignación de memoria en `allocate_array()'" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "carácter incorrecto '%s' detectado en `check_char()'" # he añadido el `poder' em # ok ng -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "el analizador requiere la opción -8 para poder usar el carácter %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "fallo de la memoria dinámica en copy_string()" # Sugerencia: error fatal. sv -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: error interno muy grave, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "falló el intento de aumentar el tamaño de la matriz" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "línea incorrecta en el archivo de esquema" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "la reserva de memoria falló en yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -876,147 +878,147 @@ msgstr "" "\n" "********** comenzando la descarga del AFN con el estado inicial %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "estado # %4d\t" # Sugerencia: volcado. sv # ok ng+ -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** fin de volcado\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "máquina vacía en `dupmachine()'" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Regla de contexto posterior variable en la línea %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "tipo de estado incorrecto en mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "las reglas de entrada son demasiado complicadas (>= %d estados AFN)" # Sugerencia: se han encontrado... sv -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "encontradas demasiadas transiciones en mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "demasiadas reglas (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "error desconocido en el proceso de la sección 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "lista de condiciones de activación incorrecta" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regla no reconocida" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "contexto posterior usado dos veces" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valores incorrectos para iteración" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "los valores para iteración deben ser positivos" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "rango negativo en clase caracteres" -#: parse.y:916 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "\t-i genera un analizador que no distingue entre mayúsculas y minúsculas\n" -#: parse.y:922 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "\t-i genera un analizador que no distingue entre mayúsculas y minúsculas\n" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "" -#: scan.l:161 +#: src/scan.l:161 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "directiva '%' no reconocida" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "directiva '%' no reconocida" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "definición de nombre incompleta" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opción no reconocida: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "clase de caracteres incorrecta" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "definición no definida {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "<condición de activación> incorrecta: %s" # Sugerencia: falta una comilla. sv -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "falta comilla" @@ -1024,99 +1026,99 @@ 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:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "expresión de la clase de caracteres incorrecta: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "carácter incorrecto dentro de {}'s" # Sugerencia: "falta una }". sv -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "falta }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "Fin de archivo (EOF) encontrado dentro de una acción" -#: scan.l:945 +#: src/scan.l:945 #, fuzzy msgid "EOF encountered inside pattern" msgstr "Fin de archivo (EOF) encontrado dentro de una acción" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "carácter incorrecto: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "no se puede abrir %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Uso: %s [OPCIONES]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "la opción `%s' no permite un argumento\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "la opción `%s' requiere un argumento\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "la opción `%s' es ambigua\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Opción no reconocida `%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Error desconocido=(%d)\n" # Asignación de memoria em -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "falló la reserva de memoria para la tabla de símbolos" # hay que procurar evitar esto, siempre nos suena mejor # el nombre ha sido definido dos veces, ¿qué te parece? em # mucho mejor, ya lo había pensado, pero no sabía cual era el estilo usual. ng -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "el nombre ha sido definido dos veces" # Aquí lo mismo 'la condición ... ha sido ..." em -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "la condición de activación %s ha sido declarada dos veces" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "fin de archivo (EOF) prematuro" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Marcador de fin\n" # sobre lo de tok, me parece que es abreviatura de token. ng # en bison he traducido token por terminal, creo que es bueno unificar. ng -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Algo extraño* - terminal: %d val: %d\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.36\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-08-02 21:16+0200\n" "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -18,43 +18,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Puskurin varaaminen merkkijonon tulostamiseen epäonnistui" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Puskurin varaaminen rividirektiiville epäonnistui" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Puskurin varaaminen m4 def -määrittelylle epäonnistui" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Puskurin varaaminen m4 undef -määrittelylle epäonnistui" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Tila #%d on ei-hyväksyvä -\n" # Sanastollisessa analyysissä (lexical analysis) esimerkiksi kauttaviivalla ilmoitetaan, että viivan jälkeinen teksti kuuluu "trailing context"-tekstiin -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "vaarallinen jättökonteksti" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " yhdistetyt sääntörivinumerot:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " ulossiirtymät: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -63,12 +63,12 @@ msgstr "" "\n" " ruuhkasiirtymät: TIEDOSTONLOPPUMERKKI " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "yhtenäisyystarkistus epäonnistui epsclosure()-funktiossa" # DFA on akronyymi käsitteelle "deterministic finite automaton" eli deterministinen äärellinen automaatti. -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -80,24 +80,24 @@ msgstr "" "Deterministisen äärellisen automaatin vedos:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "ei voitu luoda uniikkia puskurinlopputilaa" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "tila numero %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Ei voitu kirjoittaa yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "väärä siirtymämerkki havaittu funktiossa sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -109,29 +109,29 @@ msgstr "" "Ekvivalenssiluokat:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "tila numero %d hyväksyy: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "tila numero %d hyväksyy: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Ei voitu kirjoittaa: yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Ei voitu kirjoittaa: yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Ei voitu kirjoitaa ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -141,351 +141,351 @@ msgstr "" "\n" "Meta-ekvivalenssiluokkia:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Ei voitu kirjoittaa: yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Ei voitu kirjoittaa: yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Ei voitu kirjoittaa: yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Ei voitu kirjoittaa: yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Ei voitu kirjoittaa: yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Ei voitu kirjoittaa: ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Ei voitu kirjoittaa: ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Ei voitu kirjoittaa: eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Ei voitu kirjoittaa: yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "sääntö ei voinut täsmätä" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "valitsin -s annettu mutta oletussääntö ei voinut täsmätä" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Ei voi käyttää -+ valitsimen -l kanssa" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Ei voi käyttää valitsinta -f tai -F valitsimen -l kanssa" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" "Ei voi käyttää valitsinta --reentrant tai --bison-bridge valitsimen -l kanssa" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF ja -Cm eivät ole järkeviä yhdessä" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF ja -I ovat yhteensopimattomia" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF ovat yhteensopimattomia lex-yhteensopivuustilassa" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf ja -CF ovat toisensa poissulkevia" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Ei voi käyttää valitsinta -+ valitsimen -CF kanssa" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array on yhteensopimaton valitsimen -+ kanssa" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Valitsimen -+ ja --reentrant ovat toisensa poissulkevia." # bison bridge tarkoittaa, että flex käyttää bison-ohjelmaa analyysissä -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "â€bison bridgeâ€-menettelyä ei tueta C++-skannerille." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "ei voitu luoda %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "ei voitu kirjoittaa tauluotsaketta" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "ei voi avata kehystiedostoa %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "Makromäärityksen varaaminen epäonnistui" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "syötevirhe luettaessa kehystiedostoa %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "virhe suljettaessa kehystiedostoa %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "virhe luotaessa otsaketiedostoa %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "virhe kirjoitettaessa tulostetiedostoa %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "virhe suljettaessa tulostetiedostoa %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "virhe poistettaessa tulostetiedostoa %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Ei varmuuskopiointia.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d (ei-hyväksyvää) varmuuskopiointitilaa.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Tiivistetyt taulut varmuuskopioidaan aina.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "virhe kirjoitettaessa varmuuskopiotiedostoa %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "virhe suljettaessa varmuuskopiotiedostoa %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s-version %s käyttötilastot:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " skannerivalitsimet: -" # Epädeterministinen äärellinen automaatti, lyh. NFA (engl. non-deterministic finite-state automaton) -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d Epädeterministisen äärellisen automaatin tilaa\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d Deterministisen äärellisen automaatin tilaa (%d sanaa)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d sääntöä\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Ei varmuuskopiointia\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d (ei-hyväksyvää) varmuuskopiotilaa\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Tiivistetyt taulut varmuuskopioidaan aina\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Rivin-alku-malleja käytetään\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d-käynnistysehtoja\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon-tilaa, %d double epsilon-tilaa\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " ei merkkiluokkia\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d merkkiluokkaa tarvittu %d/%d tallennussanaan, %d käytetty uudelleen\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d tila/seuraavatila-paria luotu\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d uniikkia/kaksoiskappelsiirtymää\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d-tauluriviä\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def-alkiota luotu\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (huippu %d) nxt-chk-alkiota luotu\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (huippu %d) malline nxt-chk-alkiota luotu\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d tyhjää taulualkiota\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d protoa luotu\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mallinetta luotu, %d käytetään\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalenssiluokkaa luotu\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-ekvivalenssiluokkaa luotu\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" " %d (%d tallennettu) hash-törmäykset, yhtäsuuri kuin %d Deterministisen " "äärellisen automaatin törmäystä\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d uudelleenvarausjoukkoa tarvittu\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d taulukkoalkiota tarvittu yhteensä\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Sisäinen virhe. flex-valitsimet ovat vääränmuotoisia.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Lisätietoja käskyllä â€%s --helpâ€.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "tuntematon valitsin -C â€%câ€" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "vakava jäsennysvirhe" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "ei voitu luoda varmuuskopiotietotiedostoa %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l AT&T lex-yhteensopivuusvalitsin tuo mukanaan ison suorituskykysakon\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " ja saattaa olla muiden ilmoitettujen suorituskykysakkojen todellinen lähde\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -494,52 +494,52 @@ msgstr "" "%%option yylineno tuo mukanaan suorituskykysakon VAIN säännöissä, jotka " "voivat täsmätä rivinvaihtomerkkeihin\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiivinen) tuo mukanaan pienemmän suorituskykysakon\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() tuo mukanaan pienemmän suorituskykysakon\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT tuo mukanaan ison suorituskykyrangaistuksen\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Muuttujajättökontekstisäännöt tuovat mukanaan ison suorityskykysakon\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ei voida käyttää valitsimen -f tai -F kanssa" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ei voi käyttää REJECT:n kanssa" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "muuttujajättökontekstisääntöjä ei voida käyttää valitsimen -f tai -F kanssa" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass on merkityksellinen vain C++-skannereille" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Käyttö: %s [VALITSIMET] [TIEDOSTO]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -562,6 +562,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -672,51 +674,51 @@ msgstr "" " -h, --help tuota tämä opastesanoma\n" " -V, --version ilmoita %s-versio\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "sko_stack-varaaminen epäonnistui" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nimi â€%s†on naurettavan pitkä" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "muistinvaraus epäonnistui funktiossa allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "väärä merkki â€%s†havaittu funktiossa check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "skanneri vaatiin lipun -8 käytettäväksi merkille %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "dynaaminen muistivirhe funktiossa copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: vakava sisäinen virhe, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "yritys taulukon koon kasvattamiseksi epäonnistui" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "väärä rivi kehystiedostossa" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "muistinvaraus epäonnistui funktiossa yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -728,232 +730,232 @@ msgstr "" "********** Epädeterministisen äärellisen automaatin vedoksen alku " "aloitustilassa %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "tila numero %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** vedoksen loppu\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "tyhjä kone funktiossa dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Muuttujajättökontekstisääntö rivillä %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "väärä tilatyyppi funktiossa mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "" "syötesäännöt ovat liian mutkikkaita (>= %d Epädeterministisen äärellisen " "automaatin tilaa)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "löytyi liian monta siirtymää funktiossa mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "liian moni sääntöjä (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "tuntematon virhe käsiteltäessä lohkoa 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "väärä alkuehtoluettelo" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "tunnistamaton sääntö" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "jättökontekstia käytetty kahdesti" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "vääriä iteraatioarvoja" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteraatioarvon on oltava positiivinen" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "merkkialue [%c-%c] ei ole yksiselitteinen skannerissa, joka ei välitä " "kirjainkoosta" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negatiivinen lukualue merkkiluokassa" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] ei ole yksiselitteinen skannerissa, joka ei välitä kirjainkoosta" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] ei ole yksiselitteinen skannerissa, joka ei välit kirjainkoosta" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Syöterivi on liian pitkä\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "vääränmuotoinen â€%topâ€-direktiivi" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "tunnistamaton â€%â€-direktiivi" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Määritysnimi on liian pitkä\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Pariton â€{â€" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Määritysarvo kohteelle {%s} on liian pitkä\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "epätäydellinen nimimäärittely" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Valitsinrivi on liian pitkä\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "tunnistamaton %%valitsin: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "väärä merkkiluokka" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "määrittelemätön määrittely {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "virheellinen <aloitusehto>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "puuttuva lainausmerkki" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "väärä merkkiluokkalauseke: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "väärä merkki aaltosulkeiden {} sisällä" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "puuttuva }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "Tiedoston loppumerkki EOF tavattu toiminnon sisällä" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "Tiedoston loppumerkki EOF tavattu mallin sisällä" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "väärä merkki: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "ei voi avata %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Käyttö: %s [VALITSIMET]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "valitsin â€%s†ei salli argumenttia\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "valitsin â€%s†vaatii argumentin\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "valitsin â€%s†ei ole yksiselitteinen\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Tunnistamaton valitsin â€%sâ€\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Tuntematon virhe=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "symbolitaulun muistinvaraus epäonnistui" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "nimi määritelty kahdesti" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "alkuehto %s esitelty kahdesti" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "ennenaikainen tiedoston loppumerkki EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Loppumerkki\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Jotain outoa - tok: %d arvo: %d\n" diff --git a/po/flex.pot b/po/flex.pot index 467d714..76fea13 100644 --- a/po/flex.pot +++ b/po/flex.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: flex 2.5.39\n" +"Project-Id-Version: flex 2.6.0\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-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" @@ -16,53 +16,53 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr "" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr "" -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" " jam-transitions: EOF " msgstr "" -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -70,24 +70,24 @@ msgid "" "\n" msgstr "" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -95,422 +95,422 @@ msgid "" "\n" msgstr "" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "" -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" "Meta-Equivalence Classes:\n" msgstr "" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr "" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr "" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr "" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr "" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr "" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr "" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr "" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr "" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr "" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr "" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr "" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr "" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr "" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr "" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr "" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr "" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr "" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr "" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr "" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr "" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr "" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr "" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "" -#: main.c:1802 +#: src/main.c:1809 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -534,6 +534,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -576,51 +578,51 @@ msgid "" " -V, --version report %s version\n" msgstr "" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -628,226 +630,226 @@ msgid "" "********** beginning dump of nfa with start state %d\n" msgstr "" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "" Binary files differ@@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-09-19 21:01-0400\n" "Last-Translator: David Prévot <david@tilapin.org>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -22,42 +22,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.4\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Échec d'allocation de tampon pour afficher une chaîne" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Échec d'allocation de tampon pour la directive de ligne" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Échec d'allocation de tampon pour m4 défini" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Échec d'allocation de tampon pour m4 non défini" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "L'état nº %d n'accepte pas -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "le contexte traîné est dangereux" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " numéros de ligne associés à la règle :" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " transitions de sortie : " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -66,11 +66,11 @@ msgstr "" "\n" " transitions-bouchon : EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "le contrôle de cohérence a échoué dans epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -82,24 +82,24 @@ msgstr "" "Vidage de l'AFD :\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "impossible de créer un seul état de fin de tampon" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "état nº %d :\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Impossible d'écrire yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "mauvais caractère de transition détecté dans sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -111,29 +111,29 @@ msgstr "" "Classes d'équivalence :\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "l'état nº %d accepte : [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "l'état nº %d accepte : " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Impossible d'écrire yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Impossible d'écrire yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Impossible d'écrire ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -143,351 +143,351 @@ msgstr "" "\n" "Classes de métaéquivalence :\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Impossible d'écrire yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Impossible d'écrire yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Impossible d'écrire yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Impossible d'écrire yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Impossible d'écrire yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Impossible d'écrire ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Impossible d'écrire ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Impossible d'écrire eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Impossible d'écrire yynultrnas_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "la règle ne peut pas correspondre" -#: main.c:196 +#: src/main.c:197 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 correspondre" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "L'option -+ ne peut pas être combinée à -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Les options -f et -F ne peuvent pas être combinées à -l" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" "Les options --reentrant ou --bison-bridge ne peuvent pas être combinées à " "l'option -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf ou -CF et -Cm ne peuvent pas être indiquées ensemble" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf ou -CF et -I sont incompatibles" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" "les options -Cf ou -CF ne sont pas compatibles avec le mode de compatibilité " "« lex »" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf et -CF sont mutuellement exclusifs" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "L'option -+ ne peut pas être combinée à -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatible avec l'option -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Les options +- et --reentrant sont mutuellement exclusives." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bridge bison n'est pas pris en charge pour l'analyseur C++" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "impossible de créer %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "impossible d'écrire les tables d'en-tête" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "impossible d'ouvrir le fichier canevas %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "échec d'allocation de définition de macro" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "erreur de lecture du fichier canevas %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "erreur de fermeture du fichier canevas %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "erreur de création du fichier d'en-tête %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "erreur d'écriture du fichier de sortie %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "erreur de fermeture du fichier de sortie %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "erreur d'effacement du fichier de sortie %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Pas d'archivage.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d états d'archivage (non acceptants).\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Les tables comprimées sont toujours archivées.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "erreur d'écriture du fichier de sauvegarde %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "erreur de fermeture du fichier de sauvegarde %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "« %s » version %s, statistiques d'utilisation :\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " options de l'analyseur lexical : -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d états NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d états AFD (%d mots)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d règles\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Pas d'archivage\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d états d'archivage (si non acceptants)\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Les tables comprimées sont toujours archivées\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Modèles utilisés en début de ligne\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d conditions de départ\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d états epsilon, %d états double epsilon\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " pas de classes de caractères\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d classes de caractères nécessaires %d/%d mots-mémoire, %d recyclés\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d paires state/nextstate produites\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transitions uniques/dupliquées\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d entrées dans la table\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entrées base-def produites\n" -#: main.c:879 +#: src/main.c:880 #, 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:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d entrées vides dans la table\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototypes produits\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modèles produits, %d usages\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes d'équivalence produites\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de métaéquivalence produites\n" -#: main.c:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d ensembles de réallocations nécessaires\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d entrées nécessaires dans la table, au total\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Erreur interne. Les options « flexopts » sont mal composées.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" "Exécutez « %s --help » pour obtenir des renseignements complémentaires.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "l'option -C « %c » inconnue" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "erreur de lecture fatale" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "impossible de créer le fichier d'informations d'archivage %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -496,55 +496,55 @@ msgstr "" "%%option yylineno n'entraîne une importante perte de performance QUE sur\n" "les règles pouvant correspondre avec le caractère de changement de ligne\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "l'option -I (interactif) entraîne une faible perte de performance\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() entraîne une faible baisse de performance\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entraîne une importante baisse de performance\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ne peut pas être utilisé avec -f ou -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ne peut être utilisé avec REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass n'a de sens qu'avec les analyseurs C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Utilisation : %s [OPTIONS] [FICHIER]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -567,6 +567,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -679,52 +681,52 @@ msgstr "" " -h, --help afficher l'aide-mémoire\n" " -V, --version afficher la version %s du logiciel\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "échec d'allocation de sko_stack" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "le nom « %s » est ridiculement long" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "échec d'allocation mémoire dans allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "mauvais caractère « %s » détecté dans check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "" "l'analyseur nécessite l'option -8 pour pouvoir utiliser le caractère %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "échec de mémoire dynamique dans copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s : erreur interne fatale, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "échec de la tentative d'augmenter la taille du tableau" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "mauvaise ligne dans le fichier canevas" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "échec d'allocation mémoire dans yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -735,228 +737,228 @@ msgstr "" "\n" "********** début du vidage de nfa avec %d pour état de départ\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "état nº %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** fin du vidage\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "machine vide dans dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Règle de contexte traîné variable à la ligne %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "mauvais type d'état dans mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "les règles d'entrée sont trop compliquées (>= %d états NFA)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "il y a trop de transitions dans mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "trop de règles (> %d)." -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "erreur inconnue de traitement à la section 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "mauvaise liste de conditions de départ" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "règle non reconnue" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "contexte traîné utilisé deux fois" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valeurs d'itération erronée" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "la valeur d'itération doit être positive" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "plage négative dans la classe de caractères" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] est ambigu pour un scanner insensible à la casse" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] est ambigu pour un scanner insensible à la casse" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "ligne d'entrée trop longue\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "directive « %top » mal composée" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "directive « % » inconnue" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Nom de définition trop long\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "« { » non apparié" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Valeur de définition trop longue pour {%s}\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "définition de nom incomplète" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Ligne d'option trop longue\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "%%option non reconnue : %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "mauvaise classe de caractères" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "définition {%s} non définie" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "mauvaise <condition de départ> : %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "guillemet manquant" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "mauvaise expression de classe de caractères : %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "mauvais caractère entre accolades « {} »" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "« } » manquante" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "Fin de fichier rencontrée à l'intérieur d'une action" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "Fin de fichier rencontrée à l'intérieur d'un modèle" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "mauvais caractère : %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "impossible d'ouvrir %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Utilisation : %s [OPTIONS]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "l'option « %s » ne permet pas d'argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "l'option « %s » nécessite un argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "l'option « %s » est ambiguë\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Option « %s » non reconnue\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Erreur inconnue=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "échec d'allocation mémoire de la table des symboles" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "nom défini deux fois" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "condition de départ %s déclarée deux fois" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "fin de fichier inattendue" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Marqueur de fin\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Très bizarre* — tok : %d val : %d\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.34\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2008-07-23 09:37-0500\n" "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -15,43 +15,43 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/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 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "comhthéacs sraoilleach baolach" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " lÃne-uimhreacha de na rialacha bainteacha:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " athruithe amach: " # weak, I know -- KPS -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " athruithe plúchta: comhadchrÃoch " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "theip ar sheiceáil chomhionannais i epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,24 +76,24 @@ msgstr "" "Dumpáil DFA:\n" "\n" -#: dfa.c:604 +#: src/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 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "staid # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "NÃorbh fhéidir yynxt_tbl[][] a scrÃobh" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "carachtar trasdula neamhbhailà i sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -105,29 +105,29 @@ msgstr "" "Aicmà Coibhéise:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "glacann staid # %d le: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "glacann staid # %d le: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "NÃorbh fhéidir yyacclist_tbl a scrÃobh" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "NÃorbh fhéidir yyacc_tbl a scrÃobh" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "NÃorbh fhéidir ecstbl a scrÃobh" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,347 +137,347 @@ msgstr "" "\n" "Aicmà Meiteachoibhéise:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "NÃorbh fhéidir yymeta_tbl a scrÃobh" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "NÃorbh fhéidir yybase_tbl a scrÃobh" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "NÃorbh fhéidir yydef_tbl a scrÃobh" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "NÃorbh fhéidir yynxt_tbl a scrÃobh" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "NÃorbh fhéidir yychk_tbl a scrÃobh" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "NÃorbh fhéidir ftbl a scrÃobh" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "NÃorbh fhéidir ssltbl a scrÃobh" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "NÃorbh fhéidir eoltbl a scrÃobh" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "NÃorbh fhéidir yynultrans_tbl a scrÃobh" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "Nà féidir riail chomhoiriúnach a aimsiú" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "" "bhà an rogha -s tugtha ach is féidir an riail réamhshocraithe a chur i " "gcomhoiriúnacht" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "NÃl -+ ar fáil in éineacht leis an rogha -l" -#: main.c:239 +#: src/main.c:240 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:243 +#: src/main.c:244 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 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "NÃl -Cf/-CF agus -Cm comhoiriúnach" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "NÃl -Cf/-CF agus -I comhoiriúnach" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "NÃl -Cf/-CF ar fáil sa mhód comhoiriúnachta lex" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "Is comheisiatach iad na roghanna -Cf agus -CF" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "NÃl -+ ar fáil in éineacht leis an rogha -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "nÃl %array comhoiriúnach leis an rogha -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Is comheisiatach iad na roghanna -+ agus --reentrant." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "nÃl bison bridge ar fáil don scanóir C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "nÃorbh fhéidir %s a chruthú" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "nÃorbh fhéidir ceanntásc táblaà a scrÃobh" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "nà féidir creatchomhad %s a oscailt" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "earráid agus creatchomhaid %s á léamh" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "earráid agus creatchomhaid %s á dhúnadh" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "earráid agus comhad ceanntáisc %s á chruthú" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "earráid agus aschomhaid %s á scrÃobh" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "earráid agus aschomhad %s á dhúnadh" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "earráid agus aschomhaid %s á scriosadh" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Ná cúlaÃtear.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d staid chúlaithe (nÃl ina staid ghlactha).\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "CúlaÃonn táblaà comhbhrúite i gcónaÃ.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "earráid agus comhad cúltaca %s á scrÃobh" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "earráid agus comhad cúltaca %s á dhúnadh" -#: main.c:736 +#: src/main.c:737 #, 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:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " roghanna don scanóir: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d staid NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d staid DFA (%d focal)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d riail\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Ná cúlaÃtear\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d staid chúlaithe (nÃl ina staid ghlactha)\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " CúlaÃonn táblaà comhbhrúite i gcónaÃ\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Patrúin úsáidte ag ceann lÃne\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d coinnÃoll tosaigh\n" -#: main.c:846 +#: src/main.c:847 #, 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:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " nÃl aon aicme charachtair\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d péire state/nextstate\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d athrú sainiúil/dúblach\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d iontráil sa tábla\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d iontráil base-def\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (buaic %d) iontráil nxt-chk\n" -#: main.c:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d iontráil tábla folamh\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d fréamhshamhail\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d teimpléad, %d i bhfeidhm\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d aicme choibhéise\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d aicme mheiteachoibhéise\n" -#: main.c:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " tá gá le %d sraith athdháilte\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " tá gá le %d iontráil tábla ar fad\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Earráid inmheánach (flexopts mÃchumtha).\n" -#: main.c:1005 +#: src/main.c:1006 #, 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:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "rogha -C anaithnid '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "earráid pharsála mharfach" -#: main.c:1498 +#: src/main.c:1500 #, 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:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -486,55 +486,55 @@ msgstr "" "is cúis le moilliú mór an %%rogha yylineno, Mà tá rialacha ann le lÃnte nua " "iontu\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "is cúis le moilliú beag an rogha -I (idirghnÃomhach)\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "is cúis le moilliú beag an fheidhm yymore()\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "is REJECT cúis le moilliú mór\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "NÃl REJECT ar fáil leis na roghanna -f nó -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "nÃl %option yylineno ar fáil le REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, 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:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Úsáid: %s [ROGHANNA] [COMHAD]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -557,6 +557,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -662,51 +664,51 @@ msgstr "" " -h, --help taispeáin an chabhair seo\n" " -V, --version taispeáin leagan %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "tá an t-ainm \"%s\" i bhfad Éireann rófhada" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "theip ar dháileadh na cuimhne i allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "aimsÃodh carachtar neamhbhailà '%s' i check_char()" -#: misc.c:235 +#: src/misc.c:237 #, 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:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "theip ar dháileadh na cuimhne i copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: earráid inmheánach mharfach, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "theip ar mhéadú an eagair" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "drochlÃne i gcreatchomhad" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "theip ar dháileadh na cuimhne i yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -717,234 +719,234 @@ msgstr "" "\n" "********** ag tosú dumpála de nfa le staid tosaigh %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "staid # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** i ndeireadh dumpála\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "meaisÃn folamh i dupmachine()" -#: nfa.c:240 +#: src/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:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "drochstaid i mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "is róchasta na rialacha ionchuir (>= %d staid NFA)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "an iomarca athruithe i mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "an iomarca rialacha (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "earráid anaithnid agus an chéad pháirt á próiseáil" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "is neamhbhailà liosta na coinnÃollacha tosaigh" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "riail anaithnid" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "baineadh úsáid as comhthéacs sraoilleach faoi dhó" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "luachanna timthrialla neamhbhailÃ" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "nà foláir luach timthrialla deimhneach" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "tá an raon carachtair [%c-%c] débhrÃoch i scanóir a dhéanann neamhshuim ar " "cheannlitreacha agus litreacha beaga" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "raon diúltach in aicme charachtair" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "tá [:^lower:] débhrÃoch i scanóir a dhéanann neamhshuim ar cheannlitreacha " "agus litreacha beaga" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "tá [:^upper:] débhrÃoch i scanóir a dhéanann neamhshuim ar cheannlitreacha " "agus litreacha beaga" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Tá lÃne an ionchuir rófhada\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "treoir '%top' mÃchumtha" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "treoir '%' anaithnid" -#: scan.l:192 +#: src/scan.l:192 #, fuzzy msgid "Definition name too long\n" msgstr "Tá lÃne an ionchuir rófhada\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "'{' corr" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "is neamhiomlán an sainmhÃniú ainm" -#: scan.l:443 +#: src/scan.l:443 #, fuzzy msgid "Option line too long\n" msgstr "Tá lÃne an ionchuir rófhada\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "rogha %% anaithnid: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "aicme charachtair neamhbhailÃ" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "sainmhÃniú neamhshainithe {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "<coinnÃoll tosaigh> neamhbhailÃ: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "comhartha athfhriotal ar iarraidh" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "is neamhbhailà an slonn aicme carachtair: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "carachtar neamhbhailà idir {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "} ar iarraidh." -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "Buaileadh comhadchrÃoch isteach i ngnÃomh" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "Buaileadh comhadchrÃoch isteach i bpatrún" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "carachtar neamhbhailÃ: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "nà féidir %s a oscailt" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Úsáid: %s [ROGHANNA]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "nà cheadaÃtear argóint i ndiaidh na rogha `%s'\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "tá argóint de dhÃth i ndiaidh na rogha `%s'\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "tá an rogha `%s' débhrÃoch\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Rogha anaithnid `%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Earráid anaithnid=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "theip ar dháileadh na cuimhne don tábla siombalach" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "sainmhÃnÃodh an t-ainm faoi dhó" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "fógraÃodh an coinnÃoll tosaigh %s faoi dhó" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "comhadchrÃoch gan choinne" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Comhartha Deiridh\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Rud Éigin Aisteach* - tok: %d val: %d\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-10-05 16:48+0200\n" "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" @@ -19,53 +19,53 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.4\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr "" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr "" -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" " jam-transitions: EOF " msgstr "" -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -73,24 +73,24 @@ msgid "" "\n" msgstr "" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -98,422 +98,422 @@ msgid "" "\n" msgstr "" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "" -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" "Meta-Equivalence Classes:\n" msgstr "" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "greÅ¡ka pri zatvaranju datoteke predloÅ¡ka %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "greÅ¡ka pri stvaranju datoteke zaglavlja %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "greÅ¡ka pri pisanju izlazne datoteke %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "greÅ¡ka pri zatvaranju izlazne datoteke %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "greÅ¡ka pri uklanjanju izlazne datoteke %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr "" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr "" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr "" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr "" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr "" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr "" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr "" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr "" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr "" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr "" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr "" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr "" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr "" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr "" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr "" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr "" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr "" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr "" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr "" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr "" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr "" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr "" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "PokuÅ¡ajte „%s --help†za viÅ¡e informacija.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "nepoznata -C opcija „%câ€" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "fatalna greÅ¡ka analize" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uporaba: %s [OPCIJE] [DATOTEKA]...\n" -#: main.c:1802 +#: src/main.c:1809 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -537,6 +537,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -579,51 +581,51 @@ msgid "" " -V, --version report %s version\n" msgstr "" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "neispravan redak u datoteci predloÅ¡ka" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -631,226 +633,226 @@ msgid "" "********** beginning dump of nfa with start state %d\n" msgstr "" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "previÅ¡e pravila (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "neprepoznato pravilo" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "neispravne vrijednosti iteracije" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "vrijednost iteracije mora biti pozitivna" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Ulazni redak je predugaÄak\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Ime definicije je predugaÄko\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Neuparena „{â€" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "nepotpuna definicija imena" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Redak opcija je predugaÄak\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "neispravan razred znakova" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "nedefinirana definicija {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "nedostaje navodnik" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "neispravan znak unutar {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "nedostaje }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "neispravan znak: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "ne mogu otvoriti %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Uporaba: %s [OPCIJE]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "opcija „%s†ne dozvoljava argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "opcija „%s†zahtijeva argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "opcija „%s†je viÅ¡eznaÄna\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Neprepoznata opcija „%sâ€\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Nepoznata greÅ¡ka=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "alokacija memorije za tablicu simbola nije uspjela" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "ime je dvaput definirano" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "preuranjen EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Oznaka kraja\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*NeÅ¡to je Äudno* - simbol: %d vrijednost: %d\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.2\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-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" @@ -15,42 +15,42 @@ msgstr "" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8-bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "»óŹøÈ£ %d´Â ¹Þ¾ÆµéÀÌÁö ¾Ê´Â -ÀÔ´Ï´Ù\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "À§ÇèÇÑ ÃßÀû ¹®¸Æ" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " °ü·Ã ±ÔÄ¢ Çà¹øÈ£:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " ³ª°¡´Â ÂÊ ÀüÀÌ: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -59,11 +59,11 @@ msgstr "" "\n" " Àë-ÀüÀÌ: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "epsclosure()¿¡¼ ÀÏ°ü¼º °Ë»ç°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -75,24 +75,24 @@ msgstr "" "DFA Ãâ·Â:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "À¯ÀÏÇÑ ¹öÆÛÀÇ ³¡(end-of-buffer)»óŸ¦ ¸¸µé ¼ö ¾ø¾ú½À´Ï´Ù" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "»óŹøÈ£ %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "sympartition()¿¡¼ À߸øµÈ ÀüÀÌ ¹®ÀÚ¸¦ ã¾Ò½À´Ï´Ù" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -104,30 +104,30 @@ msgstr "" "µ¿Ä¡·ù:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "»óŹøÈ£ %d´Â [%d]¸¦ ¹Þ¾ÆµéÀÔ´Ï´Ù\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "»óŹøÈ£ %d´Â ´ÙÀ½À» ¹Þ¾ÆµéÀÔ´Ï´Ù: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 #, fuzzy msgid "Could not write ecstbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,402 +137,402 @@ msgstr "" "\n" "¸ÞŸ-µ¿Ä¡·ùµé:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "" -#: gen.c:1354 +#: src/gen.c:1376 #, fuzzy msgid "Could not write yybase_tbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 #, fuzzy msgid "Could not write ftbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: gen.c:1624 +#: src/gen.c:1646 #, fuzzy msgid "Could not write ssltbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: gen.c:1675 +#: src/gen.c:1697 #, fuzzy msgid "Could not write eoltbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "¸Â´Â ±ÔÄ¢À» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "-s ¿É¼ÇÀÌ ÁÖ¾îÁ³Áö¸¸ ±âº» ±ÔÄ¢ÀÌ Àû¿ëµÉ ¼ö ÀÖ½À´Ï´Ù" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "-l¿É¼Ç¿¡´Â -+¿É¼ÇÀ» °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "-l¿É¼Ç¿¡ -f³ª -F¿É¼ÇÀ» ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:243 +#: src/main.c:244 #, fuzzy msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "-l¿É¼Ç¿¡ -f³ª -F¿É¼ÇÀ» ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF´Â -Cm¿Í °°ÀÌ ¾²¸é Àǹ̰¡ ¾ø½À´Ï´Ù" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF¿Í -I´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF ´Â lexȣȯ ¸ðµå¿Í´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf¿Í -CF´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "-CF¿É¼Ç¿¡ -+¿É¼ÇÀ» °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array´Â -+¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:299 +#: src/main.c:300 #, fuzzy msgid "Options -+ and --reentrant are mutually exclusive." msgstr "-Cf¿Í -CF´Â °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: main.c:416 +#: src/main.c:417 #, fuzzy msgid "could not write tables header" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:693 +#: src/main.c:694 #, fuzzy, c-format msgid "error creating header file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ¾²´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ ¾²´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ Áö¿ì´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "µÇµ¹¸²ÀÌ ¾ø½À´Ï´Ù.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d°³ÀÇ µÇµ¹¸²(¹Þ¾ÆµéÀÌÁö ¾Ê´Â) »óÅÂ.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr " ¾ÐÃàµÈ Å×À̺íÀº Ç×»ó ¹é¾÷ÇÕ´Ï´Ù.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ¾²´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s ¹öÀü %s »ç¿ë Åë°è:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " ½ºÄ³³Ê ¿É¼Ç: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d°³ÀÇ NFA »óÅÂ\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d°³ÀÇ DFA »óÅ (%d ´Ü¾î)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d°³ÀÇ ±ÔÄ¢\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " µÇµ¹¸²ÀÌ ¾ø½À´Ï´Ù\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d°³ÀÇ µÇµ¹¸²(¹Þ¾ÆµéÀÌÁö ¾Ê´Â) »óÅÂ\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " ¾ÐÃàµÈ Å×À̺íÀº Ç×»ó ¹é¾÷ÇÕ´Ï´Ù\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Çà ½ÃÀÛ(beginning-of-line) À¯ÇüÀ» »ç¿ëÇÏ¿´½À´Ï´Ù\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d°³ÀÇ ½ÃÀÛÁ¶°Ç\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d°³ÀÇ ¿¦½Ç·Ð »óÅÂ, %d°³ÀÇ ÀÌÁß ¿¦½Ç·Ð »óÅÂ\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " ¹®ÀÚ·ù°¡ ¾ø½À´Ï´Ù\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d°³ÀÇ »óÅÂ/´ÙÀ½ »óÅ ½ÖÀÌ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d°³ÀÇ À¯ÀÏÇÑ/Áߺ¹µÇ´Â ÀüÀÌ\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d°³ÀÇ Å×ÀÌºí ¿£Æ®¸®\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (ÃÖ´ë %d) nxt-chk ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (ÃÖ´ë %d) ÅÛÇø®Æ® nxt-chk ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d°³ÀÇ ºó Å×ÀÌºí ¿£Æ®¸®\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d°³ÀÇ ¿øÇüÀÌ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d°³ÀÇ ÅÛÇø®Æ®°¡ ¸¸µé¾îÁö°í, %d°³¸¦ ¾¹´Ï´Ù\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d°³ÀÇ µ¿Ä¡·ù°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d ¸ÞŸ µ¿Ä¡·ù°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d(%d ÀúÀåµÊ)°³ÀÇ ÇØ½Ì Ãæµ¹·Î %d°³ÀÇ DFA°¡ °°°Ô 󸮵˴ϴÙ\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d°³ÀÇ ÀçÇÒ´ç ÁýÇÕÀÌ ÇÊ¿äÇÕ´Ï´Ù\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " ÃÑ %d°³ÀÇ Å×ÀÌºí ¿£Æ®¸®°¡ ÇÊ¿äÇÕ´Ï´Ù\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "¾Ë ¼ö ¾ø´Â -C ¿É¼Ç '%c'" -#: main.c:1191 +#: src/main.c:1192 #, fuzzy, c-format msgid "%s %s\n" msgstr "%s ¹öÀü %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "Ä¡¸íÀûÀÎ ÆÄ½Ì ¿¡·¯" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "µÇµ¹¸² Á¤º¸ ÆÄÀÏ %s¸¦ ¸¸µé ¼ö ¾ø¾ú½À´Ï´Ù" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex ȣȯ ¿É¼ÇÀº Å« ¼º´É ÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " ±×¸®°í ¾Æ¸¶µµ ´Ù¸¥ º¸°íµÈ ¼º´É ÀúÇÏÀÇ ½ÇÁ¦ ¿øÀÎÀÏ °ÍÀÔ´Ï´Ù\n" -#: main.c:1528 +#: src/main.c:1530 #, 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:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (´ëÈÇü) Àº ¼Ò±Ô¸ðÀÇ ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore()´Â ¼Ò±Ô¸ðÀÇ ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT´Â Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "°¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢Àº Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT´Â -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:1566 +#: src/main.c:1568 #, fuzzy, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylinenoÀº -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "°¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢Àº -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass´Â C++½ºÄ³³Ê¿¡°Ô¸¸ Àǹ̰¡ ÀÖ½À´Ï´Ù" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "" -#: main.c:1802 +#: src/main.c:1809 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -556,6 +556,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -598,51 +600,51 @@ msgid "" " -V, --version report %s version\n" msgstr "" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "À̸§ \"%s\"´Â ºñÁ¤»óÀûÀ¸·Î ±é´Ï´Ù" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "allocate_array()¿¡¼ ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "check_char()¿¡¼ À߸øµÈ ¹®ÀÚ '%s'¸¦ ã¾Ò½À´Ï´Ù" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "½ºÄ³³Ê¿¡¼ ¹®ÀÚ %s¸¦ ¾²±â À§Çؼ´Â -8¿É¼ÇÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "copy_string()¿¡¼ µ¿Àû ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: Ä¡¸íÀûÀÎ ³»ºÎ ¿¡·¯, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "¹è¿ Å©±â¸¦ ´Ã¸®·Á´Â ½Ãµµ°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ¿¡ À߸øµÈ Çà" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "yy_flex_xmalloc()¿¡¼ ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -653,233 +655,233 @@ msgstr "" "\n" "********** ½ÃÀÛ »óÅ %d¿¡¼ nfaÃâ·Â ½ÃÀÛ\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "»óÅ ¹øÈ£ %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** Ãâ·Â ³¡\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "dupmachine()¿¡¼ÀÇ ºó ¸Ó½Å" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "%dÇà¿¡¼ °¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "mark_beginning_as_normal()¿¡¼ À߸øµÈ »óÅÂÇü" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "ÀÔ·Â ±ÔÄ¢ÀÌ ³Ê¹« º¹ÀâÇÕ´Ï´Ù(>= NFA»óÅ %d°³)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "mkxtion()¿¡ ÀüÀÌ°¡ ³Ê¹« ¸¹½À´Ï´Ù" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "±ÔÄ¢ÀÌ ³Ê¹« ¸¹½À´Ï´Ù (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 #, fuzzy msgid "bad start condition list" msgstr "À߸øµÈ <½ÃÀÛ Á¶°Ç>: %s" -#: parse.y:315 +#: src/parse.y:315 #, fuzzy msgid "unrecognized rule" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 #, fuzzy msgid "trailing context used twice" msgstr "%dÇà¿¡¼ °¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢\n" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: parse.y:819 +#: src/parse.y:819 #, fuzzy msgid "negative range in character class" msgstr " ¹®ÀÚ·ù°¡ ¾ø½À´Ï´Ù\n" -#: parse.y:916 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "\t-i ´ë¼Ò¹®ÀÚ ±¸º°¾ø´Â ½ºÄ³³Ê¸¦ ¸¸µì´Ï´Ù\n" -#: parse.y:922 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "\t-i ´ë¼Ò¹®ÀÚ ±¸º°¾ø´Â ½ºÄ³³Ê¸¦ ¸¸µì´Ï´Ù\n" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "" -#: scan.l:161 +#: src/scan.l:161 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "ºÒ¿ÏÀüÇÑ À̸§ Á¤ÀÇ" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "¾Ë ¼ö ¾ø´Â %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "À߸øµÈ ¹®ÀÚ·ù" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "Á¤ÀǵÇÁö ¾ÊÀº Á¤ÀÇ {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "À߸øµÈ <½ÃÀÛ Á¶°Ç>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "Àοë±âÈ£ ºüÁü" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "À߸øµÈ ¹®ÀÚ ÁýÇÕ ½Ä: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "{}¾ÈÀÇ À߸øµÈ ¹®ÀÚ" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "}ÀÌ ºüÁ³½À´Ï´Ù" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "µ¿ÀÛ µµÁß¿¡ EOF¸¦ ¸¸³µ½À´Ï´Ù" -#: scan.l:945 +#: src/scan.l:945 #, fuzzy msgid "EOF encountered inside pattern" msgstr "µ¿ÀÛ µµÁß¿¡ EOF¸¦ ¸¸³µ½À´Ï´Ù" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "À߸øµÈ ¹®ÀÚ: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "%s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "" -#: scanopt.c:577 +#: src/scanopt.c:572 #, fuzzy, c-format msgid "Unrecognized option `%s'\n" msgstr "¾Ë ¼ö ¾ø´Â %%option: %s" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "½Éº¼ Å×ÀÌºí ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "À̸§À» µÎ¹ø Á¤ÀÇÇß½À´Ï´Ù" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "½ÃÀÛÁ¶°Ç %s¸¦ µÎ¹ø ¼±¾ðÇß½À´Ï´Ù" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "°©ÀÛ½º·± EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Á¾·á Ç¥½Ã\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*¹«¾ð°¡ ÀÌ»óÇÕ´Ï´Ù* - tok: %d val: %d\n" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2014-02-13 22:25+0100\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -20,42 +20,42 @@ msgstr "" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Geheugenreservering voor stringprintbuffer is mislukt" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Geheugenreservering voor line-commandobuffer is mislukt" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Geheugenreservering voor buffer voor m4 def is mislukt" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Geheugenreservering voor buffer voor m4 undef is mislukt" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Toestand #%d is niet-accepterend -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "gevaarlijke nakomende context" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " regelnummers van de betrokken voorschriften:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " uit-transities: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -64,11 +64,11 @@ msgstr "" "\n" " vastlopende transities: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "consistentiecontrole is mislukt in epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -80,24 +80,24 @@ msgstr "" "DFA-dump:\n" "\n" -#: dfa.c:604 +#: src/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 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "toestand # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Kan yynxt_tbl[][] niet schrijven" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "onjuist transitieteken in sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -109,29 +109,29 @@ msgstr "" "Equivalentieklassen:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "toestand # %d accepteert: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "toestand # %d accepteert: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Kan yyacclist_tbl niet schrijven" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Kan yyacc_tbl niet schrijven" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Kan ecstbl niet schrijven" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -141,349 +141,349 @@ msgstr "" "\n" "Meta-equivalentieklassen:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Kan yymeta_tbl niet schrijven" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Kan yybase_tbl niet schrijven" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Kan yydef_tbl niet schrijven" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Kan yynxt_tbl niet schrijven" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Kan yychk_tbl niet schrijven" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Kan ftbl niet schrijven" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Kan ssltbl niet schrijven" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Kan eoltbl niet schrijven" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Kan yynultrans_tbl niet schrijven" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "voorschrift geeft geen overeenkomsten" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "" "optie '-s' is gegeven, maar het standaardvoorschrift geeft overeenkomsten" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Optie '-+' gaat niet samen met '-l'" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Optie '-f' of '-F' gaat niet samen met '-l'" -#: main.c:243 +#: src/main.c:244 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 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "Opties -Cf/-CF en -Cm gaan niet samen" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "Opties -Cf/-CF en -I gaan niet samen" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "Optie -Cf of -CF gaat niet samen met lex-compatibiliteitsmodus" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "Opties -Cf en -CF sluiten elkaar uit" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Optie '-+' gaat niet samen met '-CF'" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "Optie '-+' gaat niet samen met %array" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Opties '-+' en '--reentrant' sluiten elkaar uit." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge wordt niet ondersteund voor de C++-scanner." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "kan %s niet aanmaken" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "kan tabellenkop niet schrijven" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "kan skeletbestand %s niet openen" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "geheugenreservering voor macrodefinitie is mislukt" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "invoerfout tijdens lezen van skeletbestand %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "fout tijdens sluiten van skeletbestand %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "fout tijdens aanmaken van headerbestand %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "fout tijdens schrijven van uitvoerbestand %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "fout tijdens sluiten van uitvoerbestand %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "fout tijdens verwijderen van uitvoerbestand %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Terugstappen is niet mogelijk.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d terugstappende (niet-accepterende) toestanden.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Gecomprimeerde tabellen kunnen altijd terugstappen.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "fout tijdens schrijven van terugstapbestand %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "fout tijdens sluiten van terugstapbestand %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versie %s gebruiksstatistieken:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " scanneropties: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-toestanden\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-toestanden (%d woorden)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d voorschriften\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Terugstappen is niet mogelijk\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d terugstappende (niet-accepterende) toestanden\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Gecomprimeerde tabellen kunnen altijd terugstappen\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Begin-van-regel-patronen gebruikt\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startvoorwaarden\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontoestanden, %d dubbele epsilontoestanden\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " geen tekenklassen\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d toestand/volgtoestand-paren aangemaakt\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unieke/dubbele transities\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d tabelitems\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def-items aangemaakt\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (piek %d) nxt-chk-items aangemaakt\n" -#: main.c:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d lege tabelitems\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototypes aangemaakt\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d sjablonen aangemaakt, %d keer gebruikt\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d equivalentieklassen aangemaakt\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-equivalentieklassen aangemaakt\n" -#: main.c:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d sets van herallocaties waren nodig\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " in totaal %d tabelitems nodig\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "*Interne fout*: ongeldige flexopts.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Typ '%s --help' voor meer informatie.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "onbekende -C-optie '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "fatale ontledingsfout" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "kon terugstapbestand %s niet aanmaken" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -492,55 +492,55 @@ msgstr "" "de %%optie yylineno betekent een prestatievermindering, maar ALLEEN voor " "voorschriften die met het regeleindeteken overeen kunnen komen\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "optie '-I' (interactief) betekent een kleine prestatievermindering\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() betekent een kleine prestatievermindering\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT betekent een grote prestatievermindering\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Voorschriften met variabele nakomende context betekenen een grote " "prestatievermindering\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT gaat niet samen met -f of -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%optie yylineno gaat niet samen met REJECT" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "voorschriften met variabele nakomende context gaan niet samen met '-f' of '-" "F'" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%optie yyclass heeft alleen betekenis voor C++-scanners" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Gebruik: %s [OPTIE...] [BESTAND...]\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -563,6 +563,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -671,51 +673,51 @@ msgstr "" " -h, --help deze hulptekst tonen\n" " -V, --version de versie van %s tonen\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "geheugenreservering voor 'sko_stack' is mislukt" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "naam is belachelijk lang: \"%s\"" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "geheugenreservering is mislukt in allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "onjuist teken '%s' in check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scanner heeft de optie '-8' nodig om teken %s te kunnen gebruiken" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "dynamische geheugenfout in copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: **fatale interne programmafout**, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "vergroting van array is mislukt" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "onjuiste regel in skeletbestand" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "geheugenreservering is mislukt in yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -726,228 +728,228 @@ msgstr "" "\n" "********** begin van dump van NFA met starttoestand %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "toestand # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** einde van de dump\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "lege machine in dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Voorschrift met variabele nakomende context op regel %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "onjuist toestandstype in mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "invoervoorschriften zijn te ingewikkeld (>= %d NFA-toestanden)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "te veel transities gevonden in mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "te veel voorschriften (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "onbekende fout tijdens verwerken van sectie 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "onjuiste lijst van startvoorwaarden" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "onbekend voorschrift" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "nakomende context twee keer gebruikt" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "onjuiste iteratiewaarden" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteratiewaarde moet positief zijn" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negatief bereik in tekenklasse" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] is niet eenduidig in een hoofdletterongevoelige scanner" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] is niet eenduidig in een hoofdletterongevoelige scanner" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Invoerregel is te lang\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "verkeerde opbouw van '%top'-commando" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "onbekend '%'-commando" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Definitienaam is te lang\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Ongepaarde '{'" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definitiewaarde voor {%s} is te lang\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "onvolledige naamsdefinitie" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Optiesregel is te lang\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "onbekende %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "onjuiste tekenklasse" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "ongedefinieerde definitie {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "onjuiste <startvoorwaarde>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "ontbrekend aanhalingsteken" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "onjuiste expressie '%s' in tekenklasse" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "onjuist teken tussen {}'s" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "ontbrekende }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF werd bereikt tijdens een actie" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "EOF werd bereikt binnen een patroon" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "onjuist teken: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "kan %s niet openen" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Gebruik: %s [OPTIE...]\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "optie '%s' staat geen argument toe\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "optie '%s' vereist een argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "optie '%s' is niet eenduidig\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Onbekende optie '%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Onbekende fout=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "geheugenreservering voor symbolentabel is mislukt" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "naam is twee keer gedefinieerd" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "startvoorwaarde %s is twee keer vermeld" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "voortijdig einde van bestand" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Eindmarkering\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Iets Raars* - token: %d waarde:%d\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.36\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2012-08-02 18:15+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Przydzielenie bufora do wypisania ³añcucha nie powiod³o siê" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Przydzielenie bufora dla dyrektywy linii nie powiod³o siê" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Przydzielenie bufora dla polecenia m4 def powiod³o siê" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Przydzielenie bufora dla polecenia m4 undef powiod³o siê" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Stan #%d jest nieakceptuj±cy -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "niebezpieczny kontekst koñcowy" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " numery linii powi±zanych regu³:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " przej¶cia-wyj¶ciowe: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " przej¶cia-zapêtlaj±ce: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "kontrola spójno¶ci nie powiod³a siê w epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,24 +76,24 @@ msgstr "" "Zrzut DFA:\n" "\n" -#: dfa.c:604 +#: src/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 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "stan # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Nie mo¿na zapisaæ yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "wykryto b³êdny znak przej¶cia w sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -105,29 +105,29 @@ msgstr "" "Klasy równowa¿no¶ci:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "stan # %d akceptuje: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "stan # %d akceptuje: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Nie mo¿na zapisaæ yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Nie mo¿na zapisaæ yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Nie mo¿na zapisaæ ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,344 +137,344 @@ msgstr "" "\n" "Klasy meta-równowa¿no¶ci:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Nie mo¿na zapisaæ yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Nie mo¿na zapisaæ yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Nie mo¿na zapisaæ yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Nie mo¿na zapisaæ yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Nie mo¿na zapisaæ yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Nie mo¿na zapisaæ ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Nie mo¿na zapisaæ ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Nie mo¿na zapisaæ eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Nie mo¿na zapisaæ yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "nie mo¿na dopasowaæ regu³y" -#: main.c:196 +#: src/main.c:197 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:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Nie mo¿na u¿yæ -+ z opcj± -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Nie mo¿na u¿yæ -f ani -F z opcj± -l" -#: main.c:243 +#: src/main.c:244 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 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF i -Cm razem nie maj± sensu" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF i -I s± niekompatybilne" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF s± niekompatybilne z trybem kompatybilno¶ci z leksem" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf i -CF wykluczaj± siê wzajemnie" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Nie mo¿na u¿yæ -+ z opcj± -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array jest niekompatybilne z opcj± -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Opcje -+ i --reentrant wykluczaj± siê wzajemnie." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "pomost dla bisona nie jest obs³ugiwany dla skanera C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "nie mo¿na utworzyæ %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "nie mo¿na zapisaæ nag³ówka tablic" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "nie mo¿na otworzyæ pliku szablonu %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "przydzielenie pamiêci dla definicji makra nie powiod³o siê" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "b³±d wej¶cia podczas odczytu pliku szablonu %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "b³±d podczas zamykania pliku szablonu %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "b³±d podczas tworzenia pliku nag³ówkowego %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "b³±d podczas zapisu pliku wyj¶ciowego %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "b³±d podczas zamykania pliku wyj¶ciowego %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "b³±d podczas usuwania pliku wyj¶ciowego %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Bez zapamiêtywania.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d zapamiêtywanych stanów (nie akceptuj±cych).\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Skompresowane tablice zawsze zapamiêtuj±.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "b³±d podczas zapisu pliku raportu z zapamiêtywania %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "b³±d podczas zamykania pliku raportu z zapamiêtywania %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s w wersji %s - statystyka u¿ycia:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " opcje skanera: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d stanów NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d stanów DFA (%d s³ów)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d regu³\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Bez zapamiêtywania\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d zapamiêtywanych stanów (nie akceptuj±cych)\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Skompresowane tablice zawsze zapamiêtuj±\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " U¿ytych wzorców pocz±tek-linii\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d warunków pocz±tkowych\n" -#: main.c:846 +#: src/main.c:847 #, 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:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " bez klas znaków\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d utworzonych par stan/nastêpny-stan\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d przej¶æ unikalny/duplikat\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d elementów tablicy\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d utworzonych elementów base-def\n" -#: main.c:879 +#: src/main.c:880 #, 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:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d pustych elementów tablicy\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d utworzonych prototypów\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d utworzonych szablonów, %d u¿yæ\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d utworzonych klas równowa¿no¶ci\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d utworzonych klas meta-równowa¿no¶ci\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d zachowanych) kolizji haszy, %d jednakowych DFA\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d potrzebnych zbiorów realokacji\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d potrzebnych ogó³em elementów tablicy\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "B³±d wewnêtrzny. ¬le sformu³owane flexopts.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "`%s --help' poda wiêcej informacji.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "nieznana opcja -C '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "krytyczny b³±d analizy sk³adni" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "nie mo¿na utworzyæ pliku informacji o zapamiêtywaniu %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -483,52 +483,52 @@ msgstr "" "%%option yylineno powoduje straty wydajno¶ci TYLKO dla regu³ dopasowuj±cych " "znak koñca linii\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktywny) powoduje ma³± stratê wydajno¶ci\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() powoduje ma³± stratê wydajno¶ci\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT powoduje du¿± stratê wydajno¶ci\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT nie mo¿e byæ u¿yte z -f ani -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno nie mo¿e byæ u¿yte z REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass ma znaczenie tylko dla skanerów C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Sk³adnia: %s [OPCJE] [PLIK]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -551,6 +551,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -661,51 +663,51 @@ msgstr "" " -h, --help wy¶wietlenie tego pomocnego opisu\n" " -V, --version podanie wersji programu %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "przydzielenie sko_stack nie powiod³o siê" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nazwa \"%s\" jest ¶miesznie d³uga" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "nie uda³o siê przydzieliæ pamiêci w allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "b³êdny znak '%s' usuniêty w check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "skaner wymaga flagi -8 aby u¿yæ znaku %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "niepowodzenie dynamicznej pamiêci w copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: krytyczny b³±d wewnêtrzny: %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "próba zwiêkszenia rozmiaru tablicy nie powiod³a siê" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "b³êdna linia w pliku szablonu" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "nie uda³o siê przydzieliæ pamiêci w yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -716,232 +718,232 @@ msgstr "" "\n" "********** pocz±tek zrzutu NFA ze stanem pocz±tkowym %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "stan # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** koniec zrzutu\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "pusty automat w dupmachine()" -#: nfa.c:240 +#: src/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:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "b³êdny typ stanu w mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, 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:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "znaleziono zbyt du¿o przej¶æ w mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "zbyt du¿o regu³ (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "nieznany b³±d podczas przetwarzania sekcji 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "b³êdna lista warunków pocz±tkowych" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "nierozpoznana regu³a" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "koñcowy kontekst u¿yty dwukrotnie" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "b³êdne warto¶ci iteracji" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "warto¶æ iteracji musi byæ dodatnia" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "ujemny przedzia³ w klasie znaków" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] jest niejednoznaczne w przypadku skanera ignoruj±cego wielko¶æ " "liter" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] jest niejednoznaczne w przypadku skanera ignoruj±cego wielko¶æ " "liter" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Linia wej¶ciowa zbyt d³uga\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "¼le sformu³owana dyrektywa '%top'" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "nierozpoznana dyrektywa '%'" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Nazwa definizji zbyt d³uga\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Niesparowany '{'" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definicja warto¶ci dla {%s} zbyt d³uga\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "niekompletna definicja nazwy" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Linia opcji zbyt d³uga\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "nierozpoznane %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "b³êdna klasa znaków" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "niezdefiniowana definicja {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "b³êdny <warunek pocz±tkowy>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "brak cudzys³owu" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "b³êdne wyra¿enie klasy znaków: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "b³êdny znak wewn±trz {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "brak }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF napotkany wewn±trz akcji" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "EOF napotkany wewn±trz wzorca" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "b³êdny znak: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "nie mo¿na otworzyæ %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Sk³adnia: %s [OPCJE]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "opcja `%s' nie przyjmuje argumentu\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "opcja `%s' wymaga argumentu\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "opcja `%s' jest niejednoznaczna\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Nierozpoznana opcja `%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Nieznany b³±d=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "nie uda³o siê przydzieliæ pamiêci dla tablicy symboli" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "nazwa zdefiniowana dwukrotnie" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "warunek pocz±tkowy %s zadeklarowany dwukrotnie" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "przedwczesny EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Znacznik koñca\n" -#: yylex.c:204 +#: src/yylex.c:205 #, 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 b411bc5..510596a 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index b442365..8e8638d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2013-11-27 08:09-0300\n" "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." @@ -20,42 +20,42 @@ msgstr "" "X-Generator: Poedit 1.5.7\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "A alocação de buffer para retornar string falhou" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "A alocação de buffer para diretiva de linha falhou" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "A alocação de buffer para m4 def falhou" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "A alocação de buffer para m4 undef falhou" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "O estado #%d é não-aceita -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "texto final perigoso" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " números de linha de regras associadas:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " transações de saÃda: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -64,11 +64,11 @@ msgstr "" "\n" " transições presas: Fim de Arquivo " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "verificação de consistência falhou em epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -80,24 +80,24 @@ msgstr "" "Despejo DFA:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "não foi possÃvel criar um estado único de final de buffer" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "estado # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Não foi possÃvel escrever yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "caractere de transição inválido detectado em sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -109,29 +109,29 @@ msgstr "" "Classes de Equivalência:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "estado # %d aceita: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "estado # %d aceita: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Não foi possÃvel escrever yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Não foi possÃvel escrever yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Não foi possÃvel escrever ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -141,349 +141,349 @@ msgstr "" "\n" "Classes de Meta-Equivalência:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Não foi possÃvel escrever yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Não foi possÃvel escrever yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Não foi possÃvel escrever yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Não foi possÃvel escrever yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Não foi possÃvel escrever yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Não foi possÃvel escrever ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Não foi possÃvel escrever ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Não foi possÃvel escrever eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Não foi possÃvel escrever yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "aplicação da regra não gerou nenhum resultado" -#: main.c:196 +#: src/main.c:197 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:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Não é possÃvel usar -+ com a opção -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Não é possÃvel usar -f ou -F com a opção -l" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Não é possÃvel usar --reentrant ou --bison-bridge com a opção -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF e -Cm não fazem sentido juntos" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF e -I são incompatÃveis" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF são incompatÃveis com o modo de compatibilidade lex" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf e -CF são mutuamente exclusivos" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Não é possÃvel usar -+ com a opção -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array é incompatÃvel com a opção -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "As opções -+ e --reentrant são mutuamente exclusivas." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "sem suporte à ponte bison pelo scanner de C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "não foi possÃvel criar %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "não foi possÃvel escrever o cabeçalho das tabelas" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "não é possÃvel abrir o arquivo esqueleto %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "a alocação de definição de macro falhou" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "erro lendo o arquivo esqueleto %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "erro fechando o arquivo esqueleto %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "erro ao criar o arquivo cabeçalho %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "erro ao gravar o arquivo de saÃda %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "erro ao fechar o arquivo de saÃda %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "erro ao remover o arquivo de saÃda %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "ImpossÃvel restaurar.\n" -#: main.c:720 +#: src/main.c:721 #, 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:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Tabelas compactadas sempre têm cópias de segurança.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "erro ao gravar a cópia de segurança %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "erro ao fechar a cópia de segurança %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versão %s estatÃsticas de uso:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " opções de scanner: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estados NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estados DFA (%d palavras)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d regras\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Sem cópia de segurança\n" -#: main.c:831 +#: src/main.c:832 #, 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:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Tabelas compactadas sempre têm cópias de segurança\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Padrões de inÃcio-de-linha usados\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condições de inÃcio\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estados epsilon, %d estados epsilon duplo\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " nenhuma classe de caracteres\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d classes de caracteres precisaram de %d/%d palavras de armazenamento, " "%d reusadas\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d pares estado/próximoestado criados\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transições únicas/duplicadas\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d entradas de tabela\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entradas base-def criadas\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas nxt-chk criadas\n" -#: main.c:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d entradas vazias na tabela\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d protos criados\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modelos criados, %d usos\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes de equivalência criadas\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de meta-equivalência criadas\n" -#: main.c:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d conjuntos de realocação necessários\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d total de entradas de tabela necessárias\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Erro interno. flexopts estão malformados.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente \"%s --help\" para maiores informações.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "opção -C \"%c\" desconhecida" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "erro fatal de análise" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "" "não foi possÃvel criar arquivo de cópia de segurança das informações %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -492,54 +492,54 @@ msgstr "" "%%option yylineno acarreta em uma penalidade na performance APENAS em regras " "que podem bater caracteres de nova linha\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interativo) acarreta em uma pequena penalidade na performance\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() acarreta em uma pequena penalidade na performance\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT acarreta em uma grande penalidade na performance\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT não pode ser usado com -f ou -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno não pode ser usada com REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass só tem sentido para scanners C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uso: %s [OPÇÕES] [ARQUIVO]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -562,6 +562,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -670,51 +672,51 @@ msgstr "" " -h, --help produz esta mensagem de ajuda\n" " -V, --version informa a versão do %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "alocação de sko_stack falhou" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nome \"%s\" ridiculamente longo" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "alocação de memória falhou em allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "caractere inválido \"%s\" detectado em check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "o scanner precisa da opção -8 para usar o caractere %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "falha dinâmica de memória em copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: erro interno fatal, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "tentativa de aumentar o tamanho do vetor falhou" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "linha inválida no arquivo de esqueleto" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "alocação de memória falhou em yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -725,227 +727,227 @@ msgstr "" "\n" "********** iniciando despejo de nfa com estado inicial %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "estado # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** final do despejo\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "máquina vazia em dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Regra de final de contexto variável na linha %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "estado de tipo inválido em mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "regras de entrada são muito complicadas (>= %d estados NFA)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "muitas transições em mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "muitas regras (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "erro desconhecido processando a seção 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "lista de condições de inÃcio inválida" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regra não reconhecida" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "contexto final usado duas vezes" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valores de iteração inválidos" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "valor de iteração deve ser positivo" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "a faixa de caracteres [%c-%c] é ambÃgua em um scanner \"case-insensitive\"" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "faixa negativa na classe de caracteres" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] é ambÃgua em um scanner \"case-insensitive\"" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] é ambÃgua em um scanner \"case-insensitive\"" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Linha de entrada muito longa\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "diretiva \"%top\" malformada" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "diretiva \"%\" não reconhecida" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Nome de definição muito longo\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "'{' sem fechamento" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Valor de definição para {%s} muito longo\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "definição de nome incompleta" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Linha de opção muito longa\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "%%option não reconhecida: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "classe de caractere inválida" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "definição indefinida {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "<condição de inÃcio> inválida: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "faltou aspa" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "expressão de classe de caractere inválida: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "caracatere inválido entre {}'s" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "faltou }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "Fim de Arquivo encontrado dentro de uma ação" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "Fim de Arquivo encontrado dentro do padrão" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "caracter inválido: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "não foi possÃvel abrir %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Uso: %s [OPÇÕES]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "opção \"%s\" não permite argumentos\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "opção \"%s\" requer um argumento\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "opção \"%s\" é ambÃgua\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Opção \"%s\" desconhecida\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Erro desconhecido=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "alocação da memória da tabela de sÃmbolos falhou" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "nome definido duas vezes" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "condição de inÃcio %s declarada duas vezes" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "Fim-de-Arquivo prematuro" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Marca de Fim\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Algo Estranho* - tok: %d val: %d\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.31\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-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" @@ -15,42 +15,42 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Starea #%d este de neacceptat. -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "context de sfârºit(trailing) periculos" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " numerele de linie asociate regulii:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " tranziþii exterioare(out): " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -59,11 +59,11 @@ msgstr "" "\n" " tranziþii jam: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "verificare de consistenþã eºuatã în epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -75,24 +75,24 @@ msgstr "" "Rezultat(dump) DFA:\n" "\n" -#: dfa.c:604 +#: src/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 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "stare # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Nu am putut scrie yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "caracter greºit de tranziþie detectat în sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -104,29 +104,29 @@ msgstr "" "Clase de Echivalenþã:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "starea # %d acceptã: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "starea # %d acceptã: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Nu am putut scrie yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Nu am putut scrie yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Nu am putut scrie ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -136,346 +136,346 @@ msgstr "" "\n" "Clase de Meta-Echivalenþã:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Nu am putut scrie yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Nu am putut scrie yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Nu am putut scrie yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Nu am putut scrie yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Nu am putut scrie yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Nu am putut scrie ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Nu am putut scrie ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Nu am putut scrie eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Nu am putut scrie yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "regula nu se potriveºte cu nimic" -#: main.c:196 +#: src/main.c:197 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:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Nu se poate folosi -+ cu opþiunea -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Nu se poate folosi -f sau -F cu opþiunea -l" -#: main.c:243 +#: src/main.c:244 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 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF ºi -Cm nu au sens folosite împreunã" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF ºi -I sunt incompatibile" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF sunt incompatibile cu module de compatibilitate lex" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf ºi -CF se exclud reciproc" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Nu se poate folosi -+ cu opþiunea -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array incompatibil cu opþiunea -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Opþiunile -+ and --reentrant se exclud reciproc" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bridge bison nu este suportat pentru scannerul C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "nu am putut crea %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "Nu am putut scrie capul de tabel" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "nu am putut deschide fiºierul schelet %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "eroare de intrare(input) în timpul citirii fiºierului schelet %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "eroare în închiderea fiºierului schelet %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "eroare în crearea fiºierului de header %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "eroare în scrierea fiºierului de output %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "eroare în închiderea fiºierului de output %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "eroare în ºtergerea fiºierului de output %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Nu se revine (backing-up).\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d salvare de (inacceptabile) stãri.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Tabelele compresate întotdeauna au back-up.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "eroare în scrierea fiºierului de backup %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "eroare în închiderea fiºierului de backup %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versiunea %s statistici de folosire:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " opþiuni de scanner: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d stãri NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d stãri DFA (%d cuvinte)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d reguli\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Nu se face backup\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d salvare de (inacceptabile) stãri\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Tabelele compresate întotdeauna au back-up\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Tipare de începuturi de linie folosite\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condiþii de start\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d stãri epsilon, %d stãri dublu epsilon\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " nici o clasã de caractere\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d perechi de stare/stareurmãtoare create\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d tranziþii unice/duplicate\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d intrãri în tabele\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def intrãri create\n" -#: main.c:879 +#: src/main.c:880 #, 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:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d intrãri în tabel goale\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototipuri create\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modele create, %d folosiri\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d clase de echivalenþã create\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d clase de meta-echivalenþã create\n" -#: main.c:914 +#: src/main.c:915 #, 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:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d seturi de realocãri necesare\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d intrãri totale în tabel necesare\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Eroare internã. Opþiunile flex(flexopts) sunt malformate.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "opþiune -C necunoscutã `%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "eroare fatalã de analizã(parse)" -#: main.c:1498 +#: src/main.c:1500 #, 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:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -484,54 +484,54 @@ 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:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactiãe) determinã o scãdere minorã a performanþei\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() determinã o scãdere minorã a performanþei\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT determinã o scãdere drasticã a performanþei\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT nu poate fi folosit cu -f sau -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%opþiunea yylineno nu poate fi folositã cu REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%opþunea yyclass este folositoare doar pentru scannerele C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Folosire: %s [OPÞIUNI] [FIªIER]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -554,6 +554,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -662,51 +664,51 @@ msgstr "" " -h, --help produce acest mesaj de ajutor\n" " -V, --version raporteazã versiunea %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "numele \"%s\" este ridicol de lung" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "alocare de memorie eºuatã în allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "caracter greºit `%s' detectat în check_char()" -#: misc.c:235 +#: src/misc.c:237 #, 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:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "eroare de memorie dinamicã în copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: eroare internã fatalã, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "încercare de a mãri dimensiunea domeniului eºuatã" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "linie greºitã în fiºierul schelet" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "alocare de memorie eºuatã în yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -717,237 +719,237 @@ msgstr "" "\n" "********** începerea aducerii(dump) nfa cu starea de început %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "stare # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** sfârºit de aducere(dump)\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "maºinã vidã în dupmachine()" -#: nfa.c:240 +#: src/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:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "tip de stare greºitã în mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, 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:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "s-au gãsit prea multe tranziþii în mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "prea multe reguli (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "eroare necunoscutã în procesarea secþiunii 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "listã de stãri în condiþie proastã" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regulã necunoscutã" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "context de sfârºit(trailing) utilizat de douã ori" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valori de iteraþie greºite" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "valoarea iteraþiei trebuie sã fie pozitivã" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "domeniu negativ în clasa de caractere" -#: parse.y:916 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "intervalul(range) de caracter [%c %c] este ambiguu într-un scanner caz-" "insenzitiv" -#: parse.y:922 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "intervalul(range) de caracter [%c %c] este ambiguu într-un scanner caz-" "insenzitiv" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Linie de intrare(input) prea lungã\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "directivã '%top' malformatã" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "directivã '%' necunoscutã" -#: scan.l:192 +#: src/scan.l:192 #, fuzzy msgid "Definition name too long\n" msgstr "Linie de intrare(input) prea lungã\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "'{' fãrã corespondent" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "definire de nume incompletã" -#: scan.l:443 +#: src/scan.l:443 #, fuzzy msgid "Option line too long\n" msgstr "Linie de intrare(input) prea lungã\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opþiune necunoscutã: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "clasã de caractere greºitã" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "definiþie nedefinitã {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "<condiþie de start> greºitã: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "menþionare(quote) lipsã" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "expresie clasã caracter greºitã: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "caracter eronat între {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "lipseºte }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "EOF întâlnit în mijlocul acþiunii" -#: scan.l:945 +#: src/scan.l:945 #, fuzzy msgid "EOF encountered inside pattern" msgstr "EOF întâlnit în mijlocul acþiunii" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "caracter eronat: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "nu pot deschide %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Folosire: %s [OPÞIUNI]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "opþiunea `%s' nu permite parametri\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "opþiunea `%s' necesitã un parametru\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "opþiunea `%s' este ambiguã\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Opþiune necunoscutã `%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Eroare necunoscutã=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "alocare de memorie pentru tabela de simboluri eºuatã" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "nume definit de douã ori" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "condiþie de start %s definitã de douã ori" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "EOF prematur" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Marcaj de sfârºit\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Ceva Ciudat* - tok: %d val: %d\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2014-02-16 10:00+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@mx.ru>\n" @@ -20,42 +20,42 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.4\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Ðе удалоÑÑŒ выделить буфер Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð¸Ð¼Ð¾Ð¹ Ñтроки" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Ðе удалоÑÑŒ выделить буфер Ð´Ð»Ñ Ñтроковой директивы" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Ðе удалоÑÑŒ выделить буфер Ð´Ð»Ñ m4 def" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Ðе удалоÑÑŒ выделить буфер Ð´Ð»Ñ m4 undef" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "СоÑтоÑние #%d не допуÑкает -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "опаÑный замыкающий контекÑÑ‚" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " номера Ñтрок аÑÑоциированного правила:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " out-переходы: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -64,11 +64,11 @@ msgstr "" "\n" " jam-переходы: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "ошибка при проверке на целоÑтноÑÑ‚ÑŒ в epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -80,24 +80,24 @@ msgstr "" "Дамп ДКÐ:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "невозможно Ñоздать уникальное ÑоÑтоÑние конца буфера" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "ÑоÑтоÑние # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Ðевозможно запиÑать yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "обнаружен неверный переходный Ñимвол в sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -109,29 +109,29 @@ msgstr "" "КлаÑÑÑ‹ ÑквивалентноÑти:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "ÑоÑтоÑние # %d допуÑкает: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "ÑоÑтоÑние # %d допуÑкает: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Ðевозможно запиÑать yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Ðевозможно запиÑать yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Ðевозможно запиÑать ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -141,348 +141,348 @@ msgstr "" "\n" "Мета-Ñквивалентные КлаÑÑÑ‹:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Ðевозможно запиÑать yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Ðевозможно запиÑать yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Ðевозможно запиÑать yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Ðевозможно запиÑать yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Ðевозможно запиÑать yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Ðевозможно запиÑать ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Ðевозможно запиÑать ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Ðевозможно запиÑать eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Ðевозможно запиÑать yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "невозможно применить правило" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "указан параметр -s, но правило по умолчанию не может быть применено" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Ðевозможно иÑпользовать -+ Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Ðевозможно иÑпользовать -f или -F Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -l" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Ðевозможно иÑпользовать --reentrant или --bison-bridge Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "Параметры -Cf/-CF и -Cm вмеÑте не имеют ÑмыÑла" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "Параметры -Cf/-CF и -I неÑовмеÑтимы" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "Параметры -Cf/-CF неÑовмеÑтимы Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð¾Ð¼ lex-ÑовмеÑтимоÑти" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "Параметры -Cf и -CF ÑвлÑÑŽÑ‚ÑÑ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð¸Ñключающими" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Ðевозможно иÑпользовать -+ Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array неÑовмеÑтим Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Параметры -+ и --reentrant ÑвлÑÑŽÑ‚ÑÑ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð¸Ñключающими." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge не поддерживаетÑÑ Ð´Ð»Ñ Ñканера C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "невозможно Ñоздать %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "Ðевозможно запиÑать заголовок таблиц" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "Ðевозможно открыть файл-ÐºÐ°Ñ€ÐºÐ°Ñ %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "Ðе удалоÑÑŒ размеÑтить определение макроÑа" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°-каркаÑа %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "ошибка при закрытии файла-каркаÑа %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ файла %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "ошибка запиÑи в выходной файл %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Резервное копирование отключено.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "резервное копирование %d (недопуÑтимых) ÑоÑтоÑний.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Резервное копирование Ñжатых таблиц выполнÑетÑÑ Ð²Ñегда.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "ошибка запиÑи резервной копии файла %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ð¹ копии файла %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "ÑтатиÑтика иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ %s верÑии %s:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " параметры Ñканера: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d ÑоÑтоÑний ÐКÐ\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d ÑоÑтоÑний ДКР(%d Ñлов)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d правил\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Резервное копирование отключено\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " резервное копирование %d (недопуÑтимых) ÑоÑтоÑний\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Резервное копирование Ñжатых таблиц выполнÑетÑÑ Ð²Ñегда\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " ИÑпользуютÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ñ‹ начала Ñтроки\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d начальных уÑловий\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d ÑпÑилон-ÑоÑтоÑний, %d двойных ÑпÑилон-ÑоÑтоÑний\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " отÑутÑтвуют клаÑÑÑ‹ Ñимволов\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " Ñоздано %d пар ÑоÑтоÑние/Ñлед_ÑоÑтоÑние\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d уникальных/повторÑющихÑÑ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð¾Ð²\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d Ñлементов таблицы\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " Ñоздано %d/%d base-def Ñлементов\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " Ñоздано %d/%d (пик %d) nxt-chk Ñлементов\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " Ñоздано %d/%d (пик %d) шаблонных nxt-chk Ñлементов\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d пуÑÑ‚Ñ‹Ñ… Ñлементов таблицы\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " Ñоздано %d прототипов\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " Ñоздано %d шаблонов, %d иÑпользуютÑÑ\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " Ñозданы клаÑÑÑ‹ ÑквивалентноÑти %d/%d\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d мета-Ñквивалентных клаÑÑов Ñоздано\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d запиÑано) коллизий Ñ…Ñш-таблицы, %d Ñквивалентных ДКÐ\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " требуетÑÑ %d наборов повторных размещений\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " вÑего требуетÑÑ %d Ñлементов таблицы\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°. Ðеправильное значение flexopts.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте «%s --help» Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробного опиÑаниÑ.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "неизвеÑтное значение «%c» Ð´Ð»Ñ -C" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "Ñ„Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° разбора" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "невозможно Ñоздать резервную копию информационного файла %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "Параметр -l ÑовмеÑтимоÑти Ñ AT&T lex влечёт значительное Ñнижение " "производительноÑти\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " и также может быть иÑтинным иÑточником проблем Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñтью\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -491,55 +491,55 @@ msgstr "" "%%option yylineno влечёт значительное Ñнижение производительноÑти ТОЛЬКО Ð´Ð»Ñ " "правил, которые могут Ñовпадать Ñ Ñимволами новой Ñтроки\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (интерактивный) влечёт незначительное Ñнижение производительноÑти\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() приводит к небольшому Ñнижению производительноÑти\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT влечёт значительное Ñнижение производительноÑти\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Правила Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ð¼ замыкающим контекÑтом приводÑÑ‚ к значительному Ñнижению " "производительноÑти\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT не может быть иÑпользован вмеÑте Ñ -f или -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno не может быть иÑпользован Ñ REJECT" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "правила Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ð¼ замыкающим контекÑтом не могут быть иÑпользованы Ñ -f " "или -F" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass имеет ÑмыÑл только Ð´Ð»Ñ Ñканеров C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "ИÑпользование: %s [ПÐÐ ÐМЕТРЫ] [ФÐЙЛ]…\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -562,6 +562,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -672,51 +674,51 @@ msgstr "" " -h, --help показать Ñту Ñправку\n" " -V, --version показать верÑию %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "не удалоÑÑŒ размеÑтить sko_stack" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "Ð¸Ð¼Ñ Â«%s» нелепо длинное" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "ошибка Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñти в allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "найден неверный Ñимвол «%s» в check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñимвола %s Ñканеру требуетÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ -8" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "ошибка при работе Ñ Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐµÑкой памÑтью в copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: Ñ„Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "ошибка при попытке увеличить размер маÑÑива" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñтрока в файле-каркаÑе" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "ошибка при выделении памÑти в yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -727,232 +729,232 @@ msgstr "" "\n" "******** начало дампа конечного автомата Ñ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ñ‹Ð¼ ÑоÑтоÑнием %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "ÑоÑтоÑние # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********* конец дампа\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "пуÑтой автомат в dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Правило Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ð¼ замыкающим контекÑтом в Ñтроке %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "неверный тип ÑоÑтоÑÐ½Ð¸Ñ Ð² mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "входные правила Ñлишком Ñложные (>= %d ÑоÑтоÑний ÐКÐ)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "найдено Ñлишком много переходов в mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "Ñлишком много правил (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° при обработке раздела 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "неверный ÑпиÑок начальных уÑловий" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "нераÑпознанное правило" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "замыкающий контекÑÑ‚ иÑпользуетÑÑ Ð´Ð²Ð°Ð¶Ð´Ñ‹" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "неверные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¸Ñ‚ÐµÑ€Ð°Ñ†Ð¸Ð¹" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "значение итераций должно быть положительным" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "иÑпользование Ñимвольного диапазона [%c-%c] Ñомнительно в Ñканере, не " "чувÑтвительном к региÑтру" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "отрицательный диапазон в клаÑÑе Ñимволов" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "иÑпользование [:^lower:] Ñомнительно Ð´Ð»Ñ Ñканера, не чувÑтвительного к " "региÑтру" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "иÑпользование [:^upper:] Ñомнительно Ð´Ð»Ñ Ñканера, не чувÑтвительного к " "региÑтру" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð²Ñ…Ð¾Ð´Ð½Ð°Ñ Ñтрока\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "нераÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð° «%top»" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "нераÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð° «%»" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Слишком длинное определение имени\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ Â«{»" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Слишком длинное определение Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ {%s}\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "неполное определение имени" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Слишком длинный параметр\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "нераÑпознанный %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "неверный клаÑÑ Ñимвола" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "неопределенное определение {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "неверное <начальное уÑловие>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "отÑутÑтвуют кавычки" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "неверное выражение клаÑÑа Ñимвола: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "неверный Ñимвол внутри {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "отÑутÑтвует }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "вÑтречен EOF внутри дейÑтвиÑ" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "вÑтречен EOF внутри шаблона" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "неверный Ñимвол: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "невозможно открыть %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "ИÑпользование: %s [ПÐÐ ÐМЕТРЫ]…\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "параметр «%s» должен иÑпользоватьÑÑ Ð±ÐµÐ· аргумента\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "параметр «%s» должен иÑпользоватьÑÑ Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "неоднозначный ключ «%s»\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "ÐераÑпознанный параметр «%s»\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "ошибка при выделении памÑти Ð´Ð»Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ñимволов" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "Ð¸Ð¼Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¾ дважды" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "начальное уÑловие %s опиÑано дважды" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "неожиданный EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Метка конца\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Что-то не так* — tok: %d val: %d\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2013-10-30 18:20+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -17,42 +17,42 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Ðије уÑпело додељивање међумеморије ниÑци иÑпиÑивања" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Ðије уÑпело додељивање међумеморије за одредницу реда" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Ðије уÑпело додељивање међумеморије за одредницу м4" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Ðије уÑпело додељивање међумеморије за поништавање одреднице м4" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Стање #%d је не-прихватљиво —\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "опаÑан пратећи контекÑÑ‚" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " бројеви реда придруженог правила:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " ван-прелаза:" -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -61,11 +61,11 @@ msgstr "" "\n" " јам-прелази: крај датотеке" -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "провера доÑледноÑти није уÑпела у „epsclosure()“" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -77,24 +77,24 @@ msgstr "" "ДФРиÑпиÑ:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "не могу да направим јединÑтвено Ñтање краја међумеморије" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "Ñтање # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Ðе могу да запишем „yynxt_tbl[][]“" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "откривен је лош знак прелаза у „sympartition()“" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -106,29 +106,29 @@ msgstr "" "Разреди једнакоÑти:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "Ñтање # %d прихвата: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "Ñтање # %d прихвата: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Ðе могу да запишем „yyacclist_tbl“" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Ðе могу да запишем „yyacc_tbl“" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Ðе могу да запишем „ecstbl“" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -138,345 +138,345 @@ msgstr "" "\n" "Разреди мета-једнакоÑти:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Ðе могу да запишем „yymeta_tbl“" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Ðе могу да запишем „yybase_tbl“" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Ðе могу да запишем „yydef_tbl“" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Ðе могу да запишем „yynxt_tbl“" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Ðе могу да запишем „ychk_tbl“" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Ðе могу да запишем „ftbl“" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Ðе могу да запишем „ssltbl“" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Ðе могу да запишем „eoltbl“" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Ðе могу да запишем „yynultrans_tbl“" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "правило не може бити поклопљено" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "дата је опција „-s“ али оÑновно правило може бити поклопљено" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Ðе могу да кориÑтим -+ Ñа опцијом „-l“" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Ðе могу да кориÑтим „-f“ или „-F“ Ñа опцијом „-l“" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "Ðе могу да кориÑтим „--reentrant“ или „--bison-bridge“ Ñа опцијом „-l“" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "„-Cf/-CF“ и „-Cm“ немају ÑмиÑла заједно" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "„-Cf/-CF“ и „-I“ Ñу неÑаглаÑне" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "„-Cf/-CF“ Ñу неÑаглаÑни Ñа режимом лекÑ-ÑаглаÑноÑти" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "„-Cf“ и „-CF“ Ñе међуÑобно иÑкључују" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Ðе могу да кориÑтим -+ Ñа опцијом „-CF“" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%aниз није ÑаглаÑан Ñа опцијом -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Опције -+ и „--reentrant“ Ñе међуÑобно иÑкључују." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "бизонов моÑÑ‚ није подржан за Ц++ Ñкенер." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "не могу да направим %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "не могу да запшем беÑтаблично заглавље" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "Ðе могу да отворим датотеку окоÑнице „%s“" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "није уÑпело додељивање одреднице макроа" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "грешка улаза читања датотеке окоÑнице „%s“" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "грешка затварања датотеке окоÑнице „%s“" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "грешка Ñтварања датотеке заглавља „%s“" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "грешка запиÑивања излазне датотеке „%s“" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "грешка затварања излазне датотеке „%s“" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "грешка бриÑања излазне датотеке „%s“" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Ðе правим резерву.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d Ñтварам резерве (не-прихватам) Ñтања.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Сжете табеле увек Ñтварају резерву.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "грешка запиÑивања датотеке резерве „%s“" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "грешка затварања датотеке резерве „%s“" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "СтатиÑтика коришћења %s издања%s:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " опције прегледача: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d ÐФРÑтања\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d ДФРÑтања (%d речи)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d правила\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Ðе правим резерву\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d Ñтварам резерве (не-прихватам) Ñтања\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Сжете табеле увек Ñтварају резерву\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Коришћени Ñу шаблони почетка-реда\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d уÑлови покретања\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d Ñтања ипÑилона, %d Ñтања двоÑтруког ипÑилона\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " нема разреда знака\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d пара Ñтања/Ñледећег_Ñтања је направљено\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d јединÑтвена/удвоÑтручена прелаза\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d уноÑа табеле\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " направљено је %d/%d уноÑа оÑновне одреднице\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " направљено је %d/%d (врх %d) „nxt-chk“ уноÑа\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " направљено је %d/%d (врх %d)шаблона „nxt-chk“ уноÑа\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d празна уноÑа табеле\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " направљених узорака — %d\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " направљених шаблона - %d, кориÑтим %d\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " направљено је %d/%d разреда једнакоÑти\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " направљено је %d/%d разреда мета-једнакоÑти\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (Ñачуваних %d) Ñукоба хеша, %d једнак ДФÐ-Ñу\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " потребна Ñу %d Ñкупа поновног додељивања\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " потребна Ñу укупно %d уноÑа табеле\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Унутрашња грешка. „flexopts“ је лоше обликован.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Пробајте „%s --help“ за више података.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "непозната опција -C „%c“" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "кобна грешка обраде" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "не могу да направим резерву датотеке података „%s“" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l опција ÑаглаÑноÑти ÐТ&Т лекÑа изазива велико Ñмањење учинка\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " и може бити Ñтваран извор других извешених ограничења учинка\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -485,52 +485,52 @@ msgstr "" "%%опција „yylineno“ изазива Ñмањење учинка СÐМО на правилима која могу да " "поклопе знакове новог реда\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (међудејÑтвено) изазива мање Ñмањење учинка\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "„yymore()“ изазива мање Ñмањење учинка\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "„REJECT“ изазива веће Ñмањење учинка\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Променљива правила пратећег контекÑа изазивају веће Ñмањење учинка\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "„REJECT“ не може да Ñе кориÑти Ñа „-f“ или „-F“" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%oпција „yylineno“ не може да Ñе кориÑти Ñа „REJECT“" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "променљива правила пратећег контекÑта не могу бити коришћена Ñа „-f“ или „-F“" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%oпција „yyclass“ има ÑмиÑла Ñамо за Ц++ Ñкенере" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Употреба: %s [ОПЦИЈЕ] [ДÐТОТЕКÐ]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -553,6 +553,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -666,51 +668,51 @@ msgstr "" " -h, --help иÑпиÑује ову помоћ\n" " -V, --version извештава о издању %s-а\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "није уÑпело додељивање „sko_stack“-а" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "назив „%s“ је Ñмешно дуг" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "није уÑпело додељивање меморије у „allocate_array()“" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "лош знак „%s“ је откривен у „check_char()“" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "Ñкенер захтева -8 обележја да би кориÑтио знак „%s“" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "неуÑпех динамичке меморије у „copy_string()“" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: кобна унутрашња грешка, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "није уÑпео покушај повећања величине низа" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "лош ред у датотеци окоÑнице" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "није уÑпело додељивање меморије у „yy_flex_xmalloc()“" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -721,226 +723,226 @@ msgstr "" "\n" "********** започињем иÑÐ¿Ð¸Ñ Ð½Ñ„Ð°-а Ñа почетним Ñтањем %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "Ñтање # %4d" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** крај иÑпиÑа\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "празна машина у „dupmachine()“" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Променљиво правило пратећег контекÑта на %d. реду\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "лоша врÑта Ñтања у „mark_beginning_as_normal()“" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "улазна правила Ñу превише Ñложена (>= %d ÐФРÑтања)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "пронађох превише прелаза у „mkxtion()“" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "превише правила (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "непозната грешка обраде одељка 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "лош ÑпиÑак почетног уÑлова" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "непознато правило" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "пратећи контекÑÑ‚ је коришћен два пута" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "лоша вредноÑÑ‚ опетовања" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "вредноÑÑ‚ опетовања мора бити позитивна" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "опÑег знака [%c-%c] је нејаÑан у Ñкенеру неоÑетљивом на величину Ñлова" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "негативан опÑег у разреду знака" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] је нејаÑно у Ñкенеру неоÑетљивом на величину Ñлова" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] је нејаÑно у Ñкенеру неоÑетљивом на величину Ñлова" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Улазни ред је предуг\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "лоша одредница „%top“" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "непозната " -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Ðазив одреднице је предуг\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Ðеупарена „{“" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "ВредноÑÑ‚ одреднице за {%s} је предуга\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "непотпуна одредница назива" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "Ред опције је предуг\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "непозната %%опција: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "лош разред знака" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "неодређена одредница {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "лош [почетни уÑлов]: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "недоÑтају наводници" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "лош израз разреда знака: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "лош знак унутар {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "недоÑтаје }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "наишао Ñам на крај датотеке унутар радње" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "наишао Ñам на крај датотеке унутар шаблона" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "лош знак: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "не могу да отворим „%s“" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Употреба: %s [ОПЦИЈЕ]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "опција „%s“ не дозвољава аргумент\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "опција „%s“ захтева аргумент\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "опција „%s“ је нејаÑна\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Ðепозната опција „%s“\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Ðепозната грешка=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "није уÑпело додељивање меморије табеле Ñимбола" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "назив је одређен два пута" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "почетни уÑлов „%s“ је објављен два пута" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "прерани крај датотеке" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Завршни означавач\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Ðешто је чудно* — ток: %d вред: %d\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.31\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-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" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Tillstånd %d är icke-accepterande -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "farligt efterföljande sammanhang" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " radnummer för associerad regel:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " utövergångar: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " stoppövergångar: filslut " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "konsekvenskontrollen misslyckades i epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,26 +76,26 @@ msgstr "" "DFA-utskrift:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "kunde inte skapa ett unikt buffertsluttillstånd" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "tillstånd %d:\n" # Det här är ju helt sjukt. Har buggrapporterat detta att det bör # ersättas med %s -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Kunde inte skriva yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "otillåtet övergångstecken funnet i sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -107,29 +107,29 @@ msgstr "" "Ekvivalensklasser:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "tillstånd %d accepterar: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "tillstånd %d accepterar: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Kunde inte skriva yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Kunde inte skriva yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Kunde inte skriva ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -139,346 +139,346 @@ msgstr "" "\n" "Metaekvivalensklasser:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Kunde inte skriva yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Kunde inte skriva yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Kunde inte skriva yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Kunde inte skriva yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Kunde inte skriva yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Kunde inte skriva ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Kunde inte skriva ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Kunde inte skriva eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Kunde inte skriva yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "regeln kan inte matchas" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "flaggan -s angiven men standardregeln kan följas" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "-+ kan inte användas tillsammans med flaggan -l" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "-f eller -F kan inte användas tillsammans med flaggan -l" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" "--reentrant eller --bison-bridge kan inte användas tillsammans med flaggan -l" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF och -Cm kan inte användas tillsammans" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF och -I kan inte användas tillsammans" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF kan inte användas i lex-kompatibilitetsläge" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf och -CF är ömsesidigt uteslutande" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "-+ kan inte användas tillsammans med flaggan -CF" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array kan inte användas tillsammans med flaggan -+" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Flaggorna -+ och --reentrant är ömsesidigt uteslutande." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bisonbrygga stöds inte för C++-inläsaren." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "kunde inte skapa %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "kunde inte skriva tabellhuvud" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "kan inte öppna mallfilen %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "indatafel vid läsande av mallfilen %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "fel vid stängande av mallfilen %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "fel vid skapande av huvudfilen %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "fel vid skrivande av utfilen %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "fel vid stängande av utfilen %s" -#: main.c:709 +#: src/main.c:710 #, 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:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Backar inte.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d säkerhetskopierande (icke-accepterande) tillstånd.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Komprimerade tabeller säkerhetskopierar alltid.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "fel när säkerhetskopian %s skulle skrivas" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "fel när säkerhetskopian %s skulle stängas" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Statistik över användning av %s version %s:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " inläsarflaggor: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-tillstånd\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-tillstånd (%d ord)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d regler\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Inget säkerhetskopierande\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d (icke-accepterande) tillstånd för säkerhetskopiering\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Komprimerade tabeller säkerhetskopierar alltid\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Början-av-rad-mönster använda\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startvillkor\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontillstånd, %d dubbla epsilontillstånd\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " inga teckenklasser\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d par med tillstånd/nästa-tillstånd skapade\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unika/duplicerade övergångar\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d tabellposter\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d basstandardposter skapade\n" -#: main.c:879 +#: src/main.c:880 #, 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:883 +#: src/main.c:884 #, 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:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d tomma tabellposter\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototyper skapade\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mallar skapade, %d användningar\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalensklasser skapade\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d metaekvivalensklasser skapade\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d sparade) hashkollisioner, %d DFA lika\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d uppsättningar med omallokeringar krävdes\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d tabellposter krävs totalt\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Internt fel. flexopts är felaktiga.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova \"%s --help\" för mer information.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "okänd flagga till -C \"%c\"" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "allvarligt fel vid tolkningen" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "kunde inte skapa filen %s med säkerhetskopieringsinformation" -#: main.c:1519 +#: src/main.c:1521 #, c-format 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:1522 +#: src/main.c:1524 #, c-format 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:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -487,55 +487,55 @@ msgstr "" "%%option yylineno medför en prestandaförlust ENDAST på regler som kan matcha " "nyradstecken\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) medför en mindre prestandaförlust\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() medför en mindre prestandaförlust\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT medför en väsentlig prestandaförlust\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format 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:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kan inte användas tillsammans med -f eller -F" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kan inte användas tillsammans med REJECT" -#: main.c:1569 +#: src/main.c:1571 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:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass är bara meningsfull för C++-inläsare" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Användning: %s [FLAGGOR] [FIL]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -558,6 +558,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -662,51 +664,51 @@ msgstr "" " -h, --help visa detta hjälpmeddelande\n" " -V, --version visa versionsinformation för %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "namnet \"%s\" är löjligt långt" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "minnesallokeringen misslyckades i allocate_array()" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "otillåtet tecken \"%s\" funnet i check_char()" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "inläsaren kräver flaggan -8 för att kunna använda tecknet %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "dynamiskt minnesfel i copy_string()" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: allvarligt internt fel, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "försök att öka arraystorlek misslyckades" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "otillåten rad i mallfilen" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "minnesallokeringen misslyckades i yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -717,234 +719,234 @@ msgstr "" "\n" "********** början av utskrift av nfa med starttillstånd %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "tillstånd %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** slut på utskrift\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "tom maskin i dupmachine()" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "Regel för varierbar efterföljande kontext på rad %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "otillåten tillståndstyp i mark_beginning_as_normal()" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "indatareglerna är för komplicerade (>= %d NFA-tillstånd)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "fann för många övergångar i mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "för många regler (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "okänt fel vid tolkning av avsnitt 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "felaktig lista med startvillkor" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "okänd regel" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "efterföljande kontext används två gånger" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "felaktiga iterationsvärden" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iterationsvärde måste vara positivt" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativt intervall i teckenklass" -#: parse.y:916 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "teckenintervallet [%c-%c] är tvetydigt i en skiftlägesokänslig inläsare" -#: parse.y:922 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "teckenintervallet [%c-%c] är tvetydigt i en skiftlägesokänslig inläsare" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "För lång indatarad\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "felaktigt \"%top\"-direktiv" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "okänt \"%\"-direktiv" -#: scan.l:192 +#: src/scan.l:192 #, fuzzy msgid "Definition name too long\n" msgstr "För lång indatarad\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "Ensamt \"{\"" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "ofullständig namndefinition" -#: scan.l:443 +#: src/scan.l:443 #, fuzzy msgid "Option line too long\n" msgstr "För lång indatarad\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "okänd %%option: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "otillåten teckenklass" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "odefinierad definition {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "otillåtet <startvillkor>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "citationstecken saknas" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "otillåtet uttryck för teckenklass: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "otillåtet tecken inom {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "} saknas" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "filslut påträffat inuti en handling" -#: scan.l:945 +#: src/scan.l:945 #, fuzzy msgid "EOF encountered inside pattern" msgstr "filslut påträffat inuti en handling" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "otillåtet tecken: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "kan inte öppna %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Användning: %s [FLAGGOR]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "flaggan \"%s\" tar inget argument\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "flaggan \"%s\" kräver ett argument\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "flaggan \"%s\" är tvetydig\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Okänd flagga \"%s\"\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Okänt fel=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "minnesallokering för symboltabell misslyckades" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "namnet definierat två gånger" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "startvillkoret %s deklarerat två gånger" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "för tidigt filslut" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Slutmarkering\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Något märkligt* - tecken: %d värde: %d\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.31\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-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" @@ -16,42 +16,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Durum #%d kabul etmiyor -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "izleyen baÄŸlam tehlikeli" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " alakalı kural satır numaraları:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " dış-geçiÅŸler: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -60,11 +60,11 @@ msgstr "" "\n" " sıkışık-geçiÅŸler: EOF " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "epsclosure() içindeki tutarlılık kontrolü baÅŸarısız" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -76,24 +76,24 @@ msgstr "" "DFA Dökümü:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "tekil tampon sonu durumu yaratılamadı" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "durum # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "yynxt_tbl[][] yazılamadı" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "sympartition() içinde hatalı geçiÅŸ karakterleri saptandı" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -105,29 +105,29 @@ msgstr "" "Denklik Sınıfları:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "durum # %d kabul eder: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "durum # %d kabul eder: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "yyacclist_tbl yazılamadı" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "yyacc_tbl yazılamadı" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "ecstbl yazılamadı" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -137,346 +137,346 @@ msgstr "" "\n" "Ara-Denklik Sınıfları:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "yymeta_tbl yazılamadı" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "yybase_tbl yazılamadı" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "yydef_tbl yazılamadı" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "yynxt_tbl yazılamadı" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "yychk_tbl yazılamadı" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "ftbl yazılamadı" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "ssltbl yazılamadı" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "eoltbl yazılamadı" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "yynultrans_tbl yazılamadı" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "kural eÅŸlenemedi" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "-s seçeneÄŸi verilmiÅŸ fakat öntanımlı kural eÅŸlenebiliyor" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "-+'yi -l seçeneÄŸi ile kullanma" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "-f veya -F'yi -l seçeneÄŸi ile kullanma" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "-l seçeneÄŸi ile --reentrant veya --bison-bridge bir arada kullanılamaz" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF ve -Cm birlikte anlam ifade etmiyor" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF ve -I uyumsuz" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF lex-uyumluluk kipi ile uyumsuz" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf ve -CF bir arada kullanılamaz" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "-+, -CF seçeneÄŸi ile kullanılamaz" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array, -+ seçeneÄŸi ile uyumsuz" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "-+ ve --reentrant seçenekleri bir arada kullanılamaz" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge, C++ tarayıcısı için desteklenmiyor." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "%s oluÅŸturulamadı" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "tablo baÅŸlığı yazılamadı" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "iskelet dosyası %s açılamadı" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "iskelet dosyası %s okunurken girdi hatası" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "iskelet dosyası %s kapatılırken hata" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "baÅŸlık dosyası %s oluÅŸturulurken hata" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "çıktı dosyası %s yazılırken hata" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "çıktı dosyası %s kapatılırken hata" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "çıktı dosyası %s silinirken hata" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Yedekleme yok.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d yedeklenen (kabul-etmeyen) durumlar.\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Sıkıştırılmış tablolar daima yedeklidir.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "yedek dosyası %s yazılırken hata" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "yedek dosyası %s kapatılırken hata" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s sürüm %s kullanım istatistikleri:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " tarayıcı seçenekleri: -" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA durumu\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA durumu (%d sözcük)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d kural\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Yedekleme yok\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d yedeklenmiÅŸ (kabul-edilmeyen) durum\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Sıkıştırılmış tablolar daima yedeklenir\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " BaÅŸlangıç-satırı kalıpları kullanıldı\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d baÅŸlangıç ÅŸartları\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon durumu, %d çift epsilon durumu\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " karakter sınıfı yok\n" -#: main.c:854 +#: src/main.c:855 #, 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" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d durumu/sonrakidurum çifti yaratıldı\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d tekil/çift geçiÅŸler\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d tablo girdileri\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d temel-tanım girdileri yaratıldı\n" -#: main.c:879 +#: src/main.c:880 #, 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" -#: main.c:883 +#: src/main.c:884 #, 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" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d boÅŸ tablo girdileri\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d prototip yaratıldı\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d ÅŸablon yaratıldı, %d kullanıldı\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d denklik sınıfı yaratıldı\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d ara-denklik sınıfı yaratıldı\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d kaydedildi) saçılma çarpışması, %d DFA denk\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d tekrar ayırım kümesine ihtiyaç var\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " %d toplam tablo girdisine ihtiyaç var\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "İç hata. flexopt'lar bozuk.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "bilinmeyen -C seçeneÄŸi '%c'" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "ölümcül ayrıştırma hatası" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "yedekleme bilgi dosyası %s oluÅŸturulamadı" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex uyumluluÄŸu seçeneÄŸi önemli ölçüde yavaÅŸlamaya yol açar\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " ve belki bildirilen baÅŸka performans kayıplarının da kaynağı olabilir\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -485,52 +485,52 @@ msgstr "" "yylineno %%seçeneÄŸi YALNIZCA yenisatır karakterlerini de eÅŸleyen satırlarda " "yavaÅŸlar.\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (etkileÅŸimli) küçük ölçekli bir yavaÅŸlamaya neden olur\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() küçük ölçekli bir yavaÅŸlamaya neden olur\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT büyük ölçekli bir yavaÅŸlamaya neden olur\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "DeÄŸiÅŸken izleyen baÄŸlam kuralları, büyük ölçekli yavaÅŸlamaya neden olur\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT, -f veya -F ile kullanılamaz" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno, REJECT ile birlikte kullanılamaz" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "deÄŸiÅŸken izleme ortamı kuralları, -f veya -F ile birlikte kullanılamaz" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass, sadece C++ tarayıcıları için anlamlıdır" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Kullanım: %s [SEÇENEKLER...] [DOSYA...]\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -553,6 +553,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -656,51 +658,51 @@ msgstr "" " -h, --help bu yardım bilgisini gösterir\n" " -V, --version %s sürümünü bildirir\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "\"%s\" ismi gülünç derecede uzun" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "allocate_array() içinde bellek ayırımı baÅŸarısız" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "check_char() içinde hatalı karakter '%s' saptandı" -#: misc.c:235 +#: src/misc.c:237 #, 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" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "copy_string() içinde dinamik bellek hatası" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: ölümcül iç hata, %s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "dizi boyutunu artırma denemesi baÅŸarısız" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "iskelet dosya içinde hatalı satır" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "yy_flex_xmalloc() içinde bellek ayırımı baÅŸarısız" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -711,237 +713,237 @@ msgstr "" "\n" "********** baÅŸlangıç durumu %d olan nfa'nın dökümüne baÅŸlanıyor\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "durum # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** döküm sonu\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "dupmachine() içinde boÅŸ makine" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "%d satırında deÄŸiÅŸken izleyen baÄŸlam kuralı\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "mark_beginning_as_normal() içinde hatalı durum türü" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "girdi kuralları fazla karışık (>= %d NFA durumu)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "mkxtion() içinde çok fazla geçiÅŸ bulundu" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "çok fazla kural (> %d)!" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "1. bölüm iÅŸlenirken bilinmeyen hata oluÅŸtu" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "hatalı baÅŸlangıç ÅŸart listesi" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "bilinmeyen kural" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "izleyen baÄŸlam iki defa kullanılmış" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "hatalı yineleme deÄŸerleri" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "yineleme deÄŸeri pozitif olmalı" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, 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:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "karakter sınıflarında negatif aralık" -#: parse.y:916 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in 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:922 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[%c-%c] karakter aralığı, büyük/küçük harf farkı gözetmeyen bir tarayıcıda\n" "belirsiz anlamlı" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "Girdi satırı fazla uzun\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "hatalı `%top' yönergesi" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "'%' yönergesi bilinmiyor" -#: scan.l:192 +#: src/scan.l:192 #, fuzzy msgid "Definition name too long\n" msgstr "Girdi satırı fazla uzun\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "'{' eÅŸleÅŸmiyor" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "eksik isim tanımlaması" -#: scan.l:443 +#: src/scan.l:443 #, fuzzy msgid "Option line too long\n" msgstr "Girdi satırı fazla uzun\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "geçersiz %%seçenek: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "hatalı karakter sınıfı" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "belirsiz tanım {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "hatalı <baÅŸlangıç ÅŸartı>: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "eksik çift tırnak" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "bozuk karakter sınıfı ifadesi: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "{}'ler içinde hatalı karakter" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "eksik }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "bir eylem içinde EOF ile karşılaşıldı" -#: scan.l:945 +#: src/scan.l:945 #, fuzzy msgid "EOF encountered inside pattern" msgstr "bir eylem içinde EOF ile karşılaşıldı" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "hatalı karakter: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "%s açılamıyor" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Kullanım: %s [SEÇENEKLER...]\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "`%s' seçeneÄŸi argüman kullanmaz\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "`%s' seçeneÄŸi için argüman zorunludur\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "`%s' seçeneÄŸi belirsiz\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Bilinmeyen seçenek: `%s'\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Bilinmeyen hata=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "simge tablosu bellek ayırımı baÅŸarısız" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "isim iki defa tanımlandı" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "baÅŸlangıç ÅŸartı %s iki defa bildirildi" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "erken EOF" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "BitiÅŸ Ä°ÅŸaretçisi\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Garip Bir Åžey* -andaç: %d deÄŸer: %d\n" Binary files differ@@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2014-02-14 08:17+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -22,42 +22,42 @@ msgstr "" "X-Generator: Poedit 1.5.5\n" "X-Poedit-SourceCharset: utf-8\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "Việc phân bổ bá»™ đệm cho lệnh in chuá»—i gặp lá»—i" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "Việc phân bổ bá»™ đệm cho chỉ thị dòng gặp lá»—i" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "Việc phân bổ bá»™ đệm cho “m4 def†gặp lá»—i" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "Việc phân bổ bá»™ đệm cho “m4 undef†gặp lá»—i" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "Trạng thái #%d là không chấp nháºn -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "ngữ cảnh theo sau là nguy hiểm" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " số thứ tá»± dòng quy tắc tÆ°Æ¡ng ứng:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " việc chuyển tiếp xuất: " -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -66,11 +66,11 @@ msgstr "" "\n" " chuyển tiếp kẹt: gặp kết thúc táºp tin " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "việc kiểm tra sá»± thống nhất bị lá»—i trong epsclosure()" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -82,24 +82,24 @@ msgstr "" "Äổ DFA:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "không thể tạo trạng thái kết-thúc-bá»™-đệm duy nhất" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "trạng thái# %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "Không thể ghi \"yynxt_tbl[][]\"" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "phát hiện ký tá»± chuyển tiếp sai trong sympartition()" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -111,29 +111,29 @@ msgstr "" "Lá»›p tÆ°Æ¡ng Ä‘Æ°Æ¡ng:\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "trạng thái # %d chấp nháºn: [%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "trạng thái # %d chấp nháºn: " -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "Không thể ghi \"yyacclist_tbl\"" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "Không thể ghi \"yyacc_tbl\"" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "Không thể ghi \"ecstbl\"" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -143,349 +143,349 @@ msgstr "" "\n" "Lá»›p tÆ°Æ¡ng-Ä‘Æ°Æ¡ng-meta:\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "Không thể ghi \"yymeta_tbl\"" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "Không thể ghi \"yybase_tbl\"" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "Không thể ghi \"yydef_tbl\"" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "Không thể ghi \"yynxt_tbl\"" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "Không thể ghi \"yychk_tbl\"" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "Không thể ghi \"ftbl\"" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "Không thể ghi \"ssltbl\"" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "Không thể ghi \"eoltbl\"" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "Không thể ghi \"yynultrans_tbl\"" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "quy tắc không thể được khá»›p" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "Ä‘Æ°a ra tùy chá»n \"-s\" còn quy tắc mặc định có thể được khá»›p" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "Không thể dùng ký tá»± \"-+\" vá»›i tùy chá»n \"-l\"" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "Không thể dùng cá» \"-f\" hoặc \"-F\" vá»›i tùy chá»n \"-l\"" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "" "Không thể dùng đối số \"--reentrant\" (Ä‘iá»u và o lại) hoặc \"--bison-bridge" "\" (chiếc cầu bison) vá»›i tùy chá»n \"-l\"" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "Hai tùy chá»n \"-Cf/-CF\" và \"-Cm\" vá»›i nhau thì không có ý nghÄ©a" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "Hai tùy chá»n \"-Cf/-CF\" và \"-I\" không tÆ°Æ¡ng thÃch vá»›i nhau" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "" "Tùy chá»n \"-Cf/-CF\" không tÆ°Æ¡ng thÃch vá»›i chế Ä‘á»™ \"lex-compatibility" "\" (tÆ°Æ¡ng thÃch vá»›i lex)" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "Hai tùy chá»n \"-Cf\" and \"-CF\" loại từ lẫn nhau" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "Không thể dùng ký tá»± \"-+\" vá»›i tùy chá»n \"-CF\"" -#: main.c:294 +#: src/main.c:295 #, 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 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "Hai tùy chá»n \"- +\" và \"--reentrant\" xung Ä‘á»™t vá»›i nhau." -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge (chiếc cầu bison) không được há»— trợ vá»›i bá»™ quét C++." -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "không thể tạo %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "không thể ghi phần đầu bảng" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "không thể mở táºp tin khung sÆ°á»n %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "việc phân bổ cho định nghÄ©a macro gặp lá»—i" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "gặp lá»—i nháºp và o khi Ä‘á»c táºp tin khung sÆ°á»n %s" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "gặp lá»—i khi đóng táºp tin khung sÆ°á»n %s" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "gặp lá»—i khi tạo táºp tin phần đầu %s" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "gặp lá»—i khi ghi táºp tin xuất %s" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "gặp lá»—i khi đóng táºp tin xuất %s" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "gặp lá»—i khi xoá bá» táºp tin xuất %s" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "Không sao lÆ°u.\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d Ä‘ang sao lÆ°u các trạng thái (kiểu không chấp nháºn).\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "Bảng đã nén lúc nà o cÅ©ng sao lÆ°u.\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "găp lá»—i khi ghi táºp tin sao lÆ°u %s" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "gặp lá»—i khi đóng táºp tin sao lÆ°u %s" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s phiên bản %s thống kê sá» dụng:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " tùy chá»n bá»™ quét: —" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d trạng thái NFA\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d trạng thái DFA (%d từ)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d quy tắc\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " Không sao lÆ°u\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d Ä‘ang sao lÆ°u các trạng thái (kiểu không chấp nháºn)\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " Bảng đã nén lúc nà o cÅ©ng sao lÆ°u\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Dùng mẫu kiểu đầu dòng\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d Ä‘iá»u kiện bắt đầu\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d trạng thái épxilông (ε), %d trạng thái épxilông đôi\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " không có lá»›p ký tá»±\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d lá»›p ký tá»± cần %d/%d từ bá»™ nhá»›, %d được dùng lại\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d cặp trạng_thái/trạng_thái_kế đã được tạo\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d việc chuyển tiếp duy nhất/trùng\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d mục tin bảng\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d mục tin base-def (định nghÄ©a cÆ¡ bản) đã được tạo\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (tối Ä‘a %d) mục tin nxt-chk (kiểm tra kế tiếp) đã được tạo\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" " %d/%d (tối Ä‘a %d) mục tin biểu mẫu nxt-chk (kiểm tra kế tiếp) đã được tạo\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d mục tin bảng trống\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d proto (khai báo nguyên mẫu) đã được tạo\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mẫu đã được tạo, %d lần dùng\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d lá»›p kiểu tÆ°Æ¡ng Ä‘Æ°Æ¡ng đã được tạo\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d lá»›p tÆ°Æ¡ng-Ä‘Æ°Æ¡ng-meta đã được tạo\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d được lÆ°u) lần va chạm mã băm, %d DFA bằng nhau\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " cần %d táºp hợp tái cấp phát\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " cần tổng %d mục tin bảng\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Gặp lá»—i ná»™i bá»™ vì những flexopts sai dạng.\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Hãy thá» lệnh \"%s --help\" (trợ giúp) để xem thêm thông tin.\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "không hiểu tùy chá»n \"-C\" là \"%c\"" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "gặp lá»—i phân tÃch nghiêm trá»ng" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "không thể tạo táºp tin thông tin sao lÆ°u %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "Tùy chá»n kiểu tÆ°Æ¡ng thÃch lex AT&T \"-l\" là m giảm hiệu suất rất nhiá»u\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format 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 hiệu suất khác\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -494,54 +494,54 @@ msgstr "" "%%tùy chá»n \"yylineno\" giảm hiệu suất CHỈ vá»›i quy tắc khá»›p vá»›i ký tá»± dòng " "má»›i\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "Tùy chá»n \"-I\" (tÆ°Æ¡ng tác) giảm hiệu suất má»™t Ãt\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() giảm hiệu suất má»™t Ãt\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT (đẩy ra) là m suy giảm hiệu suất nghiêm trá»ng\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Quy tắc ngữ cảnh theo sau biến rất giảm hiệu suất\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "Không cho phép dùng REJECT (đẩy ra) vá»›i tùy chá»n \"-f\" hay \"-F\"" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" "Không cho phép dùng %option (tùy chá»n) \"yylineno\" vá»›i REJECT (đẩy ra)" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "không cho phép dùng quy tắc ngữ cảnh theo sau biến vá»›i tùy chá»n \"-f\" hay " "\"-F\"" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option (tùy chá»n) \"yyclass\" chỉ có ý nghÄ©a vá»›i bá»™ quét C++" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -564,6 +564,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -677,51 +679,51 @@ msgstr "" " -h, --help hiển thị _trợ giúp_ nà y\n" " -V, --version thông báo phiên bản %s\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "việc phân bổ cho sko_stack gặp lá»—i" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "tên \"%s\" là dà i nhố nhăng" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "việc phân chia bá»™ nhá»› bị lá»—i trong allocate_array() (phân bổ mảng)" -#: misc.c:230 +#: src/misc.c:232 #, 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:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "bá»™ quét cần thiết cá» \"-8\" để dùng ký tá»± %s" -#: misc.c:268 +#: src/misc.c:270 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:367 +#: src/misc.c:369 #, 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:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "việc thá» tăng kÃch cỡ mảng đã thất bại" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "gặp dòng sai trong táºp tin khung sÆ°á»n" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "việc phân bổ bá»™ nhá»› bị lá»—i trong yy_flex_xmalloc()" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -732,229 +734,229 @@ msgstr "" "\n" "********** bắt đầu đổ NFA có trạng thái bắt đầu là %d\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "trạng thái # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** đổ xong\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "máy trống trong dupmachine() (nhân đôi máy)" -#: nfa.c:240 +#: src/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 biến tại dòng %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "" "kiểu trạng thái sai trong mark_beginning_as_normal() (đánh dấu đầu là thÆ°á»ng)" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "các quy tắc đầu và o là quá phức tạp (≥ %d trạng thái NFA)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "gặp quá nhiá»u chuyển tiếp trong mkxtion()" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "quá nhiá»u quy tắc (> %d) !" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "gặp lá»—i không rõ khi xá» lý phần 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "danh sách Ä‘iá»u kiện bắt đầu là sai" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "gặp quy tắc không được thừa nháºn" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "ngữ cảnh theo sau được dùng hai lần" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "gặp giá trị lặp lại sai" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "giá trị lặp lại phải là số dÆ°Æ¡ng" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "phạm vi ký tá»± [%c-%c] là chÆ°a rõ rà ng trong trÆ°á»ng hợp quét bá» qua chữ HOA/" "thÆ°á»ng" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "gặp phạm vi âm trong lá»›p ký tá»±" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] là chÆ°a rõ rà ng trong trÆ°á»ng hợp quét bá» qua chữ HOA/thÆ°á»ng" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] là chÆ°a rõ rà ng trong trÆ°á»ng hợp quét bá» qua chữ HOA/thÆ°á»ng" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "dòng nháºp quá dà i\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "chỉ thị kiểu \"%top\" (đầu) dạng sai" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "gặp chỉ thị kiểu \"%\" không được nháºn dạng" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "Tên định nghÄ©a quá dà i\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "ChÆ°a khá»›p \"{\"" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Giá trị định nghÄ©a cho {%s} quá dà i\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "lá»i Ä‘inh nghÄ©a tên chÆ°a hoà n tất" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "dòng tùy chá»n quá dà i\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "gặp tùy chá»n %% không được nháºn dạng: %s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "lá»›p ký tá»± sai" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "chÆ°a định nghÄ©a định danh {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "<start condition> (Ä‘iệu kiện bắt đầu) sai: %s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "thiếu dấu trÃch dẫn" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "biểu thức lá»›p ký tá»± sai: %s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "có ký tá»± sai ở trong hai dấu ngoặc móc {}" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "thiếu }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "gặp kết thúc táºp tin ở trong má»™t hà nh Ä‘á»™ng" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "gặp kết thúc táºp tin ở trong mẫu" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "ký tá»± sai: %s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "không thể mở %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "Cách dùng: %s [TÙY_CHỌN]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, 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:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "tùy chá»n \"%s\" cần má»™t đối số\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "tùy chá»n \"%s\" chÆ°a rõ rà ng\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "Không nháºn ra tùy chá»n \"%s\"\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "Không rõ lá»—i=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "gặp lá»—i khi phân bổ bá»™ nhá»› của bảng ký hiệu" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "tên đã được định nghÄ©a hai lần" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "Ä‘iá»u kiện bắt đầu %s đã được khai báo hai lần" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "gặp kết thúc táºp tin quá sá»›m" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "Dấu kết thúc\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "* Äiá»u lạ * — thẻ bà i: %d giá trị: %d\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 83d5870..aa03f76 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index d20d313..b5ecb46 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,67 +1,72 @@ # Chinese translations for flex. -# Copyright (C) 2002 The Flex Project +# Copyright (C) 2014 The Flex Project (msgids) +# This file is distributed under the same license as the flex package. # Wang Li <charles@linux.net.cn>, 2002. -# +# Wei-Lun Chao <bluebat@member.fsf.org>, 2009, 2013. +# Mingye Wang <arthur200126@gmail.com>, 2015. msgid "" msgstr "" -"Project-Id-Version: flex 2.5.8\n" +"Project-Id-Version: flex 2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" -"PO-Revision-Date: 2002-08-18 10:37+0800\n" -"Last-Translator: Wang Li <charles@linux.net.cn>\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" +"PO-Revision-Date: 2015-08-27 16:54+0800\n" +"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=gb2312\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.4\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" -msgstr "" +msgstr "给予缓冲区é…é¢ä»¥æ‰“å°å—串时失败" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" -msgstr "" +msgstr "给予缓冲区é…é¢ç”¨äºŽåˆ—指令时失败" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" -msgstr "" +msgstr "给予缓冲区é…é¢ç”¨äºŽ m4 def 时失败" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" -msgstr "" +msgstr "给予缓冲区é…é¢ç”¨äºŽ m4 undef 时失败" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" -msgstr "" +msgstr "#%d æ£å¤„于éžè®¿é—®çŠ¶æ€ -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" -msgstr "" +msgstr "ä¸å®‰å…¨çš„末端上下文" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" -msgstr "" +msgstr " å…³è”的规则列å·ï¼š" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " -msgstr "" +msgstr " 外转æ¢ï¼š" -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" " jam-transitions: EOF " msgstr "" +"\n" +" åˆå¹¶è½¬æ¢ï¼šæ–‡ä»¶ç»“å°¾ " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" -msgstr "epsclosure() ÖеÄÒ»ÖÂÐÔ¼ì²éʧ°Ü" +msgstr "epsclosure() ä¸çš„一致性检查失败" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -70,27 +75,27 @@ msgid "" msgstr "" "\n" "\n" -"DFA Êä³ö£º\n" +"DFA 转储:\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" -msgstr "ÎÞ·¨´´½¨¶ÀÁ¢µÄ end-of-buffer ״̬" +msgstr "æ— æ³•åˆ›å»ºç‹¬ç«‹çš„ end-of-buffer 状æ€" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" -msgstr "״̬ # %d£º\n" +msgstr "çŠ¶æ€ # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" -msgstr "ÔÚ sympartition() ¼ì²âµ½´íÎóµÄ±ä»»×Ö·û" +msgstr "在 sympartition() 检测到错误的å˜æ¢å—符" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -99,432 +104,430 @@ msgid "" msgstr "" "\n" "\n" -"µÈ¼ÛÀࣺ\n" +"ç‰ä»·ç±»ï¼š\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" -msgstr "" +msgstr "çŠ¶æ€ # %d 接å—:[%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " -msgstr "" +msgstr "çŠ¶æ€ # %d 接å—:" -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 -#, fuzzy +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•å†™å…¥ ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" "Meta-Equivalence Classes:\n" msgstr "" +"\n" +"\n" +"å…ƒç‰ä»·ç±»ï¼š\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yymeta_tbl" -#: gen.c:1354 -#, fuzzy +#: src/gen.c:1376 msgid "Could not write yybase_tbl" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•å†™å…¥ yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yychk_tbl" -#: gen.c:1618 gen.c:1647 -#, fuzzy +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•å†™å…¥ ftbl" -#: gen.c:1624 -#, fuzzy +#: src/gen.c:1646 msgid "Could not write ssltbl" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•å†™å…¥ ssltbl" -#: gen.c:1675 -#, fuzzy +#: src/gen.c:1697 msgid "Could not write eoltbl" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•å†™å…¥ eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" -msgstr "" +msgstr "æ— æ³•å†™å…¥ yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" -msgstr "ÎÞ·¨Æ¥Åä¹æÔò" +msgstr "æ— æ³•åŒ¹é…规则" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" -msgstr "" +msgstr "-s 选项已给定但是å¯ä»¥å»åˆç¼ºçœè§„则" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" -msgstr "" +msgstr "æ— æ³•å°† -+ 与 -l 选项共åŒä½¿ç”¨" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" -msgstr "" +msgstr "æ— æ³•å°† -f 或 -F 与 -l 选项共åŒä½¿ç”¨" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" -msgstr "" +msgstr "æ— æ³•å°† --reentrant 或 --bison-bridge 与 -l 选项共åŒä½¿ç”¨" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" -msgstr "" +msgstr "-Cf/-CF å’Œ -Cm 共用时ä¸å…·ä»»ä½•æ„义" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" -msgstr "" +msgstr "-Cf/-CF å’Œ -I 是ä¸å…¼å®¹çš„" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" -msgstr "" +msgstr "-Cf/-CF 与 lex 兼容模å¼æ˜¯ä¸å…¼å®¹çš„" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" -msgstr "" +msgstr "-Cf å’Œ -CF 是互斥的" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" -msgstr "" +msgstr "æ— æ³•å°† -+ 与 -CF 选项共åŒä½¿ç”¨" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" -msgstr "" +msgstr "%array 与 -+ 选项ä¸å…¼å®¹" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." -msgstr "" +msgstr "选项 -+ å’Œ --reentrant 是互斥的。" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." -msgstr "" +msgstr "bison 桥接器ä¸å— C++ 扫æ程åºæ”¯æŒã€‚" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•åˆ›å»º %s" -#: main.c:416 -#, fuzzy +#: src/main.c:417 msgid "could not write tables header" -msgstr "ÎÞ·¨´´½¨ %s" +msgstr "æ— æ³•å†™å…¥è¡¨å¤´" -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" -msgstr "ÎÞ·¨´ò¿ª¹Ç¼ÜÎļþ %s" +msgstr "æ— æ³•æ‰“å¼€éª¨æž¶æ–‡ä»¶ %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" -msgstr "" +msgstr "给予å®å®šä¹‰é…é¢æ—¶å¤±è´¥" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" -msgstr "¶ÁÈ¡¹Ç¼ÜÎļþ %s ʱÊäÈë´íÎó" +msgstr "读å–骨架文件 %s 时输入错误" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" -msgstr "¹Ø±Õ¹Ç¼ÜÎļþ %s ³ö´í" +msgstr "å…³é—骨架文件 %s 出错" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" -msgstr "´´½¨Í·Îļþ %s ³ö´í" +msgstr "创建头文件 %s 出错" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" -msgstr "дÈëÊä³öÎļþ %s ³ö´í" +msgstr "写入输出文件 %s 出错" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" -msgstr "¹Ø±ÕÊä³öÎļþ %s ³ö´í" +msgstr "å…³é—输出文件 %s 出错" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" -msgstr "ɾ³ýÊä³öÎļþ %s ³ö´í" +msgstr "åˆ é™¤è¾“å‡ºæ–‡ä»¶ %s 出错" -#: main.c:716 +# See Concept Index. fr translation is wrong for that 'archive'. +#: src/main.c:717 #, c-format msgid "No backing up.\n" -msgstr "" +msgstr "没有回溯。\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" -msgstr "" +msgstr "%d 回溯 (éžæŽ¥å—) 状æ€ã€‚\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" -msgstr "" +msgstr "åŽ‹ç¼©è¿‡çš„è¡¨æ ¼æ€»ä¼šè‡ªåŠ¨å›žæº¯ã€‚\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" -msgstr "дÈ뱸·ÝÎļþ %s ³ö´í" +msgstr "写入回溯文件 %s 出错" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" -msgstr "¹Ø±Õ±¸·ÝÎļþ %s ³ö´í" +msgstr "å…³é—回溯文件 %s 出错" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" -msgstr "" +msgstr "%s 版本 %s 用法统计:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" -msgstr " ɨÃèÆ÷Ñ¡Ï-" +msgstr " 扫æ器选项:-" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" -msgstr "" +msgstr " %d/%d NFA 状æ€\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" -msgstr "" +msgstr " %d/%d DFA çŠ¶æ€ (%d 个å—è¯)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" -msgstr " %d Ìõ¹æÔò\n" +msgstr " %d æ¡è§„则\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" -msgstr "" +msgstr " 没有回溯\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" -msgstr "" +msgstr " %d 回溯 (éžæŽ¥å—) 状æ€\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" -msgstr "" +msgstr " åŽ‹ç¼©è¿‡çš„è¡¨æ ¼æ€»ä¼šè‡ªåŠ¨å›žæº¯\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" -msgstr "" +msgstr " 列首å¼æ ·å·²ä½¿ç”¨\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" -msgstr "" +msgstr " %d/%d 起始æ¡ä»¶\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" -msgstr "" +msgstr " %d ε状æ€ï¼Œ%d åŒå€ÎµçŠ¶æ€\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" -msgstr "" +msgstr " æ— å—符类别\n" -#: main.c:854 +#: src/main.c:855 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" -msgstr "" +msgstr " %d/%d å—符类别所需 %d/%d å—è¯çš„ä¿å˜ä½“,%d é‡æ–°ä½¿ç”¨\n" -#: main.c:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" -msgstr "" +msgstr " %d 状æ€/下一状æ€å¯¹å·²åˆ›å»º\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" -msgstr "" +msgstr " %d/%d 独一/é‡å¤è½¬æ¢\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" -msgstr "" +msgstr " %d è¡¨æ ¼é¡¹ç›®\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" -msgstr "" +msgstr " %d/%d base-def 项目已创建\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" -msgstr "" +msgstr " %d/%d (峰值 %d) nxt-chk 项目已创建\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" -msgstr "" +msgstr " %d/%d (峰值 %d) æ¨¡æ¿ nxt-chk 项目已创建\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" -msgstr "" +msgstr " %d æ¸…ç©ºè¡¨æ ¼é¡¹ç›®\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" -msgstr "" +msgstr " %d 原型已创建\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" -msgstr "" +msgstr " %d 范本已创建,%d 使用\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" -msgstr "" +msgstr " %d/%d ç‰ä»·ç±»åˆ«å·²åˆ›å»º\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" -msgstr "" +msgstr " %d/%d åŽè®¾ç‰ä»·ç±»åˆ«å·²åˆ›å»º\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" -msgstr "" +msgstr " %d (%d å·²ä¿å˜) 哈希碰撞,%d DFAs 相ç‰\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" -msgstr "" +msgstr " éœ€è¦ %d 组é‡æ–°é…ç½®\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" -msgstr "" +msgstr " æ€»è®¡éœ€è¦ %d è¡¨æ ¼é¡¹ç›®\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" -msgstr "" +msgstr "内部错误。flexopts 功能异常。\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "" +msgstr "å°è¯•ã€Œ%s --helpã€ä»¥èŽ·å¾—更多信æ¯ã€‚\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" -msgstr "δ֪µÄ -C Ñ¡Ïî¡°%c¡±" +msgstr "未知的 -C 选项“%câ€" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" -msgstr "ÖÂÃüµÄ½âÎö´íÎó" +msgstr "致命的解æžé”™è¯¯" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" -msgstr "" +msgstr "æ— æ³•åˆ›å»ºå›žæº¯ä¿¡æ¯æ–‡ä»¶ %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" -msgstr "" +msgstr "-l AT&T lex 兼容性选项会导致大幅性能å‡é€€\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" -msgstr "" +msgstr " åŒæ—¶ä¹Ÿè®¸æ˜¯å…¶ä»–回报性能å‡é€€çš„实际æ¥æº\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -msgstr "" +msgstr "%%option yylineno 导致性能å‡é€€ï¼Œåªæœ‰å½“该规则该å»åˆæ–°åˆ—å—符时æ‰ä¼š\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" -msgstr "" +msgstr "-I (交互å¼) 导致å°å¹…性能å‡é€€\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" -msgstr "" +msgstr "yymore() 导致å°å¹…性能å‡é€€\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" -msgstr "" +msgstr "REJECT 导致大幅性能å‡é€€\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" -msgstr "" +msgstr "å˜é‡æœ«å°¾ä¸Šä¸‹æ–‡è§„则导致大幅性能å‡é€€\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" -msgstr "" +msgstr "REJECT æ— æ³•ä¸Ž -f 或 -F å…±åŒä½¿ç”¨" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" -msgstr "" +msgstr "%option yylineno æ— æ³•ä¸Ž REJECT å…±åŒä½¿ç”¨" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" -msgstr "" +msgstr "å˜é‡æœ«å°¾ä¸Šä¸‹æ–‡è§„åˆ™æ— æ³•ä¸Ž -f 或 -F å…±åŒä½¿ç”¨" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" -msgstr "" +msgstr "%option yyclass åªå¯¹äºŽ C++ 扫æ程åºæœ‰æ„义" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" -msgstr "Ó÷¨£º%s [Ñ¡Ïî] [Îļþ]...\n" +msgstr "用法:%s [选项] [文件]...\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -547,6 +550,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -588,52 +593,112 @@ msgid "" " -h, --help produce this help message\n" " -V, --version report %s version\n" msgstr "" +"äº§ç”Ÿèƒ½å¤Ÿæ ¹æ®æ–‡æœ¬è¿›è¡Œå¼æ ·åŒ¹é…的程åºã€‚\n" +"\n" +"è¡¨æ ¼åŽ‹ç¼©ï¼š\n" +" -Ca,--align æ¢æŽ‰è¾ƒå¤§è¡¨æ ¼ä»¥èŽ·å–较佳内å˜å¯¹ä½\n" +" -Ce,--ecs 建构ç‰ä»·ç±»åˆ«\n" +" -Cf ä¸åŽ‹ç¼©è¡¨æ ¼ï¼›ä½¿ç”¨ -f 表示法\n" +" -CF ä¸åŽ‹ç¼©è¡¨æ ¼ï¼›ä½¿ç”¨ -F 表示法\n" +" -Cm,--meta-ecs æž„é€ åŽè®¾ç‰ä»·ç±»åˆ«\n" +" -Cr,--read 使用 read() 以代替 stdio 用于扫æ程åºçš„输入\n" +" -f, --full 产生快速,大型扫æ程åºã€‚å¦‚åŒ -Cfr\n" +" -F, --fast ä½¿ç”¨äº¤æ›¿è¡¨æ ¼è¡¨ç¤ºæ³•ã€‚å¦‚åŒ -CFr\n" +" -Cem 缺çœåŽ‹ç¼© (å¦‚åŒ --ecs --meta-ecs)\n" +"\n" +"调试:\n" +" -d, --debug 在扫æ程åºä¸å¯ç”¨é™¤é”™æ¨¡å¼\n" +" -b, --backup 写入回溯信æ¯åˆ° %s\n" +" -p, --perf-report å°†æ€§èƒ½æŠ¥å‘Šå†™å…¥æ ‡å‡†å‹˜è¯¯\n" +" -s, --nodefault 抑制缺çœè§„则以回应ä¸ç¬¦åˆçš„文本\n" +" -T, --trace %s 应该在追踪模å¼ä¸è¿è¡Œ\n" +" -w, --nowarn ä¸äº§ç”Ÿè¦å‘Š\n" +" -v, --verbose 将概è¦çš„扫æ程åºç»Ÿè®¡å†™å…¥æ ‡å‡†è¾“出\n" +"\n" +"文件:\n" +" -o, --outfile=文件 指定输出文件å\n" +" -S, --skel=文件 指定架构文件\n" +" -t, --stdout 将扫æ程åºå†™å…¥æ ‡å‡†è¾“出以代替 %s\n" +" --yyclass=å称 C++ 类别的å称\n" +" --header-file=文件 扫æ程åºä¹‹å¤–创建 C æ ‡å¤´æ¡£\n" +" --tables-file[=文件] å°†è¡¨æ ¼å†™å…¥æ–‡ä»¶\n" +"\n" +"扫æ程åºè¡Œä¸ºï¼š\n" +" -7, --7bit 产生七比特扫æ程åº\n" +" -8, --8bit 产生八比特扫æ程åº\n" +" -B, --batch 产生批次扫æç¨‹åº (相对于 -I)\n" +" -i, --case-insensitive 忽略å¼æ ·ä¸çš„大å°å†™\n" +" -l, --lex-compat 与原始 lex 最大兼容\n" +" -X, --posix-compat 与 POSIX lex 最大兼容\n" +" -I, --interactive 产生交互å¼æ‰«æç¨‹åº (相对于 -B)\n" +" --yylineno 在 yylineno ä¸è®¡æ•°è½¨åˆ—\n" +"\n" +"产生的编ç :\n" +" -+, --c++ 产生 C++ 扫æ程åºç±»åˆ«\n" +" -Dmacro [=defn] #define å® defn (ç¼ºçœ defn 为「1ã€)\n" +" -L, --noline 在扫æ程åºä¸æŠ‘制 # 列指令\n" +" -P, --prefix=å—串 使用å—串作为å‰ç¼€ä»¥ä»£æ›¿ã€Œyyã€\n" +" -R, --reentrant 产生é‡æ–°è¿›å…¥ C 扫æ程åº\n" +" --bison-bridge 扫æ程åºç”¨äºŽ bison pure 剖æžå™¨ã€‚\n" +" --bison-locations åŒ…å« yylloc 支æŒã€‚\n" +" --stdinit åˆå§‹åŒ– yyin/yyout åˆ°æ ‡å‡†è¾“å…¥/æ ‡å‡†è¾“å‡º\n" +" --noansi-definitions æ—§å¼å‡½æ•°å®šä¹‰\n" +" --noansi-prototypes 在原型ä¸æ¸…空å‚数清å•\n" +" --nounistd ä¸åŒ…å« <unistd.h>\n" +" --noFUNCTION ä¸äº§ç”Ÿç‰¹å®šå‡½æ•°\n" +"\n" +"æ‚项:\n" +" -c do-nothing POSIX 选项\n" +" -n do-nothing POSIX 选项\n" +" -?\n" +" -h, --help 产生这个说明消æ¯\n" +" -V, --version 报告 %s 版本\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" -msgstr "" +msgstr "给予 sko_stack é…é¢æ—¶å¤±è´¥" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" -msgstr "" +msgstr "å称「%sã€æœ‰è’谬的长度" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" -msgstr "" +msgstr "在 allocatearray() ä¸å†…å˜é…置失败" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" -msgstr "" +msgstr "在 checkchar() ä¸ä¾¦æµ‹åˆ°ä¸å½“çš„å—符「%sã€" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" -msgstr "" +msgstr "扫æ程åºéœ€è¦ -8 æ——æ ‡ä»¥ä½¿ç”¨å—符 %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" -msgstr "" +msgstr "在 copystring() ä¸åŠ¨æ€å†…å˜å¤±è´¥" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" -msgstr "" +msgstr "%s:严é‡å†…部错误,%s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" -msgstr "ÊÔͼÔö¼ÓÊý×é´óСʱʧ°Ü" +msgstr "è¯•å›¾å¢žåŠ æ•°ç»„å¤§å°æ—¶å¤±è´¥" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" -msgstr "¹Ç¼ÜÎļþÖдíÎóµÄÐÐ" +msgstr "骨架文件ä¸é”™è¯¯çš„è¡Œ" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" -msgstr "ÔÚ yy_flex_xmalloc() ÖеÄÄÚ´æ·ÖÅäʧ°Ü" +msgstr "在 yy_flex_xmalloc() ä¸çš„内å˜åˆ†é…失败" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -642,235 +707,234 @@ msgid "" msgstr "" "\n" "\n" -"********** ¿ªÊ¼Êä³öÆðʼ״̬Ϊ %d µÄ NFA\n" +"********** 开始输出起始状æ€ä¸º %d çš„ NFA\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" -msgstr "״̬ # %4d\t" +msgstr "çŠ¶æ€ # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" -msgstr "********** Êä³ö½áÊø\n" +msgstr "********** 输出结æŸ\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" -msgstr "" +msgstr "在 dupmachine() ä¸æ¸…空机器" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" -msgstr "" +msgstr "å˜é‡æœ«å°¾ä¸Šä¸‹æ–‡è§„则于列 %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" -msgstr "" +msgstr "在 mark_beginning_as_normal() ä¸æœ‰ä¸å½“的状æ€è¾“å…¥" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" -msgstr "" +msgstr "输入规则太å¤æ‚ (>= %d NFA 状æ€)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" -msgstr "" +msgstr "在 mkxtion() ä¸æ‰¾åˆ°å¤ªå¤šè½¬æ¢" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" -msgstr "¹æÔò¹ý¶à (> %d)£¡" +msgstr "规则过多 (> %d)ï¼" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" -msgstr "δ֪µÄ´íÎó´¦Àí½Ú 1" +msgstr "未知的错误处ç†èŠ‚ 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" -msgstr "´íÎóµÄÆðʼ״̬Áбí" +msgstr "错误的起始状æ€åˆ—表" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" -msgstr "²»ÄÜʶ±ðµÄ¹æÔò" +msgstr "ä¸èƒ½è¯†åˆ«çš„规则" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" -msgstr "" +msgstr "末尾上下文已使用两次" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" -msgstr "" +msgstr "ä¸å½“çš„è¿ä»£å€¼" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" -msgstr "" +msgstr "è¿ä»£å€¼å¿…须是æ£å€¼" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" -msgstr "" +msgstr "在大å°å†™ä¸é¡»ç›¸ç¬¦çš„扫æ程åºä¸ï¼Œå—符范围 [%c-%c] 是模棱两å¯çš„" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" -msgstr "" +msgstr "在å—符类别ä¸æœ‰è´Ÿå€¼èŒƒå›´" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" -msgstr "" +msgstr "在大å°å†™ä¸é¡»ç›¸ç¬¦çš„扫æ程åºä¸ï¼Œ[:^lower:] 是模棱两å¯çš„" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" -msgstr "" +msgstr "在大å°å†™ä¸é¡»ç›¸ç¬¦çš„扫æ程åºä¸ï¼Œ[:^upper:] 是模棱两å¯çš„" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" -msgstr "" +msgstr "输入列太长\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" -msgstr "" +msgstr "异常的「%topã€æŒ‡ä»¤" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" -msgstr "" +msgstr "æ— æ³•è¾¨è¯†çš„ã€Œ%ã€æŒ‡ä»¤" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" -msgstr "" +msgstr "定义å称太长\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" -msgstr "" +msgstr "ä¸æˆå¯¹çš„「{ã€" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" -msgstr "" +msgstr "{%s} 的定义值太长\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" -msgstr "²»ÍêÕûµÄÃû³Æ¶¨Òå" +msgstr "ä¸å®Œæ•´çš„å称定义" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" -msgstr "" +msgstr "选项列太长\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" -msgstr "²»ÄÜʶ±ðµÄ %%Ñ¡Ï%s" +msgstr "ä¸èƒ½è¯†åˆ«çš„ %%选项:%s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" -msgstr "´íÎóµÄ×Ö·ûÀà±ð" +msgstr "错误的å—符类别" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" -msgstr "䶨ÒåµÄ¶¨Òå {%s}" +msgstr "未定义的定义 {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" -msgstr "´íÎó <ÆðʼÌõ¼þ>£º%s" +msgstr "错误 <起始æ¡ä»¶>:%s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" -msgstr "ÒÅ©ÒýºÅ" +msgstr "é—æ¼å¼•å·" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" -msgstr "´íÎóµÄ×Ö·ûÀà±ð±í´ïʽ£º%s" +msgstr "错误的å—符类别表达å¼ï¼š%s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" -msgstr "" +msgstr "ä¸å½“å—符于 {} 内部" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" -msgstr "ÒÅ© }" +msgstr "é—æ¼ }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" -msgstr "ÔÚ¶¯×÷ÖÐÎļþ½áÊø" +msgstr "在动作ä¸æ–‡ä»¶ç»“æŸ" -#: scan.l:945 -#, fuzzy +#: src/scan.l:945 msgid "EOF encountered inside pattern" -msgstr "ÔÚ¶¯×÷ÖÐÎļþ½áÊø" +msgstr "在å¼æ ·ä¹‹å†…é‡åˆ°æ–‡ä»¶ç»“æŸ" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" -msgstr "´íÎóµÄ×Ö·û£º%s" +msgstr "错误的å—符:%s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" -msgstr "ÎÞ·¨´ò¿ª %s" +msgstr "æ— æ³•æ‰“å¼€ %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" -msgstr "Ó÷¨£º%s [Ñ¡Ïî]...\n" +msgstr "用法:%s [选项]...\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" -msgstr "Ñ¡Ïî¡°%s¡±²»½ÓÊܲÎÊý\n" +msgstr "选项“%sâ€ä¸æŽ¥å—å‚æ•°\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" -msgstr "Ñ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n" +msgstr "选项“%sâ€éœ€è¦ä¸€ä¸ªå‚æ•°\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" -msgstr "" +msgstr "选项「%sã€æ˜¯æ¨¡æ£±ä¸¤å¯çš„\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" -msgstr "δ֪µÄÑ¡Ïî¡°%s¡±\n" +msgstr "未知的选项“%sâ€\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" -msgstr "δ֪´íÎó=(%d)\n" +msgstr "未知错误=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" -msgstr "·ûºÅ±íÄÚ´æ·ÖÅäʧ°Ü" +msgstr "符å·è¡¨å†…å˜åˆ†é…失败" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" -msgstr "Ãû³Æ¶¨ÒåÁËÁ½´Î" +msgstr "å称定义了两次" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" -msgstr "ÆðʼÌõ¼þ %s ÉùÃ÷ÁËÁ½´Î" +msgstr "起始æ¡ä»¶ %s 声明了两次" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" -msgstr "" +msgstr "过早出现文件结尾" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" -msgstr "" +msgstr "结æŸæ ‡å¿—\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" -msgstr "" +msgstr "*情况很怪异* - tok:%d val:%d\n" #~ msgid "consistency check failed in symfollowset" -#~ msgstr "symfollowset ÖеÄÒ»ÖÂÐÔ¼ì²éʧ°Ü" +#~ msgstr "symfollowset ä¸çš„一致性检查失败" #~ msgid "unknown -R option '%c'" -#~ msgstr "δ֪µÄ -R Ñ¡Ïî¡°%c¡±" +#~ msgstr "未知的 -R 选项“%câ€" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex d1e4fa4..66acc0c 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index 78c842a..8ed3cb5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-03-26 15:00-0400\n" +"POT-Creation-Date: 2015-11-17 11:17-0500\n" "PO-Revision-Date: 2013-02-12 23:23+0800\n" "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -18,42 +18,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: buf.c:78 +#: src/buf.c:78 msgid "Allocation of buffer to print string failed" msgstr "給予緩è¡å€é…é¡ä»¥åˆ—å°å—串時失敗" -#: buf.c:100 +#: src/buf.c:101 msgid "Allocation of buffer for line directive failed" msgstr "給予緩è¡å€é…é¡ç”¨æ–¼åˆ—指令時失敗" -#: buf.c:177 +#: src/buf.c:178 msgid "Allocation of buffer for m4 def failed" msgstr "給予緩è¡å€é…é¡ç”¨æ–¼ m4 def 時失敗" -#: buf.c:197 +#: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" msgstr "給予緩è¡å€é…é¡ç”¨æ–¼ m4 undef 時失敗" -#: dfa.c:61 +#: src/dfa.c:61 #, c-format msgid "State #%d is non-accepting -\n" msgstr "#%d æ£è™•æ–¼éžå˜å–狀態 -\n" -#: dfa.c:124 +#: src/dfa.c:124 msgid "dangerous trailing context" msgstr "ä¸å®‰å…¨çš„末端內文" -#: dfa.c:166 +#: src/dfa.c:166 #, c-format msgid " associated rule line numbers:" msgstr " é—œè¯çš„è¦å‰‡åˆ—號:" -#: dfa.c:202 +#: src/dfa.c:202 #, c-format msgid " out-transitions: " msgstr " 外轉æ›ï¼š" -#: dfa.c:210 +#: src/dfa.c:210 #, c-format msgid "" "\n" @@ -62,11 +62,11 @@ msgstr "" "\n" " åˆä½µè½‰æ›ï¼šæª”案çµå°¾ " -#: dfa.c:341 +#: src/dfa.c:341 msgid "consistency check failed in epsclosure()" msgstr "epsclosure() ä¸çš„一致性檢查失敗" -#: dfa.c:429 +#: src/dfa.c:429 msgid "" "\n" "\n" @@ -78,24 +78,24 @@ msgstr "" " DFA 傾å°ï¼š\n" "\n" -#: dfa.c:604 +#: src/dfa.c:604 msgid "could not create unique end-of-buffer state" msgstr "無法建立ç¨ä¸€çš„ç·©è¡å€çµå°¾ç‹€æ…‹" -#: dfa.c:625 +#: src/dfa.c:625 #, c-format msgid "state # %d:\n" msgstr "狀態 # %d:\n" -#: dfa.c:785 +#: src/dfa.c:785 msgid "Could not write yynxt_tbl[][]" msgstr "無法寫入 yynxt_tbl[][]" -#: dfa.c:1049 +#: src/dfa.c:1049 msgid "bad transition character detected in sympartition()" msgstr "在 sympartition() åµæ¸¬åˆ°ä¸ç•¶çš„轉æ›å—å…ƒ" -#: gen.c:478 +#: src/gen.c:499 msgid "" "\n" "\n" @@ -107,29 +107,29 @@ msgstr "" "ç‰åƒ¹é¡žåˆ¥ï¼š\n" "\n" -#: gen.c:662 gen.c:691 gen.c:1215 +#: src/gen.c:684 src/gen.c:713 src/gen.c:1237 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "狀態 # %d 接å—:[%d]\n" -#: gen.c:1110 +#: src/gen.c:1132 #, c-format msgid "state # %d accepts: " msgstr "狀態 # %d 接å—:" -#: gen.c:1157 +#: src/gen.c:1179 msgid "Could not write yyacclist_tbl" msgstr "無法寫入 yyacclist_tbl" -#: gen.c:1233 +#: src/gen.c:1255 msgid "Could not write yyacc_tbl" msgstr "無法寫入 yyacc_tbl" -#: gen.c:1248 gen.c:1633 gen.c:1656 +#: src/gen.c:1270 src/gen.c:1655 src/gen.c:1678 msgid "Could not write ecstbl" msgstr "無法寫入 ecstbl" -#: gen.c:1271 +#: src/gen.c:1293 msgid "" "\n" "\n" @@ -139,394 +139,394 @@ msgstr "" "\n" " 後è¨ç‰åƒ¹é¡žåˆ¥ï¼š\n" -#: gen.c:1293 +#: src/gen.c:1315 msgid "Could not write yymeta_tbl" msgstr "無法寫入 yymeta_tbl" -#: gen.c:1354 +#: src/gen.c:1376 msgid "Could not write yybase_tbl" msgstr "無法寫入 yybase_tbl" -#: gen.c:1388 +#: src/gen.c:1410 msgid "Could not write yydef_tbl" msgstr "無法寫入 yydef_tbl" -#: gen.c:1428 +#: src/gen.c:1450 msgid "Could not write yynxt_tbl" msgstr "無法寫入 yynxt_tbl" -#: gen.c:1464 +#: src/gen.c:1486 msgid "Could not write yychk_tbl" msgstr "無法寫入 yychk_tbl" -#: gen.c:1618 gen.c:1647 +#: src/gen.c:1640 src/gen.c:1669 msgid "Could not write ftbl" msgstr "無法寫入 ftbl" -#: gen.c:1624 +#: src/gen.c:1646 msgid "Could not write ssltbl" msgstr "無法寫入 ssltbl" -#: gen.c:1675 +#: src/gen.c:1697 msgid "Could not write eoltbl" msgstr "無法寫入 eoltbl" -#: gen.c:1735 +#: src/gen.c:1757 msgid "Could not write yynultrans_tbl" msgstr "無法寫入 yynultrans_tbl" -#: main.c:191 +#: src/main.c:192 msgid "rule cannot be matched" msgstr "è¦å‰‡ç„¡æ³•å»åˆ" -#: main.c:196 +#: src/main.c:197 msgid "-s option given but default rule can be matched" msgstr "-s é¸é …已給定但是å¯ä»¥å»åˆé è¨è¦å‰‡" -#: main.c:236 +#: src/main.c:237 msgid "Can't use -+ with -l option" msgstr "無法將 -+ 與 -l é¸é …å…±åŒä½¿ç”¨" -#: main.c:239 +#: src/main.c:240 msgid "Can't use -f or -F with -l option" msgstr "無法將 -f 或 -F 與 -l é¸é …å…±åŒä½¿ç”¨" -#: main.c:243 +#: src/main.c:244 msgid "Can't use --reentrant or --bison-bridge with -l option" msgstr "無法將 --reentrant 或 --bison-bridge 與 -l é¸é …å…±åŒä½¿ç”¨" -#: main.c:275 +#: src/main.c:276 msgid "-Cf/-CF and -Cm don't make sense together" msgstr "-Cf/-CF å’Œ -Cm 共用時ä¸å…·ä»»ä½•æ„義" -#: main.c:278 +#: src/main.c:279 msgid "-Cf/-CF and -I are incompatible" msgstr "-Cf/-CF å’Œ -I 是ä¸ç›¸å®¹çš„" -#: main.c:282 +#: src/main.c:283 msgid "-Cf/-CF are incompatible with lex-compatibility mode" msgstr "-Cf/-CF 與 lex 相容模å¼æ˜¯ä¸ç›¸å®¹çš„" -#: main.c:287 +#: src/main.c:288 msgid "-Cf and -CF are mutually exclusive" msgstr "-Cf å’Œ -CF 是互斥的" -#: main.c:291 +#: src/main.c:292 msgid "Can't use -+ with -CF option" msgstr "無法將 -+ 與 -CF é¸é …å…±åŒä½¿ç”¨" -#: main.c:294 +#: src/main.c:295 #, c-format msgid "%array incompatible with -+ option" msgstr "%array 與 -+ é¸é …ä¸ç›¸å®¹" -#: main.c:299 +#: src/main.c:300 msgid "Options -+ and --reentrant are mutually exclusive." msgstr "é¸é … -+ å’Œ --reentrant 是互斥的。" -#: main.c:302 +#: src/main.c:303 msgid "bison bridge not supported for the C++ scanner." msgstr "bison 橋接器ä¸å— C++ 掃æ程å¼æ”¯æ´ã€‚" -#: main.c:357 main.c:403 +#: src/main.c:358 src/main.c:404 #, c-format msgid "could not create %s" msgstr "無法建立 %s" -#: main.c:416 +#: src/main.c:417 msgid "could not write tables header" msgstr "無法寫入表é " -#: main.c:420 +#: src/main.c:421 #, c-format msgid "can't open skeleton file %s" msgstr "無法開啟架構檔案 %s" -#: main.c:456 +#: src/main.c:457 msgid "allocation of macro definition failed" msgstr "給予巨集定義é…é¡æ™‚失敗" -#: main.c:504 +#: src/main.c:505 #, c-format msgid "input error reading skeleton file %s" msgstr "讀å–架構檔案 %s 時輸入錯誤" -#: main.c:508 +#: src/main.c:509 #, c-format msgid "error closing skeleton file %s" msgstr "關閉架構檔案 %s 時發生錯誤" -#: main.c:693 +#: src/main.c:694 #, c-format msgid "error creating header file %s" msgstr "建立標é 檔案 %s 時發生錯誤" -#: main.c:701 +#: src/main.c:702 #, c-format msgid "error writing output file %s" msgstr "寫入輸出檔案 %s 時發生錯誤" -#: main.c:705 +#: src/main.c:706 #, c-format msgid "error closing output file %s" msgstr "關閉輸出檔案 %s 時發生錯誤" -#: main.c:709 +#: src/main.c:710 #, c-format msgid "error deleting output file %s" msgstr "刪除輸出檔案 %s 時發生錯誤" -#: main.c:716 +#: src/main.c:717 #, c-format msgid "No backing up.\n" msgstr "沒有備份。\n" -#: main.c:720 +#: src/main.c:721 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d 備份 (éžæŽ¥å—) 狀態。\n" -#: main.c:724 +#: src/main.c:725 #, c-format msgid "Compressed tables always back up.\n" msgstr "壓縮éŽçš„è¡¨æ ¼è‡ªå‹•å‚™ä»½ã€‚\n" -#: main.c:727 +#: src/main.c:728 #, c-format msgid "error writing backup file %s" msgstr "寫入備份檔案 %s 時發生錯誤" -#: main.c:731 +#: src/main.c:732 #, c-format msgid "error closing backup file %s" msgstr "關閉備份檔案 %s 時發生錯誤" -#: main.c:736 +#: src/main.c:737 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s 版本 %s 用法統計:\n" -#: main.c:739 +#: src/main.c:740 #, c-format msgid " scanner options: -" msgstr " 掃æ程å¼é¸é …:-" -#: main.c:818 +#: src/main.c:819 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA 狀態\n" -#: main.c:820 +#: src/main.c:821 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA 狀態 (%d 個å—è©ž)\n" -#: main.c:822 +#: src/main.c:823 #, c-format msgid " %d rules\n" msgstr " %d æ¢è¦å‰‡\n" -#: main.c:827 +#: src/main.c:828 #, c-format msgid " No backing up\n" msgstr " 沒有備份\n" -#: main.c:831 +#: src/main.c:832 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d 備份 (éžæŽ¥å—) 狀態\n" -#: main.c:836 +#: src/main.c:837 #, c-format msgid " Compressed tables always back-up\n" msgstr " 壓縮éŽçš„è¡¨æ ¼è‡ªå‹•å‚™ä»½\n" -#: main.c:840 +#: src/main.c:841 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " 列首å¼æ¨£å·²ä½¿ç”¨\n" -#: main.c:842 +#: src/main.c:843 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d 起始æ¢ä»¶\n" -#: main.c:846 +#: src/main.c:847 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d ε狀態,%d é›™å€Îµç‹€æ…‹\n" -#: main.c:850 +#: src/main.c:851 #, c-format msgid " no character classes\n" msgstr " ç„¡å—元類別\n" -#: main.c:854 +#: src/main.c:855 #, 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:859 +#: src/main.c:860 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d 狀態/下一狀態å°å·²å»ºç«‹\n" -#: main.c:862 +#: src/main.c:863 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d ç¨ä¸€/é‡è¤‡è½‰æ›\n" -#: main.c:867 +#: src/main.c:868 #, c-format msgid " %d table entries\n" msgstr " %d è¡¨æ ¼é …ç›®\n" -#: main.c:875 +#: src/main.c:876 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def é …ç›®å·²å»ºç«‹\n" -#: main.c:879 +#: src/main.c:880 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (å°–å³° %d) nxt-chk é …ç›®å·²å»ºç«‹\n" -#: main.c:883 +#: src/main.c:884 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (å°–å³° %d) æ¨¡æ¿ nxt-chk é …ç›®å·²å»ºç«‹\n" -#: main.c:887 +#: src/main.c:888 #, c-format msgid " %d empty table entries\n" msgstr " %d æ¸…ç©ºè¡¨æ ¼é …ç›®\n" -#: main.c:889 +#: src/main.c:890 #, c-format msgid " %d protos created\n" msgstr " %d 原型已建立\n" -#: main.c:892 +#: src/main.c:893 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d 範本已建立,%d 使用\n" -#: main.c:900 +#: src/main.c:901 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ç‰åƒ¹é¡žåˆ¥å·²å»ºç«‹\n" -#: main.c:908 +#: src/main.c:909 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d 後è¨ç‰åƒ¹é¡žåˆ¥å·²å»ºç«‹\n" -#: main.c:914 +#: src/main.c:915 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d 已儲å˜) 雜湊碰撞,%d DFAs 相ç‰\n" -#: main.c:916 +#: src/main.c:917 #, c-format msgid " %d sets of reallocations needed\n" msgstr " éœ€è¦ %d 組é‡æ–°é…ç½®\n" -#: main.c:918 +#: src/main.c:919 #, c-format msgid " %d total table entries needed\n" msgstr " ç¸½è¨ˆéœ€è¦ %d è¡¨æ ¼é …ç›®\n" -#: main.c:995 +#: src/main.c:996 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "內部錯誤。flexopts 功能異常。\n" -#: main.c:1005 +#: src/main.c:1006 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "嘗試「%s --helpã€ä»¥ç²å¾—更多資訊。\n" -#: main.c:1062 +#: src/main.c:1063 #, c-format msgid "unknown -C option '%c'" msgstr "ä¸æ˜Ž -C é¸é …「%cã€" -#: main.c:1191 +#: src/main.c:1192 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: main.c:1466 +#: src/main.c:1468 msgid "fatal parse error" msgstr "åš´é‡çš„解æžéŒ¯èª¤" -#: main.c:1498 +#: src/main.c:1500 #, c-format msgid "could not create backing-up info file %s" msgstr "無法建立備份資訊檔案 %s" -#: main.c:1519 +#: src/main.c:1521 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex 相容性é¸é …會導致大幅效能減退\n" -#: main.c:1522 +#: src/main.c:1524 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " åŒæ™‚ä¹Ÿè¨±æ˜¯å…¶ä»–å›žå ±æ•ˆèƒ½æ¸›é€€çš„å¯¦éš›ä¾†æº\n" -#: main.c:1528 +#: src/main.c:1530 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno 導致效能減退,åªæœ‰ç•¶è©²è¦å‰‡è©²å»åˆæ–°åˆ—å—元時æ‰æœƒ\n" -#: main.c:1535 +#: src/main.c:1537 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (互動å¼) 導致å°å¹…效能減退\n" -#: main.c:1540 +#: src/main.c:1542 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() 導致å°å¹…效能減退\n" -#: main.c:1546 +#: src/main.c:1548 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT 導致大幅效能減退\n" -#: main.c:1551 +#: src/main.c:1553 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "變數末尾內文è¦å‰‡å°Žè‡´å¤§å¹…效能減退\n" -#: main.c:1563 +#: src/main.c:1565 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT 無法與 -f 或 -F å…±åŒä½¿ç”¨" -#: main.c:1566 +#: src/main.c:1568 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno 無法與 REJECT å…±åŒä½¿ç”¨" -#: main.c:1569 +#: src/main.c:1571 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "變數末尾內文è¦å‰‡ç„¡æ³•èˆ‡ -f 或 -F å…±åŒä½¿ç”¨" -#: main.c:1692 +#: src/main.c:1699 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass åªå°æ–¼ C++ 掃æ程å¼æœ‰æ„義" -#: main.c:1799 +#: src/main.c:1806 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "用法:%s [é¸é …] [檔案]…\n" -#: main.c:1802 -#, c-format +#: src/main.c:1809 +#, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" "\n" @@ -549,6 +549,8 @@ msgid "" " -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" +" --hex use hexadecimal numbers instead of octal in debug " +"outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" @@ -651,51 +653,51 @@ msgstr "" " -h, --help 產生這個說明訊æ¯\n" " -V, --version å ±å‘Š %s 版本\n" -#: misc.c:65 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "給予 sko_stack é…é¡æ™‚失敗" -#: misc.c:102 misc.c:128 +#: src/misc.c:102 src/misc.c:129 #, c-format msgid "name \"%s\" ridiculously long" msgstr "å稱「%sã€æœ‰è’謬的長度" -#: misc.c:177 +#: src/misc.c:179 msgid "memory allocation failed in allocate_array()" msgstr "在 allocatearray() ä¸è¨˜æ†¶é«”é…置失敗" -#: misc.c:230 +#: src/misc.c:232 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "在 checkchar() ä¸åµæ¸¬åˆ°ä¸ç•¶çš„å—元「%sã€" -#: misc.c:235 +#: src/misc.c:237 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "掃æ程å¼éœ€è¦ -8 旗標以使用å—å…ƒ %s" -#: misc.c:268 +#: src/misc.c:270 msgid "dynamic memory failure in copy_string()" msgstr "在 copystring() ä¸å‹•æ…‹è¨˜æ†¶é«”失敗" -#: misc.c:367 +#: src/misc.c:369 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s:嚴é‡å…§éƒ¨éŒ¯èª¤ï¼Œ%s\n" -#: misc.c:803 +#: src/misc.c:795 msgid "attempt to increase array size failed" msgstr "è©¦åœ–å¢žåŠ é™£åˆ—å¤§å°æ™‚失敗" -#: misc.c:930 +#: src/misc.c:922 msgid "bad line in skeleton file" msgstr "架構檔案ä¸ä¸ç•¶çš„列" -#: misc.c:979 +#: src/misc.c:971 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "在 yy_flex_xmalloc() ä¸çš„記憶體é…置失敗" -#: nfa.c:104 +#: src/nfa.c:104 #, c-format msgid "" "\n" @@ -706,226 +708,226 @@ msgstr "" "\n" "********** 開始輸出起始狀態為 %d çš„ NFA\n" -#: nfa.c:115 +#: src/nfa.c:115 #, c-format msgid "state # %4d\t" msgstr "狀態 # %4d\t" -#: nfa.c:130 +#: src/nfa.c:130 #, c-format msgid "********** end of dump\n" msgstr "********** 傾å°çµæŸ\n" -#: nfa.c:174 +#: src/nfa.c:174 msgid "empty machine in dupmachine()" msgstr "在 dupmachine() ä¸æ¸…空機器" -#: nfa.c:240 +#: src/nfa.c:240 #, c-format msgid "Variable trailing context rule at line %d\n" msgstr "變數末尾內文è¦å‰‡æ–¼åˆ— %d\n" -#: nfa.c:364 +#: src/nfa.c:364 msgid "bad state type in mark_beginning_as_normal()" msgstr "在 mark_beginning_as_normal() ä¸æœ‰ä¸ç•¶çš„狀態輸入" -#: nfa.c:609 +#: src/nfa.c:609 #, c-format msgid "input rules are too complicated (>= %d NFA states)" msgstr "輸入è¦å‰‡å¤ªè¤‡é›œ (>= %d NFA 狀態)" -#: nfa.c:688 +#: src/nfa.c:688 msgid "found too many transitions in mkxtion()" msgstr "在 mkxtion() ä¸æ‰¾åˆ°å¤ªå¤šè½‰æ›" -#: nfa.c:714 +#: src/nfa.c:714 #, c-format msgid "too many rules (> %d)!" msgstr "太多è¦å‰‡ (> %d)ï¼" -#: parse.y:159 +#: src/parse.y:159 msgid "unknown error processing section 1" msgstr "ä¸æ˜Žçš„錯誤處ç†å€æ®µ 1" -#: parse.y:184 parse.y:351 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "ä¸ç•¶çš„起始æ¢ä»¶æ¸…å–®" -#: parse.y:315 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "無法辨è˜çš„è¦å‰‡" -#: parse.y:434 parse.y:447 parse.y:516 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "末尾內文已使用兩次" -#: parse.y:552 parse.y:562 parse.y:635 parse.y:645 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "ä¸ç•¶çš„è¿ä»£å€¼" -#: parse.y:580 parse.y:598 parse.y:663 parse.y:681 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "è¿ä»£å€¼å¿…é ˆæ˜¯æ£å€¼" -#: parse.y:804 parse.y:814 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "在大å°å¯«ä¸é ˆç›¸ç¬¦çš„掃æ程å¼ä¸ï¼Œå—å…ƒç¯„åœ [%c-%c] 是模稜兩å¯çš„" -#: parse.y:819 +#: src/parse.y:819 msgid "negative range in character class" msgstr "在å—元類別ä¸æœ‰è² 值範åœ" -#: parse.y:916 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "在大å°å¯«ä¸é ˆç›¸ç¬¦çš„掃æ程å¼ä¸ï¼Œ[:^lower:] 是模稜兩å¯çš„" -#: parse.y:922 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "在大å°å¯«ä¸é ˆç›¸ç¬¦çš„掃æ程å¼ä¸ï¼Œ[:^upper:] 是模稜兩å¯çš„" -#: scan.l:75 scan.l:618 scan.l:676 +#: src/scan.l:75 src/scan.l:618 src/scan.l:676 msgid "Input line too long\n" msgstr "輸入列太長\n" -#: scan.l:161 +#: src/scan.l:161 #, c-format msgid "malformed '%top' directive" msgstr "異常的「%topã€æŒ‡ä»¤" -#: scan.l:183 +#: src/scan.l:183 #, no-c-format msgid "unrecognized '%' directive" msgstr "無法辨è˜çš„「%ã€æŒ‡ä»¤" -#: scan.l:192 +#: src/scan.l:192 msgid "Definition name too long\n" msgstr "定義å稱太長\n" -#: scan.l:284 +#: src/scan.l:284 msgid "Unmatched '{'" msgstr "ä¸æˆå°çš„「{ã€" -#: scan.l:300 +#: src/scan.l:300 #, c-format msgid "Definition value for {%s} too long\n" msgstr "{%s} 的定義值太長\n" -#: scan.l:317 +#: src/scan.l:317 msgid "incomplete name definition" msgstr "ä¸å®Œæ•´çš„å稱定義" -#: scan.l:443 +#: src/scan.l:443 msgid "Option line too long\n" msgstr "é¸é …列太長\n" -#: scan.l:451 +#: src/scan.l:451 #, c-format msgid "unrecognized %%option: %s" msgstr "無法辨è˜çš„ %%option:%s" -#: scan.l:633 scan.l:800 +#: src/scan.l:633 src/scan.l:800 msgid "bad character class" msgstr "ä¸ç•¶çš„å—元類別" -#: scan.l:683 +#: src/scan.l:683 #, c-format msgid "undefined definition {%s}" msgstr "未定義的定義 {%s}" -#: scan.l:755 +#: src/scan.l:755 #, c-format msgid "bad <start condition>: %s" msgstr "ä¸ç•¶çš„ <起始æ¢ä»¶>:%s" -#: scan.l:768 +#: src/scan.l:768 msgid "missing quote" msgstr "缺少引號" -#: scan.l:834 +#: src/scan.l:834 #, c-format msgid "bad character class expression: %s" msgstr "ä¸ç•¶çš„å—元類別é‹ç®—å¼ï¼š%s" -#: scan.l:856 +#: src/scan.l:856 msgid "bad character inside {}'s" msgstr "ä¸ç•¶å—元於 {} 內部" -#: scan.l:862 +#: src/scan.l:862 msgid "missing }" msgstr "缺少 }" -#: scan.l:940 +#: src/scan.l:940 msgid "EOF encountered inside an action" msgstr "在動作之內é‡åˆ°æª”案çµæŸ" -#: scan.l:945 +#: src/scan.l:945 msgid "EOF encountered inside pattern" msgstr "在å¼æ¨£ä¹‹å…§é‡åˆ°æª”案çµæŸ" -#: scan.l:967 +#: src/scan.l:967 #, c-format msgid "bad character: %s" msgstr "ä¸ç•¶çš„å—元:%s" -#: scan.l:996 +#: src/scan.l:996 #, c-format msgid "can't open %s" msgstr "無法開啟 %s" -#: scanopt.c:291 +#: src/scanopt.c:291 #, c-format msgid "Usage: %s [OPTIONS]...\n" msgstr "用法:%s [é¸é …]…\n" -#: scanopt.c:564 +#: src/scanopt.c:559 #, c-format msgid "option `%s' doesn't allow an argument\n" msgstr "é¸é …「%sã€ä¸å…許任何引數\n" -#: scanopt.c:569 +#: src/scanopt.c:564 #, c-format msgid "option `%s' requires an argument\n" msgstr "é¸é …「%sã€éœ€è¦ä¸€å€‹å¼•æ•¸\n" -#: scanopt.c:573 +#: src/scanopt.c:568 #, c-format msgid "option `%s' is ambiguous\n" msgstr "é¸é …「%sã€æ˜¯æ¨¡ç¨œå…©å¯çš„\n" -#: scanopt.c:577 +#: src/scanopt.c:572 #, c-format msgid "Unrecognized option `%s'\n" msgstr "無法辨è˜çš„é¸é … %s\n" -#: scanopt.c:581 +#: src/scanopt.c:576 #, c-format msgid "Unknown error=(%d)\n" msgstr "ä¸æ˜ŽéŒ¯èª¤=(%d)\n" -#: sym.c:100 +#: src/sym.c:100 msgid "symbol table memory allocation failed" msgstr "符號表記憶體é…置失敗" -#: sym.c:202 +#: src/sym.c:202 msgid "name defined twice" msgstr "å稱定義了兩次" -#: sym.c:253 +#: src/sym.c:253 #, c-format msgid "start condition %s declared twice" msgstr "起始æ¢ä»¶ %s 宣告了兩次" -#: yylex.c:56 +#: src/yylex.c:56 msgid "premature EOF" msgstr "éŽæ—©å‡ºç¾æª”案çµå°¾" -#: yylex.c:198 +#: src/yylex.c:199 #, c-format msgid "End Marker\n" msgstr "çµæŸæ¨™èªŒ\n" -#: yylex.c:204 +#: src/yylex.c:205 #, c-format msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*情æ³å¾ˆæ€ªç•°* - tok:%d val:%d\n" diff --git a/FlexLexer.h b/src/FlexLexer.h index bad4ce0..b725b1f 100644 --- a/FlexLexer.h +++ b/src/FlexLexer.h @@ -69,22 +69,33 @@ public: yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0; virtual struct yy_buffer_state* yy_create_buffer( FLEX_STD istream* s, int size ) = 0; + virtual struct yy_buffer_state* + yy_create_buffer( FLEX_STD istream& s, int size ) = 0; virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0; - virtual void yyrestart( FLEX_STD istream* s ) = 0; + virtual void yyrestart( FLEX_STD istream* s ) = 0; + virtual void yyrestart( FLEX_STD istream& s ) = 0; virtual int yylex() = 0; // Call yylex with new input/output sources. - int yylex( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 ) - { + int yylex( FLEX_STD istream& new_in, FLEX_STD ostream& new_out ) + { + switch_streams( new_in, new_out ); + return yylex(); + } + + int yylex( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0) + { switch_streams( new_in, new_out ); return yylex(); - } + } // Switch to new input/output streams. A nil stream pointer // indicates "keep the current one". - virtual void switch_streams( FLEX_STD istream* new_in = 0, - FLEX_STD ostream* new_out = 0 ) = 0; + virtual void switch_streams( FLEX_STD istream* new_in, + FLEX_STD ostream* new_out ) = 0; + virtual void switch_streams( FLEX_STD istream& new_in, + FLEX_STD ostream& new_out ) = 0; int lineno() const { return yylineno; } @@ -113,20 +124,28 @@ class yyFlexLexer : public FlexLexer { public: // arg_yyin and arg_yyout default to the cin and cout, but we // only make that assignment when initializing in yylex(). + yyFlexLexer( FLEX_STD istream& arg_yyin, FLEX_STD ostream& arg_yyout ); yyFlexLexer( FLEX_STD istream* arg_yyin = 0, FLEX_STD ostream* arg_yyout = 0 ); +private: + void ctor_common(); + +public: virtual ~yyFlexLexer(); void yy_switch_to_buffer( struct yy_buffer_state* new_buffer ); - struct yy_buffer_state* yy_create_buffer( FLEX_STD istream* s, int size ); + struct yy_buffer_state* yy_create_buffer( FLEX_STD istream* s, int size ); + struct yy_buffer_state* yy_create_buffer( FLEX_STD istream& s, int size ); void yy_delete_buffer( struct yy_buffer_state* b ); void yyrestart( FLEX_STD istream* s ); + void yyrestart( FLEX_STD istream& s ); void yypush_buffer_state( struct yy_buffer_state* new_buffer ); void yypop_buffer_state(); virtual int yylex(); - virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 ); + virtual void switch_streams( FLEX_STD istream& new_in, FLEX_STD ostream& new_out ); + virtual void switch_streams( FLEX_STD istream* new_in = 0, FLEX_STD ostream* new_out = 0 ); virtual int yywrap(); protected: @@ -138,7 +157,7 @@ protected: int yyinput(); void yy_load_buffer_state(); - void yy_init_buffer( struct yy_buffer_state* b, FLEX_STD istream* s ); + void yy_init_buffer( struct yy_buffer_state* b, FLEX_STD istream& s ); void yy_flush_buffer( struct yy_buffer_state* b ); int yy_start_stack_ptr; @@ -153,8 +172,8 @@ protected: yy_state_type yy_try_NUL_trans( yy_state_type current_state ); int yy_get_next_buffer(); - FLEX_STD istream* yyin; // input source for default LexerInput - FLEX_STD ostream* yyout; // output sink for default LexerOutput + FLEX_STD istream yyin; // input source for default LexerInput + FLEX_STD ostream yyout; // output sink for default LexerOutput // yy_hold_char holds the character lost when yytext is formed. char yy_hold_char; diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..e324854 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,144 @@ +AM_YFLAGS = -d +localedir = $(datadir)/locale +AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl +LIBS = @LIBINTL@ @LIBS@ + +m4 = @M4@ + +bin_PROGRAMS = flex +lib_LTLIBRARIES = \ + libfl.la \ + libfl_pic.la + +flex_SOURCES = \ + ccl.c \ + dfa.c \ + ecs.c \ + scanflags.c \ + gen.c \ + main.c \ + misc.c \ + nfa.c \ + parse.y \ + scan.l \ + skel.c \ + sym.c \ + tblcmp.c \ + yylex.c \ + options.c \ + scanopt.c \ + buf.c \ + tables.c \ + tables_shared.c \ + filter.c \ + regex.c + +LDADD = ../lib/libcompat.la + +libfl_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ + +libfl_pic_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ + +noinst_HEADERS = \ + flexdef.h \ + flexint.h \ + version.h \ + options.h \ + scanopt.h \ + tables.h \ + tables_shared.h + +include_HEADERS = \ + FlexLexer.h + +EXTRA_DIST = \ + flex.skl \ + mkskel.sh \ + gettext.h + +BUILT_SOURCES = \ + skel.c + +MAINTAINERCLEANFILES = skel.c + +skel.c: flex.skl mkskel.sh flexint.h tables_shared.h + sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh >skel.c + +# Explicitly describe dependencies. +# You can recreate this with `gcc -I. -MM *.c' +buf.o: buf.c flexdef.h flexint.h +ccl.o: ccl.c flexdef.h flexint.h +dfa.o: dfa.c flexdef.h flexint.h tables.h tables_shared.h +ecs.o: ecs.c flexdef.h flexint.h +scanflags.o: scanflags.c flexdef.h flexint.h +gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h +libmain.o: libmain.c +libyywrap.o: libyywrap.c +main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \ + tables.h tables_shared.h +misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h +nfa.o: nfa.c flexdef.h flexint.h +options.o: options.c options.h scanopt.h flexdef.h flexint.h +parse.o: parse.c flexdef.h flexint.h tables.h tables_shared.h +scan.o: scan.c flexdef.h flexint.h parse.h +scanopt.o: scanopt.c flexdef.h flexint.h scanopt.h +skel.o: skel.c flexdef.h flexint.h +sym.o: sym.c flexdef.h flexint.h +tables.o: tables.c flexdef.h flexint.h tables.h tables_shared.h +tables_shared.o: tables_shared.c flexdef.h flexint.h tables.h \ + tables_shared.h +tblcmp.o: tblcmp.c flexdef.h flexint.h +yylex.o: yylex.c flexdef.h flexint.h parse.h +filter.o: filter.c flexdef.h flexint.h + +# Run GNU indent on sources. Don't run this unless all the sources compile cleanly. +# +# Whole idea: +# 1. Check for .indent.pro, otherwise indent will use unknown +# settings, or worse, the GNU defaults.) +# 2. Check that this is GNU indent. +# 3. Make sure to process only the NON-generated .c and .h files. +# 4. Run indent twice per file. The first time is a test. +# Otherwise, indent overwrites your file even if it fails! +indentfiles = \ + buf.c \ + ccl.c \ + dfa.c \ + ecs.c \ + scanflags.c \ + filter.c \ + flexdef.h \ + gen.c \ + libmain.c \ + libyywrap.c \ + main.c \ + misc.c \ + nfa.c \ + options.c \ + options.h \ + regex.c \ + scanopt.c \ + scanopt.h \ + sym.c \ + tables.c \ + tables.h \ + tables_shared.c \ + tables_shared.h \ + tblcmp.c + +indent: + if [ -f .indent.pro ] ; then \ + for f in $(indentfiles);\ + do\ + echo indenting $$f ;\ + $(indent) < $$f >/dev/null && indent $$f || echo $$f FAILED to indent ;\ + done \ + fi diff --git a/src/Makefile.in b/src/Makefile.in new file mode 100644 index 0000000..a9e0074 --- /dev/null +++ b/src/Makefile.in @@ -0,0 +1,1010 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 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@ + + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +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 = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = flex$(EXEEXT) +subdir = src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \ + $(noinst_HEADERS) $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(includedir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +libfl_la_LIBADD = +am_libfl_la_OBJECTS = libmain.lo libyywrap.lo +libfl_la_OBJECTS = $(am_libfl_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libfl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libfl_la_LDFLAGS) $(LDFLAGS) -o $@ +libfl_pic_la_LIBADD = +am_libfl_pic_la_OBJECTS = libmain.lo libyywrap.lo +libfl_pic_la_OBJECTS = $(am_libfl_pic_la_OBJECTS) +libfl_pic_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libfl_pic_la_LDFLAGS) $(LDFLAGS) -o $@ +PROGRAMS = $(bin_PROGRAMS) +am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OBJEXT) ecs.$(OBJEXT) \ + scanflags.$(OBJEXT) gen.$(OBJEXT) main.$(OBJEXT) \ + misc.$(OBJEXT) nfa.$(OBJEXT) parse.$(OBJEXT) scan.$(OBJEXT) \ + skel.$(OBJEXT) sym.$(OBJEXT) tblcmp.$(OBJEXT) yylex.$(OBJEXT) \ + options.$(OBJEXT) scanopt.$(OBJEXT) buf.$(OBJEXT) \ + tables.$(OBJEXT) tables_shared.$(OBJEXT) filter.$(OBJEXT) \ + regex.$(OBJEXT) +flex_OBJECTS = $(am_flex_OBJECTS) +flex_LDADD = $(LDADD) +flex_DEPENDENCIES = ../lib/libcompat.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS) +LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS) +AM_V_LEX = $(am__v_LEX_@AM_V@) +am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@) +am__v_LEX_0 = @echo " LEX " $@; +am__v_LEX_1 = +YLWRAP = $(top_srcdir)/build-aux/ylwrap +am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \ + -e s/c++$$/h++/ -e s/c$$/h/ +YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS) +LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS) +AM_V_YACC = $(am__v_YACC_@AM_V@) +am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = +SOURCES = $(libfl_la_SOURCES) $(libfl_pic_la_SOURCES) $(flex_SOURCES) +DIST_SOURCES = $(libfl_la_SOURCES) $(libfl_pic_la_SOURCES) \ + $(flex_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +HEADERS = $(include_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \ + parse.c parse.h scan.c +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GREP = @GREP@ +HELP2MAN = @HELP2MAN@ +INDENT = @INDENT@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBINTL@ @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +M4 = @M4@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = $(datadir)/locale +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_YFLAGS = -d +AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl +m4 = @M4@ +lib_LTLIBRARIES = \ + libfl.la \ + libfl_pic.la + +flex_SOURCES = \ + ccl.c \ + dfa.c \ + ecs.c \ + scanflags.c \ + gen.c \ + main.c \ + misc.c \ + nfa.c \ + parse.y \ + scan.l \ + skel.c \ + sym.c \ + tblcmp.c \ + yylex.c \ + options.c \ + scanopt.c \ + buf.c \ + tables.c \ + tables_shared.c \ + filter.c \ + regex.c + +LDADD = ../lib/libcompat.la +libfl_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +libfl_pic_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +noinst_HEADERS = \ + flexdef.h \ + flexint.h \ + version.h \ + options.h \ + scanopt.h \ + tables.h \ + tables_shared.h + +include_HEADERS = \ + FlexLexer.h + +EXTRA_DIST = \ + flex.skl \ + mkskel.sh \ + gettext.h + +BUILT_SOURCES = \ + skel.c + +MAINTAINERCLEANFILES = skel.c + +# Run GNU indent on sources. Don't run this unless all the sources compile cleanly. +# +# Whole idea: +# 1. Check for .indent.pro, otherwise indent will use unknown +# settings, or worse, the GNU defaults.) +# 2. Check that this is GNU indent. +# 3. Make sure to process only the NON-generated .c and .h files. +# 4. Run indent twice per file. The first time is a test. +# Otherwise, indent overwrites your file even if it fails! +indentfiles = \ + buf.c \ + ccl.c \ + dfa.c \ + ecs.c \ + scanflags.c \ + filter.c \ + flexdef.h \ + gen.c \ + libmain.c \ + libyywrap.c \ + main.c \ + misc.c \ + nfa.c \ + options.c \ + options.h \ + regex.c \ + scanopt.c \ + scanopt.h \ + sym.c \ + tables.c \ + tables.h \ + tables_shared.c \ + tables_shared.h \ + tblcmp.c + +all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .l .lo .o .obj .y +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status src/config.h +$(srcdir)/config.h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libfl.la: $(libfl_la_OBJECTS) $(libfl_la_DEPENDENCIES) $(EXTRA_libfl_la_DEPENDENCIES) + $(AM_V_CCLD)$(libfl_la_LINK) -rpath $(libdir) $(libfl_la_OBJECTS) $(libfl_la_LIBADD) $(LIBS) + +libfl_pic.la: $(libfl_pic_la_OBJECTS) $(libfl_pic_la_DEPENDENCIES) $(EXTRA_libfl_pic_la_DEPENDENCIES) + $(AM_V_CCLD)$(libfl_pic_la_LINK) -rpath $(libdir) $(libfl_pic_la_OBJECTS) $(libfl_pic_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err </dev/null \ + && test -n "`cat c$${pid}_.out`" \ + && test -z "`cat c$${pid}_.err`"; then :; \ + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad +parse.h: parse.c + @if test ! -f $@; then rm -f parse.c; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) parse.c; else :; fi + +flex$(EXEEXT): $(flex_OBJECTS) $(flex_DEPENDENCIES) $(EXTRA_flex_DEPENDENCIES) + @rm -f flex$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(flex_OBJECTS) $(flex_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfa.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmain.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libyywrap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfa.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scan.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanflags.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sym.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tables.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tables_shared.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tblcmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yylex.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +.l.c: + $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) + +.y.c: + $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$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: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h +install-binPROGRAMS: install-libLTLIBRARIES + +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) 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: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -rm -f parse.c + -rm -f parse.h + -rm -f scan.c + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-includeHEADERS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: installcheck-binPROGRAMS + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ + uninstall-libLTLIBRARIES + +.MAKE: all check install install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installcheck-binPROGRAMS installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-includeHEADERS \ + uninstall-libLTLIBRARIES + +.PRECIOUS: Makefile + + +skel.c: flex.skl mkskel.sh flexint.h tables_shared.h + sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh >skel.c + +# Explicitly describe dependencies. +# You can recreate this with `gcc -I. -MM *.c' +buf.o: buf.c flexdef.h flexint.h +ccl.o: ccl.c flexdef.h flexint.h +dfa.o: dfa.c flexdef.h flexint.h tables.h tables_shared.h +ecs.o: ecs.c flexdef.h flexint.h +scanflags.o: scanflags.c flexdef.h flexint.h +gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h +libmain.o: libmain.c +libyywrap.o: libyywrap.c +main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \ + tables.h tables_shared.h +misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h +nfa.o: nfa.c flexdef.h flexint.h +options.o: options.c options.h scanopt.h flexdef.h flexint.h +parse.o: parse.c flexdef.h flexint.h tables.h tables_shared.h +scan.o: scan.c flexdef.h flexint.h parse.h +scanopt.o: scanopt.c flexdef.h flexint.h scanopt.h +skel.o: skel.c flexdef.h flexint.h +sym.o: sym.c flexdef.h flexint.h +tables.o: tables.c flexdef.h flexint.h tables.h tables_shared.h +tables_shared.o: tables_shared.c flexdef.h flexint.h tables.h \ + tables_shared.h +tblcmp.o: tblcmp.c flexdef.h flexint.h +yylex.o: yylex.c flexdef.h flexint.h parse.h +filter.o: filter.c flexdef.h flexint.h + +indent: + if [ -f .indent.pro ] ; then \ + for f in $(indentfiles);\ + do\ + echo indenting $$f ;\ + $(indent) < $$f >/dev/null && indent $$f || echo $$f FAILED to indent ;\ + done \ + fi + +# 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: @@ -90,7 +90,8 @@ struct Buf *buf_prints (struct Buf *buf, const char *fmt, const char *s) */ struct Buf *buf_linedir (struct Buf *buf, const char* filename, int lineno) { - char *dst, *src, *t; + char *dst, *t; + const char *src; t = flex_alloc (strlen ("#line \"\"\n") + /* constant parts */ 2 * strlen (filename) + /* filename with possibly all backslashes escaped */ @@ -92,13 +92,13 @@ void ccladd (cclp, ch) static void dump_cclp (FILE* file, int cclp) { - register int i; + int i; putc ('[', file); for (i = 0; i < csize; ++i) { if (ccl_contains(cclp, i)){ - register int start_char = i; + int start_char = i; putc (' ', file); @@ -244,13 +244,13 @@ void list_character_set (file, cset) FILE *file; int cset[]; { - register int i; + int i; putc ('[', file); for (i = 0; i < csize; ++i) { if (cset[i]) { - register int start_char = i; + int start_char = i; putc (' ', file); @@ -101,12 +101,12 @@ void check_trailing_context (nfa_states, num_states, accset, nacc) int *accset; int nacc; { - register int i, j; + int i, j; for (i = 1; i <= num_states; ++i) { int ns = nfa_states[i]; - register int type = state_type[ns]; - register int ar = assoc_rule[ns]; + int type = state_type[ns]; + int ar = assoc_rule[ns]; if (type == STATE_NORMAL || rule_type[ar] != RULE_VARIABLE) { /* do nothing */ } @@ -141,14 +141,14 @@ void dump_associated_rules (file, ds) FILE *file; int ds; { - register int i, j; - register int num_associated_rules = 0; - int rule_set[MAX_ASSOC_RULES + 1]; - int *dset = dss[ds]; - int size = dfasiz[ds]; + int i, j; + int num_associated_rules = 0; + int rule_set[MAX_ASSOC_RULES + 1]; + int *dset = dss[ds]; + int size = dfasiz[ds]; for (i = 1; i <= size; ++i) { - register int rule_num = rule_linenum[assoc_rule[dset[i]]]; + int rule_num = rule_linenum[assoc_rule[dset[i]]]; for (j = 1; j <= num_associated_rules; ++j) if (rule_num == rule_set[j]) @@ -191,8 +191,8 @@ void dump_transitions (file, state) FILE *file; int state[]; { - register int i, ec; - int out_char_set[CSIZE]; + int i, ec; + int out_char_set[CSIZE]; for (i = 0; i < csize; ++i) { ec = ABS (ecgroup[i]); @@ -238,7 +238,7 @@ void dump_transitions (file, state) int *epsclosure (t, ns_addr, accset, nacc_addr, hv_addr) int *t, *ns_addr, accset[], *nacc_addr, *hv_addr; { - register int stkpos, ns, tsp; + int stkpos, ns, tsp; int numstates = *ns_addr, nacc, hashval, transsym, nfaccnum; int stkend, nstate; static int did_stk_init = false, *stk; @@ -400,7 +400,7 @@ void ntod () * from 1 to CSIZE, so their size must be CSIZE + 1. */ int duplist[CSIZE + 1], state[CSIZE + 1]; - int targfreq[CSIZE + 1], targstate[CSIZE + 1]; + int targfreq[CSIZE + 1] = {0}, targstate[CSIZE + 1]; /* accset needs to be large enough to hold all of the rules present * in the input, *plus* their YY_TRAILING_HEAD_MASK variants. @@ -823,9 +823,9 @@ void ntod () int snstods (sns, numstates, accset, nacc, hashval, newds_addr) int sns[], numstates, accset[], nacc, hashval, *newds_addr; { - int didsort = 0; - register int i, j; - int newds, *oldsns; + int didsort = 0; + int i, j; + int newds, *oldsns; for (i = 1; i <= lastdfa; ++i) if (hashval == dhash[i]) { @@ -139,7 +139,7 @@ void mkeccl (ccls, lenccl, fwd, bck, llsiz, NUL_mapping) for (i = fwd[cclm]; i != NIL && i <= llsiz; i = fwd[i]) { /* look for the symbol in the character class */ for (; j < lenccl; ++j) { - register int ccl_char; + int ccl_char; if (NUL_mapping && ccls[j] == 0) ccl_char = NUL_mapping; @@ -191,7 +191,7 @@ void mkeccl (ccls, lenccl, fwd, bck, llsiz, NUL_mapping) /* Find next ccl member to process. */ - for (++cclp; cclflags[cclp] && cclp < lenccl; ++cclp) { + for (++cclp; cclp < lenccl && cclflags[cclp]; ++cclp) { /* Reset "doesn't need processing" flag. */ cclflags[cclp] = 0; } @@ -135,9 +135,6 @@ struct filter *filter_create_int (struct filter *chain, bool filter_apply_chain (struct filter * chain) { int pid, pipes[2]; - int r; - const int readsz = 512; - char *buf; /* Tricky recursion, since we want to begin the chain @@ -189,7 +186,7 @@ clearerr(stdin); else { execvp (chain->argv[0], (char **const) (chain->argv)); - lerrsf_fatal ( _("exec of %s failed"), + lerr_fatal ( _("exec of %s failed"), chain->argv[0]); } @@ -312,21 +309,21 @@ int filter_tee_header (struct filter *chain) fflush (to_h); if (ferror (to_h)) - lerrsf (_("error writing output file %s"), + lerr (_("error writing output file %s"), (char *) chain->extra); else if (fclose (to_h)) - lerrsf (_("error closing output file %s"), + lerr (_("error closing output file %s"), (char *) chain->extra); } fflush (to_c); if (ferror (to_c)) - lerrsf (_("error writing output file %s"), + lerr (_("error writing output file %s"), outfilename ? outfilename : "<stdout>"); else if (fclose (to_c)) - lerrsf (_("error closing output file %s"), + lerr (_("error closing output file %s"), outfilename ? outfilename : "<stdout>"); while (wait (0) > 0) ; @@ -364,11 +361,9 @@ int filter_fix_linedirs (struct filter *chain) if (buf[0] == '#' && regexec (®ex_linedir, buf, 3, m, 0) == 0) { - int num; char *fname; /* extract the line number and filename */ - num = regmatch_strtol (&m[1], buf, NULL, 0); fname = regmatch_dup (&m[2], buf); if (strcmp (fname, @@ -431,11 +426,11 @@ int filter_fix_linedirs (struct filter *chain) } fflush (stdout); if (ferror (stdout)) - lerrsf (_("error writing output file %s"), + lerr (_("error writing output file %s"), outfilename ? outfilename : "<stdout>"); else if (fclose (stdout)) - lerrsf (_("error closing output file %s"), + lerr (_("error closing output file %s"), outfilename ? outfilename : "<stdout>"); return 0; @@ -556,7 +556,7 @@ struct yy_buffer_state %endif %if-c++-only - std::istream* yy_input_file; + std::streambuf* yy_input_file; %endif @@ -755,6 +755,9 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], static yy_state_type yy_get_previous_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); static yy_state_type yy_try_NUL_trans M4_YY_PARAMS( yy_state_type current_state M4_YY_PROTO_LAST_ARG); static int yy_get_next_buffer M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); +#if defined(__GNUC__) && __GNUC__ >= 3 +__attribute__((__noreturn__)) +#endif static void yy_fatal_error M4_YY_PARAMS( yyconst char msg[] M4_YY_PROTO_LAST_ARG ); ]]) @@ -951,7 +954,7 @@ FILE *yyget_in M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); m4_ifdef( [[M4_YY_NO_SET_IN]],, [[ -void yyset_in M4_YY_PARAMS( FILE * in_str M4_YY_PROTO_LAST_ARG ); +void yyset_in M4_YY_PARAMS( FILE * _in_str M4_YY_PROTO_LAST_ARG ); ]]) m4_ifdef( [[M4_YY_NO_GET_OUT]],, @@ -961,7 +964,7 @@ FILE *yyget_out M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); m4_ifdef( [[M4_YY_NO_SET_OUT]],, [[ -void yyset_out M4_YY_PARAMS( FILE * out_str M4_YY_PROTO_LAST_ARG ); +void yyset_out M4_YY_PARAMS( FILE * _out_str M4_YY_PROTO_LAST_ARG ); ]]) m4_ifdef( [[M4_YY_NO_GET_LENG]],, @@ -981,7 +984,7 @@ int yyget_lineno M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); m4_ifdef( [[M4_YY_NO_SET_LINENO]],, [[ -void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG ); +void yyset_lineno M4_YY_PARAMS( int _line_number M4_YY_PROTO_LAST_ARG ); ]]) m4_ifdef( [[M4_YY_REENTRANT]], @@ -996,7 +999,7 @@ m4_ifdef( [[M4_YY_REENTRANT]], [[ m4_ifdef( [[M4_YY_NO_SET_COLUMN]],, [[ -void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG ); +void yyset_column M4_YY_PARAMS( int _column_no M4_YY_PROTO_LAST_ARG ); ]]) ]]) @@ -1035,10 +1038,12 @@ extern int yywrap M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG ); #endif %not-for-header +#ifndef YY_NO_UNPUT m4_ifdef( [[M4_YY_NO_UNPUT]],, [[ static void yyunput M4_YY_PARAMS( int c, char *buf_ptr M4_YY_PROTO_LAST_ARG); ]]) +#endif %ok-for-header %endif @@ -1082,7 +1087,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], [[ m4_ifdef( [[M4_YY_NO_PUSH_STATE]],, [[ - static void yy_push_state M4_YY_PARAMS( int new_state M4_YY_PROTO_LAST_ARG); + static void yy_push_state M4_YY_PARAMS( int _new_state M4_YY_PROTO_LAST_ARG); ]]) m4_ifdef( [[M4_YY_NO_POP_STATE]],, [[ @@ -1138,7 +1143,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ \ %if-c++-only C++ definition \ - if ( (result = LexerInput( (char *) buf, max_size )) < 0 ) \ + if ( (int)(result = LexerInput( (char *) buf, max_size )) < 0 ) \ YY_FATAL_ERROR( "input in flex scanner failed" ); %endif @@ -1267,7 +1272,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], [[ /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif ]]) @@ -1281,9 +1286,9 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; M4_YY_DECL_GUTS_VAR(); m4_ifdef( [[M4_YY_NOT_REENTRANT]], @@ -1333,7 +1338,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], yyin = stdin; %endif %if-c++-only - yyin = & std::cin; + yyin.rdbuf(std::cin.rdbuf()); %endif if ( ! yyout ) @@ -1341,7 +1346,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], yyout = stdout; %endif %if-c++-only - yyout = & std::cout; + yyout.rdbuf(std::cout.rdbuf()); %endif if ( ! YY_CURRENT_BUFFER ) { @@ -1356,7 +1361,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], { %% [7.0] user's declarations go here - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { %% [8.0] yymore()-related code goes here yy_cp = YY_G(yy_c_buf_p); @@ -1407,7 +1412,12 @@ do_action: /* This label is used only to access EOF actions. */ * back-up) that will match for the new input source. */ YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; +%if-c-only YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; +%endif +%if-c++-only + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin.rdbuf(); +%endif YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } @@ -1520,11 +1530,29 @@ do_action: /* This label is used only to access EOF actions. */ %if-c++-only %not-for-header /* The contents of this function are C++ specific, so the YY_G macro is not used. + * This constructor simply maintains backward compatibility. + * DEPRECATED */ -yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ) +yyFlexLexer::yyFlexLexer( FLEX_STD istream* arg_yyin, FLEX_STD ostream* arg_yyout ): + yyin(arg_yyin ? arg_yyin->rdbuf() : std::cin.rdbuf()), + yyout(arg_yyout ? arg_yyout->rdbuf() : std::cout.rdbuf()) +{ + ctor_common(); +} + +/* The contents of this function are C++ specific, so the YY_G macro is not used. + */ +yyFlexLexer::yyFlexLexer( std::istream& arg_yyin, std::ostream& arg_yyout ): + yyin(arg_yyin.rdbuf()), + yyout(arg_yyout.rdbuf()) +{ + ctor_common(); +} + +/* The contents of this function are C++ specific, so the YY_G macro is not used. + */ +void yyFlexLexer::ctor_common() { - yyin = arg_yyin; - yyout = arg_yyout; yy_c_buf_p = 0; yy_init = 0; yy_start = 0; @@ -1567,16 +1595,29 @@ yyFlexLexer::~yyFlexLexer() /* The contents of this function are C++ specific, so the YY_G macro is not used. */ +void yyFlexLexer::switch_streams( std::istream& new_in, std::ostream& new_out ) +{ + // was if( new_in ) + yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG); + yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE M4_YY_CALL_LAST_ARG) M4_YY_CALL_LAST_ARG); + + // was if( new_out ) + yyout.rdbuf(new_out.rdbuf()); +} + +/* The contents of this function are C++ specific, so the YY_G macro is not used. + */ void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out ) { - if ( new_in ) - { - yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG); - yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE M4_YY_CALL_LAST_ARG) M4_YY_CALL_LAST_ARG); - } + if( ! new_in ) { + new_in = &yyin; + } - if ( new_out ) - yyout = new_out; + if ( ! new_out ) { + new_out = &yyout; + } + + switch_streams(*new_in, *new_out); } #ifdef YY_INTERACTIVE @@ -1585,33 +1626,33 @@ int yyFlexLexer::LexerInput( char* buf, int /* max_size */ ) int yyFlexLexer::LexerInput( char* buf, int max_size ) #endif { - if ( yyin->eof() || yyin->fail() ) + if ( yyin.eof() || yyin.fail() ) return 0; #ifdef YY_INTERACTIVE - yyin->get( buf[0] ); + yyin.get( buf[0] ); - if ( yyin->eof() ) + if ( yyin.eof() ) return 0; - if ( yyin->bad() ) + if ( yyin.bad() ) return -1; return 1; #else - (void) yyin->read( buf, max_size ); + (void) yyin.read( buf, max_size ); - if ( yyin->bad() ) + if ( yyin.bad() ) return -1; else - return yyin->gcount(); + return yyin.gcount(); #endif } void yyFlexLexer::LexerOutput( const char* buf, int size ) { - (void) yyout->write( buf, size ); + (void) yyout.write( buf, size ); } %ok-for-header %endif @@ -1633,9 +1674,9 @@ int yyFlexLexer::yy_get_next_buffer() %endif { M4_YY_DECL_GUTS_VAR(); - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = YY_G(yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = YY_G(yytext_ptr); + yy_size_t number_to_move, i; int ret_val; if ( YY_G(yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars) + 1] ) @@ -1664,7 +1705,7 @@ int yyFlexLexer::yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1; + number_to_move = (yy_size_t) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1781,8 +1822,8 @@ m4_ifdef( [[M4_YY_USES_REJECT]], yy_state_type yyFlexLexer::yy_get_previous_state() %endif { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; M4_YY_DECL_GUTS_VAR(); %% [15.0] code to get the start state into yy_current_state goes here @@ -1808,7 +1849,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state ) %endif { - register int yy_is_jam; + int yy_is_jam; 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 @@ -1817,16 +1858,17 @@ m4_ifdef( [[M4_YY_USES_REJECT]], } +#ifndef YY_NO_UNPUT %if-c-only m4_ifdef( [[M4_YY_NO_UNPUT]],, [[ - static void yyunput YYFARGS2( int,c, register char *,yy_bp) + static void yyunput YYFARGS2( int,c, char *,yy_bp) %endif %if-c++-only - void yyFlexLexer::yyunput( int c, register char* yy_bp) + void yyFlexLexer::yyunput( int c, char* yy_bp) %endif { - register char *yy_cp; + char *yy_cp; M4_YY_DECL_GUTS_VAR(); yy_cp = YY_G(yy_c_buf_p); @@ -1837,10 +1879,10 @@ m4_ifdef( [[M4_YY_NO_UNPUT]],, if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = YY_G(yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + yy_size_t number_to_move = YY_G(yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -1872,6 +1914,7 @@ m4_ifdef( [[M4_YY_USE_LINENO]], %if-c-only ]]) %endif +#endif %if-c-only #ifndef YY_NO_INPUT @@ -1966,7 +2009,7 @@ m4_ifdef( [[M4_YY_USE_LINENO]], void yyrestart YYFARGS1( FILE *,input_file) %endif %if-c++-only - void yyFlexLexer::yyrestart( std::istream* input_file ) + void yyFlexLexer::yyrestart( std::istream& input_file ) %endif { M4_YY_DECL_GUTS_VAR(); @@ -1981,6 +2024,18 @@ m4_ifdef( [[M4_YY_USE_LINENO]], yy_load_buffer_state( M4_YY_CALL_ONLY_ARG ); } +%if-c++-only +/** Delegate to the new version that takes an istream reference. + * @param input_file A readable stream. + * M4_YY_DOC_PARAM + * @note This function does not reset the start condition to @c INITIAL . + */ +void yyFlexLexer::yyrestart( std::istream* input_file ) +{ + yyrestart( *input_file ); +} +%endif + /** Switch to a different input buffer. * @param new_buffer The new input buffer. * M4_YY_DOC_PARAM @@ -2033,7 +2088,12 @@ static void yy_load_buffer_state YYFARGS0(void) M4_YY_DECL_GUTS_VAR(); YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; YY_G(yytext_ptr) = YY_G(yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; +%if-c-only yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; +%endif +%if-c++-only + yyin.rdbuf(YY_CURRENT_BUFFER_LVALUE->yy_input_file); +%endif YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); } @@ -2047,7 +2107,7 @@ static void yy_load_buffer_state YYFARGS0(void) YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, int ,size) %endif %if-c++-only - YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size ) + YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, int size ) %endif { YY_BUFFER_STATE b; @@ -2057,7 +2117,7 @@ static void yy_load_buffer_state YYFARGS0(void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -2073,6 +2133,19 @@ static void yy_load_buffer_state YYFARGS0(void) return b; } +%if-c++-only +/** Delegate creation of buffers to the new version that takes an istream reference. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * M4_YY_DOC_PARAM + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size ) +{ + return yy_create_buffer( *file, size ); +} +%endif + /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() * M4_YY_DOC_PARAM @@ -2107,7 +2180,7 @@ static void yy_load_buffer_state YYFARGS0(void) static void yy_init_buffer YYFARGS2( YY_BUFFER_STATE ,b, FILE *,file) %endif %if-c++-only - void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file ) + void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream& file ) %endif { @@ -2116,7 +2189,12 @@ static void yy_load_buffer_state YYFARGS0(void) yy_flush_buffer( b M4_YY_CALL_LAST_ARG); +%if-c-only b->yy_input_file = file; +%endif +%if-c++-only + b->yy_input_file = file.rdbuf(); +%endif b->yy_fill_buffer = 1; /* If b is the current buffer, then yy_init_buffer was _probably_ @@ -2272,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) * 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; + num_to_alloc = 1; // After all that talk, this was set to 1 anyways... YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) M4_YY_CALL_LAST_ARG); @@ -2290,7 +2368,7 @@ void yyFlexLexer::yyensure_buffer_stack(void) if (YY_G(yy_buffer_stack_top) >= (YY_G(yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = YY_G(yy_buffer_stack_max) + grow_size; YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2420,10 +2498,10 @@ YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, yy_size_t ,_yyb m4_ifdef( [[M4_YY_NO_PUSH_STATE]],, [[ %if-c-only - static void yy_push_state YYFARGS1( int ,new_state) + static void yy_push_state YYFARGS1( int ,_new_state) %endif %if-c++-only - void yyFlexLexer::yy_push_state( int new_state ) + void yyFlexLexer::yy_push_state( int _new_state ) %endif { M4_YY_DECL_GUTS_VAR(); @@ -2447,7 +2525,7 @@ m4_ifdef( [[M4_YY_NO_PUSH_STATE]],, YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START; - BEGIN(new_state); + BEGIN(_new_state); } ]]) @@ -2491,7 +2569,8 @@ m4_ifdef( [[M4_YY_NO_TOP_STATE]],, %if-c-only static void yy_fatal_error YYFARGS1(yyconst char*, msg) { - m4_dnl M4_YY_DECL_GUTS_VAR(); + M4_YY_DECL_GUTS_VAR(); + M4_YY_NOOP_GUTS_VAR(); (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2646,10 +2725,10 @@ void yyset_extra YYFARGS1( YY_EXTRA_TYPE ,user_defined) m4_ifdef( [[M4_YY_NO_SET_LINENO]],, [[ /** Set the current line number. - * @param line_number + * @param _line_number line number * M4_YY_DOC_PARAM */ -void yyset_lineno YYFARGS1( int ,line_number) +void yyset_lineno YYFARGS1( int ,_line_number) { M4_YY_DECL_GUTS_VAR(); @@ -2659,7 +2738,7 @@ void yyset_lineno YYFARGS1( int ,line_number) if (! YY_CURRENT_BUFFER ) YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); ]]) - yylineno = line_number; + yylineno = _line_number; } ]]) @@ -2668,10 +2747,10 @@ m4_ifdef( [[M4_YY_REENTRANT]], m4_ifdef( [[M4_YY_NO_SET_COLUMN]],, [[ /** Set the current column. - * @param line_number + * @param _column_no column number * M4_YY_DOC_PARAM */ -void yyset_column YYFARGS1( int , column_no) +void yyset_column YYFARGS1( int , _column_no) { M4_YY_DECL_GUTS_VAR(); @@ -2681,7 +2760,7 @@ void yyset_column YYFARGS1( int , column_no) if (! YY_CURRENT_BUFFER ) YY_FATAL_ERROR( "yyset_column called with no buffer" ); ]]) - yycolumn = column_no; + yycolumn = _column_no; } ]]) ]]) @@ -2691,23 +2770,23 @@ m4_ifdef( [[M4_YY_NO_SET_IN]],, [[ /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * M4_YY_DOC_PARAM * @see yy_switch_to_buffer */ -void yyset_in YYFARGS1( FILE * ,in_str) +void yyset_in YYFARGS1( FILE * ,_in_str) { M4_YY_DECL_GUTS_VAR(); - yyin = in_str ; + yyin = _in_str ; } ]]) m4_ifdef( [[M4_YY_NO_SET_OUT]],, [[ -void yyset_out YYFARGS1( FILE * ,out_str) +void yyset_out YYFARGS1( FILE * ,_out_str) { M4_YY_DECL_GUTS_VAR(); - yyout = out_str ; + yyout = _out_str ; } ]]) @@ -2723,10 +2802,10 @@ int yyget_debug YYFARGS0(void) m4_ifdef( [[M4_YY_NO_SET_DEBUG]],, [[ -void yyset_debug YYFARGS1( int ,bdebug) +void yyset_debug YYFARGS1( int ,_bdebug) { M4_YY_DECL_GUTS_VAR(); - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } ]]) %endif @@ -2854,7 +2933,7 @@ int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) } %endif if-c-only - +%# Actually, that ended an if-rentrant section %if-c-only static int yy_init_globals YYFARGS0(void) @@ -2974,7 +3053,10 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], #ifndef yytext_ptr static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n) { - register int i; + M4_YY_DECL_GUTS_VAR(); + M4_YY_NOOP_GUTS_VAR(); + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2986,7 +3068,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], #ifdef YY_NEED_STRLEN static int yy_flex_strlen YYFARGS1( yyconst char *,s) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2999,6 +3081,8 @@ m4_ifdef( [[M4_YY_NO_FLEX_ALLOC]],, [[ void *yyalloc YYFARGS1( yy_size_t ,size) { + M4_YY_DECL_GUTS_VAR(); + M4_YY_NOOP_GUTS_VAR(); return (void *) malloc( size ); } ]]) @@ -3007,6 +3091,9 @@ m4_ifdef( [[M4_YY_NO_FLEX_REALLOC]],, [[ void *yyrealloc YYFARGS2( void *,ptr, yy_size_t ,size) { + M4_YY_DECL_GUTS_VAR(); + M4_YY_NOOP_GUTS_VAR(); + /* 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 @@ -3022,6 +3109,8 @@ m4_ifdef( [[M4_YY_NO_FLEX_FREE]],, [[ void yyfree YYFARGS1( void *,ptr) { + M4_YY_DECL_GUTS_VAR(); + M4_YY_NOOP_GUTS_VAR(); free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } ]]) @@ -3067,7 +3156,7 @@ static int yytbl_read32 (void *v, struct yytbl_reader * rd) /** Read the header */ static int yytbl_hdr_read YYFARGS2(struct yytbl_hdr *, th, struct yytbl_reader *, rd) { - int bytes; + size_t bytes; memset (th, 0, sizeof (struct yytbl_hdr)); if (yytbl_read32 (&(th->th_magic), rd) != 0) @@ -3116,8 +3205,11 @@ static int yytbl_hdr_read YYFARGS2(struct yytbl_hdr *, th, struct yytbl_reader * static struct yytbl_dmap *yytbl_dmap_lookup YYFARGS2(struct yytbl_dmap *, dmap, int, id) { + M4_YY_DECL_GUTS_VAR(); + M4_YY_NOOP_GUTS_VAR(); + while (dmap->dm_id) - if (dmap->dm_id == id) + if ((int)(dmap->dm_id) == id) return dmap; else dmap++; diff --git a/flexdef.h b/src/flexdef.h index 046dd9a..496e34c 100644 --- a/flexdef.h +++ b/src/flexdef.h @@ -40,7 +40,7 @@ #endif /* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__lint__) # if HAVE_ALLOCA_H # include <alloca.h> # else @@ -395,6 +395,7 @@ char *alloca (); * yymore_really_used - whether to treat yymore() as really used, regardless * of what we think based on references to it in the user's actions. * reject_really_used - same for REJECT + * trace_hex - use hexadecimal numbers in trace/debug outputs instead of octals */ extern int printstats, syntaxerror, eofseen, ddebug, trace, nowarn, @@ -409,7 +410,7 @@ extern int csize; extern int yymore_used, reject, real_reject, continued_action, in_rule; extern int yymore_really_used, reject_really_used; - +extern int trace_hex; /* Variables used in the flex input routines: * datapos - characters on current output line @@ -843,10 +844,10 @@ extern void action_define PROTO ((const char *defname, int value)); extern void add_action PROTO ((const char *new_text)); /* True if a string is all lower case. */ -extern int all_lower PROTO ((register char *)); +extern int all_lower PROTO ((char *)); /* True if a string is all upper case. */ -extern int all_upper PROTO ((register char *)); +extern int all_upper PROTO ((char *)); /* Compare two integers for use by qsort. */ extern int intcmp PROTO ((const void *, const void *)); @@ -858,10 +859,10 @@ extern void check_char PROTO ((int c)); extern Char clower PROTO ((int)); /* Returns a dynamically allocated copy of a string. */ -extern char *copy_string PROTO ((register const char *)); +extern char *copy_string PROTO ((const char *)); /* Returns a dynamically allocated copy of a (potentially) unsigned string. */ -extern Char *copy_unsigned_string PROTO ((register Char *)); +extern Char *copy_unsigned_string PROTO ((Char *)); /* Compare two characters for use by qsort with '\0' sorting last. */ extern int cclcmp PROTO ((const void *, const void *)); @@ -902,14 +903,19 @@ extern void flexfatal PROTO ((const char *)); /* Convert a hexadecimal digit string to an integer value. */ extern int htoi PROTO ((Char[])); -/* Report an error message formatted with one integer argument. */ -extern void lerrif PROTO ((const char *, int)); - -/* Report an error message formatted with one string argument. */ -extern void lerrsf PROTO ((const char *, const char *)); +/* Report an error message formatted */ +extern void lerr PROTO ((const char *, ...)) +#if defined(__GNUC__) && __GNUC__ >= 3 + __attribute__((__format__(__printf__, 1, 2))) +#endif +; -/* Like lerrsf, but also exit after displaying message. */ -extern void lerrsf_fatal PROTO ((const char *, const char *)); +/* Like lerr, but also exit after displaying message. */ +extern void lerr_fatal PROTO ((const char *, ...)) +#if defined(__GNUC__) && __GNUC__ >= 3 + __attribute__((__format__(__printf__, 1, 2))) +#endif +; /* Spit out a "#line" statement. */ extern void line_directive_out PROTO ((FILE *, int)); @@ -987,7 +993,7 @@ extern int link_machines PROTO ((int, int)); /* Mark each "beginning" state in a machine as being a "normal" (i.e., * not trailing context associated) state. */ -extern void mark_beginning_as_normal PROTO ((register int)); +extern void mark_beginning_as_normal PROTO ((int)); /* Make a machine that branches to two machines. */ extern int mkbranch PROTO ((int, int)); diff --git a/flexint.h b/src/flexint.h index f9fa80c..f9fa80c 100644 --- a/flexint.h +++ b/src/flexint.h @@ -77,11 +77,32 @@ static const char *get_state_decl (void) : "static yyconst yy_state_type * %s = 0;\n"; } +static const char *get_uint16_decl (void) +{ + return (gentables) + ? "static yyconst flex_uint16_t %s[%d] =\n { 0,\n" + : "static yyconst flex_uint16_t * %s = 0;\n"; +} + +static const char *get_uint32_decl (void) +{ + return (gentables) + ? "static yyconst flex_uint32_t %s[%d] =\n { 0,\n" + : "static yyconst flex_uint32_t * %s = 0;\n"; +} + +static const char *get_yy_char_decl (void) +{ + return (gentables) + ? "static yyconst YY_CHAR %s[%d] =\n { 0,\n" + : "static yyconst YY_CHAR * %s = 0;\n"; +} + /* Indent to the current level. */ -void do_indent () +void do_indent (void) { - register int i = indent_level * 8; + int i = indent_level * 8; while (i >= 8) { outc ('\t'); @@ -121,7 +142,7 @@ static struct yytbl_data *mkeoltbl (void) } /* Generate the table for possible eol matches. */ -static void geneoltbl () +static void geneoltbl (void) { int i; @@ -145,7 +166,7 @@ static void geneoltbl () /* Generate the code to keep backing-up information. */ -void gen_backing_up () +void gen_backing_up (void) { if (reject || num_backing_up == 0) return; @@ -166,7 +187,7 @@ void gen_backing_up () /* Generate the code to perform the backing up. */ -void gen_bu_action () +void gen_bu_action (void) { if (reject || num_backing_up == 0) return; @@ -201,7 +222,7 @@ void gen_bu_action () static struct yytbl_data *mkctbl (void) { - register int i; + int i; struct yytbl_data *tbl = 0; flex_int32_t *tdata = 0, curr = 0; int end_of_buffer_action = num_rules + 1; @@ -330,9 +351,9 @@ static struct yytbl_data *mkssltbl (void) /* genctbl - generates full speed compressed transition table */ -void genctbl () +void genctbl (void) { - register int i; + int i; int end_of_buffer_action = num_rules + 1; /* Table of verify for transition and offset to next state. */ @@ -433,7 +454,7 @@ void genctbl () struct yytbl_data *mkecstbl (void) { - register int i; + int i; struct yytbl_data *tbl = 0; flex_int32_t *tdata = 0; @@ -453,19 +474,19 @@ struct yytbl_data *mkecstbl (void) buf_prints (&yydmap_buf, "\t{YYTD_ID_EC, (void**)&yy_ec, sizeof(%s)},\n", - "flex_int32_t"); + "YY_CHAR"); return tbl; } /* Generate equivalence-class tables. */ -void genecs () +void genecs (void) { - register int i, j; + int i, j; int numrows; - out_str_dec (get_int32_decl (), "yy_ec", csize); + out_str_dec (get_yy_char_decl (), "yy_ec", csize); for (i = 1; i < csize; ++i) { ecgroup[i] = ABS (ecgroup[i]); @@ -495,7 +516,7 @@ void genecs () /* Generate the code to find the action number. */ -void gen_find_action () +void gen_find_action (void) { if (fullspd) indent_puts ("yy_act = yy_current_state[-1].yy_nxt;"); @@ -507,7 +528,8 @@ void gen_find_action () indent_puts ("yy_current_state = *--YY_G(yy_state_ptr);"); indent_puts ("YY_G(yy_lp) = yy_accept[yy_current_state];"); - outn ("find_rule: /* we branch to this label when backing up */"); + if(reject_really_used) + outn ("find_rule: /* we branch to this label when backing up */"); indent_puts ("for ( ; ; ) /* until we find what rule we matched */"); @@ -637,7 +659,7 @@ void gen_find_action () struct yytbl_data *mkftbl (void) { - register int i; + int i; int end_of_buffer_action = num_rules + 1; struct yytbl_data *tbl; flex_int32_t *tdata = 0; @@ -654,7 +676,7 @@ struct yytbl_data *mkftbl (void) dfaacc[end_of_buffer_state].dfaacc_state = end_of_buffer_action; for (i = 1; i <= lastdfa; ++i) { - register int anum = dfaacc[i].dfaacc_state; + int anum = dfaacc[i].dfaacc_state; tdata[i] = anum; @@ -672,9 +694,9 @@ struct yytbl_data *mkftbl (void) /* genftbl - generate full transition table */ -void genftbl () +void genftbl (void) { - register int i; + int i; int end_of_buffer_action = num_rules + 1; out_str_dec (long_align ? get_int32_decl () : get_int16_decl (), @@ -683,7 +705,7 @@ void genftbl () dfaacc[end_of_buffer_state].dfaacc_state = end_of_buffer_action; for (i = 1; i <= lastdfa; ++i) { - register int anum = dfaacc[i].dfaacc_state; + int anum = dfaacc[i].dfaacc_state; mkdata (anum); @@ -708,7 +730,7 @@ void genftbl () void gen_next_compressed_state (char_map) char *char_map; { - indent_put2s ("register YY_CHAR yy_c = %s;", char_map); + indent_put2s ("YY_CHAR yy_c = %s;", char_map); /* Save the backing-up info \before/ computing the next state * because we always compute one more state than needed - we @@ -750,7 +772,7 @@ void gen_next_compressed_state (char_map) /* Generate the code to find the next match. */ -void gen_next_match () +void gen_next_match (void) { /* NOTE - changes in here should be reflected in gen_next_state() and * gen_NUL_trans(). @@ -794,8 +816,8 @@ void gen_next_match () else if (fullspd) { indent_puts ("{"); indent_puts - ("register yyconst struct yy_trans_info *yy_trans_info;\n"); - indent_puts ("register YY_CHAR yy_c;\n"); + ("yyconst struct yy_trans_info *yy_trans_info;\n"); + indent_puts ("YY_CHAR yy_c;\n"); indent_put2s ("for ( yy_c = %s;", char_map); indent_puts (" (yy_trans_info = &yy_current_state[(unsigned int) yy_c])->"); @@ -927,7 +949,7 @@ void gen_next_state (worry_about_NULs) /* Generate the code to make a NUL transition. */ -void gen_NUL_trans () +void gen_NUL_trans (void) { /* NOTE - changes in here should be reflected in gen_next_match() */ /* Only generate a definition for "yy_cp" if we'll generate code * that uses it. Otherwise lint and the like complain. @@ -938,7 +960,7 @@ void gen_NUL_trans () /* We're going to need yy_cp lying around for the call * below to gen_backing_up(). */ - indent_puts ("register char *yy_cp = YY_G(yy_c_buf_p);"); + indent_puts ("char *yy_cp = YY_G(yy_c_buf_p);"); outc ('\n'); @@ -959,10 +981,10 @@ void gen_NUL_trans () else if (fullspd) { do_indent (); - out_dec ("register int yy_c = %d;\n", NUL_ec); + out_dec ("int yy_c = %d;\n", NUL_ec); indent_puts - ("register yyconst struct yy_trans_info *yy_trans_info;\n"); + ("yyconst struct yy_trans_info *yy_trans_info;\n"); indent_puts ("yy_trans_info = &yy_current_state[(unsigned int) yy_c];"); indent_puts ("yy_current_state += yy_trans_info->yy_nxt;"); @@ -1012,7 +1034,7 @@ void gen_NUL_trans () /* Generate the code to find the start state. */ -void gen_start_state () +void gen_start_state (void) { if (fullspd) { if (bol_needed) { @@ -1045,7 +1067,7 @@ void gen_start_state () /* gentabs - generate data statements for the transition tables */ -void gentabs () +void gentabs (void) { int i, j, k, *accset, nacc, *acc_array, total_states; int end_of_buffer_action = num_rules + 1; @@ -1271,10 +1293,10 @@ void gentabs () fputs (_("\n\nMeta-Equivalence Classes:\n"), stderr); - out_str_dec (get_int32_decl (), "yy_meta", numecs + 1); + out_str_dec (get_yy_char_decl (), "yy_meta", numecs + 1); buf_prints (&yydmap_buf, "\t{YYTD_ID_META, (void**)&yy_meta, sizeof(%s)},\n", - "flex_int32_t"); + "YY_CHAR"); for (i = 1; i <= numecs; ++i) { if (trace) @@ -1301,13 +1323,13 @@ void gentabs () /* Begin generating yy_base */ out_str_dec ((tblend >= INT16_MAX || long_align) ? - get_int32_decl () : get_int16_decl (), + get_uint32_decl () : get_uint16_decl (), "yy_base", total_states + 1); buf_prints (&yydmap_buf, "\t{YYTD_ID_BASE, (void**)&yy_base, sizeof(%s)},\n", (tblend >= INT16_MAX - || long_align) ? "flex_int32_t" : "flex_int16_t"); + || long_align) ? "flex_uint32_t" : "flex_uint16_t"); yybase_tbl = (struct yytbl_data *) calloc (1, sizeof (struct yytbl_data)); @@ -1319,7 +1341,7 @@ void gentabs () yybase_curr = 1; for (i = 1; i <= lastdfa; ++i) { - register int d = def[i]; + int d = def[i]; if (base[i] == JAMSTATE) base[i] = jambase; @@ -1394,13 +1416,13 @@ void gentabs () /* Begin generating yy_nxt */ out_str_dec ((total_states >= INT16_MAX || long_align) ? - get_int32_decl () : get_int16_decl (), "yy_nxt", + get_uint32_decl () : get_uint16_decl (), "yy_nxt", tblend + 1); buf_prints (&yydmap_buf, "\t{YYTD_ID_NXT, (void**)&yy_nxt, sizeof(%s)},\n", (total_states >= INT16_MAX - || long_align) ? "flex_int32_t" : "flex_int16_t"); + || long_align) ? "flex_uint32_t" : "flex_uint16_t"); yynxt_tbl = (struct yytbl_data *) calloc (1, @@ -1499,11 +1521,11 @@ void indent_puts (str) /* make_tables - generate transition tables and finishes generating output file */ -void make_tables () +void make_tables (void) { - register int i; - int did_eof_rule = false; - struct yytbl_data *yynultrans_tbl; + int i; + int did_eof_rule = false; + struct yytbl_data *yynultrans_tbl = NULL; skelout (); /* %% [2.0] - break point in skel */ @@ -1733,9 +1755,13 @@ void make_tables () 0) flexerror (_ ("Could not write yynultrans_tbl")); + } + + if (yynultrans_tbl != NULL) { yytbl_data_destroy (yynultrans_tbl); yynultrans_tbl = NULL; - } + } + /* End generating yy_NUL_trans */ } diff --git a/gettext.h b/src/gettext.h index ea67f30..ea67f30 100644 --- a/gettext.h +++ b/src/gettext.h diff --git a/libmain.c b/src/libmain.c index 49262e4..f400fc3 100644 --- a/libmain.c +++ b/src/libmain.c @@ -21,12 +21,13 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ -extern int yylex (); +extern int yylex (void); -int main (argc, argv) - int argc; - char *argv[]; +int main (int argc, char *argv[]) { + (void)argc; + (void)argv; + while (yylex () != 0) ; return 0; diff --git a/libyywrap.c b/src/libyywrap.c index 8561a43..b0427c4 100644 --- a/libyywrap.c +++ b/src/libyywrap.c @@ -21,6 +21,8 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ +int yywrap (void); + int yywrap (void) { return 1; @@ -57,6 +57,7 @@ int C_plus_plus, long_align, use_read, yytext_is_array, do_yywrap, int reentrant, bison_bridge_lval, bison_bridge_lloc; int yymore_used, reject, real_reject, continued_action, in_rule; int yymore_really_used, reject_really_used; +int trace_hex = 0; int datapos, dataline, linenum; FILE *skelfile = NULL; int skel_ind = 0; @@ -117,13 +118,13 @@ struct yytbl_writer tableswr; char *program_name = "flex"; #ifndef SHORT_FILE_NAMES -static char *outfile_template = "lex.%s.%s"; -static char *backing_name = "lex.backup"; -static char *tablesfile_template = "lex.%s.tables"; +static const char outfile_template[] = "lex.%s.%s"; +static const char backing_name[] = "lex.backup"; +static const char tablesfile_template[] = "lex.%s.tables"; #else -static char *outfile_template = "lex%s.%s"; -static char *backing_name = "lex.bck"; -static char *tablesfile_template = "lex%s.tbl"; +static const char outfile_template[] = "lex%s.%s"; +static const char backing_name[] = "lex.bck"; +static const char tablesfile_template[] = "lex%s.tbl"; #endif #ifdef MS_DOS @@ -354,7 +355,7 @@ void check_options () prev_stdout = freopen (outfilename, "w+", stdout); if (prev_stdout == NULL) - lerrsf (_("could not create %s"), outfilename); + lerr (_("could not create %s"), outfilename); outfile_created = 1; } @@ -400,7 +401,7 @@ void check_options () } if ((tablesout = fopen (tablesfilename, "w")) == NULL) - lerrsf (_("could not create %s"), tablesfilename); + lerr (_("could not create %s"), tablesfilename); if (pname) free (pname); tablesfilename = 0; @@ -417,7 +418,7 @@ void check_options () } if (skelname && (skelfile = fopen (skelname, "r")) == NULL) - lerrsf (_("can't open skeleton file %s"), skelname); + lerr (_("can't open skeleton file %s"), skelname); if (reentrant) { buf_m4_define (&m4defs_buf, "M4_YY_REENTRANT", NULL); @@ -501,11 +502,11 @@ void flexend (exit_status) if (skelfile != NULL) { if (ferror (skelfile)) - lerrsf (_("input error reading skeleton file %s"), + lerr (_("input error reading skeleton file %s"), skelname); else if (fclose (skelfile)) - lerrsf (_("error closing skeleton file %s"), + lerr (_("error closing skeleton file %s"), skelname); } @@ -690,7 +691,7 @@ void flexend (exit_status) fprintf (header_out, "#endif /* %sHEADER_H */\n", prefix); if (ferror (header_out)) - lerrsf (_("error creating header file %s"), + lerr (_("error creating header file %s"), headerfilename); fflush (header_out); fclose (header_out); @@ -698,15 +699,15 @@ void flexend (exit_status) if (exit_status != 0 && outfile_created) { if (ferror (stdout)) - lerrsf (_("error writing output file %s"), + lerr (_("error writing output file %s"), outfilename); else if ((_stdout_closed = 1) && fclose (stdout)) - lerrsf (_("error closing output file %s"), + lerr (_("error closing output file %s"), outfilename); else if (unlink (outfilename)) - lerrsf (_("error deleting output file %s"), + lerr (_("error deleting output file %s"), outfilename); } @@ -724,11 +725,11 @@ void flexend (exit_status) _("Compressed tables always back up.\n")); if (ferror (backing_up_file)) - lerrsf (_("error writing backup file %s"), + lerr (_("error writing backup file %s"), backing_name); else if (fclose (backing_up_file)) - lerrsf (_("error closing backup file %s"), + lerr (_("error closing backup file %s"), backing_name); } @@ -1058,9 +1059,9 @@ void flexinit (argc, argv) break; default: - lerrif (_ + lerr (_ ("unknown -C option '%c'"), - (int) arg[i]); + arg[i]); break; } break; @@ -1421,7 +1422,8 @@ void flexinit (argc, argv) //buf_strdefine (&userdef_buf, "YY_NO_SET_LLOC", "1"); buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_LLOC",0); break; - + case OPT_HEX: + trace_hex = 1; } /* switch */ } /* while scanopt() */ @@ -1494,7 +1496,7 @@ void readin () if (backing_up_report) { backing_up_file = fopen (backing_name, "w"); if (backing_up_file == NULL) - lerrsf (_ + lerr (_ ("could not create backing-up info file %s"), backing_name); } @@ -1575,11 +1577,12 @@ void readin () } if (!do_yywrap) { - if (!C_plus_plus) + if (!C_plus_plus) { if (reentrant) - outn ("\n#define yywrap(yyscanner) 1"); + outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)"); else - outn ("\n#define yywrap() 1"); + outn ("\n#define yywrap() (/*CONSTCOND*/1)"); + } outn ("#define YY_SKIP_YYWRAP"); } @@ -1683,6 +1686,10 @@ void readin () } else { outn ("extern char *yytext;"); + + outn("#ifdef yytext_ptr"); + outn("#undef yytext_ptr"); + outn("#endif"); outn ("#define yytext_ptr yytext"); } } @@ -1818,6 +1825,7 @@ void usage () " -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" + " --hex use hexadecimal numbers instead of octal in debug outputs\n" "\n" "Files:\n" " -o, --outfile=FILE specify output filename\n" " -S, --skel=FILE specify skeleton file\n" @@ -113,11 +113,12 @@ void action_define (defname, value) } +#ifdef notdef /** Append "m4_define([[defname]],[[value]])m4_dnl\n" to the running buffer. * @param defname The macro name. * @param value The macro value, can be NULL, which is the same as the empty string. */ -void action_m4_define (const char *defname, const char * value) +static void action_m4_define (const char *defname, const char * value) { char buf[MAXLINE]; @@ -133,6 +134,7 @@ void action_m4_define (const char *defname, const char * value) snprintf (buf, sizeof(buf), "m4_define([[%s]],[[%s]])m4_dnl\n", defname, value?value:""); add_action (buf); } +#endif /* Append "new_text" to the running buffer. */ void add_action (new_text) @@ -168,7 +170,7 @@ void *allocate_array (size, element_size) int size; size_t element_size; { - register void *mem; + void *mem; size_t num_bytes = element_size * size; mem = flex_alloc (num_bytes); @@ -183,7 +185,7 @@ void *allocate_array (size, element_size) /* all_lower - true if a string is all lower-case */ int all_lower (str) - register char *str; + char *str; { while (*str) { if (!isascii ((Char) * str) || !islower ((Char) * str)) @@ -198,7 +200,7 @@ int all_lower (str) /* all_upper - true if a string is all upper-case */ int all_upper (str) - register char *str; + char *str; { while (*str) { if (!isascii ((Char) * str) || !isupper ((Char) * str)) @@ -227,11 +229,11 @@ void check_char (c) int c; { if (c >= CSIZE) - lerrsf (_("bad character '%s' detected in check_char()"), + lerr (_("bad character '%s' detected in check_char()"), readable_form (c)); if (c >= csize) - lerrsf (_ + lerr (_ ("scanner requires -8 flag to use the character %s"), readable_form (c)); } @@ -241,7 +243,7 @@ void check_char (c) /* clower - replace upper-case letter to lower-case */ Char clower (c) - register int c; + int c; { return (Char) ((isascii (c) && isupper (c)) ? tolower (c) : c); } @@ -250,10 +252,10 @@ Char clower (c) /* copy_string - returns a dynamically allocated copy of a string */ char *copy_string (str) - register const char *str; + const char *str; { - register const char *c1; - register char *c2; + const char *c1; + char *c2; char *copy; unsigned int size; @@ -278,9 +280,9 @@ char *copy_string (str) */ Char *copy_unsigned_string (str) - register Char *str; + Char *str; { - register Char *c; + Char *c; Char *copy; /* find length */ @@ -383,41 +385,29 @@ int htoi (str) } -/* lerrif - report an error message formatted with one integer argument */ - -void lerrif (msg, arg) - const char *msg; - int arg; -{ - char errmsg[MAXLINE]; - - snprintf (errmsg, sizeof(errmsg), msg, arg); - flexerror (errmsg); -} - - -/* lerrsf - report an error message formatted with one string argument */ +/* lerr - report an error message */ -void lerrsf (msg, arg) - const char *msg, arg[]; -{ +void lerr (const char *msg, ...) { char errmsg[MAXLINE]; + va_list args; - snprintf (errmsg, sizeof(errmsg)-1, msg, arg); - errmsg[sizeof(errmsg)-1] = 0; /* ensure NULL termination */ + va_start(args, msg); + vsnprintf (errmsg, sizeof(errmsg), msg, args); + va_end(args); flexerror (errmsg); } -/* lerrsf_fatal - as lerrsf, but call flexfatal */ +/* lerr_fatal - as lerr, but call flexfatal */ -void lerrsf_fatal (msg, arg) - const char *msg, arg[]; +void lerr_fatal (const char *msg, ...) { char errmsg[MAXLINE]; + va_list args; + va_start(args, msg); - snprintf (errmsg, sizeof(errmsg)-1, msg, arg); - errmsg[sizeof(errmsg)-1] = 0; /* ensure NULL termination */ + vsnprintf (errmsg, sizeof(errmsg), msg, args); + va_end(args); flexfatal (errmsg); } @@ -731,7 +721,6 @@ void outn (str) /** Print "m4_define( [[def]], [[val]])m4_dnl\n". * @param def The m4 symbol to define. * @param val The definition; may be NULL. - * @return buf */ void out_m4_define (const char* def, const char* val) { @@ -746,9 +735,9 @@ void out_m4_define (const char* def, const char* val) */ char *readable_form (c) - register int c; + int c; { - static char rform[10]; + static char rform[20]; if ((c >= 0 && c < 32) || c >= 127) { switch (c) { @@ -771,7 +760,10 @@ char *readable_form (c) #endif default: - snprintf (rform, sizeof(rform), "\\%.3o", (unsigned int) c); + if(trace_hex) + snprintf (rform, sizeof(rform), "\\x%.2x", (unsigned int) c); + else + snprintf (rform, sizeof(rform), "\\%.3o", (unsigned int) c); return rform; } } @@ -795,7 +787,7 @@ void *reallocate_array (array, size, element_size) int size; size_t element_size; { - register void *new_array; + void *new_array; size_t num_bytes = element_size * size; new_array = flex_realloc (array, num_bytes); @@ -991,7 +983,7 @@ void zero_out (region_ptr, size_in_bytes) char *region_ptr; size_t size_in_bytes; { - register char *rp, *rp_end; + char *rp, *rp_end; rp = region_ptr; rp_end = region_ptr + size_in_bytes; diff --git a/mkskel.sh b/src/mkskel.sh index 02c397a..02c397a 100755 --- a/mkskel.sh +++ b/src/mkskel.sh @@ -340,7 +340,7 @@ int link_machines (first, last) */ void mark_beginning_as_normal (mach) - register int mach; + int mach; { switch (state_type[mach]) { case STATE_NORMAL: @@ -605,7 +605,7 @@ int mkstate (sym) { if (++lastnfa >= current_mns) { if ((current_mns += MNS_INCREMENT) >= maximum_mns) - lerrif (_ + lerr(_ ("input rules are too complicated (>= %d NFA states)"), current_mns); @@ -711,7 +711,7 @@ void new_rule () } if (num_rules > MAX_RULE) - lerrif (_("too many rules (> %d)!"), MAX_RULE); + lerr (_("too many rules (> %d)!"), MAX_RULE); rule_linenum[num_rules] = linenum; rule_useful[num_rules] = false; diff --git a/options.c b/src/options.c index c673173..39d020e 100644 --- a/options.c +++ b/src/options.c @@ -117,6 +117,8 @@ optspec_t flexopts[] = { , {"--help", OPT_HELP, 0} , /* Produce this help message. */ + {"--hex", OPT_HEX, 0} + , /* Use hexadecimals in debug/trace outputs */ {"-I", OPT_INTERACTIVE, 0} , {"--interactive", OPT_INTERACTIVE, 0} diff --git a/options.h b/src/options.h index 1f3925b..ac3391c 100644 --- a/options.h +++ b/src/options.h @@ -60,6 +60,7 @@ enum flexopt_flag_t { OPT_FULL, OPT_HEADER_FILE, OPT_HELP, + OPT_HEX, OPT_INTERACTIVE, OPT_LEX_COMPAT, OPT_POSIX_COMPAT, @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 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 3 of the License, 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, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "3.0.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,15 +58,11 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Copy the first part of user declarations. */ - -/* Line 268 of yacc.c */ -#line 34 "parse.y" +#line 34 "parse.y" /* yacc.c:339 */ /* Copyright (c) 1990 The Regents of the University of California. */ /* All rights reserved. */ @@ -149,14 +145,15 @@ int previous_continued_action; /* whether the previous rule's action was '|' */ #define YYSTYPE int +#line 149 "parse.c" /* yacc.c:339 */ -/* Line 268 of yacc.c */ -#line 155 "parse.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULLPTR +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -166,64 +163,69 @@ int previous_continued_action; /* whether the previous rule's action was '|' */ # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_PARSE_H_INCLUDED +# define YY_YY_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; #endif - -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - CHAR = 258, - NUMBER = 259, - SECTEND = 260, - SCDECL = 261, - XSCDECL = 262, - NAME = 263, - PREVCCL = 264, - EOF_OP = 265, - OPTION_OP = 266, - OPT_OUTFILE = 267, - OPT_PREFIX = 268, - OPT_YYCLASS = 269, - OPT_HEADER = 270, - OPT_EXTRA_TYPE = 271, - OPT_TABLES = 272, - CCE_ALNUM = 273, - CCE_ALPHA = 274, - CCE_BLANK = 275, - CCE_CNTRL = 276, - CCE_DIGIT = 277, - CCE_GRAPH = 278, - CCE_LOWER = 279, - CCE_PRINT = 280, - CCE_PUNCT = 281, - CCE_SPACE = 282, - CCE_UPPER = 283, - CCE_XDIGIT = 284, - CCE_NEG_ALNUM = 285, - CCE_NEG_ALPHA = 286, - CCE_NEG_BLANK = 287, - CCE_NEG_CNTRL = 288, - CCE_NEG_DIGIT = 289, - CCE_NEG_GRAPH = 290, - CCE_NEG_LOWER = 291, - CCE_NEG_PRINT = 292, - CCE_NEG_PUNCT = 293, - CCE_NEG_SPACE = 294, - CCE_NEG_UPPER = 295, - CCE_NEG_XDIGIT = 296, - CCL_OP_UNION = 297, - CCL_OP_DIFF = 298, - BEGIN_REPEAT_POSIX = 299, - END_REPEAT_POSIX = 300, - BEGIN_REPEAT_FLEX = 301, - END_REPEAT_FLEX = 302 - }; + enum yytokentype + { + CHAR = 258, + NUMBER = 259, + SECTEND = 260, + SCDECL = 261, + XSCDECL = 262, + NAME = 263, + PREVCCL = 264, + EOF_OP = 265, + OPTION_OP = 266, + OPT_OUTFILE = 267, + OPT_PREFIX = 268, + OPT_YYCLASS = 269, + OPT_HEADER = 270, + OPT_EXTRA_TYPE = 271, + OPT_TABLES = 272, + CCE_ALNUM = 273, + CCE_ALPHA = 274, + CCE_BLANK = 275, + CCE_CNTRL = 276, + CCE_DIGIT = 277, + CCE_GRAPH = 278, + CCE_LOWER = 279, + CCE_PRINT = 280, + CCE_PUNCT = 281, + CCE_SPACE = 282, + CCE_UPPER = 283, + CCE_XDIGIT = 284, + CCE_NEG_ALNUM = 285, + CCE_NEG_ALPHA = 286, + CCE_NEG_BLANK = 287, + CCE_NEG_CNTRL = 288, + CCE_NEG_DIGIT = 289, + CCE_NEG_GRAPH = 290, + CCE_NEG_LOWER = 291, + CCE_NEG_PRINT = 292, + CCE_NEG_PUNCT = 293, + CCE_NEG_SPACE = 294, + CCE_NEG_UPPER = 295, + CCE_NEG_XDIGIT = 296, + CCL_OP_DIFF = 297, + CCL_OP_UNION = 298, + BEGIN_REPEAT_POSIX = 299, + END_REPEAT_POSIX = 300, + BEGIN_REPEAT_FLEX = 301, + END_REPEAT_FLEX = 302 + }; #endif /* Tokens. */ #define CHAR 258 @@ -265,29 +267,30 @@ int previous_continued_action; /* whether the previous rule's action was '|' */ #define CCE_NEG_SPACE 294 #define CCE_NEG_UPPER 295 #define CCE_NEG_XDIGIT 296 -#define CCL_OP_UNION 297 -#define CCL_OP_DIFF 298 +#define CCL_OP_DIFF 297 +#define CCL_OP_UNION 298 #define BEGIN_REPEAT_POSIX 299 #define END_REPEAT_POSIX 300 #define BEGIN_REPEAT_FLEX 301 #define END_REPEAT_FLEX 302 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -/* Copy the second part of user declarations. */ +extern YYSTYPE yylval; + +int yyparse (void); + +#endif /* !YY_YY_PARSE_H_INCLUDED */ +/* Copy the second part of user declarations. */ -/* Line 343 of yacc.c */ -#line 291 "parse.c" +#line 294 "parse.c" /* yacc.c:358 */ #ifdef short # undef short @@ -301,11 +304,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -325,8 +325,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -340,39 +339,68 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -390,9 +418,9 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -402,8 +430,8 @@ YYID (yyi) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -419,7 +447,7 @@ YYID (yyi) # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -427,15 +455,13 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -445,7 +471,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -470,35 +496,35 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -514,17 +540,19 @@ union yyalloc #define YYNNTS 27 /* YYNRULES -- Number of rules. */ #define YYNRULES 97 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 140 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 302 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -561,56 +589,7 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 9, 10, 14, 17, 18, 20, 22, - 24, 26, 29, 31, 33, 36, 39, 40, 44, 48, - 52, 56, 60, 64, 70, 76, 77, 78, 81, 83, - 85, 87, 88, 93, 97, 98, 102, 104, 106, 108, - 111, 115, 118, 120, 124, 126, 129, 132, 134, 141, - 147, 152, 155, 158, 161, 168, 174, 179, 181, 183, - 185, 189, 193, 195, 199, 203, 205, 209, 214, 219, - 222, 225, 226, 228, 230, 232, 234, 236, 238, 240, - 242, 244, 246, 248, 250, 252, 254, 256, 258, 260, - 262, 264, 266, 268, 270, 272, 274, 277 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 70, 0, -1, 71, 72, 73, 79, 80, -1, -1, - 72, 74, 75, -1, 72, 76, -1, -1, 1, -1, - 5, -1, 6, -1, 7, -1, 75, 8, -1, 8, - -1, 1, -1, 11, 77, -1, 77, 78, -1, -1, - 12, 48, 8, -1, 16, 48, 8, -1, 13, 48, - 8, -1, 14, 48, 8, -1, 15, 48, 8, -1, - 17, 48, 8, -1, 79, 83, 80, 81, 49, -1, - 79, 83, 50, 79, 51, -1, -1, -1, 52, 86, - -1, 86, -1, 10, -1, 1, -1, -1, 53, 82, - 84, 54, -1, 53, 55, 54, -1, -1, 84, 56, - 85, -1, 85, -1, 1, -1, 8, -1, 88, 87, - -1, 88, 87, 57, -1, 87, 57, -1, 87, -1, - 87, 58, 89, -1, 89, -1, 87, 59, -1, 89, - 90, -1, 90, -1, 89, 44, 4, 56, 4, 45, - -1, 89, 44, 4, 56, 45, -1, 89, 44, 4, - 45, -1, 90, 55, -1, 90, 60, -1, 90, 61, - -1, 90, 46, 4, 56, 4, 47, -1, 90, 46, - 4, 56, 47, -1, 90, 46, 4, 47, -1, 62, - -1, 91, -1, 9, -1, 63, 95, 63, -1, 64, - 87, 65, -1, 3, -1, 91, 43, 92, -1, 91, - 42, 92, -1, 92, -1, 66, 93, 67, -1, 66, - 52, 93, 67, -1, 93, 3, 68, 3, -1, 93, - 3, -1, 93, 94, -1, -1, 18, -1, 19, -1, - 20, -1, 21, -1, 22, -1, 23, -1, 24, -1, - 25, -1, 26, -1, 27, -1, 29, -1, 28, -1, - 30, -1, 31, -1, 32, -1, 33, -1, 34, -1, - 35, -1, 37, -1, 38, -1, 39, -1, 41, -1, - 36, -1, 40, -1, 95, 3, -1, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { 0, 118, 118, 148, 155, 156, 157, 158, 162, 170, @@ -626,7 +605,7 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -639,7 +618,7 @@ static const char *const yytname[] = "CCE_SPACE", "CCE_UPPER", "CCE_XDIGIT", "CCE_NEG_ALNUM", "CCE_NEG_ALPHA", "CCE_NEG_BLANK", "CCE_NEG_CNTRL", "CCE_NEG_DIGIT", "CCE_NEG_GRAPH", "CCE_NEG_LOWER", "CCE_NEG_PRINT", "CCE_NEG_PUNCT", "CCE_NEG_SPACE", - "CCE_NEG_UPPER", "CCE_NEG_XDIGIT", "CCL_OP_UNION", "CCL_OP_DIFF", + "CCE_NEG_UPPER", "CCE_NEG_XDIGIT", "CCL_OP_DIFF", "CCL_OP_UNION", "BEGIN_REPEAT_POSIX", "END_REPEAT_POSIX", "BEGIN_REPEAT_FLEX", "END_REPEAT_FLEX", "'='", "'\\n'", "'{'", "'}'", "'^'", "'<'", "'>'", "'*'", "','", "'$'", "'|'", "'/'", "'+'", "'?'", "'.'", "'\"'", "'('", @@ -647,13 +626,13 @@ static const char *const yytname[] = "sect1end", "startconddecl", "namelist1", "options", "optionlist", "option", "sect2", "initforrule", "flexrule", "scon_stk_ptr", "scon", "namelist2", "sconname", "rule", "re", "re2", "series", "singleton", - "fullccl", "braceccl", "ccl", "ccl_expr", "string", 0 + "fullccl", "braceccl", "ccl", "ccl_expr", "string", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -666,68 +645,18 @@ static const yytype_uint16 yytoknum[] = }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 69, 70, 71, 72, 72, 72, 72, 73, 74, - 74, 75, 75, 75, 76, 77, 77, 78, 78, 78, - 78, 78, 78, 79, 79, 79, 80, 81, 81, 81, - 81, 82, 83, 83, 83, 84, 84, 84, 85, 86, - 86, 86, 86, 87, 87, 88, 89, 89, 89, 89, - 89, 90, 90, 90, 90, 90, 90, 90, 90, 90, - 90, 90, 90, 91, 91, 91, 92, 92, 93, 93, - 93, 93, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 95, 95 -}; +#define YYPACT_NINF -52 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 5, 0, 3, 2, 0, 1, 1, 1, - 1, 2, 1, 1, 2, 2, 0, 3, 3, 3, - 3, 3, 3, 5, 5, 0, 0, 2, 1, 1, - 1, 0, 4, 3, 0, 3, 1, 1, 1, 2, - 3, 2, 1, 3, 1, 2, 2, 1, 6, 5, - 4, 2, 2, 2, 6, 5, 4, 1, 1, 1, - 3, 3, 1, 3, 3, 1, 3, 4, 4, 2, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 0 -}; +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-52))) -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 3, 0, 0, 1, 7, 0, 8, 9, 10, 16, - 25, 0, 5, 14, 34, 13, 12, 4, 0, 0, - 0, 0, 0, 0, 15, 31, 2, 26, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 25, 0, 17, - 19, 20, 21, 18, 22, 33, 37, 38, 0, 36, - 34, 30, 62, 59, 29, 0, 57, 97, 0, 71, - 0, 28, 42, 0, 44, 47, 58, 65, 32, 0, - 24, 27, 0, 0, 71, 0, 23, 41, 0, 45, - 39, 0, 46, 0, 51, 52, 53, 0, 0, 35, - 96, 60, 61, 0, 69, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 83, 82, 84, 85, 86, - 87, 88, 89, 94, 90, 91, 92, 95, 93, 66, - 70, 43, 40, 0, 0, 64, 63, 67, 0, 50, - 0, 56, 0, 68, 0, 49, 0, 55, 48, 54 -}; +#define YYTABLE_NINF -27 -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 1, 2, 5, 10, 11, 17, 12, 13, 24, - 14, 26, 60, 36, 27, 48, 49, 61, 62, 63, - 64, 65, 66, 67, 75, 120, 72 -}; +#define yytable_value_is_error(Yytable_value) \ + 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -52 + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { -52, 17, 103, -52, -52, 113, -52, -52, -52, -52, @@ -746,7 +675,28 @@ static const yytype_int16 yypact[] = 9, -52, -3, -52, 108, -52, 107, -52, -52, -52 }; -/* YYPGOTO[NTERM-NUM]. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 3, 0, 0, 1, 7, 0, 8, 9, 10, 16, + 25, 0, 5, 14, 34, 13, 12, 4, 0, 0, + 0, 0, 0, 0, 15, 31, 2, 26, 11, 0, + 0, 0, 0, 0, 0, 0, 0, 25, 0, 17, + 19, 20, 21, 18, 22, 33, 37, 38, 0, 36, + 34, 30, 62, 59, 29, 0, 57, 97, 0, 71, + 0, 28, 42, 0, 44, 47, 58, 65, 32, 0, + 24, 27, 0, 0, 71, 0, 23, 41, 0, 45, + 39, 0, 46, 0, 51, 52, 53, 0, 0, 35, + 96, 60, 61, 0, 69, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 83, 82, 84, 85, 86, + 87, 88, 89, 94, 90, 91, 92, 95, 93, 66, + 70, 43, 40, 0, 0, 63, 64, 67, 0, 50, + 0, 56, 0, 68, 0, 49, 0, 55, 48, 54 +}; + + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -52, -52, -52, -52, -52, -52, -52, -52, -52, -52, @@ -754,10 +704,17 @@ static const yytype_int16 yypgoto[] = 80, -21, -52, 47, 85, -52, -52 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -27 + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 1, 2, 5, 10, 11, 17, 12, 13, 24, + 14, 26, 60, 36, 27, 48, 49, 61, 62, 63, + 64, 65, 66, 67, 75, 120, 72 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 51, 136, 52, 94, 90, 129, -26, 78, 53, 54, @@ -779,12 +736,6 @@ static const yytype_int16 yytable[] = 0, 89 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-52)) - -#define yytable_value_is_error(yytable_value) \ - YYID (0) - static const yytype_int8 yycheck[] = { 1, 4, 3, 3, 3, 45, 0, 58, 9, 10, @@ -806,8 +757,8 @@ static const yytype_int8 yycheck[] = -1, 69 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 70, 71, 0, 1, 72, 5, 6, 7, 11, @@ -826,94 +777,71 @@ static const yytype_uint8 yystos[] = 56, 47, 56, 3, 4, 45, 4, 47, 45, 47 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 69, 70, 71, 72, 72, 72, 72, 73, 74, + 74, 75, 75, 75, 76, 77, 77, 78, 78, 78, + 78, 78, 78, 79, 79, 79, 80, 81, 81, 81, + 81, 82, 83, 83, 83, 84, 84, 84, 85, 86, + 86, 86, 86, 87, 87, 88, 89, 89, 89, 89, + 89, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 91, 91, 91, 92, 92, 93, 93, + 93, 93, 94, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 94, 95, 95 +}; -#define YYRECOVERING() (!!yyerrstatus) + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 5, 0, 3, 2, 0, 1, 1, 1, + 1, 2, 1, 1, 2, 2, 0, 3, 3, 3, + 3, 3, 3, 5, 5, 0, 0, 2, 1, 1, + 1, 0, 4, 3, 0, 3, 1, 1, 1, 2, + 3, 2, 1, 3, 1, 2, 2, 1, 6, 5, + 4, 2, 2, 2, 6, 5, 4, 1, 1, 1, + 3, 3, 1, 3, 3, 1, 3, 4, 4, 2, + 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 0 +}; -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -/* This macro is provided for backward compatibility. */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (0) + +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -923,54 +851,46 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -978,22 +898,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); @@ -1004,16 +913,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1024,49 +925,42 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1080,7 +974,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1103,15 +997,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1127,16 +1014,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1166,27 +1045,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1209,12 +1088,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1222,10 +1100,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html> - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -1274,11 +1148,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1298,10 +1174,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1338,48 +1216,20 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif { YYUSE (yyvaluep); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* The lookahead symbol. */ @@ -1387,7 +1237,6 @@ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ int yynerrs; @@ -1396,37 +1245,18 @@ int yynerrs; | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1444,7 +1274,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1462,9 +1292,8 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1473,14 +1302,6 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -1501,23 +1322,23 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1525,22 +1346,22 @@ yyparse () # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1549,10 +1370,10 @@ yyparse () yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1581,7 +1402,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (); } if (yychar <= YYEOF) @@ -1621,7 +1442,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1644,7 +1467,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1658,9 +1481,7 @@ yyreduce: switch (yyn) { case 2: - -/* Line 1806 of yacc.c */ -#line 119 "parse.y" +#line 119 "parse.y" /* yacc.c:1646 */ { /* add default rule */ int def_rule; @@ -1687,135 +1508,118 @@ yyreduce: add_action( ";\n\tYY_BREAK\n" ); } +#line 1512 "parse.c" /* yacc.c:1646 */ break; case 3: - -/* Line 1806 of yacc.c */ -#line 148 "parse.y" +#line 148 "parse.y" /* yacc.c:1646 */ { /* initialize for processing rules */ /* Create default DFA start condition. */ scinstal( "INITIAL", false ); } +#line 1522 "parse.c" /* yacc.c:1646 */ break; case 7: - -/* Line 1806 of yacc.c */ -#line 159 "parse.y" +#line 159 "parse.y" /* yacc.c:1646 */ { synerr( _("unknown error processing section 1") ); } +#line 1528 "parse.c" /* yacc.c:1646 */ break; case 8: - -/* Line 1806 of yacc.c */ -#line 163 "parse.y" +#line 163 "parse.y" /* yacc.c:1646 */ { check_options(); scon_stk = allocate_integer_array( lastsc + 1 ); scon_stk_ptr = 0; } +#line 1538 "parse.c" /* yacc.c:1646 */ break; case 9: - -/* Line 1806 of yacc.c */ -#line 171 "parse.y" +#line 171 "parse.y" /* yacc.c:1646 */ { xcluflg = false; } +#line 1544 "parse.c" /* yacc.c:1646 */ break; case 10: - -/* Line 1806 of yacc.c */ -#line 174 "parse.y" +#line 174 "parse.y" /* yacc.c:1646 */ { xcluflg = true; } +#line 1550 "parse.c" /* yacc.c:1646 */ break; case 11: - -/* Line 1806 of yacc.c */ -#line 178 "parse.y" +#line 178 "parse.y" /* yacc.c:1646 */ { scinstal( nmstr, xcluflg ); } +#line 1556 "parse.c" /* yacc.c:1646 */ break; case 12: - -/* Line 1806 of yacc.c */ -#line 181 "parse.y" +#line 181 "parse.y" /* yacc.c:1646 */ { scinstal( nmstr, xcluflg ); } +#line 1562 "parse.c" /* yacc.c:1646 */ break; case 13: - -/* Line 1806 of yacc.c */ -#line 184 "parse.y" +#line 184 "parse.y" /* yacc.c:1646 */ { synerr( _("bad start condition list") ); } +#line 1568 "parse.c" /* yacc.c:1646 */ break; case 17: - -/* Line 1806 of yacc.c */ -#line 195 "parse.y" +#line 195 "parse.y" /* yacc.c:1646 */ { outfilename = copy_string( nmstr ); did_outfilename = 1; } +#line 1577 "parse.c" /* yacc.c:1646 */ break; case 18: - -/* Line 1806 of yacc.c */ -#line 200 "parse.y" +#line 200 "parse.y" /* yacc.c:1646 */ { extra_type = copy_string( nmstr ); } +#line 1583 "parse.c" /* yacc.c:1646 */ break; case 19: - -/* Line 1806 of yacc.c */ -#line 202 "parse.y" +#line 202 "parse.y" /* yacc.c:1646 */ { prefix = copy_string( nmstr ); } +#line 1589 "parse.c" /* yacc.c:1646 */ break; case 20: - -/* Line 1806 of yacc.c */ -#line 204 "parse.y" +#line 204 "parse.y" /* yacc.c:1646 */ { yyclass = copy_string( nmstr ); } +#line 1595 "parse.c" /* yacc.c:1646 */ break; case 21: - -/* Line 1806 of yacc.c */ -#line 206 "parse.y" +#line 206 "parse.y" /* yacc.c:1646 */ { headerfilename = copy_string( nmstr ); } +#line 1601 "parse.c" /* yacc.c:1646 */ break; case 22: - -/* Line 1806 of yacc.c */ -#line 208 "parse.y" +#line 208 "parse.y" /* yacc.c:1646 */ { tablesext = true; tablesfilename = copy_string( nmstr ); } +#line 1607 "parse.c" /* yacc.c:1646 */ break; case 23: - -/* Line 1806 of yacc.c */ -#line 212 "parse.y" - { scon_stk_ptr = (yyvsp[(2) - (5)]); } +#line 212 "parse.y" /* yacc.c:1646 */ + { scon_stk_ptr = (yyvsp[-3]); } +#line 1613 "parse.c" /* yacc.c:1646 */ break; case 24: - -/* Line 1806 of yacc.c */ -#line 214 "parse.y" - { scon_stk_ptr = (yyvsp[(2) - (5)]); } +#line 214 "parse.y" /* yacc.c:1646 */ + { scon_stk_ptr = (yyvsp[-3]); } +#line 1619 "parse.c" /* yacc.c:1646 */ break; case 26: - -/* Line 1806 of yacc.c */ -#line 219 "parse.y" +#line 219 "parse.y" /* yacc.c:1646 */ { /* Initialize for a parse of one rule. */ trlcontxt = variable_trail_rule = varlength = false; @@ -1826,14 +1630,13 @@ yyreduce: new_rule(); } +#line 1634 "parse.c" /* yacc.c:1646 */ break; case 27: - -/* Line 1806 of yacc.c */ -#line 232 "parse.y" +#line 232 "parse.y" /* yacc.c:1646 */ { - pat = (yyvsp[(2) - (2)]); + pat = (yyvsp[0]); finish_rule( pat, variable_trail_rule, headcnt, trailcnt , previous_continued_action); @@ -1866,14 +1669,13 @@ yyreduce: "'^' operator results in sub-optimal performance" ); } } +#line 1673 "parse.c" /* yacc.c:1646 */ break; case 28: - -/* Line 1806 of yacc.c */ -#line 268 "parse.y" +#line 268 "parse.y" /* yacc.c:1646 */ { - pat = (yyvsp[(1) - (1)]); + pat = (yyvsp[0]); finish_rule( pat, variable_trail_rule, headcnt, trailcnt , previous_continued_action); @@ -1894,12 +1696,11 @@ yyreduce: pat ); } } +#line 1700 "parse.c" /* yacc.c:1646 */ break; case 29: - -/* Line 1806 of yacc.c */ -#line 292 "parse.y" +#line 292 "parse.y" /* yacc.c:1646 */ { if ( scon_stk_ptr > 0 ) build_eof_action(); @@ -1921,33 +1722,29 @@ yyreduce: build_eof_action(); } } +#line 1726 "parse.c" /* yacc.c:1646 */ break; case 30: - -/* Line 1806 of yacc.c */ -#line 315 "parse.y" +#line 315 "parse.y" /* yacc.c:1646 */ { synerr( _("unrecognized rule") ); } +#line 1732 "parse.c" /* yacc.c:1646 */ break; case 31: - -/* Line 1806 of yacc.c */ -#line 319 "parse.y" +#line 319 "parse.y" /* yacc.c:1646 */ { (yyval) = scon_stk_ptr; } +#line 1738 "parse.c" /* yacc.c:1646 */ break; case 32: - -/* Line 1806 of yacc.c */ -#line 323 "parse.y" - { (yyval) = (yyvsp[(2) - (4)]); } +#line 323 "parse.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[-2]); } +#line 1744 "parse.c" /* yacc.c:1646 */ break; case 33: - -/* Line 1806 of yacc.c */ -#line 326 "parse.y" +#line 326 "parse.y" /* yacc.c:1646 */ { (yyval) = scon_stk_ptr; @@ -1963,26 +1760,23 @@ yyreduce: scon_stk[++scon_stk_ptr] = i; } } +#line 1764 "parse.c" /* yacc.c:1646 */ break; case 34: - -/* Line 1806 of yacc.c */ -#line 343 "parse.y" +#line 343 "parse.y" /* yacc.c:1646 */ { (yyval) = scon_stk_ptr; } +#line 1770 "parse.c" /* yacc.c:1646 */ break; case 37: - -/* Line 1806 of yacc.c */ -#line 351 "parse.y" +#line 351 "parse.y" /* yacc.c:1646 */ { synerr( _("bad start condition list") ); } +#line 1776 "parse.c" /* yacc.c:1646 */ break; case 38: - -/* Line 1806 of yacc.c */ -#line 355 "parse.y" +#line 355 "parse.y" /* yacc.c:1646 */ { if ( (scnum = sclookup( nmstr )) == 0 ) format_pinpoint_message( @@ -2003,22 +1797,21 @@ yyreduce: scon_stk[++scon_stk_ptr] = scnum; } } +#line 1801 "parse.c" /* yacc.c:1646 */ break; case 39: - -/* Line 1806 of yacc.c */ -#line 378 "parse.y" +#line 378 "parse.y" /* yacc.c:1646 */ { - if ( transchar[lastst[(yyvsp[(2) - (2)])]] != SYM_EPSILON ) + if ( transchar[lastst[(yyvsp[0])]] != SYM_EPSILON ) /* Provide final transition \now/ so it * will be marked as a trailing context * state. */ - (yyvsp[(2) - (2)]) = link_machines( (yyvsp[(2) - (2)]), + (yyvsp[0]) = link_machines( (yyvsp[0]), mkstate( SYM_EPSILON ) ); - mark_beginning_as_normal( (yyvsp[(2) - (2)]) ); + mark_beginning_as_normal( (yyvsp[0]) ); current_state_type = STATE_NORMAL; if ( previous_continued_action ) @@ -2053,7 +1846,7 @@ yyreduce: * trail rule, and add_accept() can create * a new state ... */ - add_accept( (yyvsp[(1) - (2)]), + add_accept( (yyvsp[-1]), num_rules | YY_TRAILING_HEAD_MASK ); variable_trail_rule = true; } @@ -2061,21 +1854,19 @@ yyreduce: else trailcnt = rulelen; - (yyval) = link_machines( (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]) ); + (yyval) = link_machines( (yyvsp[-1]), (yyvsp[0]) ); } +#line 1860 "parse.c" /* yacc.c:1646 */ break; case 40: - -/* Line 1806 of yacc.c */ -#line 434 "parse.y" +#line 434 "parse.y" /* yacc.c:1646 */ { synerr( _("trailing context used twice") ); } +#line 1866 "parse.c" /* yacc.c:1646 */ break; case 41: - -/* Line 1806 of yacc.c */ -#line 437 "parse.y" +#line 437 "parse.y" /* yacc.c:1646 */ { headcnt = 0; trailcnt = 1; @@ -2106,7 +1897,7 @@ yyreduce: /* Again, see the comment in the rule for * "re2 re" above. */ - add_accept( (yyvsp[(1) - (2)]), + add_accept( (yyvsp[-1]), num_rules | YY_TRAILING_HEAD_MASK ); variable_trail_rule = true; } @@ -2114,17 +1905,16 @@ yyreduce: trlcontxt = true; eps = mkstate( SYM_EPSILON ); - (yyval) = link_machines( (yyvsp[(1) - (2)]), + (yyval) = link_machines( (yyvsp[-1]), link_machines( eps, mkstate( '\n' ) ) ); } +#line 1912 "parse.c" /* yacc.c:1646 */ break; case 42: - -/* Line 1806 of yacc.c */ -#line 480 "parse.y" +#line 480 "parse.y" /* yacc.c:1646 */ { - (yyval) = (yyvsp[(1) - (1)]); + (yyval) = (yyvsp[0]); if ( trlcontxt ) { @@ -2137,29 +1927,26 @@ yyreduce: trailcnt = rulelen; } } +#line 1931 "parse.c" /* yacc.c:1646 */ break; case 43: - -/* Line 1806 of yacc.c */ -#line 498 "parse.y" +#line 498 "parse.y" /* yacc.c:1646 */ { varlength = true; - (yyval) = mkor( (yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]) ); + (yyval) = mkor( (yyvsp[-2]), (yyvsp[0]) ); } +#line 1940 "parse.c" /* yacc.c:1646 */ break; case 44: - -/* Line 1806 of yacc.c */ -#line 504 "parse.y" - { (yyval) = (yyvsp[(1) - (1)]); } +#line 504 "parse.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 1946 "parse.c" /* yacc.c:1646 */ break; case 45: - -/* Line 1806 of yacc.c */ -#line 509 "parse.y" +#line 509 "parse.y" /* yacc.c:1646 */ { /* This rule is written separately so the * reduction will occur before the trailing @@ -2182,83 +1969,78 @@ yyreduce: rulelen = 0; current_state_type = STATE_TRAILING_CONTEXT; - (yyval) = (yyvsp[(1) - (2)]); + (yyval) = (yyvsp[-1]); } +#line 1975 "parse.c" /* yacc.c:1646 */ break; case 46: - -/* Line 1806 of yacc.c */ -#line 536 "parse.y" +#line 536 "parse.y" /* yacc.c:1646 */ { /* This is where concatenation of adjacent patterns * gets done. */ - (yyval) = link_machines( (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]) ); + (yyval) = link_machines( (yyvsp[-1]), (yyvsp[0]) ); } +#line 1986 "parse.c" /* yacc.c:1646 */ break; case 47: - -/* Line 1806 of yacc.c */ -#line 544 "parse.y" - { (yyval) = (yyvsp[(1) - (1)]); } +#line 544 "parse.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[0]); } +#line 1992 "parse.c" /* yacc.c:1646 */ break; case 48: - -/* Line 1806 of yacc.c */ -#line 547 "parse.y" +#line 547 "parse.y" /* yacc.c:1646 */ { varlength = true; - if ( (yyvsp[(3) - (6)]) > (yyvsp[(5) - (6)]) || (yyvsp[(3) - (6)]) < 0 ) + if ( (yyvsp[-3]) > (yyvsp[-1]) || (yyvsp[-3]) < 0 ) { synerr( _("bad iteration values") ); - (yyval) = (yyvsp[(1) - (6)]); + (yyval) = (yyvsp[-5]); } else { - if ( (yyvsp[(3) - (6)]) == 0 ) + if ( (yyvsp[-3]) == 0 ) { - if ( (yyvsp[(5) - (6)]) <= 0 ) + if ( (yyvsp[-1]) <= 0 ) { synerr( _("bad iteration values") ); - (yyval) = (yyvsp[(1) - (6)]); + (yyval) = (yyvsp[-5]); } else (yyval) = mkopt( - mkrep( (yyvsp[(1) - (6)]), 1, (yyvsp[(5) - (6)]) ) ); + mkrep( (yyvsp[-5]), 1, (yyvsp[-1]) ) ); } else - (yyval) = mkrep( (yyvsp[(1) - (6)]), (yyvsp[(3) - (6)]), (yyvsp[(5) - (6)]) ); + (yyval) = mkrep( (yyvsp[-5]), (yyvsp[-3]), (yyvsp[-1]) ); } } +#line 2023 "parse.c" /* yacc.c:1646 */ break; case 49: - -/* Line 1806 of yacc.c */ -#line 575 "parse.y" +#line 575 "parse.y" /* yacc.c:1646 */ { varlength = true; - if ( (yyvsp[(3) - (5)]) <= 0 ) + if ( (yyvsp[-2]) <= 0 ) { synerr( _("iteration value must be positive") ); - (yyval) = (yyvsp[(1) - (5)]); + (yyval) = (yyvsp[-4]); } else - (yyval) = mkrep( (yyvsp[(1) - (5)]), (yyvsp[(3) - (5)]), INFINITE_REPEAT ); + (yyval) = mkrep( (yyvsp[-4]), (yyvsp[-2]), INFINITE_REPEAT ); } +#line 2040 "parse.c" /* yacc.c:1646 */ break; case 50: - -/* Line 1806 of yacc.c */ -#line 589 "parse.y" +#line 589 "parse.y" /* yacc.c:1646 */ { /* The series could be something like "(foo)", * in which case we have no idea what its length @@ -2266,104 +2048,98 @@ yyreduce: */ varlength = true; - if ( (yyvsp[(3) - (4)]) <= 0 ) + if ( (yyvsp[-1]) <= 0 ) { synerr( _("iteration value must be positive") ); - (yyval) = (yyvsp[(1) - (4)]); + (yyval) = (yyvsp[-3]); } else - (yyval) = link_machines( (yyvsp[(1) - (4)]), - copysingl( (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]) - 1 ) ); + (yyval) = link_machines( (yyvsp[-3]), + copysingl( (yyvsp[-3]), (yyvsp[-1]) - 1 ) ); } +#line 2063 "parse.c" /* yacc.c:1646 */ break; case 51: - -/* Line 1806 of yacc.c */ -#line 611 "parse.y" +#line 611 "parse.y" /* yacc.c:1646 */ { varlength = true; - (yyval) = mkclos( (yyvsp[(1) - (2)]) ); + (yyval) = mkclos( (yyvsp[-1]) ); } +#line 2073 "parse.c" /* yacc.c:1646 */ break; case 52: - -/* Line 1806 of yacc.c */ -#line 618 "parse.y" +#line 618 "parse.y" /* yacc.c:1646 */ { varlength = true; - (yyval) = mkposcl( (yyvsp[(1) - (2)]) ); + (yyval) = mkposcl( (yyvsp[-1]) ); } +#line 2082 "parse.c" /* yacc.c:1646 */ break; case 53: - -/* Line 1806 of yacc.c */ -#line 624 "parse.y" +#line 624 "parse.y" /* yacc.c:1646 */ { varlength = true; - (yyval) = mkopt( (yyvsp[(1) - (2)]) ); + (yyval) = mkopt( (yyvsp[-1]) ); } +#line 2091 "parse.c" /* yacc.c:1646 */ break; case 54: - -/* Line 1806 of yacc.c */ -#line 630 "parse.y" +#line 630 "parse.y" /* yacc.c:1646 */ { varlength = true; - if ( (yyvsp[(3) - (6)]) > (yyvsp[(5) - (6)]) || (yyvsp[(3) - (6)]) < 0 ) + if ( (yyvsp[-3]) > (yyvsp[-1]) || (yyvsp[-3]) < 0 ) { synerr( _("bad iteration values") ); - (yyval) = (yyvsp[(1) - (6)]); + (yyval) = (yyvsp[-5]); } else { - if ( (yyvsp[(3) - (6)]) == 0 ) + if ( (yyvsp[-3]) == 0 ) { - if ( (yyvsp[(5) - (6)]) <= 0 ) + if ( (yyvsp[-1]) <= 0 ) { synerr( _("bad iteration values") ); - (yyval) = (yyvsp[(1) - (6)]); + (yyval) = (yyvsp[-5]); } else (yyval) = mkopt( - mkrep( (yyvsp[(1) - (6)]), 1, (yyvsp[(5) - (6)]) ) ); + mkrep( (yyvsp[-5]), 1, (yyvsp[-1]) ) ); } else - (yyval) = mkrep( (yyvsp[(1) - (6)]), (yyvsp[(3) - (6)]), (yyvsp[(5) - (6)]) ); + (yyval) = mkrep( (yyvsp[-5]), (yyvsp[-3]), (yyvsp[-1]) ); } } +#line 2122 "parse.c" /* yacc.c:1646 */ break; case 55: - -/* Line 1806 of yacc.c */ -#line 658 "parse.y" +#line 658 "parse.y" /* yacc.c:1646 */ { varlength = true; - if ( (yyvsp[(3) - (5)]) <= 0 ) + if ( (yyvsp[-2]) <= 0 ) { synerr( _("iteration value must be positive") ); - (yyval) = (yyvsp[(1) - (5)]); + (yyval) = (yyvsp[-4]); } else - (yyval) = mkrep( (yyvsp[(1) - (5)]), (yyvsp[(3) - (5)]), INFINITE_REPEAT ); + (yyval) = mkrep( (yyvsp[-4]), (yyvsp[-2]), INFINITE_REPEAT ); } +#line 2139 "parse.c" /* yacc.c:1646 */ break; case 56: - -/* Line 1806 of yacc.c */ -#line 672 "parse.y" +#line 672 "parse.y" /* yacc.c:1646 */ { /* The singleton could be something like "(foo)", * in which case we have no idea what its length @@ -2371,22 +2147,21 @@ yyreduce: */ varlength = true; - if ( (yyvsp[(3) - (4)]) <= 0 ) + if ( (yyvsp[-1]) <= 0 ) { synerr( _("iteration value must be positive") ); - (yyval) = (yyvsp[(1) - (4)]); + (yyval) = (yyvsp[-3]); } else - (yyval) = link_machines( (yyvsp[(1) - (4)]), - copysingl( (yyvsp[(1) - (4)]), (yyvsp[(3) - (4)]) - 1 ) ); + (yyval) = link_machines( (yyvsp[-3]), + copysingl( (yyvsp[-3]), (yyvsp[-1]) - 1 ) ); } +#line 2161 "parse.c" /* yacc.c:1646 */ break; case 57: - -/* Line 1806 of yacc.c */ -#line 691 "parse.y" +#line 691 "parse.y" /* yacc.c:1646 */ { if ( ! madeany ) { @@ -2419,111 +2194,101 @@ yyreduce: else (yyval) = mkstate( -ccldot ); } +#line 2198 "parse.c" /* yacc.c:1646 */ break; case 58: - -/* Line 1806 of yacc.c */ -#line 725 "parse.y" +#line 725 "parse.y" /* yacc.c:1646 */ { /* Sort characters for fast searching. */ - qsort( ccltbl + cclmap[(yyvsp[(1) - (1)])], ccllen[(yyvsp[(1) - (1)])], sizeof (*ccltbl), cclcmp ); + qsort( ccltbl + cclmap[(yyvsp[0])], ccllen[(yyvsp[0])], sizeof (*ccltbl), cclcmp ); if ( useecs ) - mkeccl( ccltbl + cclmap[(yyvsp[(1) - (1)])], ccllen[(yyvsp[(1) - (1)])], + mkeccl( ccltbl + cclmap[(yyvsp[0])], ccllen[(yyvsp[0])], nextecm, ecgroup, csize, csize ); ++rulelen; - if (ccl_has_nl[(yyvsp[(1) - (1)])]) + if (ccl_has_nl[(yyvsp[0])]) rule_has_nl[num_rules] = true; - (yyval) = mkstate( -(yyvsp[(1) - (1)]) ); + (yyval) = mkstate( -(yyvsp[0]) ); } +#line 2219 "parse.c" /* yacc.c:1646 */ break; case 59: - -/* Line 1806 of yacc.c */ -#line 743 "parse.y" +#line 743 "parse.y" /* yacc.c:1646 */ { ++rulelen; - if (ccl_has_nl[(yyvsp[(1) - (1)])]) + if (ccl_has_nl[(yyvsp[0])]) rule_has_nl[num_rules] = true; - (yyval) = mkstate( -(yyvsp[(1) - (1)]) ); + (yyval) = mkstate( -(yyvsp[0]) ); } +#line 2232 "parse.c" /* yacc.c:1646 */ break; case 60: - -/* Line 1806 of yacc.c */ -#line 753 "parse.y" - { (yyval) = (yyvsp[(2) - (3)]); } +#line 753 "parse.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[-1]); } +#line 2238 "parse.c" /* yacc.c:1646 */ break; case 61: - -/* Line 1806 of yacc.c */ -#line 756 "parse.y" - { (yyval) = (yyvsp[(2) - (3)]); } +#line 756 "parse.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[-1]); } +#line 2244 "parse.c" /* yacc.c:1646 */ break; case 62: - -/* Line 1806 of yacc.c */ -#line 759 "parse.y" +#line 759 "parse.y" /* yacc.c:1646 */ { ++rulelen; - if ((yyvsp[(1) - (1)]) == nlch) + if ((yyvsp[0]) == nlch) rule_has_nl[num_rules] = true; - if (sf_case_ins() && has_case((yyvsp[(1) - (1)]))) + if (sf_case_ins() && has_case((yyvsp[0]))) /* create an alternation, as in (a|A) */ - (yyval) = mkor (mkstate((yyvsp[(1) - (1)])), mkstate(reverse_case((yyvsp[(1) - (1)])))); + (yyval) = mkor (mkstate((yyvsp[0])), mkstate(reverse_case((yyvsp[0])))); else - (yyval) = mkstate( (yyvsp[(1) - (1)]) ); + (yyval) = mkstate( (yyvsp[0]) ); } +#line 2261 "parse.c" /* yacc.c:1646 */ break; case 63: - -/* Line 1806 of yacc.c */ -#line 773 "parse.y" - { (yyval) = ccl_set_diff ((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); } +#line 773 "parse.y" /* yacc.c:1646 */ + { (yyval) = ccl_set_diff ((yyvsp[-2]), (yyvsp[0])); } +#line 2267 "parse.c" /* yacc.c:1646 */ break; case 64: - -/* Line 1806 of yacc.c */ -#line 774 "parse.y" - { (yyval) = ccl_set_union ((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); } +#line 774 "parse.y" /* yacc.c:1646 */ + { (yyval) = ccl_set_union ((yyvsp[-2]), (yyvsp[0])); } +#line 2273 "parse.c" /* yacc.c:1646 */ break; case 66: - -/* Line 1806 of yacc.c */ -#line 780 "parse.y" - { (yyval) = (yyvsp[(2) - (3)]); } +#line 780 "parse.y" /* yacc.c:1646 */ + { (yyval) = (yyvsp[-1]); } +#line 2279 "parse.c" /* yacc.c:1646 */ break; case 67: - -/* Line 1806 of yacc.c */ -#line 783 "parse.y" +#line 783 "parse.y" /* yacc.c:1646 */ { - cclnegate( (yyvsp[(3) - (4)]) ); - (yyval) = (yyvsp[(3) - (4)]); + cclnegate( (yyvsp[-1]) ); + (yyval) = (yyvsp[-1]); } +#line 2288 "parse.c" /* yacc.c:1646 */ break; case 68: - -/* Line 1806 of yacc.c */ -#line 790 "parse.y" +#line 790 "parse.y" /* yacc.c:1646 */ { if (sf_case_ins()) @@ -2534,316 +2299,286 @@ yyreduce: * sure what range the user is trying to express. * Examples: [@-z] or [S-t] */ - if (has_case ((yyvsp[(2) - (4)])) != has_case ((yyvsp[(4) - (4)])) - || (has_case ((yyvsp[(2) - (4)])) && (b_islower ((yyvsp[(2) - (4)])) != b_islower ((yyvsp[(4) - (4)])))) - || (has_case ((yyvsp[(2) - (4)])) && (b_isupper ((yyvsp[(2) - (4)])) != b_isupper ((yyvsp[(4) - (4)]))))) + if (has_case ((yyvsp[-2])) != has_case ((yyvsp[0])) + || (has_case ((yyvsp[-2])) && (b_islower ((yyvsp[-2])) != b_islower ((yyvsp[0])))) + || (has_case ((yyvsp[-2])) && (b_isupper ((yyvsp[-2])) != b_isupper ((yyvsp[0]))))) format_warn3 ( _("the character range [%c-%c] is ambiguous in a case-insensitive scanner"), - (yyvsp[(2) - (4)]), (yyvsp[(4) - (4)])); + (yyvsp[-2]), (yyvsp[0])); /* If the range spans uppercase characters but not * lowercase (or vice-versa), then should we automatically * include lowercase characters in the range? * Example: [@-_] spans [a-z] but not [A-Z] */ - else if (!has_case ((yyvsp[(2) - (4)])) && !has_case ((yyvsp[(4) - (4)])) && !range_covers_case ((yyvsp[(2) - (4)]), (yyvsp[(4) - (4)]))) + else if (!has_case ((yyvsp[-2])) && !has_case ((yyvsp[0])) && !range_covers_case ((yyvsp[-2]), (yyvsp[0]))) format_warn3 ( _("the character range [%c-%c] is ambiguous in a case-insensitive scanner"), - (yyvsp[(2) - (4)]), (yyvsp[(4) - (4)])); + (yyvsp[-2]), (yyvsp[0])); } - if ( (yyvsp[(2) - (4)]) > (yyvsp[(4) - (4)]) ) + if ( (yyvsp[-2]) > (yyvsp[0]) ) synerr( _("negative range in character class") ); else { - for ( i = (yyvsp[(2) - (4)]); i <= (yyvsp[(4) - (4)]); ++i ) - ccladd( (yyvsp[(1) - (4)]), i ); + for ( i = (yyvsp[-2]); i <= (yyvsp[0]); ++i ) + ccladd( (yyvsp[-3]), i ); /* Keep track if this ccl is staying in * alphabetical order. */ - cclsorted = cclsorted && ((yyvsp[(2) - (4)]) > lastchar); - lastchar = (yyvsp[(4) - (4)]); + cclsorted = cclsorted && ((yyvsp[-2]) > lastchar); + lastchar = (yyvsp[0]); /* Do it again for upper/lowercase */ - if (sf_case_ins() && has_case((yyvsp[(2) - (4)])) && has_case((yyvsp[(4) - (4)]))){ - (yyvsp[(2) - (4)]) = reverse_case ((yyvsp[(2) - (4)])); - (yyvsp[(4) - (4)]) = reverse_case ((yyvsp[(4) - (4)])); + if (sf_case_ins() && has_case((yyvsp[-2])) && has_case((yyvsp[0]))){ + (yyvsp[-2]) = reverse_case ((yyvsp[-2])); + (yyvsp[0]) = reverse_case ((yyvsp[0])); - for ( i = (yyvsp[(2) - (4)]); i <= (yyvsp[(4) - (4)]); ++i ) - ccladd( (yyvsp[(1) - (4)]), i ); + for ( i = (yyvsp[-2]); i <= (yyvsp[0]); ++i ) + ccladd( (yyvsp[-3]), i ); - cclsorted = cclsorted && ((yyvsp[(2) - (4)]) > lastchar); - lastchar = (yyvsp[(4) - (4)]); + cclsorted = cclsorted && ((yyvsp[-2]) > lastchar); + lastchar = (yyvsp[0]); } } - (yyval) = (yyvsp[(1) - (4)]); + (yyval) = (yyvsp[-3]); } +#line 2351 "parse.c" /* yacc.c:1646 */ break; case 69: - -/* Line 1806 of yacc.c */ -#line 850 "parse.y" +#line 850 "parse.y" /* yacc.c:1646 */ { - ccladd( (yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]) ); - cclsorted = cclsorted && ((yyvsp[(2) - (2)]) > lastchar); - lastchar = (yyvsp[(2) - (2)]); + ccladd( (yyvsp[-1]), (yyvsp[0]) ); + cclsorted = cclsorted && ((yyvsp[0]) > lastchar); + lastchar = (yyvsp[0]); /* Do it again for upper/lowercase */ - if (sf_case_ins() && has_case((yyvsp[(2) - (2)]))){ - (yyvsp[(2) - (2)]) = reverse_case ((yyvsp[(2) - (2)])); - ccladd ((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); + if (sf_case_ins() && has_case((yyvsp[0]))){ + (yyvsp[0]) = reverse_case ((yyvsp[0])); + ccladd ((yyvsp[-1]), (yyvsp[0])); - cclsorted = cclsorted && ((yyvsp[(2) - (2)]) > lastchar); - lastchar = (yyvsp[(2) - (2)]); + cclsorted = cclsorted && ((yyvsp[0]) > lastchar); + lastchar = (yyvsp[0]); } - (yyval) = (yyvsp[(1) - (2)]); + (yyval) = (yyvsp[-1]); } +#line 2372 "parse.c" /* yacc.c:1646 */ break; case 70: - -/* Line 1806 of yacc.c */ -#line 868 "parse.y" +#line 868 "parse.y" /* yacc.c:1646 */ { /* Too hard to properly maintain cclsorted. */ cclsorted = false; - (yyval) = (yyvsp[(1) - (2)]); + (yyval) = (yyvsp[-1]); } +#line 2382 "parse.c" /* yacc.c:1646 */ break; case 71: - -/* Line 1806 of yacc.c */ -#line 875 "parse.y" +#line 875 "parse.y" /* yacc.c:1646 */ { cclsorted = true; lastchar = 0; currccl = (yyval) = cclinit(); } +#line 2392 "parse.c" /* yacc.c:1646 */ break; case 72: - -/* Line 1806 of yacc.c */ -#line 883 "parse.y" +#line 883 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isalnum); } +#line 2398 "parse.c" /* yacc.c:1646 */ break; case 73: - -/* Line 1806 of yacc.c */ -#line 884 "parse.y" +#line 884 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isalpha); } +#line 2404 "parse.c" /* yacc.c:1646 */ break; case 74: - -/* Line 1806 of yacc.c */ -#line 885 "parse.y" +#line 885 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(IS_BLANK); } +#line 2410 "parse.c" /* yacc.c:1646 */ break; case 75: - -/* Line 1806 of yacc.c */ -#line 886 "parse.y" +#line 886 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(iscntrl); } +#line 2416 "parse.c" /* yacc.c:1646 */ break; case 76: - -/* Line 1806 of yacc.c */ -#line 887 "parse.y" +#line 887 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isdigit); } +#line 2422 "parse.c" /* yacc.c:1646 */ break; case 77: - -/* Line 1806 of yacc.c */ -#line 888 "parse.y" +#line 888 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isgraph); } +#line 2428 "parse.c" /* yacc.c:1646 */ break; case 78: - -/* Line 1806 of yacc.c */ -#line 889 "parse.y" +#line 889 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(islower); if (sf_case_ins()) CCL_EXPR(isupper); } +#line 2438 "parse.c" /* yacc.c:1646 */ break; case 79: - -/* Line 1806 of yacc.c */ -#line 894 "parse.y" +#line 894 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isprint); } +#line 2444 "parse.c" /* yacc.c:1646 */ break; case 80: - -/* Line 1806 of yacc.c */ -#line 895 "parse.y" +#line 895 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(ispunct); } +#line 2450 "parse.c" /* yacc.c:1646 */ break; case 81: - -/* Line 1806 of yacc.c */ -#line 896 "parse.y" +#line 896 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isspace); } +#line 2456 "parse.c" /* yacc.c:1646 */ break; case 82: - -/* Line 1806 of yacc.c */ -#line 897 "parse.y" +#line 897 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isxdigit); } +#line 2462 "parse.c" /* yacc.c:1646 */ break; case 83: - -/* Line 1806 of yacc.c */ -#line 898 "parse.y" +#line 898 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isupper); if (sf_case_ins()) CCL_EXPR(islower); } +#line 2472 "parse.c" /* yacc.c:1646 */ break; case 84: - -/* Line 1806 of yacc.c */ -#line 904 "parse.y" +#line 904 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isalnum); } +#line 2478 "parse.c" /* yacc.c:1646 */ break; case 85: - -/* Line 1806 of yacc.c */ -#line 905 "parse.y" +#line 905 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isalpha); } +#line 2484 "parse.c" /* yacc.c:1646 */ break; case 86: - -/* Line 1806 of yacc.c */ -#line 906 "parse.y" +#line 906 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(IS_BLANK); } +#line 2490 "parse.c" /* yacc.c:1646 */ break; case 87: - -/* Line 1806 of yacc.c */ -#line 907 "parse.y" +#line 907 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(iscntrl); } +#line 2496 "parse.c" /* yacc.c:1646 */ break; case 88: - -/* Line 1806 of yacc.c */ -#line 908 "parse.y" +#line 908 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isdigit); } +#line 2502 "parse.c" /* yacc.c:1646 */ break; case 89: - -/* Line 1806 of yacc.c */ -#line 909 "parse.y" +#line 909 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isgraph); } +#line 2508 "parse.c" /* yacc.c:1646 */ break; case 90: - -/* Line 1806 of yacc.c */ -#line 910 "parse.y" +#line 910 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isprint); } +#line 2514 "parse.c" /* yacc.c:1646 */ break; case 91: - -/* Line 1806 of yacc.c */ -#line 911 "parse.y" +#line 911 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(ispunct); } +#line 2520 "parse.c" /* yacc.c:1646 */ break; case 92: - -/* Line 1806 of yacc.c */ -#line 912 "parse.y" +#line 912 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isspace); } +#line 2526 "parse.c" /* yacc.c:1646 */ break; case 93: - -/* Line 1806 of yacc.c */ -#line 913 "parse.y" +#line 913 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isxdigit); } +#line 2532 "parse.c" /* yacc.c:1646 */ break; case 94: - -/* Line 1806 of yacc.c */ -#line 914 "parse.y" +#line 914 "parse.y" /* yacc.c:1646 */ { if ( sf_case_ins() ) warn(_("[:^lower:] is ambiguous in case insensitive scanner")); else CCL_NEG_EXPR(islower); } +#line 2543 "parse.c" /* yacc.c:1646 */ break; case 95: - -/* Line 1806 of yacc.c */ -#line 920 "parse.y" +#line 920 "parse.y" /* yacc.c:1646 */ { if ( sf_case_ins() ) warn(_("[:^upper:] ambiguous in case insensitive scanner")); else CCL_NEG_EXPR(isupper); } +#line 2554 "parse.c" /* yacc.c:1646 */ break; case 96: - -/* Line 1806 of yacc.c */ -#line 929 "parse.y" +#line 929 "parse.y" /* yacc.c:1646 */ { - if ( (yyvsp[(2) - (2)]) == nlch ) + if ( (yyvsp[0]) == nlch ) rule_has_nl[num_rules] = true; ++rulelen; - if (sf_case_ins() && has_case((yyvsp[(2) - (2)]))) - (yyval) = mkor (mkstate((yyvsp[(2) - (2)])), mkstate(reverse_case((yyvsp[(2) - (2)])))); + if (sf_case_ins() && has_case((yyvsp[0]))) + (yyval) = mkor (mkstate((yyvsp[0])), mkstate(reverse_case((yyvsp[0])))); else - (yyval) = mkstate ((yyvsp[(2) - (2)])); + (yyval) = mkstate ((yyvsp[0])); - (yyval) = link_machines( (yyvsp[(1) - (2)]), (yyval)); + (yyval) = link_machines( (yyvsp[-1]), (yyval)); } +#line 2572 "parse.c" /* yacc.c:1646 */ break; case 97: - -/* Line 1806 of yacc.c */ -#line 944 "parse.y" +#line 944 "parse.y" /* yacc.c:1646 */ { (yyval) = mkstate( SYM_EPSILON ); } +#line 2578 "parse.c" /* yacc.c:1646 */ break; - -/* Line 1806 of yacc.c */ -#line 2847 "parse.c" +#line 2582 "parse.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2865,7 +2600,7 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -2880,9 +2615,9 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -2933,20 +2668,20 @@ yyerrlab: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -2965,7 +2700,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -2978,35 +2713,37 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -3030,7 +2767,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -3049,14 +2786,14 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -3067,14 +2804,9 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - - -/* Line 2067 of yacc.c */ -#line 947 "parse.y" +#line 947 "parse.y" /* yacc.c:1906 */ @@ -3084,7 +2816,7 @@ yyreturn: void build_eof_action() { - register int i; + int i; char action_text[MAXLINE]; for ( i = 1; i <= scon_stk_ptr; ++i ) @@ -3217,5 +2949,5 @@ int line; void yyerror( msg ) const char *msg; { + (void)msg; } - @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 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 3 of the License, 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, see <http://www.gnu.org/licenses/>. */ @@ -26,63 +26,71 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +#ifndef YY_YY_PARSE_H_INCLUDED +# define YY_YY_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - CHAR = 258, - NUMBER = 259, - SECTEND = 260, - SCDECL = 261, - XSCDECL = 262, - NAME = 263, - PREVCCL = 264, - EOF_OP = 265, - OPTION_OP = 266, - OPT_OUTFILE = 267, - OPT_PREFIX = 268, - OPT_YYCLASS = 269, - OPT_HEADER = 270, - OPT_EXTRA_TYPE = 271, - OPT_TABLES = 272, - CCE_ALNUM = 273, - CCE_ALPHA = 274, - CCE_BLANK = 275, - CCE_CNTRL = 276, - CCE_DIGIT = 277, - CCE_GRAPH = 278, - CCE_LOWER = 279, - CCE_PRINT = 280, - CCE_PUNCT = 281, - CCE_SPACE = 282, - CCE_UPPER = 283, - CCE_XDIGIT = 284, - CCE_NEG_ALNUM = 285, - CCE_NEG_ALPHA = 286, - CCE_NEG_BLANK = 287, - CCE_NEG_CNTRL = 288, - CCE_NEG_DIGIT = 289, - CCE_NEG_GRAPH = 290, - CCE_NEG_LOWER = 291, - CCE_NEG_PRINT = 292, - CCE_NEG_PUNCT = 293, - CCE_NEG_SPACE = 294, - CCE_NEG_UPPER = 295, - CCE_NEG_XDIGIT = 296, - CCL_OP_UNION = 297, - CCL_OP_DIFF = 298, - BEGIN_REPEAT_POSIX = 299, - END_REPEAT_POSIX = 300, - BEGIN_REPEAT_FLEX = 301, - END_REPEAT_FLEX = 302 - }; + enum yytokentype + { + CHAR = 258, + NUMBER = 259, + SECTEND = 260, + SCDECL = 261, + XSCDECL = 262, + NAME = 263, + PREVCCL = 264, + EOF_OP = 265, + OPTION_OP = 266, + OPT_OUTFILE = 267, + OPT_PREFIX = 268, + OPT_YYCLASS = 269, + OPT_HEADER = 270, + OPT_EXTRA_TYPE = 271, + OPT_TABLES = 272, + CCE_ALNUM = 273, + CCE_ALPHA = 274, + CCE_BLANK = 275, + CCE_CNTRL = 276, + CCE_DIGIT = 277, + CCE_GRAPH = 278, + CCE_LOWER = 279, + CCE_PRINT = 280, + CCE_PUNCT = 281, + CCE_SPACE = 282, + CCE_UPPER = 283, + CCE_XDIGIT = 284, + CCE_NEG_ALNUM = 285, + CCE_NEG_ALPHA = 286, + CCE_NEG_BLANK = 287, + CCE_NEG_CNTRL = 288, + CCE_NEG_DIGIT = 289, + CCE_NEG_GRAPH = 290, + CCE_NEG_LOWER = 291, + CCE_NEG_PRINT = 292, + CCE_NEG_PUNCT = 293, + CCE_NEG_SPACE = 294, + CCE_NEG_UPPER = 295, + CCE_NEG_XDIGIT = 296, + CCL_OP_DIFF = 297, + CCL_OP_UNION = 298, + BEGIN_REPEAT_POSIX = 299, + END_REPEAT_POSIX = 300, + BEGIN_REPEAT_FLEX = 301, + END_REPEAT_FLEX = 302 + }; #endif /* Tokens. */ #define CHAR 258 @@ -124,23 +132,23 @@ #define CCE_NEG_SPACE 294 #define CCE_NEG_UPPER 295 #define CCE_NEG_XDIGIT 296 -#define CCL_OP_UNION 297 -#define CCL_OP_DIFF 298 +#define CCL_OP_DIFF 297 +#define CCL_OP_UNION 298 #define BEGIN_REPEAT_POSIX 299 #define END_REPEAT_POSIX 300 #define BEGIN_REPEAT_FLEX 301 #define END_REPEAT_FLEX 302 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; +int yyparse (void); +#endif /* !YY_YY_PARSE_H_INCLUDED */ @@ -953,7 +953,7 @@ string : string CHAR void build_eof_action() { - register int i; + int i; char action_text[MAXLINE]; for ( i = 1; i <= scon_stk_ptr; ++i ) @@ -1086,4 +1086,5 @@ int line; void yyerror( msg ) const char *msg; { + (void)msg; } @@ -113,7 +113,6 @@ char *regmatch_cpy (regmatch_t * m, char *dest, const char *src) /** Get the length in characters of the match. * @param m A match as returned by regexec(). - * @param src The source string that was passed to regexec(). * @return The length of the match. */ int regmatch_len (regmatch_t * m) @@ -8,8 +8,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0-pre #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -353,11 +353,17 @@ extern int yylineno; int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #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 ); +#if defined(__GNUC__) && __GNUC__ >= 3 +__attribute__((__noreturn__)) +#endif static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the @@ -380,272 +386,133 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[1223] = +static yyconst flex_int16_t yy_accept[1107] = { 0, - 248, 248, 252, 250, 251, 9, 250, 251, 20, 250, - 251, 250, 251, 18, 250, 251, 1, 9, 250, 251, - 19, 20, 250, 251, 250, 251, 250, 251, 250, 251, - 250, 251, 17, 18, 250, 251, 164, 250, 251, 149, - 164, 250, 251, 150, 250, 251, 164, 250, 251, 142, - 164, 250, 251, 164, 250, 251, 161, 163, 164, 250, - 251, 162, 163, 164, 250, 251, 163, 164, 250, 251, - 163, 164, 250, 251, 164, 250, 251, 164, 250, 251, - 164, 250, 251, 163, 164, 250, 251, 148, 149, 164, - 250, 251, 138, 150, 250, 251, 164, 250, 251, 164, - - 250, 251, 140, 164, 250, 251, 141, 164, 250, 251, - 136, 250, 251, 137, 250, 251, 136, 250, 251, 135, - 136, 250, 251, 134, 136, 250, 251, 135, 136, 250, - 251, 248, 249, 250, 251, 248, 249, 250, 251, 249, - 250, 251, 249, 250, 251, 41, 250, 251, 42, 250, - 251, 41, 250, 251, 41, 250, 251, 41, 250, 251, - 41, 250, 251, 41, 250, 251, 41, 250, 251, 50, - 250, 251, 49, 250, 251, 51, 250, 251, 250, 251, - 170, 250, 251, 170, 250, 251, 165, 250, 251, 170, - 250, 251, 166, 170, 250, 251, 167, 170, 250, 251, - - 169, 170, 250, 251, 171, 250, 251, 219, 250, 251, - 220, 250, 251, 219, 250, 251, 217, 219, 250, 251, - 216, 219, 250, 251, 218, 219, 250, 251, 172, 250, - 251, 174, 250, 251, 172, 250, 251, 173, 250, 251, - 172, 250, 251, 186, 250, 251, 186, 250, 251, 186, - 250, 251, 186, 250, 251, 188, 190, 250, 251, 190, - 250, 251, 188, 190, 250, 251, 188, 190, 250, 251, - 188, 190, 250, 251, 188, 190, 250, 251, 189, 190, - 250, 251, 233, 239, 250, 251, 238, 250, 251, 233, - 239, 250, 251, 237, 239, 250, 251, 239, 250, 251, - - 239, 250, 251, 235, 239, 250, 251, 235, 239, 250, - 251, 235, 239, 250, 251, 234, 239, 250, 251, 234, - 239, 250, 251, 229, 239, 250, 251, 230, 239, 250, - 251, 250, 251, 131, 250, 251, 250, 251, 25, 250, - 251, 26, 250, 251, 25, 250, 251, 22, 250, 251, - 25, 250, 251, 25, 250, 251, 240, 244, 250, 251, - 242, 250, 251, 240, 244, 250, 251, 243, 244, 250, - 251, 244, 250, 251, 227, 250, 251, 227, 250, 251, - 228, 250, 251, 227, 250, 251, 227, 250, 251, 227, - 250, 251, 227, 250, 251, 227, 250, 251, 227, 250, - - 251, 227, 250, 251, 130, 250, 251, 53, 130, 250, - 251, 52, 250, 251, 130, 250, 251, 130, 250, 251, - 130, 250, 251, 130, 250, 251, 54, 130, 250, 251, - 130, 250, 251, 130, 250, 251, 130, 250, 251, 130, - 250, 251, 130, 250, 251, 130, 250, 251, 130, 250, - 251, 130, 250, 251, 130, 250, 251, 130, 250, 251, - 130, 250, 251, 130, 250, 251, 130, 250, 251, 130, - 250, 251, 130, 250, 251, 130, 250, 251, 130, 250, - 251, 130, 250, 251, 130, 250, 251, 130, 250, 251, - 130, 250, 251, 37, 250, 251, 34, 250, 251, 37, - - 250, 251, 35, 37, 250, 251, 48, 250, 251, 45, - 250, 251, 250, 251, 48, 250, 251, 48, 250, 251, - 44, 250, 251, 43, 250, 251, 176, 250, 251, 175, - 250, 251, 177, 250, 251, 178, 250, 251, 179, 250, - 251, 180, 250, 251, 181, 250, 251, 182, 250, 251, - 183, 250, 251, 32, 250, 251, 33, 250, 251, 32, - 250, 251, 31, 250, 251, 29, 250, 251, 30, 250, - 251, 29, 250, 251, 28, 250, 251, 9, 20, 18, - 1, 9, 19, 20, 16, 10, 16, 4, 16, 5, - 2, 17, 18, 149, 150, 144, 160, 158, 154, 154, - - 245, 245, 245, 143, 148, 149, 138, 150, 140, 141, - 153, 139, 137, 135, 134, 134, 132, 135, 133, 135, - 248, 248, 246, 247, 42, 39, 40, 50, 49, 51, - 165, 165, 168, 169, 220, 216, 174, 184, 185, 190, - 187, 233, 238, 236, 222, 235, 235, 235, 231, 232, - 131, 26, 21, 23, 24, 240, 242, 241, 228, 221, - 225, 226, 53, 52, 129, 130, 130, 130, 130, 130, + 0, 0, 0, 0, 0, 0, 248, 248, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 252, 250, + 9, 20, 250, 18, 1, 19, 250, 250, 250, 250, + 17, 164, 149, 150, 164, 142, 164, 161, 162, 163, + 163, 164, 164, 164, 163, 148, 138, 164, 164, 140, + 141, 136, 137, 136, 135, 134, 135, 248, 248, 249, + 249, 41, 42, 41, 41, 41, 41, 41, 41, 50, + + 49, 51, 250, 170, 170, 165, 170, 166, 167, 169, + 171, 219, 220, 219, 217, 216, 218, 172, 174, 172, + 173, 172, 186, 186, 186, 186, 188, 190, 188, 188, + 188, 188, 189, 233, 238, 233, 237, 239, 239, 235, + 235, 235, 234, 234, 229, 230, 250, 131, 250, 25, + 26, 25, 22, 25, 25, 240, 242, 240, 243, 244, + 227, 227, 228, 227, 227, 227, 227, 227, 227, 227, + 130, 53, 52, 130, 130, 130, 130, 54, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 55, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 36, 35, 45, - - 46, 47, 32, 33, 30, 27, 16, 10, 16, 14, - 4, 16, 5, 6, 145, 146, 159, 154, 154, 154, - 154, 154, 245, 245, 156, 155, 157, 139, 145, 147, - 153, 132, 135, 133, 135, 38, 235, 235, 221, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 37, + + 34, 37, 35, 48, 45, 250, 48, 48, 44, 43, + 176, 175, 177, 178, 179, 180, 181, 182, 183, 32, + 33, 32, 31, 29, 30, 29, 28, 9, 20, 0, + 18, 1, 19, 0, 0, 0, 16, 10, 0, 0, + 0, 0, 4, 16, 5, 0, 2, 17, 149, 150, + 0, 0, 0, 144, 0, 160, 158, 0, 154, 154, + 0, 245, 245, 245, 0, 0, 143, 0, 148, 138, + 0, 0, 0, 140, 141, 153, 139, 0, 137, 135, + 134, 134, 132, 133, 248, 248, 246, 247, 42, 0, + 0, 39, 40, 0, 50, 49, 51, 0, 165, 0, + + 165, 168, 169, 220, 216, 174, 0, 184, 185, 190, + 187, 233, 238, 0, 236, 0, 222, 235, 235, 235, + 231, 232, 0, 131, 0, 26, 21, 23, 24, 240, + 242, 241, 0, 0, 228, 221, 225, 226, 53, 52, + 0, 129, 0, 0, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 55, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 0, 36, 35, 45, + 46, 47, 32, 33, 30, 27, 0, 16, 10, 0, + 14, 0, 0, 0, 0, 0, 4, 16, 5, 0, + + 6, 0, 145, 0, 146, 0, 159, 0, 154, 154, + 0, 154, 154, 154, 245, 245, 156, 155, 0, 157, + 139, 147, 0, 153, 0, 132, 133, 0, 0, 0, + 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 235, 235, 221, 0, 0, 130, 130, 130, 130, 130, 130, 130, 67, 130, 130, 130, - 130, 72, 130, 130, 130, 130, 130, 130, 130, 130, + 72, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 14, 15, 4, - 8, 16, 5, 154, 154, 154, 154, 154, 154, 154, + 130, 130, 130, 130, 130, 0, 0, 0, 0, 14, - 245, 157, 235, 235, 56, 57, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 73, 130, 74, - 130, 130, 130, 130, 130, 79, 130, 130, 130, 130, + 0, 0, 0, 0, 0, 0, 4, 8, 5, 0, + 154, 154, 154, 154, 154, 154, 154, 245, 157, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 235, 235, 56, 57, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 73, 74, 130, 130, 130, 130, 79, 130, 130, 130, 130, 130, 130, 130, 84, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 93, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 15, 8, 16, 8, - 16, 8, 16, 154, 154, 154, 154, 154, 154, 154, - 215, 235, 235, 58, 130, 130, 130, 60, 130, 130, - 64, 130, 130, 130, 130, 130, 70, 130, 130, 130, - 130, 75, 130, 130, 130, 130, 130, 130, 130, 130, - - 130, 130, 130, 130, 87, 130, 130, 130, 130, 130, - 91, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 3, 8, 16, 7, 8, 16, 154, 154, - 154, 223, 224, 223, 235, 224, 235, 130, 130, 130, - 63, 130, 130, 130, 130, 130, 130, 130, 130, 126, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 124, - 130, 130, 86, 130, 130, 89, 130, 130, 90, 130, - 130, 130, 130, 105, 130, 130, 95, 130, 130, 96, - 130, 12, 13, 152, 151, 152, 130, 130, 130, 130, - 130, 130, 130, 68, 130, 130, 71, 130, 130, 130, - - 130, 130, 130, 130, 123, 130, 130, 83, 130, 130, - 130, 88, 130, 130, 92, 130, 103, 130, 125, 130, - 130, 130, 151, 130, 130, 130, 130, 130, 130, 130, - 69, 130, 130, 130, 130, 130, 80, 130, 130, 130, - 130, 130, 130, 130, 114, 94, 130, 130, 115, 11, - 191, 215, 192, 215, 193, 215, 194, 215, 195, 215, - 196, 215, 197, 215, 198, 215, 199, 215, 200, 215, - 201, 215, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 85, 130, 130, 130, - 116, 104, 130, 117, 202, 215, 203, 215, 204, 215, - - 205, 215, 206, 215, 207, 215, 208, 215, 209, 215, - 210, 215, 211, 215, 212, 215, 213, 215, 130, 130, - 130, 130, 130, 130, 130, 122, 130, 130, 130, 77, - 130, 130, 130, 130, 130, 130, 110, 120, 118, 111, - 121, 119, 214, 215, 130, 130, 130, 130, 130, 130, - 130, 126, 130, 76, 130, 130, 82, 130, 130, 127, - 130, 130, 106, 108, 107, 109, 130, 130, 130, 65, - 130, 130, 130, 130, 130, 78, 130, 130, 112, 113, - 98, 99, 130, 130, 130, 130, 130, 130, 130, 128, - 130, 97, 101, 130, 130, 130, 130, 130, 68, 130, - - 130, 100, 102, 130, 130, 62, 130, 66, 130, 130, - 130, 130, 61, 130, 69, 130, 130, 130, 81, 130, - 59, 130 - } ; - -static yyconst flex_int16_t yy_accept[1108] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, - 6, 9, 12, 14, 17, 21, 25, 27, 29, 31, - 33, 37, 40, 44, 47, 50, 54, 57, 62, 67, - 71, 75, 78, 81, 84, 88, 93, 97, 100, 103, - 107, 111, 114, 117, 120, 124, 128, 132, 136, 140, - 143, 146, 149, 152, 155, 158, 161, 164, 167, 170, - - 173, 176, 179, 181, 184, 187, 190, 193, 197, 201, - 205, 208, 211, 214, 217, 221, 225, 229, 232, 235, - 238, 241, 244, 247, 250, 253, 256, 260, 263, 267, - 271, 275, 279, 283, 287, 290, 294, 298, 301, 304, - 308, 312, 316, 320, 324, 328, 332, 334, 337, 339, - 342, 345, 348, 351, 354, 357, 361, 364, 368, 372, - 375, 378, 381, 384, 387, 390, 393, 396, 399, 402, - 405, 408, 412, 415, 418, 421, 424, 427, 431, 434, - 437, 440, 443, 446, 449, 452, 455, 458, 461, 464, - 467, 470, 473, 476, 479, 482, 485, 488, 491, 494, - - 497, 500, 503, 507, 510, 513, 515, 518, 521, 524, - 527, 530, 533, 536, 539, 542, 545, 548, 551, 554, - 557, 560, 563, 566, 569, 572, 575, 578, 579, 580, - 580, 581, 583, 585, 585, 585, 585, 586, 588, 588, - 588, 588, 588, 589, 590, 591, 591, 592, 594, 595, - 596, 596, 596, 596, 597, 597, 598, 599, 599, 600, - 601, 601, 602, 603, 604, 604, 604, 605, 605, 607, - 609, 609, 609, 609, 610, 611, 612, 613, 613, 614, - 615, 616, 617, 619, 621, 622, 623, 624, 625, 626, - 626, 626, 627, 628, 628, 629, 630, 631, 631, 632, - - 632, 633, 634, 635, 636, 637, 638, 638, 639, 640, - 641, 642, 643, 644, 644, 645, 645, 646, 647, 648, - 649, 650, 651, 651, 652, 652, 653, 654, 655, 656, - 657, 658, 659, 659, 659, 660, 661, 662, 663, 664, - 665, 665, 666, 666, 666, 667, 668, 669, 670, 671, - 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, - 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, - 692, 693, 694, 695, 696, 697, 698, 698, 699, 700, - 701, 702, 703, 704, 705, 706, 707, 707, 708, 710, - 710, 711, 711, 711, 711, 711, 711, 712, 713, 714, - - 714, 715, 715, 716, 716, 717, 717, 718, 718, 719, - 720, 720, 721, 722, 723, 724, 725, 726, 727, 727, - 728, 730, 731, 731, 732, 732, 734, 736, 736, 736, - 736, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 738, 739, 740, 740, 740, - 741, 742, 743, 744, 745, 746, 747, 749, 750, 751, - 752, 754, 755, 756, 757, 758, 759, 760, 761, 762, - 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, - 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, - 783, 784, 785, 786, 787, 788, 788, 788, 788, 788, - - 790, 790, 790, 790, 790, 790, 790, 791, 793, 794, - 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, - 803, 803, 803, 803, 803, 803, 803, 803, 803, 803, - 803, 803, 803, 803, 803, 803, 803, 803, 803, 803, - 803, 803, 803, 803, 803, 803, 804, 805, 806, 807, - 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, - 818, 820, 822, 823, 824, 825, 826, 828, 829, 830, - 831, 832, 833, 834, 835, 837, 838, 839, 840, 841, - 842, 843, 844, 845, 846, 848, 849, 850, 851, 852, - 853, 854, 855, 856, 857, 857, 857, 857, 857, 858, - - 858, 858, 858, 858, 858, 860, 862, 864, 864, 865, - 866, 867, 868, 869, 870, 871, 871, 871, 871, 871, - 872, 872, 872, 872, 872, 872, 872, 872, 872, 872, - 872, 872, 872, 872, 872, 872, 872, 872, 872, 872, - 872, 872, 872, 872, 873, 874, 876, 877, 878, 880, - 881, 883, 884, 885, 886, 887, 889, 890, 891, 892, - 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, - 904, 905, 907, 908, 909, 910, 911, 913, 914, 915, - 916, 917, 918, 919, 920, 921, 922, 923, 923, 923, - 923, 923, 924, 924, 924, 924, 926, 927, 929, 929, - - 930, 931, 932, 932, 932, 933, 934, 934, 934, 934, - 934, 934, 934, 934, 934, 934, 934, 934, 934, 934, - 934, 934, 934, 934, 934, 934, 934, 934, 934, 934, - 934, 936, 938, 939, 940, 941, 943, 944, 945, 946, - 947, 948, 949, 950, 952, 953, 954, 955, 956, 957, - 958, 959, 960, 962, 963, 965, 966, 968, 969, 971, - 972, 973, 974, 976, 976, 977, 979, 980, 980, 982, - 982, 982, 982, 982, 982, 983, 983, 984, 984, 985, - 985, 987, 987, 987, 987, 987, 987, 987, 987, 987, - 987, 987, 987, 987, 987, 987, 987, 987, 987, 987, - - 987, 987, 987, 987, 987, 987, 988, 989, 990, 991, - 992, 993, 994, 996, 997, 999, 1000, 1001, 1002, 1003, - 1004, 1005, 1007, 1008, 1010, 1011, 1012, 1014, 1015, 1017, - 1019, 1021, 1021, 1021, 1021, 1021, 1021, 1021, 1022, 1023, - 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, - 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, - 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, - 1024, 1024, 1024, 1024, 1024, 1025, 1026, 1027, 1028, 1029, - 1030, 1031, 1033, 1034, 1035, 1036, 1037, 1039, 1040, 1041, - 1042, 1043, 1044, 1045, 1045, 1045, 1046, 1046, 1046, 1046, - - 1046, 1046, 1046, 1048, 1049, 1049, 1049, 1050, 1050, 1050, - 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1051, 1051, 1053, - 1055, 1057, 1059, 1061, 1063, 1065, 1067, 1069, 1071, 1073, - 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, - 1073, 1073, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, - 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1089, 1090, 1091, - 1091, 1091, 1091, 1091, 1091, 1091, 1092, 1092, 1094, 1094, - 1094, 1094, 1094, 1094, 1095, 1095, 1095, 1095, 1095, 1095, - 1097, 1099, 1101, 1103, 1105, 1107, 1109, 1111, 1113, 1115, - 1117, 1119, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, - - 1128, 1129, 1130, 1132, 1133, 1134, 1135, 1136, 1137, 1137, - 1137, 1138, 1138, 1139, 1140, 1141, 1141, 1141, 1141, 1142, - 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1145, 1146, 1147, - 1148, 1149, 1150, 1151, 1152, 1154, 1156, 1157, 1159, 1160, - 1162, 1163, 1164, 1165, 1165, 1166, 1167, 1167, 1167, 1167, - 1167, 1167, 1167, 1167, 1168, 1169, 1170, 1172, 1173, 1174, - 1175, 1176, 1178, 1179, 1180, 1181, 1182, 1182, 1182, 1182, - 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1192, - 1193, 1193, 1194, 1194, 1195, 1196, 1197, 1198, 1199, 1201, - 1202, 1203, 1204, 1205, 1206, 1208, 1210, 1211, 1212, 1213, - - 1215, 1217, 1218, 1219, 1221, 1223, 1223 + 130, 130, 130, 130, 93, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 0, 0, 0, 0, 15, 0, + + 0, 0, 0, 0, 8, 8, 8, 0, 154, 154, + 154, 154, 154, 154, 154, 0, 0, 0, 0, 215, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 235, 235, 58, 130, 130, 60, 130, + 64, 130, 130, 130, 130, 70, 130, 130, 130, 75, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 130, 87, 130, 130, 130, 130, 91, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 0, 0, 0, + 0, 3, 0, 0, 0, 8, 7, 8, 0, 154, + + 154, 154, 0, 0, 223, 224, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 223, 224, 130, 130, 130, 63, 130, 130, 130, 130, + 130, 130, 130, 126, 130, 130, 130, 130, 130, 130, + 130, 130, 124, 130, 86, 130, 89, 130, 90, 130, + 130, 130, 105, 0, 130, 95, 130, 0, 96, 0, + 0, 0, 0, 0, 12, 0, 13, 0, 152, 0, + 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 130, 130, 130, 130, 130, + 130, 130, 68, 130, 71, 130, 130, 130, 130, 130, + 130, 123, 130, 83, 130, 130, 88, 130, 92, 103, + 125, 0, 0, 0, 0, 0, 0, 130, 130, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 130, 130, 130, 130, 130, 130, + 130, 69, 130, 130, 130, 130, 80, 130, 130, 130, + 130, 130, 130, 0, 0, 114, 0, 0, 0, 0, + + 0, 0, 94, 130, 0, 0, 115, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 11, 0, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 130, 130, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 85, 130, 130, 0, + 0, 0, 0, 0, 0, 116, 0, 104, 0, 0, + 0, 0, 0, 117, 0, 0, 0, 0, 0, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 213, 0, 130, 130, 130, 130, 130, 130, 130, 122, + + 130, 130, 77, 130, 130, 130, 130, 130, 0, 0, + 110, 0, 120, 118, 111, 0, 0, 0, 121, 119, + 0, 0, 0, 0, 0, 0, 214, 130, 130, 130, + 130, 130, 130, 130, 126, 76, 130, 82, 130, 127, + 130, 106, 108, 0, 107, 109, 0, 0, 0, 0, + 0, 0, 0, 130, 130, 130, 65, 130, 130, 130, + 130, 78, 130, 112, 113, 98, 0, 0, 0, 0, + 99, 130, 130, 130, 130, 130, 130, 130, 128, 97, + 0, 101, 0, 130, 130, 130, 130, 130, 68, 130, + 100, 102, 130, 130, 62, 66, 130, 130, 130, 61, + + 69, 130, 130, 81, 59, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 4, 5, 1, 1, 1, 1, 1, 1, 1, @@ -677,7 +544,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[85] = +static yyconst YY_CHAR yy_meta[85] = { 0, 1, 1, 2, 1, 3, 4, 1, 1, 1, 5, 1, 6, 1, 7, 1, 8, 1, 5, 9, 9, @@ -690,7 +557,7 @@ static yyconst flex_int32_t yy_meta[85] = 12, 5, 1, 17 } ; -static yyconst flex_int16_t yy_base[1201] = +static yyconst flex_uint16_t yy_base[1201] = { 0, 0, 84, 167, 250, 171, 184, 174, 179, 192, 233, 196, 200, 334, 0, 3343, 3340, 203, 416, 206, 211, @@ -962,7 +829,7 @@ static yyconst flex_int16_t yy_def[1201] = } ; -static yyconst flex_int16_t yy_nxt[4060] = +static yyconst flex_uint16_t yy_nxt[4060] = { 0, 50, 51, 52, 50, 53, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, @@ -1862,20 +1729,16 @@ static yyconst flex_int16_t yy_chk[4060] = 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106, 1106 } ; +static yy_state_type yy_last_accepting_state; +static char *yy_last_accepting_cpos; + extern int yy_flex_debug; int yy_flex_debug = 0; -static yy_state_type *yy_state_buf=0, *yy_state_ptr=0; -static char *yy_full_match; -static int yy_lp; -#define REJECT \ -{ \ -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \ -yy_cp = (yy_full_match); /* restore poss. backed-over text */ \ -++(yy_lp); \ -goto find_rule; \ -} - +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected static int yy_more_flag = 0; static int yy_more_len = 0; #define yymore() ((yy_more_flag) = 1) @@ -1984,7 +1847,7 @@ extern const char *escaped_qstart, *escaped_qend; -#line 1979 "scan.c" +#line 1850 "scan.c" #define INITIAL 0 #define SECT2 1 @@ -2040,11 +1903,11 @@ void yyset_extra (YY_EXTRA_TYPE user_defined ); FILE *yyget_in (void ); -void yyset_in (FILE * in_str ); +void yyset_in (FILE * _in_str ); FILE *yyget_out (void ); -void yyset_out (FILE * out_str ); +void yyset_out (FILE * _out_str ); yy_size_t yyget_leng (void ); @@ -2052,7 +1915,7 @@ char *yyget_text (void ); int yyget_lineno (void ); -void yyset_lineno (int line_number ); +void yyset_lineno (int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -2066,8 +1929,12 @@ extern int yywrap (void ); #endif #endif +#ifndef YY_NO_UNPUT + static void yyunput (int c,char *buf_ptr ); +#endif + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ); #endif @@ -2090,7 +1957,7 @@ static int input (void ); static int yy_start_stack_depth = 0; static int *yy_start_stack = NULL; - static void yy_push_state (int new_state ); + static void yy_push_state (int _new_state ); static void yy_pop_state (void ); @@ -2188,7 +2055,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -2201,9 +2068,9 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; if ( !(yy_init) ) { @@ -2213,12 +2080,6 @@ YY_DECL YY_USER_INIT; #endif - /* Create the reject buffer large enough to save one state per allowed character. */ - if ( ! (yy_state_buf) ) - (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE ); - if ( ! (yy_state_buf) ) - YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); - if ( ! (yy_start) ) (yy_start) = 1; /* first start state */ @@ -2249,9 +2110,9 @@ YY_DECL Char nmdef[MAXLINE]; -#line 2239 "scan.c" +#line 2113 "scan.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { (yy_more_len) = 0; if ( (yy_more_flag) ) @@ -2271,14 +2132,15 @@ YY_DECL yy_current_state = (yy_start); yy_current_state += YY_AT_BOL(); - - (yy_state_ptr) = (yy_state_buf); - *(yy_state_ptr)++ = yy_current_state; - yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + 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; + } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -2286,28 +2148,17 @@ yy_match: yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } while ( yy_base[yy_current_state] != 3975 ); yy_find_action: - yy_current_state = *--(yy_state_ptr); - (yy_lp) = yy_accept[yy_current_state]; -find_rule: /* we branch to this label when backing up */ - for ( ; ; ) /* until we find what rule we matched */ - { - if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] ) - { - yy_act = yy_acclist[(yy_lp)]; - { - (yy_full_match) = yy_cp; - break; - } - } - --yy_cp; - yy_current_state = *--(yy_state_ptr); - (yy_lp) = yy_accept[yy_current_state]; + 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_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; @@ -2316,6 +2167,12 @@ 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); + goto yy_find_action; case 1: YY_RULE_SETUP @@ -3439,7 +3296,7 @@ case 157: YY_RULE_SETUP #line 663 "scan.l" { - register Char *nmdefptr; + Char *nmdefptr; int end_is_ws, end_ch; end_ch = yytext[yyleng-1]; @@ -4125,22 +3982,22 @@ YY_RULE_SETUP #line 969 "scan.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 4115 "scan.c" - case YY_STATE_EOF(INITIAL): - case YY_STATE_EOF(SECT2): - case YY_STATE_EOF(CODEBLOCK): - case YY_STATE_EOF(PICKUPDEF): - case YY_STATE_EOF(SC): - case YY_STATE_EOF(CARETISBOL): - case YY_STATE_EOF(NUM): - case YY_STATE_EOF(QUOTE): - case YY_STATE_EOF(FIRSTCCL): - case YY_STATE_EOF(CCL): - case YY_STATE_EOF(RECOVER): - case YY_STATE_EOF(PERCENT_BRACE_ACTION): - case YY_STATE_EOF(OPTION): - case YY_STATE_EOF(LINEDIR): - yyterminate(); +#line 3985 "scan.c" +case YY_STATE_EOF(INITIAL): +case YY_STATE_EOF(SECT2): +case YY_STATE_EOF(CODEBLOCK): +case YY_STATE_EOF(PICKUPDEF): +case YY_STATE_EOF(SC): +case YY_STATE_EOF(CARETISBOL): +case YY_STATE_EOF(NUM): +case YY_STATE_EOF(QUOTE): +case YY_STATE_EOF(FIRSTCCL): +case YY_STATE_EOF(CCL): +case YY_STATE_EOF(RECOVER): +case YY_STATE_EOF(PERCENT_BRACE_ACTION): +case YY_STATE_EOF(OPTION): +case YY_STATE_EOF(LINEDIR): + yyterminate(); case YY_END_OF_BUFFER: { @@ -4281,9 +4138,9 @@ YY_FATAL_ERROR( "flex scanner jammed" ); */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + yy_size_t number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -4312,7 +4169,7 @@ 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 = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -4331,8 +4188,37 @@ static int yy_get_next_buffer (void) while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + + int yy_c_buf_p_offset = + (int) ((yy_c_buf_p) - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + yy_size_t new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; } @@ -4386,18 +4272,20 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); yy_current_state += YY_AT_BOL(); - (yy_state_ptr) = (yy_state_buf); - *(yy_state_ptr)++ = yy_current_state; - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + 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; + } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -4405,7 +4293,6 @@ static int yy_get_next_buffer (void) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - *(yy_state_ptr)++ = yy_current_state; } return yy_current_state; @@ -4418,9 +4305,15 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - - register YY_CHAR yy_c = 1; + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); + + YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; + } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -4429,15 +4322,15 @@ static int yy_get_next_buffer (void) } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_is_jam = (yy_current_state == 1106); - if ( ! yy_is_jam ) - *(yy_state_ptr)++ = yy_current_state; return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) +#ifndef YY_NO_UNPUT + + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -4447,10 +4340,10 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + yy_size_t number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -4472,6 +4365,8 @@ static int yy_get_next_buffer (void) (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -4623,7 +4518,7 @@ static void yy_load_buffer_state (void) if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -4778,7 +4673,7 @@ static void yyensure_buffer_stack (void) * 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; + num_to_alloc = 1; // After all that talk, this was set to 1 anyways... (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -4795,7 +4690,7 @@ static void yyensure_buffer_stack (void) 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 */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -4897,7 +4792,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len return b; } - static void yy_push_state (int new_state ) + static void yy_push_state (int _new_state ) { if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) ) { @@ -4918,7 +4813,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START; - BEGIN(new_state); + BEGIN(_new_state); } static void yy_pop_state (void) @@ -4935,7 +4830,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len static void yy_fatal_error (yyconst char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -5001,29 +4896,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -5031,9 +4926,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -5053,11 +4948,6 @@ static int yy_init_globals (void) (yy_start_stack_depth) = 0; (yy_start_stack) = NULL; - (yy_state_buf) = 0; - (yy_state_ptr) = 0; - (yy_full_match) = 0; - (yy_lp) = 0; - /* Defined in main.c */ #ifdef YY_STDINIT yyin = stdin; @@ -5092,9 +4982,6 @@ int yylex_destroy (void) yyfree((yy_start_stack) ); (yy_start_stack) = NULL; - yyfree ( (yy_state_buf) ); - (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( ); @@ -5109,7 +4996,8 @@ int yylex_destroy (void) #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -5118,7 +5006,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -5128,11 +5016,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return (void *) malloc( size ); } void *yyrealloc (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 @@ -5145,7 +5034,7 @@ void *yyrealloc (void * ptr, yy_size_t size ) void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -5179,7 +5068,7 @@ char *file; yyin = fopen( infilename, "r" ); if ( yyin == NULL ) - lerrsf( _( "can't open %s" ), file ); + lerr( _( "can't open %s" ), file ); } else @@ -95,7 +95,7 @@ extern const char *escaped_qstart, *escaped_qend; %} -%option caseless nodefault stack noyy_top_state +%option caseless nodefault noreject stack noyy_top_state %option nostdinit %x SECT2 SECT2PROLOG SECT3 CODEBLOCK PICKUPDEF SC CARETISBOL NUM QUOTE @@ -661,7 +661,7 @@ M4QEND "]]" * context. */ "{"{NAME}"}"[[:space:]]? { - register Char *nmdefptr; + Char *nmdefptr; int end_is_ws, end_ch; end_ch = yytext[yyleng-1]; @@ -993,7 +993,7 @@ char *file; yyin = fopen( infilename, "r" ); if ( yyin == NULL ) - lerrsf( _( "can't open %s" ), file ); + lerr( _( "can't open %s" ), file ); } else diff --git a/scanflags.c b/src/scanflags.c index f75aa82..5beb24a 100644 --- a/scanflags.c +++ b/src/scanflags.c @@ -61,8 +61,7 @@ sf_init (void) assert(_sf_stk == NULL); _sf_stk = (scanflags_t*) flex_alloc ( sizeof(scanflags_t) * (_sf_max = 32)); if (!_sf_stk) - lerrsf_fatal(_("Unable to allocate %ld of stack"), - (long)sizeof(scanflags_t)); + lerr_fatal(_("Unable to allocate %zu of stack"), sizeof(scanflags_t)); _sf_stk[_sf_top_ix] = 0; } diff --git a/scanopt.c b/src/scanopt.c index f76ecd3..10c372a 100644 --- a/scanopt.c +++ b/src/scanopt.c @@ -46,7 +46,7 @@ static int STRCASECMP (a, b) const char *a; const char *b; { - while (tolower (*a++) == tolower (*b++)) ; + while (tolower ((unsigned char)*a++) == tolower ((unsigned char)*b++)) ; return b - a; } #endif @@ -82,7 +82,7 @@ static int PRINTLEN PROTO ((struct _scanopt_t *, int)); static int RVAL PROTO ((struct _scanopt_t *, int)); static int FLAGS PROTO ((struct _scanopt_t *, int)); static const char *DESC PROTO ((struct _scanopt_t *, int)); -static int scanopt_err PROTO ((struct _scanopt_t *, int, int, int)); +static int scanopt_err PROTO ((struct _scanopt_t *, int, int)); static int matchlongopt PROTO ((char *, char **, int *, char **, int *)); static int find_opt PROTO ((struct _scanopt_t *, int, char *, int, int *, int *opt_offset)); @@ -212,7 +212,7 @@ scanopt_t *scanopt_init (options, argc, argv, flags) aux->namelen = 0; for (p = pname + 1; *p; p++) { /* detect required arg */ - if (*p == '=' || isspace (*p) + if (*p == '=' || isspace ((unsigned char)*p) || !(aux->flags & IS_LONG)) { if (aux->namelen == 0) aux->namelen = p - pname; @@ -481,7 +481,7 @@ int scanopt_usage (scanner, fp, usage) while (*p && n < maxlen[1] && *p != '\n') { - if (isspace ((Char)(*p)) + if (isspace ((unsigned char)(*p)) || *p == '-') lastws = p; n++; @@ -529,18 +529,13 @@ int scanopt_usage (scanner, fp, usage) #endif /* no scanopt_usage */ -static int scanopt_err (s, opt_offset, is_short, err) +static int scanopt_err (s, is_short, err) struct _scanopt_t *s; - int opt_offset; int is_short; int err; { const char *optname = ""; char optchar[2]; - const optspec_t *opt = NULL; - - if (opt_offset >= 0) - opt = s->options + opt_offset; if (!s->no_err_msg) { @@ -749,7 +744,7 @@ int scanopt (svoid, arg, optindex) if (!find_opt (s, 1, optname, namelen, &errcode, &opt_offset)) { - scanopt_err (s, opt_offset, 0, errcode); + scanopt_err (s, 0, errcode); return errcode; } /* We handle this below. */ @@ -784,7 +779,7 @@ int scanopt (svoid, arg, optindex) if (!find_opt (s, 0, pstart, namelen, &errcode, &opt_offset)) { - return scanopt_err (s, opt_offset, 1, errcode); + return scanopt_err (s, 1, errcode); } optarg = pstart + 1; @@ -812,8 +807,7 @@ int scanopt (svoid, arg, optindex) /* case: no args allowed */ if (auxp->flags & ARG_NONE) { if (optarg && !is_short) { - scanopt_err (s, opt_offset, is_short, errcode = - SCANOPT_ERR_ARG_NOT_ALLOWED); + scanopt_err (s, is_short, errcode = SCANOPT_ERR_ARG_NOT_ALLOWED); INC_INDEX (s, 1); return errcode; } @@ -827,8 +821,7 @@ int scanopt (svoid, arg, optindex) /* case: required */ if (auxp->flags & ARG_REQ) { if (!optarg && !has_next) - return scanopt_err (s, opt_offset, is_short, - SCANOPT_ERR_ARG_NOT_FOUND); + return scanopt_err (s, is_short, SCANOPT_ERR_ARG_NOT_FOUND); if (!optarg) { /* Let the next argv element become the argument. */ diff --git a/scanopt.h b/src/scanopt.h index 359a18a..359a18a 100644 --- a/scanopt.h +++ b/src/scanopt.h @@ -89,8 +89,8 @@ const char *skel[] = { "", "#define FLEX_SCANNER", "#define YY_FLEX_MAJOR_VERSION 2", - "#define YY_FLEX_MINOR_VERSION 5", - "#define YY_FLEX_SUBMINOR_VERSION 39", + "#define YY_FLEX_MINOR_VERSION 6", + "#define YY_FLEX_SUBMINOR_VERSION 0", "#if YY_FLEX_SUBMINOR_VERSION > 0", "#define FLEX_BETA", "#endif", @@ -623,7 +623,7 @@ const char *skel[] = { "%endif", "", "%if-c++-only", - " std::istream* yy_input_file;", + " std::streambuf* yy_input_file; ", "%endif", "", "", @@ -822,6 +822,9 @@ const char *skel[] = { "static yy_state_type yy_get_previous_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );", "static yy_state_type yy_try_NUL_trans M4_YY_PARAMS( yy_state_type current_state M4_YY_PROTO_LAST_ARG);", "static int yy_get_next_buffer M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );", + "#if defined(__GNUC__) && __GNUC__ >= 3", + "__attribute__((__noreturn__))", + "#endif", "static void yy_fatal_error M4_YY_PARAMS( yyconst char msg[] M4_YY_PROTO_LAST_ARG );", "]])", "", @@ -1018,7 +1021,7 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_NO_SET_IN]],,", "[[", - "void yyset_in M4_YY_PARAMS( FILE * in_str M4_YY_PROTO_LAST_ARG );", + "void yyset_in M4_YY_PARAMS( FILE * _in_str M4_YY_PROTO_LAST_ARG );", "]])", "", "m4_ifdef( [[M4_YY_NO_GET_OUT]],,", @@ -1028,7 +1031,7 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_NO_SET_OUT]],,", "[[", - "void yyset_out M4_YY_PARAMS( FILE * out_str M4_YY_PROTO_LAST_ARG );", + "void yyset_out M4_YY_PARAMS( FILE * _out_str M4_YY_PROTO_LAST_ARG );", "]])", "", "m4_ifdef( [[M4_YY_NO_GET_LENG]],,", @@ -1048,7 +1051,7 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_NO_SET_LINENO]],,", "[[", - "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );", + "void yyset_lineno M4_YY_PARAMS( int _line_number M4_YY_PROTO_LAST_ARG );", "]])", "", "m4_ifdef( [[M4_YY_REENTRANT]],", @@ -1063,7 +1066,7 @@ const char *skel[] = { "[[", "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,", "[[", - "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );", + "void yyset_column M4_YY_PARAMS( int _column_no M4_YY_PROTO_LAST_ARG );", "]])", "]])", "", @@ -1102,10 +1105,12 @@ const char *skel[] = { "#endif", "", "%not-for-header", + "#ifndef YY_NO_UNPUT", " m4_ifdef( [[M4_YY_NO_UNPUT]],,", " [[", " static void yyunput M4_YY_PARAMS( int c, char *buf_ptr M4_YY_PROTO_LAST_ARG);", " ]])", + "#endif", "%ok-for-header", "%endif", "", @@ -1149,7 +1154,7 @@ const char *skel[] = { "[[", " m4_ifdef( [[M4_YY_NO_PUSH_STATE]],,", " [[", - " static void yy_push_state M4_YY_PARAMS( int new_state M4_YY_PROTO_LAST_ARG);", + " static void yy_push_state M4_YY_PARAMS( int _new_state M4_YY_PROTO_LAST_ARG);", " ]])", " m4_ifdef( [[M4_YY_NO_POP_STATE]],,", " [[", @@ -1205,7 +1210,7 @@ const char *skel[] = { "%% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \\", "\\", "%if-c++-only C++ definition \\", - " if ( (result = LexerInput( (char *) buf, max_size )) < 0 ) \\", + " if ( (int)(result = LexerInput( (char *) buf, max_size )) < 0 ) \\", " YY_FATAL_ERROR( \"input in flex scanner failed\" );", "%endif", "", @@ -1478,7 +1483,7 @@ const char *skel[] = { "[[", "/* Code executed at the end of each rule. */", "#ifndef YY_BREAK", - "#define YY_BREAK break;", + "#define YY_BREAK /*LINTED*/break;", "#endif", "]])", "", @@ -1492,9 +1497,9 @@ const char *skel[] = { " */", "YY_DECL", "{", - " register yy_state_type yy_current_state;", - " register char *yy_cp, *yy_bp;", - " register int yy_act;", + " yy_state_type yy_current_state;", + " char *yy_cp, *yy_bp;", + " int yy_act;", " M4_YY_DECL_GUTS_VAR();", "", "m4_ifdef( [[M4_YY_NOT_REENTRANT]],", @@ -1544,7 +1549,7 @@ const char *skel[] = { " yyin = stdin;", "%endif", "%if-c++-only", - " yyin = & std::cin;", + " yyin.rdbuf(std::cin.rdbuf());", "%endif", "", " if ( ! yyout )", @@ -1552,7 +1557,7 @@ const char *skel[] = { " yyout = stdout;", "%endif", "%if-c++-only", - " yyout = & std::cout;", + " yyout.rdbuf(std::cout.rdbuf());", "%endif", "", " if ( ! YY_CURRENT_BUFFER ) {", @@ -1567,7 +1572,7 @@ const char *skel[] = { " {", "%% [7.0] user's declarations go here", "", - " while ( 1 ) /* loops until end-of-file is reached */", + " while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */", " {", "%% [8.0] yymore()-related code goes here", " yy_cp = YY_G(yy_c_buf_p);", @@ -1618,7 +1623,12 @@ const char *skel[] = { " * back-up) that will match for the new input source.", " */", " YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;", + "%if-c-only", " YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;", + "%endif", + "%if-c++-only", + " YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin.rdbuf();", + "%endif", " YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;", " }", "", @@ -1731,11 +1741,29 @@ const char *skel[] = { "%if-c++-only", "%not-for-header", "/* The contents of this function are C++ specific, so the YY_G macro is not used.", + " * This constructor simply maintains backward compatibility.", + " * DEPRECATED", " */", - "yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )", + "yyFlexLexer::yyFlexLexer( FLEX_STD istream* arg_yyin, FLEX_STD ostream* arg_yyout ):", + " yyin(arg_yyin ? arg_yyin->rdbuf() : std::cin.rdbuf()),", + " yyout(arg_yyout ? arg_yyout->rdbuf() : std::cout.rdbuf())", + "{", + " ctor_common();", + "}", + "", + "/* The contents of this function are C++ specific, so the YY_G macro is not used.", + " */", + "yyFlexLexer::yyFlexLexer( std::istream& arg_yyin, std::ostream& arg_yyout ):", + " yyin(arg_yyin.rdbuf()),", + " yyout(arg_yyout.rdbuf())", + "{", + " ctor_common();", + "}", + "", + "/* The contents of this function are C++ specific, so the YY_G macro is not used.", + " */", + "void yyFlexLexer::ctor_common()", "{", - " yyin = arg_yyin;", - " yyout = arg_yyout;", " yy_c_buf_p = 0;", " yy_init = 0;", " yy_start = 0;", @@ -1778,16 +1806,29 @@ const char *skel[] = { "", "/* The contents of this function are C++ specific, so the YY_G macro is not used.", " */", + "void yyFlexLexer::switch_streams( std::istream& new_in, std::ostream& new_out )", + "{", + " // was if( new_in )", + " yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG);", + " yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE M4_YY_CALL_LAST_ARG) M4_YY_CALL_LAST_ARG);", + "", + " // was if( new_out )", + " yyout.rdbuf(new_out.rdbuf());", + "}", + "", + "/* The contents of this function are C++ specific, so the YY_G macro is not used.", + " */", "void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )", "{", - " if ( new_in )", - " {", - " yy_delete_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG);", - " yy_switch_to_buffer( yy_create_buffer( new_in, YY_BUF_SIZE M4_YY_CALL_LAST_ARG) M4_YY_CALL_LAST_ARG);", - " }", + " if( ! new_in ) {", + " new_in = &yyin;", + " }", "", - " if ( new_out )", - " yyout = new_out;", + " if ( ! new_out ) {", + " new_out = &yyout;", + " }", + "", + " switch_streams(*new_in, *new_out);", "}", "", "#ifdef YY_INTERACTIVE", @@ -1796,33 +1837,33 @@ const char *skel[] = { "int yyFlexLexer::LexerInput( char* buf, int max_size )", "#endif", "{", - " if ( yyin->eof() || yyin->fail() )", + " if ( yyin.eof() || yyin.fail() )", " return 0;", "", "#ifdef YY_INTERACTIVE", - " yyin->get( buf[0] );", + " yyin.get( buf[0] );", "", - " if ( yyin->eof() )", + " if ( yyin.eof() )", " return 0;", "", - " if ( yyin->bad() )", + " if ( yyin.bad() )", " return -1;", "", " return 1;", "", "#else", - " (void) yyin->read( buf, max_size );", + " (void) yyin.read( buf, max_size );", "", - " if ( yyin->bad() )", + " if ( yyin.bad() )", " return -1;", " else", - " return yyin->gcount();", + " return yyin.gcount();", "#endif", "}", "", "void yyFlexLexer::LexerOutput( const char* buf, int size )", "{", - " (void) yyout->write( buf, size );", + " (void) yyout.write( buf, size );", "}", "%ok-for-header", "%endif", @@ -1844,9 +1885,9 @@ const char *skel[] = { "%endif", "{", " M4_YY_DECL_GUTS_VAR();", - " register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;", - " register char *source = YY_G(yytext_ptr);", - " register int number_to_move, i;", + " char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;", + " char *source = YY_G(yytext_ptr);", + " yy_size_t number_to_move, i;", " int ret_val;", "", " if ( YY_G(yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars) + 1] )", @@ -1875,7 +1916,7 @@ const char *skel[] = { " /* Try to read more data. */", "", " /* First move last chars to start of buffer. */", - " number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1;", + " number_to_move = (yy_size_t) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1;", "", " for ( i = 0; i < number_to_move; ++i )", " *(dest++) = *(source++);", @@ -1992,8 +2033,8 @@ const char *skel[] = { " yy_state_type yyFlexLexer::yy_get_previous_state()", "%endif", "{", - " register yy_state_type yy_current_state;", - " register char *yy_cp;", + " yy_state_type yy_current_state;", + " char *yy_cp;", " M4_YY_DECL_GUTS_VAR();", "", "%% [15.0] code to get the start state into yy_current_state goes here", @@ -2019,7 +2060,7 @@ const char *skel[] = { " yy_state_type yyFlexLexer::yy_try_NUL_trans( yy_state_type yy_current_state )", "%endif", "{", - " register int yy_is_jam;", + " int yy_is_jam;", " 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", "", @@ -2028,16 +2069,17 @@ const char *skel[] = { "}", "", "", + "#ifndef YY_NO_UNPUT", "%if-c-only", "m4_ifdef( [[M4_YY_NO_UNPUT]],,", "[[", - " static void yyunput YYFARGS2( int,c, register char *,yy_bp)", + " static void yyunput YYFARGS2( int,c, char *,yy_bp)", "%endif", "%if-c++-only", - " void yyFlexLexer::yyunput( int c, register char* yy_bp)", + " void yyFlexLexer::yyunput( int c, char* yy_bp)", "%endif", "{", - " register char *yy_cp;", + " char *yy_cp;", " M4_YY_DECL_GUTS_VAR();", "", " yy_cp = YY_G(yy_c_buf_p);", @@ -2048,10 +2090,10 @@ const char *skel[] = { " if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )", " { /* need to shift things up to make room */", " /* +2 for EOB chars. */", - " register yy_size_t number_to_move = YY_G(yy_n_chars) + 2;", - " register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[", + " yy_size_t number_to_move = YY_G(yy_n_chars) + 2;", + " char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[", " YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];", - " register char *source =", + " char *source =", " &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];", "", " while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )", @@ -2083,6 +2125,7 @@ const char *skel[] = { "%if-c-only", "]])", "%endif", + "#endif", "", "%if-c-only", "#ifndef YY_NO_INPUT", @@ -2177,7 +2220,7 @@ const char *skel[] = { " void yyrestart YYFARGS1( FILE *,input_file)", "%endif", "%if-c++-only", - " void yyFlexLexer::yyrestart( std::istream* input_file )", + " void yyFlexLexer::yyrestart( std::istream& input_file )", "%endif", "{", " M4_YY_DECL_GUTS_VAR();", @@ -2192,6 +2235,18 @@ const char *skel[] = { " yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );", "}", "", + "%if-c++-only", + "/** Delegate to the new version that takes an istream reference.", + " * @param input_file A readable stream.", + " * M4_YY_DOC_PARAM", + " * @note This function does not reset the start condition to @c INITIAL .", + " */", + "void yyFlexLexer::yyrestart( std::istream* input_file )", + "{", + " yyrestart( *input_file );", + "}", + "%endif", + "", "/** Switch to a different input buffer.", " * @param new_buffer The new input buffer.", " * M4_YY_DOC_PARAM", @@ -2244,7 +2299,12 @@ const char *skel[] = { " M4_YY_DECL_GUTS_VAR();", " YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;", " YY_G(yytext_ptr) = YY_G(yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;", + "%if-c-only", " yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;", + "%endif", + "%if-c++-only", + " yyin.rdbuf(YY_CURRENT_BUFFER_LVALUE->yy_input_file);", + "%endif", " YY_G(yy_hold_char) = *YY_G(yy_c_buf_p);", "}", "", @@ -2258,7 +2318,7 @@ const char *skel[] = { " YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, int ,size)", "%endif", "%if-c++-only", - " YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )", + " YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, int size )", "%endif", "{", " YY_BUFFER_STATE b;", @@ -2268,7 +2328,7 @@ const char *skel[] = { " if ( ! b )", " YY_FATAL_ERROR( \"out of dynamic memory in yy_create_buffer()\" );", "", - " b->yy_buf_size = size;", + " b->yy_buf_size = (yy_size_t)size;", "", " /* yy_ch_buf has to be 2 characters longer than the size given because", " * we need to put in 2 end-of-buffer characters.", @@ -2284,6 +2344,19 @@ const char *skel[] = { " return b;", "}", "", + "%if-c++-only", + "/** Delegate creation of buffers to the new version that takes an istream reference.", + " * @param file A readable stream.", + " * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.", + " * M4_YY_DOC_PARAM", + " * @return the allocated buffer state.", + " */", + " YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )", + "{", + " return yy_create_buffer( *file, size );", + "}", + "%endif", + "", "/** Destroy the buffer.", " * @param b a buffer created with yy_create_buffer()", " * M4_YY_DOC_PARAM", @@ -2318,7 +2391,7 @@ const char *skel[] = { " static void yy_init_buffer YYFARGS2( YY_BUFFER_STATE ,b, FILE *,file)", "%endif", "%if-c++-only", - " void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )", + " void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream& file )", "%endif", "", "{", @@ -2327,7 +2400,12 @@ const char *skel[] = { "", " yy_flush_buffer( b M4_YY_CALL_LAST_ARG);", "", + "%if-c-only", " b->yy_input_file = file;", + "%endif", + "%if-c++-only", + " b->yy_input_file = file.rdbuf();", + "%endif", " b->yy_fill_buffer = 1;", "", " /* If b is the current buffer, then yy_init_buffer was _probably_", @@ -2483,7 +2561,7 @@ const char *skel[] = { " * 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;", + " num_to_alloc = 1; // After all that talk, this was set to 1 anyways...", " YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc", " (num_to_alloc * sizeof(struct yy_buffer_state*)", " M4_YY_CALL_LAST_ARG);", @@ -2501,7 +2579,7 @@ const char *skel[] = { " if (YY_G(yy_buffer_stack_top) >= (YY_G(yy_buffer_stack_max)) - 1){", "", " /* Increase the buffer to prepare for a possible push. */", - " int grow_size = 8 /* arbitrary grow size */;", + " yy_size_t grow_size = 8 /* arbitrary grow size */;", "", " num_to_alloc = YY_G(yy_buffer_stack_max) + grow_size;", " YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc", @@ -2631,10 +2709,10 @@ const char *skel[] = { "m4_ifdef( [[M4_YY_NO_PUSH_STATE]],,", "[[", "%if-c-only", - " static void yy_push_state YYFARGS1( int ,new_state)", + " static void yy_push_state YYFARGS1( int ,_new_state)", "%endif", "%if-c++-only", - " void yyFlexLexer::yy_push_state( int new_state )", + " void yyFlexLexer::yy_push_state( int _new_state )", "%endif", "{", " M4_YY_DECL_GUTS_VAR();", @@ -2658,7 +2736,7 @@ const char *skel[] = { "", " YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START;", "", - " BEGIN(new_state);", + " BEGIN(_new_state);", "}", "]])", "", @@ -2702,7 +2780,8 @@ const char *skel[] = { "%if-c-only", "static void yy_fatal_error YYFARGS1(yyconst char*, msg)", "{", - " m4_dnl M4_YY_DECL_GUTS_VAR();", + " M4_YY_DECL_GUTS_VAR();", + " M4_YY_NOOP_GUTS_VAR();", " (void) fprintf( stderr, \"%s\\n\", msg );", " exit( YY_EXIT_FAILURE );", "}", @@ -2857,10 +2936,10 @@ const char *skel[] = { "m4_ifdef( [[M4_YY_NO_SET_LINENO]],,", "[[", "/** Set the current line number.", - " * @param line_number", + " * @param _line_number line number", " * M4_YY_DOC_PARAM", " */", - "void yyset_lineno YYFARGS1( int ,line_number)", + "void yyset_lineno YYFARGS1( int ,_line_number)", "{", " M4_YY_DECL_GUTS_VAR();", "", @@ -2870,7 +2949,7 @@ const char *skel[] = { " if (! YY_CURRENT_BUFFER )", " YY_FATAL_ERROR( \"yyset_lineno called with no buffer\" );", " ]])", - " yylineno = line_number;", + " yylineno = _line_number;", "}", "]])", "", @@ -2879,10 +2958,10 @@ const char *skel[] = { "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,", "[[", "/** Set the current column.", - " * @param line_number", + " * @param _column_no column number", " * M4_YY_DOC_PARAM", " */", - "void yyset_column YYFARGS1( int , column_no)", + "void yyset_column YYFARGS1( int , _column_no)", "{", " M4_YY_DECL_GUTS_VAR();", "", @@ -2892,7 +2971,7 @@ const char *skel[] = { " if (! YY_CURRENT_BUFFER )", " YY_FATAL_ERROR( \"yyset_column called with no buffer\" );", " ]])", - " yycolumn = column_no;", + " yycolumn = _column_no;", "}", "]])", "]])", @@ -2902,23 +2981,23 @@ const char *skel[] = { "[[", "/** Set the input stream. This does not discard the current", " * input buffer.", - " * @param in_str A readable stream.", + " * @param _in_str A readable stream.", " * M4_YY_DOC_PARAM", " * @see yy_switch_to_buffer", " */", - "void yyset_in YYFARGS1( FILE * ,in_str)", + "void yyset_in YYFARGS1( FILE * ,_in_str)", "{", " M4_YY_DECL_GUTS_VAR();", - " yyin = in_str ;", + " yyin = _in_str ;", "}", "]])", "", "m4_ifdef( [[M4_YY_NO_SET_OUT]],,", "[[", - "void yyset_out YYFARGS1( FILE * ,out_str)", + "void yyset_out YYFARGS1( FILE * ,_out_str)", "{", " M4_YY_DECL_GUTS_VAR();", - " yyout = out_str ;", + " yyout = _out_str ;", "}", "]])", "", @@ -2934,10 +3013,10 @@ const char *skel[] = { "", "m4_ifdef( [[M4_YY_NO_SET_DEBUG]],,", "[[", - "void yyset_debug YYFARGS1( int ,bdebug)", + "void yyset_debug YYFARGS1( int ,_bdebug)", "{", " M4_YY_DECL_GUTS_VAR();", - " yy_flex_debug = bdebug ;", + " yy_flex_debug = _bdebug ;", "}", "]])", "%endif", @@ -3065,7 +3144,7 @@ const char *skel[] = { "}", "", "%endif if-c-only", - "", + "%# Actually, that ended an if-rentrant section", "", "%if-c-only", "static int yy_init_globals YYFARGS0(void)", @@ -3185,7 +3264,10 @@ const char *skel[] = { "#ifndef yytext_ptr", "static void yy_flex_strncpy YYFARGS3( char*,s1, yyconst char *,s2, int,n)", "{", - " register int i;", + " M4_YY_DECL_GUTS_VAR();", + " M4_YY_NOOP_GUTS_VAR();", + "", + " int i;", " for ( i = 0; i < n; ++i )", " s1[i] = s2[i];", "}", @@ -3197,7 +3279,7 @@ const char *skel[] = { "#ifdef YY_NEED_STRLEN", "static int yy_flex_strlen YYFARGS1( yyconst char *,s)", "{", - " register int n;", + " int n;", " for ( n = 0; s[n]; ++n )", " ;", "", @@ -3210,6 +3292,8 @@ const char *skel[] = { "[[", "void *yyalloc YYFARGS1( yy_size_t ,size)", "{", + " M4_YY_DECL_GUTS_VAR();", + " M4_YY_NOOP_GUTS_VAR();", " return (void *) malloc( size );", "}", "]])", @@ -3218,6 +3302,9 @@ const char *skel[] = { "[[", "void *yyrealloc YYFARGS2( void *,ptr, yy_size_t ,size)", "{", + " M4_YY_DECL_GUTS_VAR();", + " M4_YY_NOOP_GUTS_VAR();", + "", " /* 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", @@ -3233,6 +3320,8 @@ const char *skel[] = { "[[", "void yyfree YYFARGS1( void *,ptr)", "{", + " M4_YY_DECL_GUTS_VAR();", + " M4_YY_NOOP_GUTS_VAR();", " free( (char *) ptr ); /* see yyrealloc() for (char *) cast */", "}", "]])", @@ -3292,7 +3381,7 @@ const char *skel[] = { "", "/** Get the number of integers in this table. This is NOT the", " * same thing as the number of elements.", - " * @param td the table ", + " * @param tbl the table", " * @return the number of integers in the table", " */", "yyskel_static flex_int32_t yytbl_calc_total_len (const struct yytbl_data *tbl)", @@ -3348,7 +3437,7 @@ const char *skel[] = { "/** Read the header */", "static int yytbl_hdr_read YYFARGS2(struct yytbl_hdr *, th, struct yytbl_reader *, rd)", "{", - " int bytes;", + " size_t bytes;", " memset (th, 0, sizeof (struct yytbl_hdr));", "", " if (yytbl_read32 (&(th->th_magic), rd) != 0)", @@ -3397,8 +3486,11 @@ const char *skel[] = { "static struct yytbl_dmap *yytbl_dmap_lookup YYFARGS2(struct yytbl_dmap *, dmap,", " int, id)", "{", + " M4_YY_DECL_GUTS_VAR();", + " M4_YY_NOOP_GUTS_VAR();", + "", " while (dmap->dm_id)", - " if (dmap->dm_id == id)", + " if ((int)(dmap->dm_id) == id)", " return dmap;", " else", " dmap++;", @@ -59,12 +59,12 @@ static struct hash_entry *ccltab[CCL_HASH_SIZE]; /* declare functions that have forward references */ -static int addsym PROTO ((register char[], char *, int, hash_table, int)); -static struct hash_entry *findsym PROTO ((register const char *sym, +static int addsym PROTO ((char[], char *, int, hash_table, int)); +static struct hash_entry *findsym PROTO ((const char *sym, hash_table table, int table_size)); -static int hashfunct PROTO ((register const char *, int)); +static int hashfunct PROTO ((const char *, int)); /* addsym - add symbol and definitions to symbol table @@ -73,16 +73,16 @@ static int hashfunct PROTO ((register const char *, int)); */ static int addsym (sym, str_def, int_def, table, table_size) - register char sym[]; + char sym[]; char *str_def; int int_def; hash_table table; int table_size; { - int hash_val = hashfunct (sym, table_size); - register struct hash_entry *sym_entry = table[hash_val]; - register struct hash_entry *new_entry; - register struct hash_entry *successor; + int hash_val = hashfunct (sym, table_size); + struct hash_entry *sym_entry = table[hash_val]; + struct hash_entry *new_entry; + struct hash_entry *successor; while (sym_entry) { if (!strcmp (sym, sym_entry->name)) { /* entry already exists */ @@ -147,7 +147,7 @@ int ccllookup (ccltxt) /* findsym - find symbol in symbol table */ static struct hash_entry *findsym (sym, table, table_size) - register const char *sym; + const char *sym; hash_table table; int table_size; { @@ -155,7 +155,7 @@ static struct hash_entry *findsym (sym, table, table_size) (struct hash_entry *) 0, (struct hash_entry *) 0, (char *) 0, (char *) 0, 0, }; - register struct hash_entry *sym_entry = + struct hash_entry *sym_entry = table[hashfunct (sym, table_size)]; @@ -171,11 +171,11 @@ static struct hash_entry *findsym (sym, table, table_size) /* hashfunct - compute the hash value for "str" and hash size "hash_size" */ static int hashfunct (str, hash_size) - register const char *str; + const char *str; int hash_size; { - register int hashval; - register int locstr; + int hashval; + int locstr; hashval = 0; locstr = 0; @@ -65,7 +65,7 @@ static flex_int32_t yytbl_data_getijk (const struct yytbl_data *tbl, int i, /** Initialize the table writer. * @param wr an uninitialized writer - * @param the output file + * @param out the output file * @return 0 on success */ int yytbl_writer_init (struct yytbl_writer *wr, FILE * out) @@ -96,7 +96,7 @@ int yytbl_hdr_init (struct yytbl_hdr *th, const char *version_str, } /** Allocate and initialize a table data structure. - * @param tbl a pointer to an uninitialized table + * @param td a pointer to an uninitialized table * @param id the table identifier * @return 0 on success */ @@ -137,7 +137,7 @@ static int yytbl_write_pad64 (struct yytbl_writer *wr) } /** write the header. - * @param out the output stream + * @param wr the output stream * @param th table header to be written * @return -1 on error, or bytes written on success. */ @@ -183,7 +183,7 @@ int yytbl_hdr_fwrite (struct yytbl_writer *wr, const struct yytbl_hdr *th) /** Write this table. - * @param out the file writer + * @param wr the file writer * @param td table data to be written * @return -1 on error, or bytes written on success. */ diff --git a/tables_shared.c b/src/tables_shared.c index b962666..123626c 100644 --- a/tables_shared.c +++ b/src/tables_shared.c @@ -52,7 +52,7 @@ dnl /** Get the number of integers in this table. This is NOT the * same thing as the number of elements. - * @param td the table + * @param tbl the table * @return the number of integers in the table */ yyskel_static flex_int32_t yytbl_calc_total_len (const struct yytbl_data *tbl) diff --git a/tables_shared.h b/src/tables_shared.h index bbf9910..bbf9910 100644 --- a/tables_shared.h +++ b/src/tables_shared.h @@ -36,7 +36,7 @@ /* declarations for functions that have forward references */ -void mkentry PROTO ((register int *, int, int, int, int)); +void mkentry PROTO ((int *, int, int, int, int)); void mkprot PROTO ((int[], int, int)); void mktemplate PROTO ((int[], int, int)); void mv2front PROTO ((int)); @@ -223,9 +223,9 @@ void bldtbl (state, statenum, totaltrans, comstate, comfreq) void cmptmps () { - int tmpstorage[CSIZE + 1]; - register int *tmp = tmpstorage, i, j; - int totaltrans, trans; + int tmpstorage[CSIZE + 1]; + int *tmp = tmpstorage, i, j; + int totaltrans, trans; peakpairs = numtemps * numecs + tblend; @@ -291,7 +291,7 @@ void cmptmps () void expand_nxt_chk () { - register int old_max = current_max_xpairs; + int old_max = current_max_xpairs; current_max_xpairs += MAX_XPAIRS_INCREMENT; @@ -330,9 +330,9 @@ int find_table_space (state, numtrans) /* Firstfree is the position of the first possible occurrence of two * consecutive unused records in the chk and nxt arrays. */ - register int i; - register int *state_ptr, *chk_ptr; - register int *ptr_to_last_entry_in_state; + int i; + int *state_ptr, *chk_ptr; + int *ptr_to_last_entry_in_state; /* If there are too many out-transitions, put the state at the end of * nxt and chk. @@ -421,7 +421,7 @@ int find_table_space (state, numtrans) */ void inittbl () { - register int i; + int i; zero_out ((char *) chk, @@ -501,11 +501,11 @@ void mkdeftbl () */ void mkentry (state, numchars, statenum, deflink, totaltrans) - register int *state; - int numchars, statenum, deflink, totaltrans; + int *state; + int numchars, statenum, deflink, totaltrans; { - register int minec, maxec, i, baseaddr; - int tblbase, tbllast; + int minec, maxec, i, baseaddr; + int tblbase, tbllast; if (totaltrans == 0) { /* there are no out-transitions */ if (deflink == JAMSTATE) @@ -762,9 +762,9 @@ void mv2front (qelm) void place_state (state, statenum, transnum) int *state, statenum, transnum; { - register int i; - register int *state_ptr; - int position = find_table_space (state, transnum); + int i; + int *state_ptr; + int position = find_table_space (state, transnum); /* "base" is the table of start positions. */ base[statenum] = position; @@ -835,8 +835,8 @@ void stack1 (statenum, sym, nextstate, deflink) int tbldiff (state, pr, ext) int state[], pr, ext[]; { - register int i, *sp = state, *ep = ext, *protp; - register int numdiff = 0; + int i, *sp = state, *ep = ext, *protp; + int numdiff = 0; protp = &protsave[numecs * (pr - 1)]; diff --git a/version.h b/src/version.h index b9e5d6c..b9e5d6c 100644 --- a/version.h +++ b/src/version.h @@ -38,11 +38,11 @@ /* yylex - scan for a regular expression token */ -int yylex () +extern char *yytext; +int yylex (void) { int toktype; static int beglin = false; - extern char *yytext; if (eofseen) toktype = EOF; @@ -150,11 +150,12 @@ int yylex () break; default: - if (!isascii (yylval) || !isprint (yylval)) - fprintf (stderr, - "\\%.3o", - (unsigned int) yylval); - else + if (!isascii (yylval) || !isprint (yylval)) { + if(trace_hex) + fprintf (stderr, "\\x%02x", (unsigned int) yylval); + else + fprintf (stderr, "\\%.3o", (unsigned int) yylval); + } else (void) putc (yylval, stderr); break; } diff --git a/tests/Makefile.am b/tests/Makefile.am index 25d8b0c..4ac3c17 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,129 +19,464 @@ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # PURPOSE. +TESTS = $(check_PROGRAMS) options.cn + +# The script testwrapper.sh will run most tests as is. A couple tests +# in the suite end in .reject, .table and the like so that we can pass +# different arguments to the test runner. We list those extensions so +# automake knows how to distinguish between the various kinds of tests +# we have. + +TEST_EXTENSIONS = .reject .table .direct .cn .i3 .pthread .one .opt .ser .ver + +LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_LOG_FLAGS = -d $(srcdir) -r + +REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r + +TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t + +DIRECT_LOG_COMPILER=$(srcdir)/testwrapper.sh +AM_DIRECT_LOG_FLAGS = -d $(srcdir) + +CN_LOG_COMPILER=$(srcdir)/options.cn +AM_CN_LOG_FLAGS=$(FLEX) + +I3_LOG_COMPILER=$(srcdir)/testwrapper.sh +AM_I3_LOG_FLAGS=-i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt + +PTHREAD_LOG_COMPILER=$(srcdir)/testwrapper.sh +AM_PTHREAD_LOG_FLAGS=-i $(srcdir)/pthread_1.txt -i $(srcdir)/pthread_2.txt -i $(srcdir)/pthread_3.txt -i $(srcdir)/pthread_4.txt -i $(srcdir)/pthread_5.txt + +ONE_LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_ONE_LOG_FLAGS = -1 -d $(srcdir) + +AM_YFLAGS = -d -p test + +check_PROGRAMS = $(simple_tests) $(reject_tests) $(TABLE_TESTS) $(DIRECT_TESTS) $(I3_TESTS) $(PTHREAD_TESTS) $(ONE_TESTS) $(TABLEOPTS_TESTS) + +simple_tests = \ + alloc_extra \ + array_nr \ + array_r \ + basic_nr \ + basic_r \ + bison_nr \ + bison_yylloc \ + bison_yylval \ + c_cxx_nr \ + c_cxx_r \ + ccl \ + cxx_basic \ + cxx_multiple_scanners \ + debug_nr \ + debug_r \ + extended \ + header_nr \ + header_r \ + mem_nr \ + mem_r \ + multiple_scanners_nr \ + multiple_scanners_r \ + noansi_nr \ + noansi_r \ + posix \ + posixly_correct \ + prefix_nr \ + prefix_r \ + quotes \ + string_nr \ + string_r \ + top \ + yyextra + +reject_tests = \ + reject_nr.reject \ + reject_r.reject + +TABLE_TESTS = \ + reject_ver.table \ + reject_ser.table + +DIRECT_TESTS = \ + include_by_buffer.direct \ + include_by_push.direct \ + include_by_reentrant.direct \ + rescan_nr.direct \ + rescan_r.direct + +I3_TESTS = \ + cxx_yywrap.i3 + +if want_pthread +PTHREAD_TESTS = \ + pthread.pthread +endif + +ONE_TESTS = \ + lineno_nr.one \ + lineno_r.one \ + lineno_trailing.one + +alloc_extra_SOURCES = alloc_extra.l +array_nr_SOURCES = array_nr.l +array_r_SOURCES = array_r.l +basic_nr_SOURCES = basic_nr.l +basic_r_SOURCES = basic_r.l +bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c +bison_yylloc_SOURCES = bison_yylloc_scanner.l bison_yylloc_parser.y bison_yylloc_main.c +bison_yylval_SOURCES = bison_yylval_scanner.l bison_yylval_parser.y bison_yylval_main.c +c_cxx_nr_SOURCES = c_cxx_nr.lll +c_cxx_r_SOURCES = c_cxx_r.lll +ccl_SOURCES = ccl.l +cxx_basic_SOURCES = cxx_basic.ll +cxx_multiple_scanners_SOURCES = cxx_multiple_scanners_main.cc cxx_multiple_scanners_1.ll cxx_multiple_scanners_2.ll +cxx_yywrap_i3_SOURCES = cxx_yywrap.ll +debug_nr_SOURCES = debug_nr.l +debug_r_SOURCES = debug_r.l +extended_SOURCES = extended.l +header_nr_SOURCES = header_nr_scanner.l header_nr_main.c +header_r_SOURCES = header_r_scanner.l header_r_main.c +include_by_buffer_direct_SOURCES = include_by_buffer.direct.l +include_by_push_direct_SOURCES = include_by_push.direct.l +include_by_reentrant_direct_SOURCES = include_by_reentrant.direct.l +lineno_nr_one_SOURCES = lineno_nr.l +lineno_r_one_SOURCES = lineno_r.l +lineno_trailing_one_SOURCES = lineno_trailing.l +mem_nr_SOURCES = mem_nr.l +mem_r_SOURCES = mem_r.l +multiple_scanners_nr_SOURCES = multiple_scanners_nr_main.c multiple_scanners_nr_1.l multiple_scanners_nr_2.l +multiple_scanners_r_SOURCES = multiple_scanners_r_main.c multiple_scanners_r_1.l multiple_scanners_r_2.l +noansi_nr_SOURCES = noansi_nr.l +noansi_r_SOURCES = noansi_r.l +posix_SOURCES = posix.l +posixly_correct_SOURCES = posixly_correct.l +prefix_nr_SOURCES = prefix_nr.l +prefix_r_SOURCES = prefix_r.l +pthread_pthread_SOURCES = pthread.l +quotes_SOURCES = quotes.l +reject_nr_reject_SOURCES = reject.l4 +reject_r_reject_SOURCES = reject.l4 +reject_ver_table_SOURCES = reject.l4 +reject_ser_table_SOURCES = reject.l4 +rescan_nr_direct_SOURCES = rescan_nr.direct.l +rescan_r_direct_SOURCES = rescan_r.direct.l +string_nr_SOURCES = string_nr.l +string_r_SOURCES = string_r.l +top_SOURCES = top.l top_main.c +yyextra_SOURCES = yyextra.l + +BUILT_SOURCES = \ + bison_nr_parser.h \ + bison_nr_scanner.h \ + bison_yylloc_parser.h \ + bison_yylloc_scanner.h \ + bison_yylval_parser.h \ + bison_yylval_scanner.h \ + header_nr_scanner.h \ + header_r_scanner.h \ + multiple_scanners_nr_1.h \ + multiple_scanners_nr_2.h \ + multiple_scanners_r_1.h \ + multiple_scanners_r_2.h \ + top.h + +# Normally, automake would distribute files built by flex. Since the +# point of the test suite is to test the files that flex builds, and +# since anyone who has the flex distribution can build a flex binary +# without having a flex binary, we want to not distribute the files +# built by flex in the test suite. The dist-hook target accomplishes +# this goal. It's also handy to have the list of files to clean since +# automake doesn't know about the whacky ways in which we're abusing +# it. + +CLEANFILES = \ + array_nr.c \ + array_r.c \ + basic_nr.c \ + basic_r.c \ + bison_nr_parser.c \ + bison_nr_parser.h \ + bison_nr_scanner.c \ + bison_nr_scanner.h \ + bison_yylloc_parser.c \ + bison_yylloc_parser.h \ + bison_yylloc_scanner.c \ + bison_yylloc_scanner.h \ + bison_yylval_parser.c \ + bison_yylval_parser.h \ + bison_yylval_scanner.c \ + bison_yylval_scanner.h \ + c_cxx_nr.cc \ + c_cxx_r.cc \ + ccl.c \ + cxx_basic.cc \ + cxx_multiple_scanners_1.cc \ + cxx_multiple_scanners_2.cc \ + cxx_yywrap.cc \ + debug_nr.c \ + debug_r.c \ + extended.c \ + header_nr_scanner.c \ + header_nr_scanner.h \ + header_r_scanner.c \ + header_r_scanner.h \ + include_by_buffer.direct.c \ + include_by_push.direct.c \ + include_by_reentrant.direct.c \ + lineno_nr.c \ + lineno_r.c \ + lineno_trailing.c \ + mem_nr.c \ + mem_r.c \ + multiple_scanners_nr_1.c \ + multiple_scanners_nr_1.h \ + multiple_scanners_nr_2.c \ + multiple_scanners_nr_2.h \ + multiple_scanners_r_1.c \ + multiple_scanners_r_1.h \ + multiple_scanners_r_2.c \ + multiple_scanners_r_2.h \ + noansi_nr.c \ + noansi_r.c \ + posix.c \ + posixly_correct.c \ + prefix_nr.c \ + prefix_r.c \ + pthread.c \ + quotes.c \ + reject_nr.reject.c \ + reject_r.reject.c \ + reject_ser.table.c \ + reject_ser.table.tables \ + reject_ver.table.c \ + reject_ver.table.tables \ + rescan_nr.direct.c \ + rescan_r.direct.c \ + string_nr.c \ + string_r.c \ + top.c \ + top.h \ + yyextra.c \ +alloc_extra.c \ + $(tableopts_c) \ + $(tableopts_tables) + +dist-hook: + for file in $(CLEANFILES) ; do \ + rm -f $(distdir)/$$file \ + ; done + EXTRA_DIST = \ - README + README \ + alloc_extra.txt \ + array_nr.txt \ + array_r.txt \ + basic_nr.txt \ + basic_r.txt \ + bison_nr.txt \ + bison_yylloc.txt \ + bison_yylval.txt \ + c_cxx_nr.txt \ + c_cxx_r.txt \ + ccl.txt \ + cxx_basic.txt \ + cxx_multiple_scanners.txt \ + cxx_yywrap.txt \ + debug_nr.txt \ + debug_r.txt \ + extended.txt \ + header_nr.txt \ + header_r.txt \ + include_by_buffer.direct.txt \ + include_by_buffer.direct_2.txt \ + include_by_buffer.direct_3.txt \ + include_by_push.direct.txt \ + include_by_push.direct_2.txt \ + include_by_push.direct_3.txt \ + include_by_reentrant.direct.txt \ + include_by_reentrant.direct_2.txt \ + include_by_reentrant.direct_3.txt \ + lineno_nr.one.txt \ + lineno_r.one.txt \ + lineno_trailing.one.txt \ + mem_nr.txt \ + mem_r.txt \ + noansi_nr.txt \ + noansi_r.txt \ + prefix_nr.txt \ + prefix_r.txt \ + pthread_1.txt \ + pthread_2.txt \ + pthread_3.txt \ + pthread_4.txt \ + pthread_5.txt \ + reject.txt \ + rescan_nr.direct.txt \ + rescan_r.direct.txt \ + quotes.txt \ + top.txt \ + yyextra.txt \ + tableopts.txt dist_noinst_SCRIPTS = \ - create-test - -DIST_SUBDIRS = \ - test-concatenated-options \ - test-c++-yywrap \ - test-extended \ - test-ccl \ - test-quotes \ - test-rescan-r \ - test-rescan-nr \ - test-basic-nr \ - test-basic-r \ - test-bison-yylloc \ - test-bison-yylval \ - test-bison-nr \ - test-multiple-scanners-nr \ - test-multiple-scanners-r \ - test-header-nr \ - test-header-r \ - test-reject \ - test-c++-multiple-scanners \ - test-c++-basic \ - test-posixly-correct \ - test-posix \ - test-mem-r \ - test-mem-nr \ - test-debug-nr \ - test-debug-r \ - test-lineno-r \ - test-lineno-nr \ - test-lineno-trailing \ - test-linedir-r \ - TEMPLATE \ - test-top \ - test-array-nr \ - test-array-r \ - test-c-cpp-nr \ - test-c-cpp-r \ - test-include-by-buffer \ - test-include-by-push \ - test-include-by-reentrant \ - test-prefix-nr \ - test-prefix-r \ - test-pthread \ - test-string-nr \ - test-string-r \ - test-yyextra \ - test-alloc-extra \ - test-noansi-nr \ - test-noansi-r \ - test-table-opts - -SUBDIRS = \ - test-concatenated-options \ - test-c++-yywrap \ - test-extended \ - test-ccl \ - test-quotes \ - test-rescan-r \ - test-rescan-nr \ - test-basic-nr \ - test-basic-r \ - test-bison-yylloc \ - test-bison-yylval \ - test-bison-nr \ - test-multiple-scanners-nr \ - test-multiple-scanners-r \ - test-header-nr \ - test-header-r \ - test-reject \ - test-c++-multiple-scanners \ - test-c++-basic \ - test-posixly-correct \ - test-posix \ - test-mem-r \ - test-mem-nr \ - test-debug-nr \ - test-debug-r \ - test-lineno-r \ - test-lineno-nr \ - test-lineno-trailing \ - test-linedir-r \ - test-array-nr \ - test-array-r \ - test-c-cpp-nr \ - test-c-cpp-r \ - test-include-by-buffer \ - test-include-by-push \ - test-include-by-reentrant \ - test-prefix-nr \ - test-prefix-r \ - test-pthread \ - test-string-nr \ - test-string-r \ - test-yyextra \ - test-alloc-extra \ - test-noansi-nr \ - test-noansi-r \ - test-top \ - test-table-opts - -# clean up before running the test suite so we dont test old builds of test code - -check-local: clean - NOK=;\ - NFAIL=;\ - for dir in $(SUBDIRS) ; do \ - echo Executing test "$$dir" ; \ - ( cd "$$dir" && $(MAKE) test > OUTPUT 2>&1 ) ; \ - case $$? in \ - 0 ) echo Test "$$dir" succeeded.; \ - NOK=0$$NOK;\ - ;; \ - * ) echo Test "$$dir" FAILED. See "$$dir"/OUTPUT for details. ; \ - NFAIL=0$$NFAIL; \ - ;; \ - esac; \ - done ; \ - echo Results: ; \ - echo Tests succeeded: `echo @ECHO_N@ "$$NOK@ECHO_C@"|wc -c`; \ - echo Tests FAILED: `echo @ECHO_N@ "$$NFAIL@ECHO_C@"|wc -c` ; \ - test "$$NFAIL" = "" + tableopts.sh + +dist_check_SCRIPTS = \ + options.cn \ + testwrapper.sh + +pthread_pthread_LDADD = -lpthread + +# specify how to process .l files in order to test the flex built by make all + +FLEX = $(top_builddir)/src/flex + +.l.c: $(FLEX) + $(FLEX) -o $@ $< + +.ll.cc: $(FLEX) + $(FLEX) -+ -o $@ $< + +bison_nr_main.($OBJEXT): bison_nr_parser.h bison_nr_scanner.h +bison_nr_scanner.h: bison_nr_scanner.c + +bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h +bison_yylloc_scanner.h: bison_yylloc_scanner.c + +bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h +bison_yylval_scanner.h: bison_yylval_scanner.c + +# automake does not support compiling flex scanners output in C as C++ +# so we explicitly sayhow, using the .lll suffix for the lex input file + +.lll.cc: $(FLEX) + $(FLEX) -o $@ $< + +header_nr_main.$(OBJEXT): header_nr_scanner.h +header_nr_scanner.h: header_nr_scanner.c + +header_r_main.$(OBJEXT): header_r_scanner.h +header_r_scanner.h: header_r_scanner.c + +include_by_buffer.direct$(EXE): include_by_buffer.direct.txt include_by_buffer.direct_2.txt include_by_buffer.direct_3.txt + +include_by_push.direct$(EXE): include_by_push.direct.txt include_by_push.direct_2.txt include_by_push.direct_3.txt + +include_by_reentrant.direct$(EXE): include_by_reentrant.direct.txt include_by_reentrant.direct_2.txt include_by_reentrant.direct_3.txt + +multiple_scanners_nr_main.$(OBJEXT): multiple_scanners_nr_1.h multiple_scanners_nr_2.h +multiple_scanners_nr_1.h: multiple_scanners_nr_1.c +multiple_scanners_nr_2.h: multiple_scanners_nr_2.c + +multiple_scanners_r_main.$(OBJEXT): multiple_scanners_r_1.h multiple_scanners_r_2.h +multiple_scanners_r_1.h: multiple_scanners_r_1.c +multiple_scanners_r_2.h: multiple_scanners_r_2.c + +posixly_correct.c: posixly_correct.l $(FLEX) + POSIXLY_CORRECT=1 $(FLEX) -o $@ $< + +reject_nr.reject.c: reject.l4 $(FLEX) + $(FLEX) -o $@ $< + +reject_nr.reject$(EXEEXT): reject_nr.reject.$(OBJEXT) + $(LINK) $^ + +reject_r.reject.c: reject.l4 $(FLEX) + $(FLEX) --reentrant -o $@ $< + +reject_r.reject.$(OBJEXT): reject_r.reject.c + $(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< + +reject_r.reject$(EXEEXT): reject_r.reject.$(OBJEXT) + $(LINK) $^ + +reject_ver.table.c: reject.l4 $(FLEX) + $(FLEX) -o $@ --tables-verify --tables-file=$(basename $@).tables $< + +reject_ver.table.$(OBJEXT): reject_ver.table.c + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + +reject_ver.table$(EXEEXT): reject_ver.table.$(OBJEXT) + $(LINK) $^ + +reject_ser.table.c: reject.l4 $(FLEX) + $(FLEX) -o $@ --tables-file=$(basename $@).tables $< + +reject_ser.table.$(OBJEXT): reject_ser.table.c + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + +reject_ser.table$(EXEEXT): reject_ser.table.$(OBJEXT) + $(LINK) $^ + +top_main.$(OBJEXT): top.h +top.h: top.c + +# We separate out the tableopts _SOURCES variables and the linking +# rules for those programs because automake has no way to specify such +# things with a loop in a variable (even though make can do such +# things) and the resultant list is both long an unenlightening. And +# it can be / is generated by a shell script, tableopts.sh. + +tableopts.am: tableopts.sh + $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am + +include $(srcdir)/tableopts.am + +tableopts := -Ca -Ce -Cf -CF -Cm -Cem -Cae -Caef -CaeF -Cam -Caem +tableopts_opt_tests := $(foreach opt,$(tableopts), tableopts_opt_nr$(opt) tableopts_opt_r$(opt)) +tableopts_sertests := $(foreach opt,$(tableopts), tableopts_ser_nr$(opt) tableopts_ser_r$(opt)) +tableopts_vertests := $(foreach opt,$(tableopts), tableopts_ver_nr$(opt) tableopts_ver_r$(opt)) +tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sertests) + +tableopts_c := $(addsuffix .c,$(tableopts_tests)) + +OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r + +tableopts_opt_nr%.c: tableopts.l4 $(FLEX) + $(FLEX) -P $(subst -,_,$(basename $(*F))) $* -o $@ $< + +tableopts_opt_nr%.$(OBJEXT): tableopts_opt_nr%.c + $(COMPILE) -c -o $@ $< + +tableopts_opt_r%.c: tableopts.l4 $(FLEX) + $(FLEX) -P $(subst -,_,$(basename $(*F))) --reentrant $* -o $@ $< + +tableopts_opt_r%.$(OBJEXT): tableopts_opt_r%.c + $(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< + +SER_LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t + +tableopts_ser_nr%.c: tableopts.l4 $(FLEX) + $(FLEX) -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $* -o $@ $< + +tableopts_ser_nr%.$(OBJEXT): tableopts_ser_nr%.c + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + +tableopts_ser_r%.c: tableopts.l4 $(FLEX) + $(FLEX) -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $* -o $@ $< + +tableopts_ser_r%.$(OBJEXT): tableopts_ser_r%.c + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< + +VER_LOG_COMPILER = $(srcdir)/testwrapper.sh +AM_VER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t + +tableopts_ver_nr%.c: tableopts.l4 $(FLEX) + $(FLEX) -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $* -o $@ $< + +tableopts_ver_nr%.$(OBJEXT): tableopts_ver_nr%.c + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + +tableopts_ver_nr%.ver$(EXEEXT): tableopts_ver_nr%.$(OBJEXT) + $(LINK) -o $@ $^ + +tableopts_ver_r%.c: tableopts.l4 $(FLEX) + $(FLEX) -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ver_r$*.ver.tables" --tables-verify $* -o $@ $< + +tableopts_ver_r%.$(OBJEXT): tableopts_ver_r%.c + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< diff --git a/tests/README b/tests/README index f948eaf..43387f4 100644 --- a/tests/README +++ b/tests/README @@ -8,14 +8,14 @@ this directory and its contents. * STRUCTURE OF THE TEST SUITE -The test suite consists of several directories, each containing a -scanner known to work with the most recent version of flex. In +The testsuite consists of several tests. Each test is centered around +a scanner known to work with the most recent version of flex. In general, after you modify your copy of the flex distribution, you -should re-run the test suite. Some of the tests may require certain tools -to be available (e.g., bison, diff). If any test returns an error or -generates an error message, then your modifications *may* have broken -a feature of flex. At a minimum, you'll want to investigate the -failure and determine if it's truly significant. +should re-run the test suite. Some of the tests may require certain +tools to be available (e.g., bison, diff). If any test returns an +error or generates an error message, then your modifications *may* +have broken a feature of flex. At a minimum, you'll want to +investigate the failure and determine if it's truly significant. * HOW TO RUN THE TEST SUITE @@ -26,52 +26,32 @@ To build and execute all tests from the top level of the flex source tree: To build and execute a single test: $ cd tests/ # from the top level of the flex tree. - $ cd test-pthread-nr # for example - $ make test + $ make testname.log -* HOW TO ADD A NEW TEST TO THE TEST SUITE + where "testname" is the name of the test. This is an automake-ism + that will create (or re-create, if need be), a log of the particular + test run that you're working on. -**- RUN the script `create-test` found in this directory with a single -argument of the name of the test you want to create. If it fails with -a message about a non-existent file `config.status', then run the -configure script in the top-level directory and everything will be -fine. If it fails to work for you other than this, report it as a -bug. +* HOW TO ADD A NEW TEST TO THE TEST SUITE -** Modify the files in the newly created directory so that they test -whatever feature of flex you are interested in. +** List your test in the TESTS variable in Makefile.am in this + directory. Note that due to the large number of tests, we use + variables to group similar tests together. This also helps with + handling the automake test suite requirements. Hopefully your test + can be listed in SIMPLE_TESTS. You'll need to add the appropriate + automake _SOURCES variable as well. If you're unsure, then consult + the automake manual, paying attention to the parallel test harness + section. ** On success, your test should return zero. ** On error, your test should return 1 (one) and print a message to -stderr, which will have been redirected to the file named, "OUTPUT", -in your test's directory. +stderr, which will have been redirected to the log file created by the +automake test suite harness. ** If your test is skipped (e.g., because bison was not found), then - the test should return 2 (two). See "test-bison-nr/Makefile.am" for - an example. - -** You must modify the last few lines of the top-level configure.in by - adding the Makefile for your test directory. (This step is - done automatically by `create-test`.) - -** You must add the name of your test to the SUBDIRS variable in - tests/Makefile.am. (This is also done automatically for you by `create-test'.) - -** Add a description of your new test to the end of the file - `descriptions'. Remember to keep the description as brief as - possible, preferably to one line. - -** You will have to run the autogen.sh script in the top-level - directory as well as run the configure script in that - directory. (Note that running config.status may prove easier or - quicker.) - -** The easiest way for you to submit your new test to the flex - maintainers is by generating a patch. The flex maintainers only - need to have the Makefile.am, the flex input file, the test input - file (if there is one) and any other files necessary to compile the - test. You do not need to submit files generated by autoconf, - automake, configure etc. It would be helpful to include the file - .cvsignore which you will find in your test directory if you used - the `create-test' script. + the test should return 2 (two). + +** Once your work is done, submit a patch via the flex development + mailing list, the github pull request mechanism or some other + suitable means. diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am deleted file mode 100644 index 531d931..0000000 --- a/tests/TEMPLATE/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -# 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 parser.y test.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) 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 = TEMPLATE - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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/TEMPLATE/parser.y b/tests/TEMPLATE/parser.y deleted file mode 100644 index 54c428b..0000000 --- a/tests/TEMPLATE/parser.y +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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 dummy template parser to build "parser.c" and "parser.h". - How to compile: - bison --defines --output-file="parser.c" --name-prefix="test" parser.y - */ -%{ -#include <stdio.h> -#include <stdlib.h> -#include "config.h" - -#define YYERROR_VERBOSE 1 /* For debugging. */ -/* #define YYPARSE_PARAM scanner */ /* For pure bison parser. */ -/* #define YYLEX_PARAM scanner */ /* For reentrant flex. */ - - -int yyerror(char* msg); -extern int testlex(); - -%} - -%% - -rule: ; - -%% - -int yyerror(char* msg) { - fprintf(stderr,"%s\n",msg); - return 0; -} - -/* -int -main ( int argc, char** argv ) -{ - yyparse (); - return 0; -} -*/ diff --git a/tests/TEMPLATE/scanner.l b/tests/TEMPLATE/scanner.l deleted file mode 100644 index c41a778..0000000 --- a/tests/TEMPLATE/scanner.l +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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> -#include "config.h" -/*#include "parser.h" */ - -%} - -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap -%option warn - - -%% - -. { } - -%% - -int main(void); - -int -main () -{ - yyin = stdin; - yyout = stdout; - yylex(); - printf("TEST RETURNING OK.\n"); - return 0; -} diff --git a/tests/test-alloc-extra/scanner.l b/tests/alloc_extra.l index bedd43b..2c582a8 100644 --- a/tests/test-alloc-extra/scanner.l +++ b/tests/alloc_extra.l @@ -48,8 +48,8 @@ void *yyalloc ( size_t size, yyscan_t scanner ); %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap nodefault +%option 8bit prefix="test" +%option nounput nomain noyywrap nodefault noinput %option warn %option extra-type="struct Check *" %option reentrant diff --git a/tests/test-alloc-extra/test.input b/tests/alloc_extra.txt index 243df29..243df29 100644 --- a/tests/test-alloc-extra/test.input +++ b/tests/alloc_extra.txt diff --git a/tests/test-array-nr/scanner.l b/tests/array_nr.l index 068c674..52e0753 100644 --- a/tests/test-array-nr/scanner.l +++ b/tests/array_nr.l @@ -30,8 +30,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn array diff --git a/tests/TEMPLATE/test.input b/tests/array_nr.txt index 7288a40..7288a40 100644 --- a/tests/TEMPLATE/test.input +++ b/tests/array_nr.txt diff --git a/tests/test-array-r/scanner.l b/tests/array_r.l index 2d4c1b1..556d26f 100644 --- a/tests/test-array-r/scanner.l +++ b/tests/array_r.l @@ -30,8 +30,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn array reentrant diff --git a/tests/test-array-nr/test.input b/tests/array_r.txt index 7288a40..7288a40 100644 --- a/tests/test-array-nr/test.input +++ b/tests/array_r.txt diff --git a/tests/test-basic-nr/scanner.l b/tests/basic_nr.l index c284884..3c29757 100644 --- a/tests/test-basic-nr/scanner.l +++ b/tests/basic_nr.l @@ -23,7 +23,6 @@ /* TEST scanner. Basic non-reentrant scanner. - Compile with: flex scanner.l Sample Input: # this is a comment @@ -35,8 +34,8 @@ #include "config.h" %} -%option prefix="test" outfile="scanner.c" -%option nounput noyywrap noyylineno warn nodefault +%option prefix="test" +%option nounput noyywrap noyylineno warn nodefault noinput IDENT [[:alnum:]_-] WS [[:blank:]] @@ -63,4 +62,3 @@ int main () printf("TEST RETURNING OK.\n"); return 0; } - diff --git a/tests/test-basic-nr/test.input b/tests/basic_nr.txt index 642e0fb..642e0fb 100644 --- a/tests/test-basic-nr/test.input +++ b/tests/basic_nr.txt diff --git a/tests/test-basic-r/scanner.l b/tests/basic_r.l index 6e3510f..e9ff59f 100644 --- a/tests/test-basic-r/scanner.l +++ b/tests/basic_r.l @@ -33,8 +33,8 @@ #include "config.h" %} -%option prefix="test" outfile="scanner.c" -%option nounput noyywrap noyylineno warn nodefault +%option prefix="test" +%option nounput noyywrap noyylineno warn nodefault noinput %option reentrant IDENT [[:alnum:]_-] diff --git a/tests/test-basic-r/test.input b/tests/basic_r.txt index 2160628..2160628 100644 --- a/tests/test-basic-r/test.input +++ b/tests/basic_r.txt diff --git a/tests/test-bison-nr/test.input b/tests/bison_nr.txt index 94adcb2..94adcb2 100644 --- a/tests/test-bison-nr/test.input +++ b/tests/bison_nr.txt diff --git a/tests/test-bison-nr/main.c b/tests/bison_nr_main.c index 49dde7c..f5dd98a 100644 --- a/tests/test-bison-nr/main.c +++ b/tests/bison_nr_main.c @@ -21,13 +21,16 @@ * PURPOSE. */ -#include "parser.h" -#include "scanner.h" +#include "bison_nr_parser.h" +#include "bison_nr_scanner.h" extern int testparse(void); int main ( int argc, char** argv ) { + (void)argc; + (void)argv; + /*yydebug =1;*/ testin = stdin; testparse ( ); diff --git a/tests/test-bison-nr/parser.y b/tests/bison_nr_parser.y index 2cbf9aa..3021048 100644 --- a/tests/test-bison-nr/parser.y +++ b/tests/bison_nr_parser.y @@ -30,12 +30,14 @@ #include <stdlib.h> #include <string.h> #include "config.h" +#include "bison_nr_parser.h" +#include "bison_nr_scanner.h" #define YYERROR_VERBOSE 1 /* #define YYPARSE_PARAM scanner */ /* #define YYLEX_PARAM scanner */ -int yyerror(char* msg); +int yyerror(const char* msg); extern int testget_lineno(void); @@ -89,7 +91,7 @@ line: %% -int yyerror(char* msg) { +int yyerror(const char* msg) { fprintf(stderr,"%s\n",msg); return 0; } diff --git a/tests/test-bison-nr/scanner.l b/tests/bison_nr_scanner.l index 2510de6..4378e5a 100644 --- a/tests/test-bison-nr/scanner.l +++ b/tests/bison_nr_scanner.l @@ -25,16 +25,16 @@ /* The scanner expects to link to bison yylval . */ #include <stdio.h> #include <stdlib.h> -#include "parser.h" +#include "bison_nr_parser.h" #include "config.h" static char* STRDUP(char* s1); #define YY_EXTRA_TYPE int %} -%option 8bit outfile="scanner.c" prefix="test" +%option 8bit prefix="test" %option bison-locations yylineno -%option nomain nounput noyy_top_state noyywrap nodefault warn -%option prefix="test" header="scanner.h" yylineno +%option prefix="test" header="bison_nr_scanner.h" yylineno +%option nomain nounput noyy_top_state noyywrap nodefault noinput warn %% diff --git a/tests/test-bison-yylloc/test.input b/tests/bison_yylloc.txt index 94adcb2..94adcb2 100644 --- a/tests/test-bison-yylloc/test.input +++ b/tests/bison_yylloc.txt diff --git a/tests/test-bison-yylval/main.c b/tests/bison_yylloc_main.c index 30c4314..0274d39 100644 --- a/tests/test-bison-yylval/main.c +++ b/tests/bison_yylloc_main.c @@ -21,12 +21,16 @@ * PURPOSE. */ -#include "parser.h" -#include "scanner.h" +#include "bison_yylloc_parser.h" +#include "bison_yylloc_scanner.h" int main ( int argc, char** argv ) { yyscan_t scanner; + + (void)argc; + (void)argv; + /*yydebug =1;*/ testlex_init ( &scanner ); testset_in(stdin,scanner); @@ -36,4 +40,5 @@ int main ( int argc, char** argv ) } + /* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/test-bison-yylloc/parser.y b/tests/bison_yylloc_parser.y index 224d252..8737291 100644 --- a/tests/test-bison-yylloc/parser.y +++ b/tests/bison_yylloc_parser.y @@ -26,13 +26,17 @@ /* How to compile: - bison --defines --output-file="parser.c" --name-prefix="test" parser.y + bison --defines --output-file="bison_yylloc_parser.c" --name-prefix="test" parser.y */ %{ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "config.h" +#include "bison_yylloc_parser.h" +#include "bison_yylloc_scanner.h" + +int yyerror(YYLTYPE *location, void* scanner, const char* msg); #define YYERROR_VERBOSE 1 @@ -78,7 +82,7 @@ line: /* Check lineno. */ if( $1 != @1.first_line || $1 != testget_lineno(scanner)) { - yyerror("Parse failed: Line numbers do not match."); + yyerror(0, 0, "Parse failed: Line numbers do not match."); YYABORT; } @@ -89,7 +93,9 @@ line: %% -int yyerror(void* scanner, char* msg) { +int yyerror(YYLTYPE *location, void* scanner, const char* msg) { + (void)location; + (void)scanner; fprintf(stderr,"%s\n",msg); return 0; } diff --git a/tests/test-bison-yylloc/scanner.l b/tests/bison_yylloc_scanner.l index aaf6fd7..3708237 100644 --- a/tests/test-bison-yylloc/scanner.l +++ b/tests/bison_yylloc_scanner.l @@ -25,16 +25,16 @@ /* The scanner expects to link to bison yylval . */ #include <stdio.h> #include <stdlib.h> -#include "parser.h" +#include "bison_yylloc_parser.h" #include "config.h" static char* STRDUP(char* s1); #define YY_EXTRA_TYPE int %} -%option 8bit outfile="scanner.c" prefix="test" +%option 8bit prefix="test" %option reentrant bison-bridge bison-locations yylineno -%option nomain nounput noyy_top_state noyywrap nodefault warn -%option prefix="test" header="scanner.h" +%option header="bison_yylloc_scanner.h" +%option nomain nounput noyy_top_state noyywrap nodefault noinput warn %% diff --git a/tests/test-bison-yylval/test.input b/tests/bison_yylval.txt index 846f206..846f206 100644 --- a/tests/test-bison-yylval/test.input +++ b/tests/bison_yylval.txt diff --git a/tests/test-bison-yylloc/main.c b/tests/bison_yylval_main.c index 24568a9..fb04538 100644 --- a/tests/test-bison-yylloc/main.c +++ b/tests/bison_yylval_main.c @@ -21,12 +21,16 @@ * PURPOSE. */ -#include "parser.h" -#include "scanner.h" +#include "bison_yylval_parser.h" +#include "bison_yylval_scanner.h" int main ( int argc, char** argv ) { yyscan_t scanner; + + (void)argc; + (void)argv; + /*yydebug =1;*/ testlex_init ( &scanner ); testset_in(stdin,scanner); @@ -36,5 +40,4 @@ int main ( int argc, char** argv ) } - /* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/test-bison-yylval/parser.y b/tests/bison_yylval_parser.y index 626c5e7..4159d7b 100644 --- a/tests/test-bison-yylval/parser.y +++ b/tests/bison_yylval_parser.y @@ -32,9 +32,12 @@ #include <stdlib.h> #include <string.h> #include "config.h" +#include "bison_yylval_parser.h" +#include "bison_yylval_scanner.h" #define YYERROR_VERBOSE 1 +int yyerror(void* scanner, const char* msg); /* A dummy function. A check against seg-faults in yylval->str. */ int process_text(char* s) { @@ -74,7 +77,8 @@ starttag: LT TAGNAME GT { process_text($2); free($2);} ; endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ; %% -int yyerror(void* scanner, char* msg) { +int yyerror(void* scanner, const char* msg) { + (void)scanner; fprintf(stderr,"%s\n",msg); return 0; } diff --git a/tests/test-bison-yylval/scanner.l b/tests/bison_yylval_scanner.l index 7e902f7..db99fa0 100644 --- a/tests/test-bison-yylval/scanner.l +++ b/tests/bison_yylval_scanner.l @@ -25,7 +25,7 @@ /* The scanner expects to link to bison yylval . */ #include <stdio.h> #include <stdlib.h> -#include "parser.h" +#include "bison_yylval_parser.h" #include "config.h" static char* STRDUP(char* s1); @@ -33,10 +33,10 @@ enum yesno_t { no=0, yes=1 }; #define YY_EXTRA_TYPE enum yesno_t %} -%option 8bit outfile="scanner.c" prefix="test" +%option 8bit prefix="test" %option reentrant bison-bridge -%option noyywrap nomain nounput noyy_top_state noyywrap nodefault warn -%option prefix="test" header="scanner.h" +%option header="bison_yylval_scanner.h" +%option noyywrap nomain nounput noyy_top_state noyywrap nodefault noinput warn %option stack diff --git a/tests/test-c-cpp-nr/scanner.l b/tests/c_cxx_nr.lll index e184008..c9e0fb6 100644 --- a/tests/test-c-cpp-nr/scanner.l +++ b/tests/c_cxx_nr.lll @@ -32,7 +32,7 @@ %} -%option 8bit outfile="scanner.cpp" prefix="test" +%option 8bit prefix="test" %option nounput nomain noyywrap %option warn diff --git a/tests/test-array-r/test.input b/tests/c_cxx_nr.txt index 7288a40..7288a40 100644 --- a/tests/test-array-r/test.input +++ b/tests/c_cxx_nr.txt diff --git a/tests/test-c-cpp-r/scanner.l b/tests/c_cxx_r.lll index 3182d1b..83a39d7 100644 --- a/tests/test-c-cpp-r/scanner.l +++ b/tests/c_cxx_r.lll @@ -32,7 +32,7 @@ %} -%option 8bit outfile="scanner.cpp" prefix="test" +%option 8bit prefix="test" %option nounput nomain noyywrap %option warn reentrant diff --git a/tests/test-c++-basic/test.input b/tests/c_cxx_r.txt index 7288a40..7288a40 100644 --- a/tests/test-c++-basic/test.input +++ b/tests/c_cxx_r.txt diff --git a/tests/test-ccl/scanner.l b/tests/ccl.l index 330278a..c244892 100644 --- a/tests/test-ccl/scanner.l +++ b/tests/ccl.l @@ -32,8 +32,8 @@ #define a_ok() do{printf("OK: flex line %d. input line %d.\n", __LINE__, yylineno); return 1;}while(0) %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-ccl/test.input b/tests/ccl.txt index b318fe6..b318fe6 100644 --- a/tests/test-ccl/test.input +++ b/tests/ccl.txt diff --git a/tests/create-test b/tests/create-test deleted file mode 100755 index 05e6864..0000000 --- a/tests/create-test +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -TESTFILES="Makefile.am scanner.l parser.y .cvsignore test.input" - -if [ ! $# -eq 1 ] ; then - echo 1>&2 Usage: $0 test-name - exit 1 -fi - -if test -e "$1" ; then - echo 1>&2 "$1 exists already" - exit 1 -fi - -mkdir $1 -if test "$?" -ne 0 ; then - echo 1>&2 "mkdir $1 failed" - exit 1 -fi - -for i in $TESTFILES ; do - cp TEMPLATE/$i $1/$i -done - -echo "$1" >> "$1"/.cvsignore - -sed -i '/--new-test-here--/i\ -tests/'"$1"'/Makefile' ../configure.in - -sed -i '/^\(DIST_\)\?SUBDIRS/a\ - '"$1"' \\' Makefile.am - -sed -i "s:TEMPLATE:$1:g" "$1"/Makefile.am diff --git a/tests/test-c++-basic/scanner.l b/tests/cxx_basic.ll index 48baf00..6ffa39c 100644 --- a/tests/test-c++-basic/scanner.l +++ b/tests/cxx_basic.ll @@ -27,10 +27,9 @@ %} -%option 8bit outfile="scanner.cpp" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" %option warn c++ - +%option nounput nomain noinput noyywrap %% diff --git a/tests/test-c++-yywrap/test.input b/tests/cxx_basic.txt index 7288a40..7288a40 100644 --- a/tests/test-c++-yywrap/test.input +++ b/tests/cxx_basic.txt diff --git a/tests/test-c++-multiple-scanners/test.input b/tests/cxx_multiple_scanners.txt index 08498fa..08498fa 100644 --- a/tests/test-c++-multiple-scanners/test.input +++ b/tests/cxx_multiple_scanners.txt diff --git a/tests/test-c++-multiple-scanners/scanner-1.l b/tests/cxx_multiple_scanners_1.ll index 38cc5d7..f4adb9d 100644 --- a/tests/test-c++-multiple-scanners/scanner-1.l +++ b/tests/cxx_multiple_scanners_1.ll @@ -24,7 +24,7 @@ %} -%option 8bit outfile="scanner-1.cpp" prefix="S1_" +%option 8bit prefix="S1_" %option nounput nomain noyywrap %option warn stack noyy_top_state diff --git a/tests/test-c++-multiple-scanners/scanner-2.l b/tests/cxx_multiple_scanners_2.ll index 15faf26..d84c530 100644 --- a/tests/test-c++-multiple-scanners/scanner-2.l +++ b/tests/cxx_multiple_scanners_2.ll @@ -24,7 +24,7 @@ %} -%option 8bit outfile="scanner-2.cpp" prefix="S2_" +%option 8bit prefix="S2_" %option nounput nomain %option warn stack noyy_top_state diff --git a/tests/test-c++-multiple-scanners/main.cpp b/tests/cxx_multiple_scanners_main.cc index 08fe2c1..08fe2c1 100644 --- a/tests/test-c++-multiple-scanners/main.cpp +++ b/tests/cxx_multiple_scanners_main.cc diff --git a/tests/test-c++-yywrap/scanner.l b/tests/cxx_yywrap.ll index 433ad08..0947cec 100644 --- a/tests/test-c++-yywrap/scanner.l +++ b/tests/cxx_yywrap.ll @@ -28,7 +28,7 @@ %} -%option 8bit outfile="scanner.cpp" prefix="test" +%option 8bit prefix="test" %option nounput nomain %option warn c++ diff --git a/tests/test-c-cpp-nr/test.input b/tests/cxx_yywrap.txt index 7288a40..7288a40 100644 --- a/tests/test-c-cpp-nr/test.input +++ b/tests/cxx_yywrap.txt diff --git a/tests/test-debug-nr/scanner.l b/tests/debug_nr.l index 13d11d6..0596dce 100644 --- a/tests/test-debug-nr/scanner.l +++ b/tests/debug_nr.l @@ -29,8 +29,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn debug %% diff --git a/tests/test-debug-nr/test.input b/tests/debug_nr.txt index 8d6476c..8d6476c 100644 --- a/tests/test-debug-nr/test.input +++ b/tests/debug_nr.txt diff --git a/tests/test-debug-r/scanner.l b/tests/debug_r.l index 14a335e..0d40e0e 100644 --- a/tests/test-debug-r/scanner.l +++ b/tests/debug_r.l @@ -29,8 +29,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn debug reentrant %% diff --git a/tests/test-debug-r/test.input b/tests/debug_r.txt index 8d6476c..8d6476c 100644 --- a/tests/test-debug-r/test.input +++ b/tests/debug_r.txt diff --git a/tests/test-extended/scanner.l b/tests/extended.l index 222c7dd..a113fac 100644 --- a/tests/test-extended/scanner.l +++ b/tests/extended.l @@ -30,8 +30,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-extended/test.input b/tests/extended.txt index 829e23d..829e23d 100644 --- a/tests/test-extended/test.input +++ b/tests/extended.txt diff --git a/tests/test-header-nr/test.input b/tests/header_nr.txt index 2ce5001..2ce5001 100644 --- a/tests/test-header-nr/test.input +++ b/tests/header_nr.txt diff --git a/tests/test-header-nr/main.c b/tests/header_nr_main.c index b03fe30..bb14749 100644 --- a/tests/test-header-nr/main.c +++ b/tests/header_nr_main.c @@ -21,11 +21,14 @@ * PURPOSE. */ -#include "scanner.h" +#include "header_nr_scanner.h" int main ( int argc, char** argv ) { + (void)argc; + (void)argv; + testin = stdin; testout = stdout; testlex(); diff --git a/tests/test-header-nr/scanner.l b/tests/header_nr_scanner.l index a768f72..b429a6c 100644 --- a/tests/test-header-nr/scanner.l +++ b/tests/header_nr_scanner.l @@ -29,8 +29,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" header="scanner.h" -%option nounput nomain noyywrap +%option 8bit prefix="test" header="header_nr_scanner.h" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-header-r/test.input b/tests/header_r.txt index 2ce5001..2ce5001 100644 --- a/tests/test-header-r/test.input +++ b/tests/header_r.txt diff --git a/tests/test-header-r/main.c b/tests/header_r_main.c index 353a63e..22b397d 100644 --- a/tests/test-header-r/main.c +++ b/tests/header_r_main.c @@ -21,7 +21,9 @@ * PURPOSE. */ -#include "scanner.h" +#include <assert.h> + +#include "header_r_scanner.h" /* The scanner itself is not important here. * We simply try to use all the functions that are exported in the @@ -30,6 +32,9 @@ int main ( int argc, char** argv ) { + (void)argc; + (void)argv; + yyscan_t scanner; FILE *fp; char * extra = "EXTRA"; @@ -40,7 +45,9 @@ main ( int argc, char** argv ) testset_extra(extra,scanner); fp = testget_in(scanner); + assert(fp == stdin); fp = testget_out(scanner); + assert(fp == stdout); while(testlex(scanner)) { char * text; @@ -58,6 +65,3 @@ main ( int argc, char** argv ) printf("TEST RETURNING OK.\n"); return 0; } - - -/* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/test-header-r/scanner.l b/tests/header_r_scanner.l index 9f565c9..bfad8ba 100644 --- a/tests/test-header-r/scanner.l +++ b/tests/header_r_scanner.l @@ -33,8 +33,8 @@ %} %option reentrant -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" header="header_r_scanner.h" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-include-by-buffer/scanner.l b/tests/include_by_buffer.direct.l index 3224543..f3b2d2a 100644 --- a/tests/test-include-by-buffer/scanner.l +++ b/tests/include_by_buffer.direct.l @@ -3,7 +3,7 @@ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions - * are met: +f * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. @@ -31,8 +31,8 @@ #include "config.h" %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn %x GET_FILENAME @@ -87,7 +87,7 @@ main ( int argc, char** argv ) { FILE * fp; if( argc != 2 ) { - fprintf(stderr,"*** Error: Must specifiy one filename.\n"); + fprintf(stderr,"*** Error: Must specify one filename.\n"); exit(-1); } if((fp=fopen(argv[1],"r"))==NULL) { diff --git a/tests/include_by_buffer.direct.txt b/tests/include_by_buffer.direct.txt new file mode 100644 index 0000000..56f1ed2 --- /dev/null +++ b/tests/include_by_buffer.direct.txt @@ -0,0 +1,3 @@ +Beginning of "include_by_buffer.direct.txt" +#include <include_by_buffer.direct_2.txt> +End of "include_by_buffer.direct.txt" diff --git a/tests/include_by_buffer.direct_2.txt b/tests/include_by_buffer.direct_2.txt new file mode 100644 index 0000000..52e61ea --- /dev/null +++ b/tests/include_by_buffer.direct_2.txt @@ -0,0 +1,3 @@ +Beginning of "include_by_buffer.direct_2.txt" +#include <include_by_buffer.direct_3.txt> +End of "include_by_buffer.direct_2.txt" diff --git a/tests/include_by_buffer.direct_3.txt b/tests/include_by_buffer.direct_3.txt new file mode 100644 index 0000000..3cfdd0f --- /dev/null +++ b/tests/include_by_buffer.direct_3.txt @@ -0,0 +1,2 @@ +Beginning of "include_by_buffer.direct_3.txt" +End of "include_by_buffer.direct_3.txt" diff --git a/tests/test-include-by-push/scanner.l b/tests/include_by_push.direct.l index 8556152..6b7a5fa 100644 --- a/tests/test-include-by-push/scanner.l +++ b/tests/include_by_push.direct.l @@ -31,8 +31,8 @@ #include "config.h" %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn %x GET_FILENAME @@ -77,7 +77,7 @@ main ( int argc, char** argv ) { FILE * fp; if( argc != 2 ) { - fprintf(stderr,"*** Error: Must specifiy one filename.\n"); + fprintf(stderr,"*** Error: Must specify one filename.\n"); exit(-1); } if((fp=fopen(argv[1],"r"))==NULL) { diff --git a/tests/include_by_push.direct.txt b/tests/include_by_push.direct.txt new file mode 100644 index 0000000..93136f6 --- /dev/null +++ b/tests/include_by_push.direct.txt @@ -0,0 +1,3 @@ +Beginning of "include_by_push.direct.txt" +#include <include_by_push.direct_2.txt> +End of "include_by_push.direct.txt" diff --git a/tests/include_by_push.direct_2.txt b/tests/include_by_push.direct_2.txt new file mode 100644 index 0000000..8b378e8 --- /dev/null +++ b/tests/include_by_push.direct_2.txt @@ -0,0 +1,3 @@ +Beginning of "include_by_push.direct_2.txt" +#include <include_by_push.direct_3.txt> +End of "include_by_push.direct_2.txt" diff --git a/tests/include_by_push.direct_3.txt b/tests/include_by_push.direct_3.txt new file mode 100644 index 0000000..8b8f9a5 --- /dev/null +++ b/tests/include_by_push.direct_3.txt @@ -0,0 +1,2 @@ +Beginning of "include_by_push.direct_3.txt" +End of "include_by_push.direct_3.txt" diff --git a/tests/test-include-by-reentrant/scanner.l b/tests/include_by_reentrant.direct.l index 8d23681..8cd4900 100644 --- a/tests/test-include-by-reentrant/scanner.l +++ b/tests/include_by_reentrant.direct.l @@ -31,8 +31,8 @@ #include "config.h" %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option reentrant %option warn @@ -84,7 +84,7 @@ main ( argc, argv ) FILE * fp; yyscan_t scanner; if( argc != 2 ) { - fprintf(stderr,"*** Error: Must specifiy one filename.\n"); + fprintf(stderr,"*** Error: Must specify one filename.\n"); exit(-1); } if((fp=fopen(argv[1],"r"))==NULL) { diff --git a/tests/include_by_reentrant.direct.txt b/tests/include_by_reentrant.direct.txt new file mode 100644 index 0000000..190a600 --- /dev/null +++ b/tests/include_by_reentrant.direct.txt @@ -0,0 +1,3 @@ +Beginning of "include_by_reentrant.direct.txt". +#include <include_by_reentrant.direct_2.txt> +End of "include_by_reentrant.direct.txt". diff --git a/tests/include_by_reentrant.direct_2.txt b/tests/include_by_reentrant.direct_2.txt new file mode 100644 index 0000000..84a647b --- /dev/null +++ b/tests/include_by_reentrant.direct_2.txt @@ -0,0 +1,3 @@ +Beginning of "include_by_reentrant.direct_2.txt". +#include <include_by_reentrant.direct_3.txt> +End of "include_by_reentrant.direct_2.txt". diff --git a/tests/include_by_reentrant.direct_3.txt b/tests/include_by_reentrant.direct_3.txt new file mode 100644 index 0000000..b0fba64 --- /dev/null +++ b/tests/include_by_reentrant.direct_3.txt @@ -0,0 +1,2 @@ +Beginning of "include_by_reentrant.direct_3.txt". +End of "include_by_reentrant.direct_3.txt". diff --git a/tests/test-lineno-nr/scanner.l b/tests/lineno_nr.l index 4341335..8e35fc1 100644 --- a/tests/test-lineno-nr/scanner.l +++ b/tests/lineno_nr.l @@ -34,8 +34,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap yylineno +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput yylineno %option warn WORD [[:alpha:]]+ @@ -82,6 +82,8 @@ main ( argc, argv ) int argc; char** argv; { + (void)argv; + if( argc > 1 ) printf("%d\n", count_newlines(stdin)); diff --git a/tests/test-lineno-nr/test.input b/tests/lineno_nr.one.txt index c1eb961..c1eb961 100644 --- a/tests/test-lineno-nr/test.input +++ b/tests/lineno_nr.one.txt diff --git a/tests/test-lineno-r/scanner.l b/tests/lineno_r.l index 8933f5f..e6207c6 100644 --- a/tests/test-lineno-r/scanner.l +++ b/tests/lineno_r.l @@ -34,8 +34,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap yylineno reentrant +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput yylineno reentrant %option warn WORD [[:alpha:]]+ @@ -82,6 +82,8 @@ main (argc, argv) int argc; char ** argv; { + (void)argv; + if( argc > 1 ) printf("%d\n", count_newlines(stdin)); diff --git a/tests/test-lineno-r/test.input b/tests/lineno_r.one.txt index c1eb961..c1eb961 100644 --- a/tests/test-lineno-r/test.input +++ b/tests/lineno_r.one.txt diff --git a/tests/test-lineno-trailing/scanner.l b/tests/lineno_trailing.l index 20d3c8a..3a8a683 100644 --- a/tests/test-lineno-trailing/scanner.l +++ b/tests/lineno_trailing.l @@ -34,8 +34,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap yylineno +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput yylineno %option warn WORD [[:alpha:]]+ @@ -75,6 +75,8 @@ main ( argc, argv ) int argc; char** argv; { + (void)argv; + if( argc > 1 ) printf("%d\n", count_newlines(stdin)); diff --git a/tests/test-lineno-trailing/test.input b/tests/lineno_trailing.one.txt index 201164d..201164d 100644 --- a/tests/test-lineno-trailing/test.input +++ b/tests/lineno_trailing.one.txt diff --git a/tests/test-mem-nr/scanner.l b/tests/mem_nr.l index d03996a..c7a6ce0 100644 --- a/tests/test-mem-nr/scanner.l +++ b/tests/mem_nr.l @@ -39,8 +39,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput noyy_top_state %option warn stack nodefault %option noyyalloc noyyrealloc noyyfree diff --git a/tests/test-mem-nr/test.input b/tests/mem_nr.txt index 79aa16a..79aa16a 100644 --- a/tests/test-mem-nr/test.input +++ b/tests/mem_nr.txt diff --git a/tests/test-mem-r/scanner.l b/tests/mem_r.l index ba6e0b5..cbfe08c 100644 --- a/tests/test-mem-r/scanner.l +++ b/tests/mem_r.l @@ -39,8 +39,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput noyy_top_state %option warn stack nodefault reentrant %option noyyalloc noyyrealloc noyyfree @@ -87,6 +87,8 @@ static void dump_mem(FILE* fp){ void * yyalloc(yy_size_t n , void* yyscanner) { + (void)yyscanner; + void * p; int i; @@ -116,6 +118,8 @@ void * yyalloc(yy_size_t n , void* yyscanner) void * yyrealloc(void* p, yy_size_t n , void* yyscanner) { + (void)yyscanner; + int i; for (i=0; i < arrsz; i++) if ( ptrs[i].p == p){ @@ -137,6 +141,8 @@ void * yyrealloc(void* p, yy_size_t n , void* yyscanner) void yyfree(void* p , void* yyscanner) { + (void)yyscanner; + int i; for (i=0; i < arrsz; i++) if ( ptrs[i].p == p){ diff --git a/tests/test-mem-r/test.input b/tests/mem_r.txt index 79aa16a..79aa16a 100644 --- a/tests/test-mem-r/test.input +++ b/tests/mem_r.txt diff --git a/tests/test-multiple-scanners-nr/scanner-1.l b/tests/multiple_scanners_nr_1.l index 0d520b1..fcba194 100644 --- a/tests/test-multiple-scanners-nr/scanner-1.l +++ b/tests/multiple_scanners_nr_1.l @@ -29,9 +29,9 @@ %} -%option header="scanner-1.h" -%option 8bit outfile="scanner-1.c" prefix="S1_" -%option nounput nomain noyywrap +%option header="multiple_scanners_nr_1.h" +%option 8bit prefix="S1_" +%option nounput nomain noyywrap noinput %option warn stack noyy_top_state %x ON diff --git a/tests/test-multiple-scanners-nr/scanner-2.l b/tests/multiple_scanners_nr_2.l index 88bd799..fff2e88 100644 --- a/tests/test-multiple-scanners-nr/scanner-2.l +++ b/tests/multiple_scanners_nr_2.l @@ -29,9 +29,9 @@ %} -%option header="scanner-2.h" -%option 8bit outfile="scanner-2.c" prefix="S2_" -%option nounput nomain noyywrap +%option header="multiple_scanners_nr_2.h" +%option 8bit prefix="S2_" +%option nounput nomain noyywrap noinput %option warn stack noyy_top_state %x OFF diff --git a/tests/test-multiple-scanners-nr/main.c b/tests/multiple_scanners_nr_main.c index a83bec6..497bd9f 100644 --- a/tests/test-multiple-scanners-nr/main.c +++ b/tests/multiple_scanners_nr_main.c @@ -21,12 +21,15 @@ * PURPOSE. */ -#include "scanner-1.h" -#include "scanner-2.h" +#include "multiple_scanners_nr_1.h" +#include "multiple_scanners_nr_2.h" int main ( int argc, char** argv ) { + (void)argc; + (void)argv; + int S1_ok=1, S2_ok=1; YY_BUFFER_STATE buff1, buff2; S1_out = S2_out = stdout; @@ -46,6 +49,3 @@ main ( int argc, char** argv ) printf("TEST RETURNING OK.\n"); return 0; } - - -/* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/test-multiple-scanners-r/scanner-1.l b/tests/multiple_scanners_r_1.l index 84f8719..75ef179 100644 --- a/tests/test-multiple-scanners-r/scanner-1.l +++ b/tests/multiple_scanners_r_1.l @@ -29,11 +29,10 @@ %} -%option header="scanner-1.h" -%option 8bit outfile="scanner-1.c" prefix="S1_" -%option nounput nomain noyywrap noyy_top_state +%option header="multiple_scanners_r_1.h" +%option 8bit prefix="S1_" +%option nounput nomain noyywrap noinput noyy_top_state %option warn stack reentrant -%option tables-file="scanner-1.tables" %x ON %x OFF diff --git a/tests/test-multiple-scanners-r/scanner-2.l b/tests/multiple_scanners_r_2.l index f0d5c2d..a10d63d 100644 --- a/tests/test-multiple-scanners-r/scanner-2.l +++ b/tests/multiple_scanners_r_2.l @@ -29,11 +29,10 @@ %} -%option header="scanner-2.h" -%option 8bit outfile="scanner-2.c" prefix="S2_" -%option nounput nomain noyywrap +%option header="multiple_scanners_r_2.h" +%option 8bit prefix="S2_" +%option nounput nomain noyywrap noinput %option warn stack reentrant noyy_top_state -%option tables-file="scanner-2.tables" %x OFF %x ON diff --git a/tests/test-multiple-scanners-r/main.c b/tests/multiple_scanners_r_main.c index 3c07266..ea73806 100644 --- a/tests/test-multiple-scanners-r/main.c +++ b/tests/multiple_scanners_r_main.c @@ -21,12 +21,15 @@ * PURPOSE. */ -#include "scanner-1.h" -#include "scanner-2.h" +#include "multiple_scanners_r_1.h" +#include "multiple_scanners_r_2.h" int main ( int argc, char** argv ) { + (void)argc; + (void)argv; + int S1_ok=1, S2_ok=1; FILE * fp; YY_BUFFER_STATE buff1, buff2; @@ -35,26 +38,6 @@ main ( int argc, char** argv ) S1_lex_init(&scan1); S2_lex_init(&scan2); - if((fp = fopen("scanner-1.tables","r")) == 0){ - fprintf(stderr,"Could not open scanner-1.tables.\n"); - exit(1); - } - if(S1_tables_fload(fp,scan1) != 0){ - fprintf(stderr,"Could not load scanner-1.tables.\n"); - exit(1); - } - fclose(fp); - - if((fp = fopen("scanner-2.tables","r")) == 0){ - fprintf(stderr,"Could not open scanner-2.tables.\n"); - exit(1); - } - if(S2_tables_fload(fp,scan2) != 0){ - fprintf(stderr,"Could not load scanner-2.tables.\n"); - exit(1); - } - fclose(fp); - S1_set_out(stdout,scan1); S2_set_out(S1_get_out(scan1),scan2); @@ -72,9 +55,6 @@ main ( int argc, char** argv ) S1__delete_buffer(buff1, scan1); S2__delete_buffer(buff2, scan2); - S1_tables_destroy(scan1); - S2_tables_destroy(scan2); - S1_lex_destroy(scan1); S2_lex_destroy(scan2); printf("TEST RETURNING OK.\n"); diff --git a/tests/test-noansi-nr/scanner.l b/tests/noansi_nr.l index 4afc8c2..db075a4 100644 --- a/tests/test-noansi-nr/scanner.l +++ b/tests/noansi_nr.l @@ -35,8 +35,8 @@ #include "config.h" %} -%option prefix="test" outfile="scanner.c" -%option nounput noyywrap noyylineno warn nodefault +%option prefix="test" +%option nounput noyywrap noyylineno warn nodefault noinput %option noansi-prototypes noansi-definitions IDENT [[:alnum:]_-] diff --git a/tests/test-noansi-nr/test.input b/tests/noansi_nr.txt index 642e0fb..642e0fb 100644 --- a/tests/test-noansi-nr/test.input +++ b/tests/noansi_nr.txt diff --git a/tests/test-noansi-r/scanner.l b/tests/noansi_r.l index e0b3ffb..5a3b778 100644 --- a/tests/test-noansi-r/scanner.l +++ b/tests/noansi_r.l @@ -33,8 +33,8 @@ #include "config.h" %} -%option prefix="test" outfile="scanner.c" -%option nounput noyywrap noyylineno warn nodefault +%option prefix="test" +%option nounput noyywrap noyylineno warn nodefault noinput %option reentrant %option noansi-definitions noansi-prototypes diff --git a/tests/test-noansi-r/test.input b/tests/noansi_r.txt index 2160628..2160628 100644 --- a/tests/test-noansi-r/test.input +++ b/tests/noansi_r.txt diff --git a/tests/options.cn b/tests/options.cn new file mode 100755 index 0000000..2f592e9 --- /dev/null +++ b/tests/options.cn @@ -0,0 +1,5 @@ +#!/bin/bash + +# Test that flex handles the grouped noop options -c and -n properly. + +echo %% | $1 -cn -o /dev/null diff --git a/tests/test-posix/scanner.l b/tests/posix.l index c6c0b51..38e8d3b 100644 --- a/tests/test-posix/scanner.l +++ b/tests/posix.l @@ -40,8 +40,8 @@ int tests_ok[NUM_TESTS] = { 0 }; %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn posix-compat diff --git a/tests/test-posixly-correct/scanner.l b/tests/posixly_correct.l index 20912df..aff9cbd 100644 --- a/tests/test-posixly-correct/scanner.l +++ b/tests/posixly_correct.l @@ -40,8 +40,8 @@ int tests_ok[NUM_TESTS] = { 0 }; %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-prefix-nr/scanner.l b/tests/prefix_nr.l index 4497aa1..c1665df 100644 --- a/tests/test-prefix-nr/scanner.l +++ b/tests/prefix_nr.l @@ -30,8 +30,8 @@ %} -%option 8bit outfile="scanner.c" prefix="FOO" -%option nounput nomain noyywrap +%option 8bit prefix="FOO" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-prefix-nr/test.input b/tests/prefix_nr.txt index 0e6c88f..0e6c88f 100644 --- a/tests/test-prefix-nr/test.input +++ b/tests/prefix_nr.txt diff --git a/tests/test-prefix-r/scanner.l b/tests/prefix_r.l index 4c25982..a2d4c1a 100644 --- a/tests/test-prefix-r/scanner.l +++ b/tests/prefix_r.l @@ -30,8 +30,8 @@ %} %option reentrant -%option 8bit outfile="scanner.c" prefix="FOO" -%option nounput nomain noyywrap +%option 8bit prefix="FOO" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-prefix-r/test.input b/tests/prefix_r.txt index 0e6c88f..0e6c88f 100644 --- a/tests/test-prefix-r/test.input +++ b/tests/prefix_r.txt diff --git a/tests/test-pthread/scanner.l b/tests/pthread.l index 8603873..38080c1 100644 --- a/tests/test-pthread/scanner.l +++ b/tests/pthread.l @@ -46,8 +46,8 @@ static int process_text(char* s, yyscan_t scanner); %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain nodefault +%option 8bit prefix="test" +%option nounput nomain nodefault noinput %option yywrap %option reentrant %option warn @@ -78,9 +78,13 @@ static int process_text(char* s, yyscan_t scanner); <INITIAL,STATE_1,STATE_2>[[:space:]\r\n]+ { } %% -int yywrap( yyscan_t scanner) { return 1; } +int yywrap( yyscan_t scanner) { + (void)scanner; + return 1; +} static int process_text(char* s, yyscan_t scanner) { + (void)scanner; return (int)(*s) + (int) *(s + yyget_leng(scanner)-1); } @@ -114,6 +118,8 @@ void * thread_func ( void* arg ) { int i; + (void)arg; + /* Wait for go-ahead. */ pthread_mutex_lock( &go_ahead); pthread_mutex_unlock(&go_ahead); diff --git a/tests/test-pthread/test-1.input b/tests/pthread_1.txt index 234774b..234774b 100644 --- a/tests/test-pthread/test-1.input +++ b/tests/pthread_1.txt diff --git a/tests/test-pthread/test-2.input b/tests/pthread_2.txt index 234774b..234774b 100644 --- a/tests/test-pthread/test-2.input +++ b/tests/pthread_2.txt diff --git a/tests/test-pthread/test-3.input b/tests/pthread_3.txt index 234774b..234774b 100644 --- a/tests/test-pthread/test-3.input +++ b/tests/pthread_3.txt diff --git a/tests/test-pthread/test-4.input b/tests/pthread_4.txt index 234774b..234774b 100644 --- a/tests/test-pthread/test-4.input +++ b/tests/pthread_4.txt diff --git a/tests/test-pthread/test-5.input b/tests/pthread_5.txt index 234774b..234774b 100644 --- a/tests/test-pthread/test-5.input +++ b/tests/pthread_5.txt diff --git a/tests/test-quotes/scanner.l b/tests/quotes.l index 0c7c482..c1386c3 100644 --- a/tests/test-quotes/scanner.l +++ b/tests/quotes.l @@ -55,8 +55,8 @@ static int foo (int i){ } %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-c-cpp-r/test.input b/tests/quotes.txt index 7288a40..7288a40 100644 --- a/tests/test-c-cpp-r/test.input +++ b/tests/quotes.txt diff --git a/tests/test-reject/scanner.l b/tests/reject.l4 index 5e5208e..27982b1 100644 --- a/tests/test-reject/scanner.l +++ b/tests/reject.l4 @@ -29,7 +29,7 @@ %} %option 8bit prefix="test" -%option nounput nomain noyywrap +%option nounput nomain noyywrap noinput %option warn reject @@ -48,6 +48,8 @@ int main ( int argc, char** argv ) #ifdef TEST_IS_REENTRANT yylex_init(&yyscanner); +#else + (void)yyscanner; #endif #ifdef TEST_HAS_TABLES_EXTERNAL diff --git a/tests/test-quotes/test.input b/tests/reject.txt index 7288a40..7288a40 100644 --- a/tests/test-quotes/test.input +++ b/tests/reject.txt diff --git a/tests/test-rescan-nr/scanner.l b/tests/rescan_nr.direct.l index a4ac521..86103aa 100644 --- a/tests/test-rescan-nr/scanner.l +++ b/tests/rescan_nr.direct.l @@ -27,8 +27,8 @@ #include <stdlib.h> %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput %option warn stack never-interactive %x STATE_1 @@ -51,6 +51,8 @@ main (int argc, char* const argv[]) FILE* fp; int i; + (void)argc; + if ((fp = fopen(argv[1],"r")) == NULL){ perror("Failed to open input file."); return 1; diff --git a/tests/test-reject/test.input b/tests/rescan_nr.direct.txt index 7288a40..7288a40 100644 --- a/tests/test-reject/test.input +++ b/tests/rescan_nr.direct.txt diff --git a/tests/test-rescan-r/scanner.l b/tests/rescan_r.direct.l index 3357ce8..2255ee2 100644 --- a/tests/test-rescan-r/scanner.l +++ b/tests/rescan_r.direct.l @@ -27,8 +27,8 @@ #include <stdlib.h> %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap reentrant +%option 8bit prefix="test" +%option nounput nomain noyywrap noinput reentrant %option warn stack never-interactive %x STATE_1 @@ -52,6 +52,8 @@ main (int argc, char* const argv[]) int i; yyscan_t yyscanner; + (void)argc; + if ((fp = fopen(argv[1],"r")) == NULL){ perror("Failed to open input file."); return 1; diff --git a/tests/test-rescan-nr/test.input b/tests/rescan_r.direct.txt index 7288a40..7288a40 100644 --- a/tests/test-rescan-nr/test.input +++ b/tests/rescan_r.direct.txt diff --git a/tests/test-string-nr/scanner.l b/tests/string_nr.l index 6ab5b54..3dd752a 100644 --- a/tests/test-string-nr/scanner.l +++ b/tests/string_nr.l @@ -32,8 +32,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain nodefault noyywrap +%option 8bit prefix="test" +%option nounput nomain nodefault noyywrap noinput %option warn diff --git a/tests/test-string-r/scanner.l b/tests/string_r.l index 6b594d7..d98c98a 100644 --- a/tests/test-string-r/scanner.l +++ b/tests/string_r.l @@ -32,8 +32,8 @@ %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain nodefault noyywrap +%option 8bit prefix="test" +%option nounput nomain nodefault noyywrap noinput %option warn reentrant diff --git a/tests/tableopts.am b/tests/tableopts.am new file mode 100644 index 0000000..bbb20d0 --- /dev/null +++ b/tests/tableopts.am @@ -0,0 +1,333 @@ +tableopts_opt_nr_Ca_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Ca.opt$(EXEEXT): tableopts_opt_nr-Ca.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Ce_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Ce.opt$(EXEEXT): tableopts_opt_nr-Ce.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Cf_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Cf.opt$(EXEEXT): tableopts_opt_nr-Cf.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_CF_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-CF.opt$(EXEEXT): tableopts_opt_nr-CF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Cm_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Cm.opt$(EXEEXT): tableopts_opt_nr-Cm.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Cem_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Cem.opt$(EXEEXT): tableopts_opt_nr-Cem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Cae_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Cae.opt$(EXEEXT): tableopts_opt_nr-Cae.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Caef_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Caef.opt$(EXEEXT): tableopts_opt_nr-Caef.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_CaeF_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-CaeF.opt$(EXEEXT): tableopts_opt_nr-CaeF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Cam_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Cam.opt$(EXEEXT): tableopts_opt_nr-Cam.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_nr_Caem_opt_SOURCES = tableopts.l4 + +tableopts_opt_nr-Caem.opt$(EXEEXT): tableopts_opt_nr-Caem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Ca_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Ca.opt$(EXEEXT): tableopts_opt_r-Ca.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Ce_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Ce.opt$(EXEEXT): tableopts_opt_r-Ce.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Cf_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Cf.opt$(EXEEXT): tableopts_opt_r-Cf.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_CF_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-CF.opt$(EXEEXT): tableopts_opt_r-CF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Cm_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Cm.opt$(EXEEXT): tableopts_opt_r-Cm.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Cem_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Cem.opt$(EXEEXT): tableopts_opt_r-Cem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Cae_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Cae.opt$(EXEEXT): tableopts_opt_r-Cae.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Caef_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Caef.opt$(EXEEXT): tableopts_opt_r-Caef.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_CaeF_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-CaeF.opt$(EXEEXT): tableopts_opt_r-CaeF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Cam_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Cam.opt$(EXEEXT): tableopts_opt_r-Cam.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_opt_r_Caem_opt_SOURCES = tableopts.l4 + +tableopts_opt_r-Caem.opt$(EXEEXT): tableopts_opt_r-Caem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Ca_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Ca.ser$(EXEEXT): tableopts_ser_nr-Ca.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Ce_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Ce.ser$(EXEEXT): tableopts_ser_nr-Ce.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Cf_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Cf.ser$(EXEEXT): tableopts_ser_nr-Cf.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_CF_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-CF.ser$(EXEEXT): tableopts_ser_nr-CF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Cm_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Cm.ser$(EXEEXT): tableopts_ser_nr-Cm.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Cem_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Cem.ser$(EXEEXT): tableopts_ser_nr-Cem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Cae_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Cae.ser$(EXEEXT): tableopts_ser_nr-Cae.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Caef_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Caef.ser$(EXEEXT): tableopts_ser_nr-Caef.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_CaeF_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-CaeF.ser$(EXEEXT): tableopts_ser_nr-CaeF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Cam_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Cam.ser$(EXEEXT): tableopts_ser_nr-Cam.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_nr_Caem_ser_SOURCES = tableopts.l4 + +tableopts_ser_nr-Caem.ser$(EXEEXT): tableopts_ser_nr-Caem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Ca_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Ca.ser$(EXEEXT): tableopts_ser_r-Ca.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Ce_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Ce.ser$(EXEEXT): tableopts_ser_r-Ce.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Cf_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Cf.ser$(EXEEXT): tableopts_ser_r-Cf.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_CF_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-CF.ser$(EXEEXT): tableopts_ser_r-CF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Cm_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Cm.ser$(EXEEXT): tableopts_ser_r-Cm.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Cem_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Cem.ser$(EXEEXT): tableopts_ser_r-Cem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Cae_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Cae.ser$(EXEEXT): tableopts_ser_r-Cae.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Caef_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Caef.ser$(EXEEXT): tableopts_ser_r-Caef.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_CaeF_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-CaeF.ser$(EXEEXT): tableopts_ser_r-CaeF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Cam_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Cam.ser$(EXEEXT): tableopts_ser_r-Cam.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ser_r_Caem_ser_SOURCES = tableopts.l4 + +tableopts_ser_r-Caem.ser$(EXEEXT): tableopts_ser_r-Caem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Ca_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Ca.ver$(EXEEXT): tableopts_ver_nr-Ca.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Ce_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Ce.ver$(EXEEXT): tableopts_ver_nr-Ce.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Cf_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Cf.ver$(EXEEXT): tableopts_ver_nr-Cf.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_CF_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-CF.ver$(EXEEXT): tableopts_ver_nr-CF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Cm_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Cm.ver$(EXEEXT): tableopts_ver_nr-Cm.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Cem_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Cem.ver$(EXEEXT): tableopts_ver_nr-Cem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Cae_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Cae.ver$(EXEEXT): tableopts_ver_nr-Cae.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Caef_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Caef.ver$(EXEEXT): tableopts_ver_nr-Caef.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_CaeF_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-CaeF.ver$(EXEEXT): tableopts_ver_nr-CaeF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Cam_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Cam.ver$(EXEEXT): tableopts_ver_nr-Cam.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_nr_Caem_ver_SOURCES = tableopts.l4 + +tableopts_ver_nr-Caem.ver$(EXEEXT): tableopts_ver_nr-Caem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Ca_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Ca.ver$(EXEEXT): tableopts_ver_r-Ca.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Ce_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Ce.ver$(EXEEXT): tableopts_ver_r-Ce.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Cf_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Cf.ver$(EXEEXT): tableopts_ver_r-Cf.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_CF_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-CF.ver$(EXEEXT): tableopts_ver_r-CF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Cm_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Cm.ver$(EXEEXT): tableopts_ver_r-Cm.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Cem_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Cem.ver$(EXEEXT): tableopts_ver_r-Cem.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Cae_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Cae.ver$(EXEEXT): tableopts_ver_r-Cae.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Caef_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Caef.ver$(EXEEXT): tableopts_ver_r-Caef.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_CaeF_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-CaeF.ver$(EXEEXT): tableopts_ver_r-CaeF.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Cam_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Cam.ver$(EXEEXT): tableopts_ver_r-Cam.$(OBJEXT) + $(LINK) -o $@ $< + +tableopts_ver_r_Caem_ver_SOURCES = tableopts.l4 + +tableopts_ver_r-Caem.ver$(EXEEXT): tableopts_ver_r-Caem.$(OBJEXT) + $(LINK) -o $@ $< + +TABLEOPTS_TESTS = tableopts_opt_nr-Ca.opt tableopts_opt_nr-Ce.opt tableopts_opt_nr-Cf.opt tableopts_opt_nr-CF.opt tableopts_opt_nr-Cm.opt tableopts_opt_nr-Cem.opt tableopts_opt_nr-Cae.opt tableopts_opt_nr-Caef.opt tableopts_opt_nr-CaeF.opt tableopts_opt_nr-Cam.opt tableopts_opt_nr-Caem.opt tableopts_opt_r-Ca.opt tableopts_opt_r-Ce.opt tableopts_opt_r-Cf.opt tableopts_opt_r-CF.opt tableopts_opt_r-Cm.opt tableopts_opt_r-Cem.opt tableopts_opt_r-Cae.opt tableopts_opt_r-Caef.opt tableopts_opt_r-CaeF.opt tableopts_opt_r-Cam.opt tableopts_opt_r-Caem.opt tableopts_ser_nr-Ca.ser tableopts_ser_nr-Ce.ser tableopts_ser_nr-Cf.ser tableopts_ser_nr-CF.ser tableopts_ser_nr-Cm.ser tableopts_ser_nr-Cem.ser tableopts_ser_nr-Cae.ser tableopts_ser_nr-Caef.ser tableopts_ser_nr-CaeF.ser tableopts_ser_nr-Cam.ser tableopts_ser_nr-Caem.ser tableopts_ser_r-Ca.ser tableopts_ser_r-Ce.ser tableopts_ser_r-Cf.ser tableopts_ser_r-CF.ser tableopts_ser_r-Cm.ser tableopts_ser_r-Cem.ser tableopts_ser_r-Cae.ser tableopts_ser_r-Caef.ser tableopts_ser_r-CaeF.ser tableopts_ser_r-Cam.ser tableopts_ser_r-Caem.ser tableopts_ver_nr-Ca.ver tableopts_ver_nr-Ce.ver tableopts_ver_nr-Cf.ver tableopts_ver_nr-CF.ver tableopts_ver_nr-Cm.ver tableopts_ver_nr-Cem.ver tableopts_ver_nr-Cae.ver tableopts_ver_nr-Caef.ver tableopts_ver_nr-CaeF.ver tableopts_ver_nr-Cam.ver tableopts_ver_nr-Caem.ver tableopts_ver_r-Ca.ver tableopts_ver_r-Ce.ver tableopts_ver_r-Cf.ver tableopts_ver_r-CF.ver tableopts_ver_r-Cm.ver tableopts_ver_r-Cem.ver tableopts_ver_r-Cae.ver tableopts_ver_r-Caef.ver tableopts_ver_r-CaeF.ver tableopts_ver_r-Cam.ver tableopts_ver_r-Caem.ver + +tableopts_tables = tableopts_ser_nr-Ca.ser.tables tableopts_ser_nr-Ce.ser.tables tableopts_ser_nr-Cf.ser.tables tableopts_ser_nr-CF.ser.tables tableopts_ser_nr-Cm.ser.tables tableopts_ser_nr-Cem.ser.tables tableopts_ser_nr-Cae.ser.tables tableopts_ser_nr-Caef.ser.tables tableopts_ser_nr-CaeF.ser.tables tableopts_ser_nr-Cam.ser.tables tableopts_ser_nr-Caem.ser.tables tableopts_ser_r-Ca.ser.tables tableopts_ser_r-Ce.ser.tables tableopts_ser_r-Cf.ser.tables tableopts_ser_r-CF.ser.tables tableopts_ser_r-Cm.ser.tables tableopts_ser_r-Cem.ser.tables tableopts_ser_r-Cae.ser.tables tableopts_ser_r-Caef.ser.tables tableopts_ser_r-CaeF.ser.tables tableopts_ser_r-Cam.ser.tables tableopts_ser_r-Caem.ser.tables tableopts_ver_nr-Ca.ver.tables tableopts_ver_nr-Ce.ver.tables tableopts_ver_nr-Cf.ver.tables tableopts_ver_nr-CF.ver.tables tableopts_ver_nr-Cm.ver.tables tableopts_ver_nr-Cem.ver.tables tableopts_ver_nr-Cae.ver.tables tableopts_ver_nr-Caef.ver.tables tableopts_ver_nr-CaeF.ver.tables tableopts_ver_nr-Cam.ver.tables tableopts_ver_nr-Caem.ver.tables tableopts_ver_r-Ca.ver.tables tableopts_ver_r-Ce.ver.tables tableopts_ver_r-Cf.ver.tables tableopts_ver_r-CF.ver.tables tableopts_ver_r-Cm.ver.tables tableopts_ver_r-Cem.ver.tables tableopts_ver_r-Cae.ver.tables tableopts_ver_r-Caef.ver.tables tableopts_ver_r-CaeF.ver.tables tableopts_ver_r-Cam.ver.tables tableopts_ver_r-Caem.ver.tables diff --git a/tests/test-table-opts/scanner.l b/tests/tableopts.l4 index 3ad6199..bb79407 100644 --- a/tests/test-table-opts/scanner.l +++ b/tests/tableopts.l4 @@ -29,7 +29,7 @@ %} %option 8bit -%option nounput nomain noyywrap +%option nounput nomain noyywrap noinput %option warn yylineno @@ -50,6 +50,8 @@ int main ( int argc, char** argv ) #ifdef TEST_IS_REENTRANT yylex_init(&yyscanner); +#else + (void)yyscanner; #endif #ifdef TEST_HAS_TABLES_EXTERNAL diff --git a/tests/tableopts.sh b/tests/tableopts.sh new file mode 100755 index 0000000..63a36d3 --- /dev/null +++ b/tests/tableopts.sh @@ -0,0 +1,44 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +# This script is present to generate the automake _SOURCES variables +# for the tableopts_* tests. It also generates the linking rules for +# each test since automake isn't able to handle the pattern rules that +# would be natural to use. Output is written to standard output for +# inclusion in a Makefile.am, typically by redirecting the output and then an automake include directive. + +TABLEOPTS_TESTS="" +tableopts_tables="" + +for kind in opt ser ver ; do + for threading in nr r ; do + for opt in -Ca -Ce -Cf -CF -Cm -Cem -Cae -Caef -CaeF -Cam -Caem ; do + testname=tableopts_${kind}_${threading}${opt}.${kind} + if [ "${TABLEOPTS_TESTS}" = "" ] ;then + TABLEOPTS_TESTS=${testname} + if [ "$kind" = "ser" -o "$kind" = "ver" ] ; then + tableopts_tables=${testname}.tables + fi + else + TABLEOPTS_TESTS="${TABLEOPTS_TESTS} ${testname}" + if [ "$kind" = "ser" -o "$kind" = "ver" ] ; then + tableopts_tables="${tableopts_tables} ${testname}.tables" + fi + fi + + bare_opt=${opt#-} + cat << EOF +tableopts_${kind}_${threading}_${bare_opt}_${kind}_SOURCES = tableopts.l4 + +${testname}\$(EXEEXT): tableopts_${kind}_${threading}${opt}.\$(OBJEXT) + \$(LINK) -o \$@ \$< + +EOF + done + done +done + +echo TABLEOPTS_TESTS = ${TABLEOPTS_TESTS} +echo +echo tableopts_tables = ${tableopts_tables} diff --git a/tests/test-table-opts/test.input b/tests/tableopts.txt index aec9276..aec9276 100644 --- a/tests/test-table-opts/test.input +++ b/tests/tableopts.txt diff --git a/tests/test-alloc-extra/Makefile.am b/tests/test-alloc-extra/Makefile.am deleted file mode 100644 index 04509b6..0000000 --- a/tests/test-alloc-extra/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-alloc-extra - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am deleted file mode 100644 index a54e3fc..0000000 --- a/tests/test-array-nr/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-array-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-array-r/Makefile.am b/tests/test-array-r/Makefile.am deleted file mode 100644 index b60c917..0000000 --- a/tests/test-array-r/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-array-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am deleted file mode 100644 index 956b068..0000000 --- a/tests/test-basic-nr/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-basic-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am deleted file mode 100644 index beca2e7..0000000 --- a/tests/test-basic-r/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-basic-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-bison-nr/Makefile.am b/tests/test-bison-nr/Makefile.am deleted file mode 100644 index f6e6de9..0000000 --- a/tests/test-bison-nr/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -# 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 parser.y test.input main.c -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS) OUTPUT -OBJS = scanner.o parser.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -YFLAGS = --defines --output=parser.c --name-prefix="test" - -testname = test-bison-nr - -scanner.c scanner.h: $(srcdir)/scanner.l - $(FLEX) $< -scanner.h: scanner.c -scanner.o: parser.h - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< -parser.h: parser.c - -main.o: scanner.h parser.h - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am deleted file mode 100644 index 0070991..0000000 --- a/tests/test-bison-yylloc/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -# 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 parser.y test.input main.c -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS) OUTPUT -OBJS = scanner.o parser.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -YFLAGS = --defines --output=parser.c --name-prefix="test" - -testname = test-bison-yylloc - -scanner.c scanner.h: $(srcdir)/scanner.l - $(FLEX) $< -scanner.h: scanner.c -scanner.o: parser.h - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< -parser.h: parser.c - -main.o: scanner.h parser.h - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am deleted file mode 100644 index 1937b34..0000000 --- a/tests/test-bison-yylval/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -# 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 parser.y test.input main.c -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS) OUTPUT -OBJS = parser.o scanner.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -YFLAGS = --defines --output=parser.c --name-prefix="test" - -testname = test-bison-yylval - -scanner.c scanner.h: $(srcdir)/scanner.l - $(FLEX) $< -scanner.h: scanner.c -scanner.o: parser.h - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< -parser.h: parser.c - -main.o: scanner.h parser.h - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-c++-basic/Makefile.am b/tests/test-c++-basic/Makefile.am deleted file mode 100644 index ccfc884..0000000 --- a/tests/test-c++-basic/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.cpp scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -LFLAGS = -+ -#LDFLAGS = - -testname = test-c++-basic - -scanner.cpp: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.cpp.o: - $(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $< diff --git a/tests/test-c++-multiple-scanners/Makefile.am b/tests/test-c++-multiple-scanners/Makefile.am deleted file mode 100644 index 9bcc9f8..0000000 --- a/tests/test-c++-multiple-scanners/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# 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-1.l scanner-2.l main.cpp test.input -CLEANFILES = scanner-1.cpp $(testname)$(EXEEXT) OUTPUT $(OBJS) scanner-2.cpp -OBJS = scanner-1.o scanner-2.o main.o - -AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-c++-multiple-scanners - -scanner-1.cpp: $(srcdir)/scanner-1.l - $(FLEX) -+ $(LFLAGS) $< - -scanner-2.cpp: $(srcdir)/scanner-2.l - $(FLEX) -+ $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - $(builddir)/$(testname)$(EXEEXT) < $(srcdir)/test.input - -.cpp.o: - $(CXX) -c -o $@ $(AM_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< - -main.o: scanner-1.h scanner-2.h -scanner-1.h: scanner-1.cpp -scanner-2.h: scanner-2.cpp diff --git a/tests/test-c++-yywrap/Makefile.am b/tests/test-c++-yywrap/Makefile.am deleted file mode 100644 index 014452b..0000000 --- a/tests/test-c++-yywrap/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.cpp scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -LFLAGS = -+ -#LDFLAGS = - -testname = test-c++-yywrap - -scanner.cpp: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) $(srcdir)/test.input $(srcdir)/test.input $(srcdir)/test.input - -.cpp.o: - $(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $< diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am deleted file mode 100644 index 9aec3b2..0000000 --- a/tests/test-c-cpp-nr/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.cpp $(testname)$(EXEEXT) $(OBJS) OUTPUT -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-c-cpp-nr - -scanner.cpp: $(srcdir)/scanner.l - $(FLEX) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.cpp.o: - $(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $< diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am deleted file mode 100644 index 1c9c23e..0000000 --- a/tests/test-c-cpp-r/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.cpp $(testname)$(EXEEXT) $(OBJS) OUTPUT -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-c-cpp-r - -scanner.cpp: $(srcdir)/scanner.l - $(FLEX) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.cpp.o: - $(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $< diff --git a/tests/test-ccl/Makefile.am b/tests/test-ccl/Makefile.am deleted file mode 100644 index 0a92bb2..0000000 --- a/tests/test-ccl/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# 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 $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) - -testname = test-ccl - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-concatenated-options/Makefile.am b/tests/test-concatenated-options/Makefile.am deleted file mode 100644 index e392073..0000000 --- a/tests/test-concatenated-options/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# 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$(EXEEXT) - -CLEANFILES = OUTPUT - -# The test below just wants to know if flex can process multiple -# concatenated options. The -c and -n options both do nothing, so we -# group them together to see if flex will still function. We write the -# output to /dev/null since we don't really care what flex produces, -# just that it runs successfully. - -test: - echo %% | $(FLEX) -cn -o /dev/null diff --git a/tests/test-debug-nr/Makefile.am b/tests/test-debug-nr/Makefile.am deleted file mode 100644 index 8e4ae82..0000000 --- a/tests/test-debug-nr/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a - -testname = test-debug-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-debug-r/Makefile.am b/tests/test-debug-r/Makefile.am deleted file mode 100644 index 6496892..0000000 --- a/tests/test-debug-r/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a - -testname = test-debug-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-extended/Makefile.am b/tests/test-extended/Makefile.am deleted file mode 100644 index 190e95e..0000000 --- a/tests/test-extended/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# 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 $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) - -testname = test-extended - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input | cmp -s $(srcdir)/test.input - - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am deleted file mode 100644 index 11b6ff4..0000000 --- a/tests/test-header-nr/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# 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 main.c -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) $(OBJS) OUTPUT -OBJS = scanner.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-header-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -scanner.h: scanner.c -main.o: scanner.h diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am deleted file mode 100644 index abd22a2..0000000 --- a/tests/test-header-r/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# 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 main.c -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-header-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -scanner.h: scanner.c -main.o: scanner.h diff --git a/tests/test-include-by-buffer/Makefile.am b/tests/test-include-by-buffer/Makefile.am deleted file mode 100644 index 78e43af..0000000 --- a/tests/test-include-by-buffer/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-include-by-buffer - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) $(srcdir)/test-1.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-include-by-buffer/test-1.input b/tests/test-include-by-buffer/test-1.input deleted file mode 100644 index 355beaa..0000000 --- a/tests/test-include-by-buffer/test-1.input +++ /dev/null @@ -1,3 +0,0 @@ -Beginning of "test-1.input". -#include <test-2.input> -End of "test-1.input". diff --git a/tests/test-include-by-buffer/test-2.input b/tests/test-include-by-buffer/test-2.input deleted file mode 100644 index 45f11f9..0000000 --- a/tests/test-include-by-buffer/test-2.input +++ /dev/null @@ -1,3 +0,0 @@ -Beginning of "test-2.input". -#include <test-3.input> -End of "test-2.input". diff --git a/tests/test-include-by-buffer/test-3.input b/tests/test-include-by-buffer/test-3.input deleted file mode 100644 index 6a2d055..0000000 --- a/tests/test-include-by-buffer/test-3.input +++ /dev/null @@ -1,2 +0,0 @@ -Beginning of "test-3.input". -End of "test-3.input". diff --git a/tests/test-include-by-push/Makefile.am b/tests/test-include-by-push/Makefile.am deleted file mode 100644 index fac4a0e..0000000 --- a/tests/test-include-by-push/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-include-by-push - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) $(srcdir)/test-1.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-include-by-push/test-1.input b/tests/test-include-by-push/test-1.input deleted file mode 100644 index 355beaa..0000000 --- a/tests/test-include-by-push/test-1.input +++ /dev/null @@ -1,3 +0,0 @@ -Beginning of "test-1.input". -#include <test-2.input> -End of "test-1.input". diff --git a/tests/test-include-by-push/test-2.input b/tests/test-include-by-push/test-2.input deleted file mode 100644 index 45f11f9..0000000 --- a/tests/test-include-by-push/test-2.input +++ /dev/null @@ -1,3 +0,0 @@ -Beginning of "test-2.input". -#include <test-3.input> -End of "test-2.input". diff --git a/tests/test-include-by-push/test-3.input b/tests/test-include-by-push/test-3.input deleted file mode 100644 index 6a2d055..0000000 --- a/tests/test-include-by-push/test-3.input +++ /dev/null @@ -1,2 +0,0 @@ -Beginning of "test-3.input". -End of "test-3.input". diff --git a/tests/test-include-by-reentrant/Makefile.am b/tests/test-include-by-reentrant/Makefile.am deleted file mode 100644 index 3f4d1d5..0000000 --- a/tests/test-include-by-reentrant/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-include-by-reentrant - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname) $(srcdir)/test-1.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-include-by-reentrant/test-1.input b/tests/test-include-by-reentrant/test-1.input deleted file mode 100644 index 355beaa..0000000 --- a/tests/test-include-by-reentrant/test-1.input +++ /dev/null @@ -1,3 +0,0 @@ -Beginning of "test-1.input". -#include <test-2.input> -End of "test-1.input". diff --git a/tests/test-include-by-reentrant/test-2.input b/tests/test-include-by-reentrant/test-2.input deleted file mode 100644 index 45f11f9..0000000 --- a/tests/test-include-by-reentrant/test-2.input +++ /dev/null @@ -1,3 +0,0 @@ -Beginning of "test-2.input". -#include <test-3.input> -End of "test-2.input". diff --git a/tests/test-include-by-reentrant/test-3.input b/tests/test-include-by-reentrant/test-3.input deleted file mode 100644 index 6a2d055..0000000 --- a/tests/test-include-by-reentrant/test-3.input +++ /dev/null @@ -1,2 +0,0 @@ -Beginning of "test-3.input". -End of "test-3.input". diff --git a/tests/test-linedir-r/Makefile.am b/tests/test-linedir-r/Makefile.am deleted file mode 100644 index d7f3bf7..0000000 --- a/tests/test-linedir-r/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# 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 main.c check-lines.awk -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-linedir-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - cat -n scanner.c | grep '#line' | grep scanner.c | $(AWK) -f $(srcdir)/check-lines.awk - cat -n scanner.h | grep '#line' | grep scanner.h | $(AWK) -f $(srcdir)/check-lines.awk - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -scanner.h: scanner.c -main.o: scanner.h diff --git a/tests/test-linedir-r/check-lines.awk b/tests/test-linedir-r/check-lines.awk deleted file mode 100644 index 6a1e5ec..0000000 --- a/tests/test-linedir-r/check-lines.awk +++ /dev/null @@ -1,7 +0,0 @@ -{ - if( /#line/ && $1 != ($3 - 1)) { - printf "Line directive mismatch at line %d: %s\n", NR, $0; - exit 1; - } -} - diff --git a/tests/test-linedir-r/main.c b/tests/test-linedir-r/main.c deleted file mode 100644 index 6ba9808..0000000 --- a/tests/test-linedir-r/main.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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. - */ - -#include "scanner.h" - -int -main ( int argc, char** argv ) -{ - yyscan_t scanner; - FILE *fp; - char * extra = "EXTRA"; - - testlex_init(&scanner); - testset_in(stdin,scanner); - testset_out(stdout,scanner); - testset_extra(extra,scanner); - - fp = testget_in(scanner); - fp = testget_out(scanner); - - while(testlex(scanner)) { - char * text; - int line; - line = testget_lineno(scanner); - text = testget_text(scanner); - - if( (char*)testget_extra(scanner) != extra) - break; - - if ( !text || line < 0) - continue; - } - testlex_destroy(scanner); - return 0; -} - - -/* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/test-linedir-r/scanner.l b/tests/test-linedir-r/scanner.l deleted file mode 100644 index e87cc60..0000000 --- a/tests/test-linedir-r/scanner.l +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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. - */ - -%{ -/* Build "scanner.c". - The scanner is not important. - This test is really about getting the line directives correct. -*/ -#include <stdio.h> -#include <stdlib.h> -#include "config.h" - -%} - -%option reentrant -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap -%option warn - -%% - -.|\n { } - -%% - diff --git a/tests/test-lineno-nr/Makefile.am b/tests/test-lineno-nr/Makefile.am deleted file mode 100644 index 2db8e64..0000000 --- a/tests/test-lineno-nr/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) - -testname = test-lineno-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - test `./$(testname)$(EXEEXT) < $(srcdir)/test.input` -eq \ - `./$(testname)$(EXEEXT) 1 < $(srcdir)/test.input` || exit 1 - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-lineno-r/Makefile.am b/tests/test-lineno-r/Makefile.am deleted file mode 100644 index 8ded4b3..0000000 --- a/tests/test-lineno-r/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) - -testname = test-lineno-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - test `./$(testname)$(EXEEXT) < $(srcdir)/test.input` -eq \ - `./$(testname)$(EXEEXT) 1 < $(srcdir)/test.input` || exit 1 - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-lineno-trailing/Makefile.am b/tests/test-lineno-trailing/Makefile.am deleted file mode 100644 index bb303c3..0000000 --- a/tests/test-lineno-trailing/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) - -testname = test-lineno-trailing - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - test `./$(testname)$(EXEEXT) < $(srcdir)/test.input` -eq \ - `./$(testname)$(EXEEXT) 1 < $(srcdir)/test.input` || exit 1 - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-lineno-trailing/Makefile.in b/tests/test-lineno-trailing/Makefile.in deleted file mode 100644 index f5d06ca..0000000 --- a/tests/test-lineno-trailing/Makefile.in +++ /dev/null @@ -1,458 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -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 = : -build_triplet = @build@ -host_triplet = @host@ -subdir = tests/test-lineno-trailing -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BISON = @BISON@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GREP = @GREP@ -HELP2MAN = @HELP2MAN@ -INDENT = @INDENT@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -FLEX = $(top_builddir)/flex -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -testname = test-lineno-trailing -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .o -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/test-lineno-trailing/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/test-lineno-trailing/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$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: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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 clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - test `./$(testname)$(EXEEXT) < $(srcdir)/test.input` -eq \ - `./$(testname)$(EXEEXT) 1 < $(srcdir)/test.input` || exit 1 - -.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-mem-nr/Makefile.am b/tests/test-mem-nr/Makefile.am deleted file mode 100644 index 4ad450d..0000000 --- a/tests/test-mem-nr/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a - -testname = test-mem-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-mem-r/Makefile.am b/tests/test-mem-r/Makefile.am deleted file mode 100644 index ae06bd2..0000000 --- a/tests/test-mem-r/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a - -testname = test-mem-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am deleted file mode 100644 index 950dd23..0000000 --- a/tests/test-multiple-scanners-nr/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# 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-1.l scanner-2.l main.c -CLEANFILES = scanner-1.c scanner-1.h $(testname)$(EXEEXT) OUTPUT $(OBJS) scanner-2.c scanner-2.h -OBJS = scanner-1.o scanner-2.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-multiple-scanners-nr - -scanner-1.c: $(srcdir)/scanner-1.l - $(FLEX) $(LFLAGS) --header=scanner-1.h $< - -scanner-2.c: $(srcdir)/scanner-2.l - $(FLEX) $(LFLAGS) --header=scanner-2.h $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -main.o: scanner-1.h scanner-2.h -scanner-1.h: scanner-1.c -scanner-2.h: scanner-2.c diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am deleted file mode 100644 index 5f0df8c..0000000 --- a/tests/test-multiple-scanners-r/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# 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-1.l scanner-2.l main.c -CLEANFILES = scanner-1.c scanner-1.h $(testname)$(EXEEXT) OUTPUT\ - $(OBJS) scanner-2.c scanner-2.h scanner-1.tables \ - scanner-2.tables -OBJS = scanner-1.o scanner-2.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-multiple-scanners-r - -scanner-1.c: $(srcdir)/scanner-1.l - $(FLEX) $(LFLAGS) --header=scanner-1.h $< - -scanner-2.c: $(srcdir)/scanner-2.l - $(FLEX) $(LFLAGS) --header=scanner-2.h $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -main.o: scanner-1.h scanner-2.h -scanner-1.h: scanner-1.c -scanner-2.h: scanner-2.c diff --git a/tests/test-noansi-nr/Makefile.am b/tests/test-noansi-nr/Makefile.am deleted file mode 100644 index a2a327e..0000000 --- a/tests/test-noansi-nr/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-noansi-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-noansi-r/Makefile.am b/tests/test-noansi-r/Makefile.am deleted file mode 100644 index ec123fe..0000000 --- a/tests/test-noansi-r/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#YFLAGS = --defines --output=parser.c - -testname = test-noansi-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-posix/Makefile.am b/tests/test-posix/Makefile.am deleted file mode 100644 index 2fd3271..0000000 --- a/tests/test-posix/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" - -testname = test-posix - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-posixly-correct/Makefile.am b/tests/test-posixly-correct/Makefile.am deleted file mode 100644 index 6821cf7..0000000 --- a/tests/test-posixly-correct/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" - -testname = test-posixly-correct - -scanner.c: $(srcdir)/scanner.l - POSIXLY_CORRECT=1 $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-prefix-nr/Makefile.am b/tests/test-prefix-nr/Makefile.am deleted file mode 100644 index 712ce3f..0000000 --- a/tests/test-prefix-nr/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-prefix-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-prefix-nr/README b/tests/test-prefix-nr/README deleted file mode 100644 index 91f75c9..0000000 --- a/tests/test-prefix-nr/README +++ /dev/null @@ -1,2 +0,0 @@ -This check is to make sure the prefix "yy" is substituted where it should be. - diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am deleted file mode 100644 index 1021029..0000000 --- a/tests/test-prefix-r/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-prefix-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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-prefix-r/README b/tests/test-prefix-r/README deleted file mode 100644 index 91f75c9..0000000 --- a/tests/test-prefix-r/README +++ /dev/null @@ -1,2 +0,0 @@ -This check is to make sure the prefix "yy" is substituted where it should be. - diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am deleted file mode 100644 index fe5d545..0000000 --- a/tests/test-pthread/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input test-4.input test-5.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -LIBS = -lpthread -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-pthread - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname) $(srcdir)/test-*.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-quotes/Makefile.am b/tests/test-quotes/Makefile.am deleted file mode 100644 index 70676ef..0000000 --- a/tests/test-quotes/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# 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 = l.out c.out scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o - -AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) - -testname = test-quotes - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - grep TEST_XXX < $(srcdir)/scanner.l | sed 's/^ *//' > l.out - grep TEST_XXX < scanner.c | sed 's/^ *//' > c.out - cmp -s l.out c.out - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-reject/Makefile.am b/tests/test-reject/Makefile.am deleted file mode 100644 index 902d7be..0000000 --- a/tests/test-reject/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c $(testname)$(EXEEXT)-* OUTPUT $(OBJS) -OBJS = test-reject-nr.o test-reject-r.o test-reject-ver.o \ - test-reject-ser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) - -tests = test-reject-nr$(EXEEXT) test-reject-r$(EXEEXT) \ - test-reject-ser$(EXEEXT) test-reject-ver$(EXEEXT) -testname = test-reject - -test-reject-nr.c: $(srcdir)/scanner.l - $(FLEX) -o $@ $(LFLAGS) $< - -test-reject-ver.c: $(srcdir)/scanner.l - $(FLEX) -o $@ --tables-verify --tables-file=`basename $@ .c`.tables $(LFLAGS) $< - -test-reject-ser.c: $(srcdir)/scanner.l - $(FLEX) -o $@ --tables-file=`basename $@ .c`.tables $(LFLAGS) $< - -test-reject-r.c: $(srcdir)/scanner.l - $(FLEX) --reentrant -o $@ $(LFLAGS) $< - -test-reject-nr$(EXEEXT): test-reject-nr.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -test-reject-ver$(EXEEXT): test-reject-ver.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -test-reject-ser$(EXEEXT): test-reject-ser.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -test-reject-r$(EXEEXT): test-reject-r.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -$(testname)$(EXEEXT): $(OBJS) - -test: $(tests) - ./$(testname)-nr$(EXEEXT) < $(srcdir)/test.input - ./$(testname)-r$(EXEEXT) < $(srcdir)/test.input - ./$(testname)-ver$(EXEEXT) $(testname)-ver.tables < $(srcdir)/test.input - ./$(testname)-ser$(EXEEXT) $(testname)-ser.tables < $(srcdir)/test.input - -test-reject-nr.o: test-reject-nr.c - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -test-reject-ver.o: test-reject-ver.c - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL $(CFLAGS) $< - -test-reject-ser.o: test-reject-ser.c - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL $(CFLAGS) $< - -test-reject-r.o: test-reject-r.c - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_IS_REENTRANT $(CFLAGS) $< - - diff --git a/tests/test-rescan-nr/Makefile.am b/tests/test-rescan-nr/Makefile.am deleted file mode 100644 index 3d23a55..0000000 --- a/tests/test-rescan-nr/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# 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 $(testname)$(EXEEXT) 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) $(CFLAGS) -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.am b/tests/test-rescan-r/Makefile.am deleted file mode 100644 index b24a152..0000000 --- a/tests/test-rescan-r/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# 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 $(testname)$(EXEEXT) 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) $(CFLAGS) -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/test.input b/tests/test-rescan-r/test.input deleted file mode 100644 index 7288a40..0000000 --- a/tests/test-rescan-r/test.input +++ /dev/null @@ -1,2 +0,0 @@ -0000 foo 1111 foo 0000 bar -0000 foo 1111 foo 0000 bar diff --git a/tests/test-string-nr/Makefile.am b/tests/test-string-nr/Makefile.am deleted file mode 100644 index 1b06765..0000000 --- a/tests/test-string-nr/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-string-nr - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-string-r/Makefile.am b/tests/test-string-r/Makefile.am deleted file mode 100644 index ec3d4da..0000000 --- a/tests/test-string-r/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-string-r - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< diff --git a/tests/test-table-opts/Makefile.am b/tests/test-table-opts/Makefile.am deleted file mode 100644 index 235e6c8..0000000 --- a/tests/test-table-opts/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -# 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. - -# ------------------------------------------------ -# This test is really a set of tests, one for -# each compression flag. -Ca, -Cem, etc.. -# 'test-opt' builds non-serialized scanners with various table options. -# 'test-ver' verifies that the serialized tables match the in-code tables. -# 'test-ser' deserializes the tables at runtime. -# 'test-mul' checks that we can store multiple tables in a single file. -# ------------------------------------------------ - -FLEX = $(top_builddir)/flex - -testname := test-table-opts -allopts := -Ca -Ce -Cf -CF -Cm -Cem -Cae -Caef -CaeF -Cam -Caem - -# the test names themselves -opttests := $(foreach opt,$(allopts), test-opt-nr$(opt) test-opt-r$(opt)) -sertests := $(foreach opt,$(allopts), test-ser-nr$(opt) test-ser-r$(opt)) -vertests := $(foreach opt,$(allopts), test-ver-nr$(opt) test-ver-r$(opt)) -alltests := $(opttests) $(vertests) $(sertests) test-mul - -# the executables to build -optexe := $(addsuffix $(EXEEXT),$(opttests)) -verexe := $(addsuffix $(EXEEXT),$(vertests)) -serexe := $(addsuffix $(EXEEXT),$(sertests)) -allexe := $(optexe) $(verexe) $(serexe) - -# the .c files -optsrc := $(addsuffix .c,$(opttests)) -versrc := $(addsuffix .c,$(vertests)) -sersrc := $(addsuffix .c,$(sertests)) -allsrc := $(optsrc) $(versrc) $(sersrc) - -# the .o files -optobj := $(addsuffix .o,$(opttests)) -verobj := $(addsuffix .o,$(vertests)) -serobj := $(addsuffix .o,$(sertests)) -allobj := $(optobj) $(verobj) $(serobj) - -# the .tables files -sertables := $(addsuffix .tables,$(sertests)) -alltables := $(addsuffix .tables,$(alltests)) - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c OUTPUT $(allobj) $(allsrc) $(alltables) \ - all-ser.tables $(allexe) -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) - -test: test-opt test-ser test-ver test-mul - -test-opt-r%.c: $(srcdir)/scanner.l - $(FLEX) -L -P $(subst -,_,$(basename $(@F))) --reentrant $* -o $@ $< - -test-opt-nr%.c: $(srcdir)/scanner.l - $(FLEX) -L -P $(subst -,_,$(basename $(@F))) $* -o $@ $< - -test-ser-r%.c: $(srcdir)/scanner.l - $(FLEX) -L -P $(subst -,_,$(basename $(@F))) -R --tables-file="test-ser-r$*.tables" $* -o $@ $< - -test-ser-nr%.c: $(srcdir)/scanner.l - $(FLEX) -L -P $(subst -,_,$(basename $(@F))) --tables-file="test-ser-nr$*.tables" $* -o $@ $< - -test-ver-r%.c: $(srcdir)/scanner.l - $(FLEX) -L -P $(subst -,_,$(basename $(@F))) -R --tables-file="test-ver-r$*.tables" --tables-verify $* -o $@ $< - -test-ver-nr%.c: $(srcdir)/scanner.l - $(FLEX) -L -P $(subst -,_,$(basename $(@F))) --tables-file="test-ver-nr$*.tables" --tables-verify $* -o $@ $< - -test-opt%$(EXEEXT): test-opt%.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -test-ser%$(EXEEXT): test-ser%.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -test-ver%$(EXEEXT): test-ver%.o - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES) - -test-opt: $(optexe) - for t in $(optexe) ; do \ - ./$$t `basename $$t $(EXEEXT)`.tables < $(srcdir)/test.input \ - || { echo $t FAILED ; exit 1 ; } ; \ - done - -test-ver: $(verexe) - for t in $(verexe) ; do \ - ./$$t `basename $$t $(EXEEXT)`.tables < $(srcdir)/test.input \ - || { echo $t FAILED ; exit 1 ; } ; \ - done - -test-ser: $(serexe) - for t in $(serexe) ; do \ - ./$$t `basename $$t $(EXEEXT)`.tables < $(srcdir)/test.input \ - || { echo $t FAILED ; exit 1 ; } ; \ - done - -test-mul: $(serexe) - $(RM) all-ser.tables - cat $(sertables) > all-ser.tables - for t in $(serexe) ; do \ - ./$$t all-ser.tables < $(srcdir)/test.input || { echo $$t FAILED; exit 1; } ; \ - done - -test-opt-nr-%.o: test-opt-nr-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< -test-ser-nr-%.o: test-ser-nr-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL $(CFLAGS) $< -test-ver-nr-%.o: test-ver-nr-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL $(CFLAGS) $< - -test-opt-r-%.o: test-opt-r-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_IS_REENTRANT $(CFLAGS) $< -test-ser-r-%.o: test-ser-r-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT $(CFLAGS) $< -test-ver-r-%.o: test-ver-r-%.c ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT $(CFLAGS) $< - -.PHONY: test test-opt test-ser test-ver test-mul -.SECONDARY: $(allobj) $(allsrc) diff --git a/tests/test-top/Makefile.am b/tests/test-top/Makefile.am deleted file mode 100644 index 681cadb..0000000 --- a/tests/test-top/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# 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 main.c -CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o main.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-top - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES) - -test: $(testname)$(EXEEXT) - ./$(testname)$(EXEEXT) < $(srcdir)/test.input - -.c.o: - $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< - -scanner.h: scanner.c -main.o: scanner.h diff --git a/tests/test-top/test.input b/tests/test-top/test.input deleted file mode 100644 index 2ce5001..0000000 --- a/tests/test-top/test.input +++ /dev/null @@ -1,3 +0,0 @@ -Any input is ok for this scanner. -We only care if it links. - diff --git a/tests/test-yyextra/Makefile.am b/tests/test-yyextra/Makefile.am deleted file mode 100644 index d55f74e..0000000 --- a/tests/test-yyextra/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - -EXTRA_DIST = scanner.l test.input -CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS) -OBJS = scanner.o # parser.o - -AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -#LDFLAGS = $(top_srcdir)/libfl.a -#LFLAGS = --header="scanner.h" -#YFLAGS = --defines --output=parser.c - -testname = test-yyextra - -scanner.c: $(srcdir)/scanner.l - $(FLEX) $(LFLAGS) $< - -parser.c: $(srcdir)/parser.y - $(BISON) $(YFLAGS) $< - -$(testname)$(EXEEXT): $(OBJS) - $(CC) $(CFLAGS) -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/testwrapper.sh b/tests/testwrapper.sh new file mode 100755 index 0000000..30127b5 --- /dev/null +++ b/tests/testwrapper.sh @@ -0,0 +1,53 @@ +#!/bin/bash -vx +set -euo pipefail + +# testwrapper.sh: run a flex test, typically called by a Makefile + +# Each test will exercise some feature or aspect of flex. Run the test with any input it may need. + +INPUT_DIRECTORY="" +INPUT_NAME="" +INPUT_COUNT=0 +USE_REDIRECT=0 +DO_COMPARISON=0 + +while getopts :d:i:rt1 OPTION ; do + case $OPTION in + d) INPUT_DIRECTORY=$OPTARG ;; + i) + if [ "$INPUT_NAME" == "" ] ; then + INPUT_NAME="$OPTARG" + else + INPUT_NAME="$INPUT_NAME $OPTARG" + fi + INPUT_COUNT=$(($INPUT_COUNT+1)) + ;; + r) USE_REDIRECT=1 ;; + t) USE_TABLES=1 ;; + 1) DO_COMPARISON=1 ;; + esac + done + +TESTNAME="${!OPTIND}" + +INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt} + +if [ "$DO_COMPARISON" -eq "1" ] ; then + test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < $INPUT_DIRECTORY/$INPUT_NAME` + exit $? + fi + +if [ $INPUT_COUNT -gt 1 ] ; then + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} ${INPUT_NAME} + exit $? + fi + +if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then + if [ $USE_REDIRECT == 1 ] ; then + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_DIRECTORY/$INPUT_NAME + else + $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_DIRECTORY/$INPUT_NAME + fi +else + $TESTNAME +fi diff --git a/tests/test-top/scanner.l b/tests/top.l index be329b0..25f4773 100644 --- a/tests/test-top/scanner.l +++ b/tests/top.l @@ -40,8 +40,8 @@ } %option reentrant -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap +%option 8bit header="top.h" prefix="test" +%option nounput nomain noyywrap noinput %option warn diff --git a/tests/test-linedir-r/test.input b/tests/top.txt index 2ce5001..2ce5001 100644 --- a/tests/test-linedir-r/test.input +++ b/tests/top.txt diff --git a/tests/test-top/main.c b/tests/top_main.c index 353a63e..b273214 100644 --- a/tests/test-top/main.c +++ b/tests/top_main.c @@ -21,7 +21,9 @@ * PURPOSE. */ -#include "scanner.h" +#include <assert.h> + +#include "top.h" /* The scanner itself is not important here. * We simply try to use all the functions that are exported in the @@ -30,6 +32,9 @@ int main ( int argc, char** argv ) { + (void)argc; + (void)argv; + yyscan_t scanner; FILE *fp; char * extra = "EXTRA"; @@ -40,7 +45,9 @@ main ( int argc, char** argv ) testset_extra(extra,scanner); fp = testget_in(scanner); + assert(fp == stdin); fp = testget_out(scanner); + assert(fp == stdout); while(testlex(scanner)) { char * text; @@ -58,6 +65,3 @@ main ( int argc, char** argv ) printf("TEST RETURNING OK.\n"); return 0; } - - -/* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/test-yyextra/scanner.l b/tests/yyextra.l index baba52b..37e8821 100644 --- a/tests/test-yyextra/scanner.l +++ b/tests/yyextra.l @@ -47,8 +47,8 @@ static void append_char (char c, yyscan_t scanner ); %} -%option 8bit outfile="scanner.c" prefix="test" -%option nounput nomain noyywrap nodefault +%option 8bit prefix="test" +%option nounput nomain noyywrap nodefault noinput %option warn %option reentrant diff --git a/tests/test-yyextra/test.input b/tests/yyextra.txt index 243df29..243df29 100644 --- a/tests/test-yyextra/test.input +++ b/tests/yyextra.txt diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..46743a6 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ + git2cl diff --git a/tools/git2cl b/tools/git2cl new file mode 100755 index 0000000..1c2ab3f --- /dev/null +++ b/tools/git2cl @@ -0,0 +1,372 @@ +#!/usr/bin/perl + +# Copyright (C) 2007, 2008 Simon Josefsson <simon@josefsson.org> +# Copyright (C) 2007 Luis Mondesi <lemsx1@gmail.com> +# * calls git directly. To use it just: +# cd ~/Project/my_git_repo; git2cl > ChangeLog +# * implements strptime() +# * fixes bugs in $comment parsing +# - copy input before we remove leading spaces +# - skip "merge branch" statements as they don't +# have information about files (i.e. we never +# go into $state 2) +# - behaves like a pipe/filter if input is given from the CLI +# else it calls git log by itself +# +# The functions mywrap, last_line_len, wrap_log_entry are derived from +# the cvs2cl tool, see <http://www.red-bean.com/cvs2cl/>: +# Copyright (C) 2001,2002,2003,2004 Martyn J. Pearce <fluffy@cpan.org> +# Copyright (C) 1999 Karl Fogel <kfogel@red-bean.com> +# +# git2cl 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. +# +# git2cl 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 git2cl; see the file COPYING. If not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +use strict; +use POSIX qw(strftime); +use Text::Wrap qw(wrap); +use FileHandle; + +use constant EMPTY_LOG_MESSAGE => '*** empty log message ***'; + +# this is a helper hash for stptime. +# Assumes you are calling 'git log ...' with LC_ALL=C +my %month = ( + 'Jan'=>0, + 'Feb'=>1, + 'Mar'=>2, + 'Apr'=>3, + 'May'=>4, + 'Jun'=>5, + 'Jul'=>6, + 'Aug'=>7, + 'Sep'=>8, + 'Oct'=>9, + 'Nov'=>10, + 'Dec'=>11, +); + +my $fh = new FileHandle; + +sub key_ready +{ + my ($rin, $nfd); + vec($rin, fileno(STDIN), 1) = 1; + return $nfd = select($rin, undef, undef, 0); +} + +sub strptime { + my $str = shift; + return undef if not defined $str; + + # we are parsing this format + # Fri Oct 26 00:42:56 2007 -0400 + # to these fields + # sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1 + # Luis Mondesi <lemsx1@gmail.com> + my @date; + if ($str =~ /([[:alpha:]]{3})\s+([[:alpha:]]{3})\s+([[:digit:]]{1,2})\s+([[:digit:]]{1,2}):([[:digit:]]{1,2}):([[:digit:]]{1,2})\s+([[:digit:]]{4})/){ + push(@date,$6,$5,$4,$3,$month{$2},($7 - 1900),-1,-1,-1); + } else { + die ("Cannot parse date '$str'\n'"); + } + return @date; +} + +sub mywrap { + my ($indent1, $indent2, @text) = @_; + # If incoming text looks preformatted, don't get clever + my $text = Text::Wrap::wrap($indent1, $indent2, @text); + if ( grep /^\s+/m, @text ) { + return $text; + } + my @lines = split /\n/, $text; + $indent2 =~ s!^((?: {8})+)!"\t" x (length($1)/8)!e; + $lines[0] =~ s/^$indent1\s+/$indent1/; + s/^$indent2\s+/$indent2/ + for @lines[1..$#lines]; + my $newtext = join "\n", @lines; + $newtext .= "\n" + if substr($text, -1) eq "\n"; + return $newtext; +} + +sub last_line_len { + my $files_list = shift; + my @lines = split (/\n/, $files_list); + my $last_line = pop (@lines); + return length ($last_line); +} + +# A custom wrap function, sensitive to some common constructs used in +# log entries. +sub wrap_log_entry { + my $text = shift; # The text to wrap. + my $left_pad_str = shift; # String to pad with on the left. + + # These do NOT take left_pad_str into account: + my $length_remaining = shift; # Amount left on current line. + my $max_line_length = shift; # Amount left for a blank line. + + my $wrapped_text = ''; # The accumulating wrapped entry. + my $user_indent = ''; # Inherited user_indent from prev line. + + my $first_time = 1; # First iteration of the loop? + my $suppress_line_start_match = 0; # Set to disable line start checks. + + my @lines = split (/\n/, $text); + while (@lines) # Don't use `foreach' here, it won't work. + { + my $this_line = shift (@lines); + chomp $this_line; + + if ($this_line =~ /^(\s+)/) { + $user_indent = $1; + } + else { + $user_indent = ''; + } + + # If it matches any of the line-start regexps, print a newline now... + if ($suppress_line_start_match) + { + $suppress_line_start_match = 0; + } + elsif (($this_line =~ /^(\s*)\*\s+[a-zA-Z0-9]/) + || ($this_line =~ /^(\s*)\* [a-zA-Z0-9_\.\/\+-]+/) + || ($this_line =~ /^(\s*)\([a-zA-Z0-9_\.\/\+-]+(\)|,\s*)/) + || ($this_line =~ /^(\s+)(\S+)/) + || ($this_line =~ /^(\s*)- +/) + || ($this_line =~ /^()\s*$/) + || ($this_line =~ /^(\s*)\*\) +/) + || ($this_line =~ /^(\s*)[a-zA-Z0-9](\)|\.|\:) +/)) + { + $length_remaining = $max_line_length - (length ($user_indent)); + } + + # Now that any user_indent has been preserved, strip off leading + # whitespace, so up-folding has no ugly side-effects. + $this_line =~ s/^\s*//; + + # Accumulate the line, and adjust parameters for next line. + my $this_len = length ($this_line); + if ($this_len == 0) + { + # Blank lines should cancel any user_indent level. + $user_indent = ''; + $length_remaining = $max_line_length; + } + elsif ($this_len >= $length_remaining) # Line too long, try breaking it. + { + # Walk backwards from the end. At first acceptable spot, break + # a new line. + my $idx = $length_remaining - 1; + if ($idx < 0) { $idx = 0 }; + while ($idx > 0) + { + if (substr ($this_line, $idx, 1) =~ /\s/) + { + my $line_now = substr ($this_line, 0, $idx); + my $next_line = substr ($this_line, $idx); + $this_line = $line_now; + + # Clean whitespace off the end. + chomp $this_line; + + # The current line is ready to be printed. + $this_line .= "\n${left_pad_str}"; + + # Make sure the next line is allowed full room. + $length_remaining = $max_line_length - (length ($user_indent)); + + # Strip next_line, but then preserve any user_indent. + $next_line =~ s/^\s*//; + + # Sneak a peek at the user_indent of the upcoming line, so + # $next_line (which will now precede it) can inherit that + # indent level. Otherwise, use whatever user_indent level + # we currently have, which might be none. + my $next_next_line = shift (@lines); + if ((defined ($next_next_line)) && ($next_next_line =~ /^(\s+)/)) { + $next_line = $1 . $next_line if (defined ($1)); + # $length_remaining = $max_line_length - (length ($1)); + $next_next_line =~ s/^\s*//; + } + else { + $next_line = $user_indent . $next_line; + } + if (defined ($next_next_line)) { + unshift (@lines, $next_next_line); + } + unshift (@lines, $next_line); + + # Our new next line might, coincidentally, begin with one of + # the line-start regexps, so we temporarily turn off + # sensitivity to that until we're past the line. + $suppress_line_start_match = 1; + + last; + } + else + { + $idx--; + } + } + + if ($idx == 0) + { + # We bottomed out because the line is longer than the + # available space. But that could be because the space is + # small, or because the line is longer than even the maximum + # possible space. Handle both cases below. + + if ($length_remaining == ($max_line_length - (length ($user_indent)))) + { + # The line is simply too long -- there is no hope of ever + # breaking it nicely, so just insert it verbatim, with + # appropriate padding. + $this_line = "\n${left_pad_str}${this_line}"; + } + else + { + # Can't break it here, but may be able to on the next round... + unshift (@lines, $this_line); + $length_remaining = $max_line_length - (length ($user_indent)); + $this_line = "\n${left_pad_str}"; + } + } + } + else # $this_len < $length_remaining, so tack on what we can. + { + # Leave a note for the next iteration. + $length_remaining = $length_remaining - $this_len; + + if ($this_line =~ /\.$/) + { + $this_line .= " "; + $length_remaining -= 2; + } + else # not a sentence end + { + $this_line .= " "; + $length_remaining -= 1; + } + } + + # Unconditionally indicate that loop has run at least once. + $first_time = 0; + + $wrapped_text .= "${user_indent}${this_line}"; + } + + # One last bit of padding. + $wrapped_text .= "\n"; + + return $wrapped_text; +} + +# main + +my @date; +my $author; +my @files; +my $comment; + +my $state; # 0-header 1-comment 2-files +my $done = 0; + +$state = 0; + +# if reading from STDIN, we assume that we are +# getting git log as input +if (key_ready()) +{ + + #my $dummyfh; # don't care about writing + #($fh,$dummyfh) = FileHandle::pipe; + $fh->fdopen(*STDIN, 'r'); +} +else +{ + $fh->open("LC_ALL=C git log --pretty --numstat --summary|") + or die("Cannot execute git log...$!\n"); +} + +while (my $_l = <$fh>) { + #print STDERR "debug ($state, " . (@date ? (strftime "%Y-%m-%d", @date) : "") . "): `$_'\n"; + if ($state == 0) { + if ($_l =~ m,^Author: (.*),) { + $author = $1; + } + if ($_l =~ m,^Date: (.*),) { + @date = strptime($1); + } + $state = 1 if ($_l =~ m,^$, and $author and (@date+0>0)); + } elsif ($state == 1) { + # * modifying our input text is a bad choice + # let's make a copy of it first, then we remove spaces + # * if we meet a "merge branch" statement, we need to start + # over and find a real entry + # Luis Mondesi <lemsx1@gmail.com> + my $_s = $_l; + $_s =~ s/^ //g; + if ($_s =~ m/^Merge branch/) + { + $state=0; + next; + } + $comment = $comment . $_s; + $state = 2 if ($_l =~ m,^$,); + } elsif ($state == 2) { + if ($_l =~ m,^([0-9]+)\t([0-9]+)\t(.*)$,) { + push @files, $3; + } + $done = 1 if ($_l =~ m,^$,); + } + + if ($done) { + print (strftime "%Y-%m-%d $author\n\n", @date); + + my $files = join (", ", @files); + $files = mywrap ("\t", "\t", "* $files"), ": "; + + if (index($comment, EMPTY_LOG_MESSAGE) > -1 ) { + $comment = "[no log message]\n"; + } + + my $files_last_line_len = 0; + $files_last_line_len = last_line_len($files) + 1; + my $msg = wrap_log_entry($comment, "\t", 69-$files_last_line_len, 69); + + $msg =~ s/[ \t]+\n/\n/g; + + print "$files: $msg\n"; + + @date = (); + $author = ""; + @files = (); + $comment = ""; + + $state = 0; + $done = 0; + } +} + +if (@date + 0) +{ + print (strftime "%Y-%m-%d $author\n\n", @date); + my $msg = wrap_log_entry($comment, "\t", 69, 69); + $msg =~ s/[ \t]+\n/\n/g; + print "\t* $msg\n"; +} @@ -1,226 +0,0 @@ -#! /bin/sh -# ylwrap - wrapper for lex/yacc invocations. - -scriptversion=2011-08-25.18; # UTC - -# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, -# 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -# -# Written by Tom Tromey <tromey@cygnus.com>. -# -# 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, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -case "$1" in - '') - echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 - exit 1 - ;; - --basedir) - basedir=$2 - shift 2 - ;; - -h|--h*) - cat <<\EOF -Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... - -Wrapper for lex/yacc invocations, renaming files as desired. - - INPUT is the input file - OUTPUT is one file PROG generates - DESIRED is the file we actually want instead of OUTPUT - PROGRAM is program to run - ARGS are passed to PROG - -Any number of OUTPUT,DESIRED pairs may be used. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v|--v*) - echo "ylwrap $scriptversion" - exit $? - ;; -esac - - -# The input. -input="$1" -shift -case "$input" in - [\\/]* | ?:[\\/]*) - # Absolute path; do nothing. - ;; - *) - # Relative path. Make it absolute. - input="`pwd`/$input" - ;; -esac - -pairlist= -while test "$#" -ne 0; do - if test "$1" = "--"; then - shift - break - fi - pairlist="$pairlist $1" - shift -done - -# The program to run. -prog="$1" -shift -# Make any relative path in $prog absolute. -case "$prog" in - [\\/]* | ?:[\\/]*) ;; - *[\\/]*) prog="`pwd`/$prog" ;; -esac - -# FIXME: add hostname here for parallel makes that run commands on -# other machines. But that might take us over the 14-char limit. -dirname=ylwrap$$ -do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' -trap "ret=129; $do_exit" 1 -trap "ret=130; $do_exit" 2 -trap "ret=141; $do_exit" 13 -trap "ret=143; $do_exit" 15 -mkdir $dirname || exit 1 - -cd $dirname - -case $# in - 0) "$prog" "$input" ;; - *) "$prog" "$@" "$input" ;; -esac -ret=$? - -if test $ret -eq 0; then - set X $pairlist - shift - first=yes - # Since DOS filename conventions don't allow two dots, - # the DOS version of Bison writes out y_tab.c instead of y.tab.c - # and y_tab.h instead of y.tab.h. Test to see if this is the case. - y_tab_nodot="no" - if test -f y_tab.c || test -f y_tab.h; then - y_tab_nodot="yes" - fi - - # The directory holding the input. - input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'` - # Quote $INPUT_DIR so we can use it in a regexp. - # FIXME: really we should care about more than `.' and `\'. - input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'` - - while test "$#" -ne 0; do - from="$1" - # Handle y_tab.c and y_tab.h output by DOS - if test $y_tab_nodot = "yes"; then - if test $from = "y.tab.c"; then - from="y_tab.c" - else - if test $from = "y.tab.h"; then - from="y_tab.h" - fi - fi - fi - if test -f "$from"; then - # If $2 is an absolute path name, then just use that, - # otherwise prepend `../'. - case "$2" in - [\\/]* | ?:[\\/]*) target="$2";; - *) target="../$2";; - esac - - # We do not want to overwrite a header file if it hasn't - # changed. This avoid useless recompilations. However the - # parser itself (the first file) should always be updated, - # because it is the destination of the .y.c rule in the - # Makefile. Divert the output of all other files to a temporary - # file so we can compare them to existing versions. - if test $first = no; then - realtarget="$target" - target="tmp-`echo $target | sed s/.*[\\/]//g`" - fi - # Edit out `#line' or `#' directives. - # - # We don't want the resulting debug information to point at - # an absolute srcdir; it is better for it to just mention the - # .y file with no path. - # - # We want to use the real output file name, not yy.lex.c for - # instance. - # - # We want the include guards to be adjusted too. - FROM=`echo "$from" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - TARGET=`echo "$2" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'` - - sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \ - -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$? - - # Check whether header files must be updated. - if test $first = no; then - if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then - echo "$2" is unchanged - rm -f "$target" - else - echo updating "$2" - mv -f "$target" "$realtarget" - fi - fi - else - # A missing file is only an error for the first file. This - # is a blatant hack to let us support using "yacc -d". If -d - # is not specified, we don't want an error when the header - # file is "missing". - if test $first = yes; then - ret=1 - fi - fi - shift - shift - first=no - done -else - ret=$? -fi - -# Remove the directory. -cd .. -rm -rf $dirname - -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: |