From e79137accc7ea0352cd4677ff22818f9c68d4eab Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 18 Sep 2000 13:01:59 +0000 Subject: [PATCH] Add support for an Autotest test suite for Bison. * m4/m4.m4, m4/atconfig.m4: New files. * m4/Makefile.am (EXTRA_DIST): Adjust. * tests/suite.m4, tests/Makefile.am, tests/atgeneral.m4: New files. * src/getargs.c: Display a more standard --version message. * src/reader.c (reader): Formatting changes. No longer depend upon VERSION_STRING. * configure.in: No longer use `dnl'. Set up the test suite and the new directory `tests/. (VERSION_STRING): Remove. --- ChangeLog | 15 ++ Makefile.am | 2 +- configure.in | 35 ++-- m4/Makefile.am | 11 +- m4/atconfig.m4 | 13 ++ m4/m4.m4 | 14 ++ po/de.po | 256 ++++++++++++++++-------------- po/es.po | 256 ++++++++++++++++-------------- po/et.po | 256 ++++++++++++++++-------------- po/fr.po | 256 ++++++++++++++++-------------- po/ja.po | 256 ++++++++++++++++-------------- po/nl.po | 256 ++++++++++++++++-------------- po/ru.po | 256 ++++++++++++++++-------------- src/getargs.c | 43 ++++- src/reader.c | 91 ++++++----- tests/Makefile.am | 40 +++++ tests/atconfig.in | 82 ++++++++++ tests/atgeneral.m4 | 388 +++++++++++++++++++++++++++++++++++++++++++++ tests/suite.m4 | 5 + 19 files changed, 1633 insertions(+), 898 deletions(-) create mode 100644 m4/atconfig.m4 create mode 100644 m4/m4.m4 create mode 100644 tests/Makefile.am create mode 100644 tests/atconfig.in create mode 100644 tests/atgeneral.m4 create mode 100644 tests/suite.m4 diff --git a/ChangeLog b/ChangeLog index b4d76f36..b6a4a654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-09-18 Akim Demaille + + Add support for an Autotest test suite for Bison. + + * m4/m4.m4, m4/atconfig.m4: New files. + * m4/Makefile.am (EXTRA_DIST): Adjust. + * tests/suite.m4, tests/Makefile.am, tests/atgeneral.m4: New + files. + * src/getargs.c: Display a more standard --version message. + * src/reader.c (reader): Formatting changes. + No longer depend upon VERSION_STRING. + * configure.in: No longer use `dnl'. + Set up the test suite and the new directory `tests/. + (VERSION_STRING): Remove. + 2000-04-14 Akim Demaille * src/reader.c (copy_comment2): New function, same as former diff --git a/Makefile.am b/Makefile.am index 93f09260..bc0e9eaa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.4 check-news ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = intl po lib src doc m4 +SUBDIRS = intl po lib src doc m4 tests EXTRA_DIST = REFERENCES configure.bat OChangeLog diff --git a/configure.in b/configure.in index a9e625b1..c2add60f 100644 --- a/configure.in +++ b/configure.in @@ -1,22 +1,25 @@ -dnl Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script. AC_PREREQ(2.13) AC_INIT(src/reduce.c) AM_INIT_AUTOMAKE(bison, 1.28a) AM_CONFIG_HEADER(config.h:config.hin) -AC_DEFINE_UNQUOTED(VERSION_STRING, "GNU Bison version ${VERSION}", - [The version string.]) -AC_DEFINE([_GNU_SOURCE],1,[Define to 1 for GNU C library extensions.]) - -ALL_LINGUAS="de es et fr ja nl ru" +# Initialize the test suite. +AT_CONFIG(../src) -dnl Checks for programs. +# Checks for programs. AC_PROG_CC AC_MINIX AC_ISC_POSIX AM_PROG_CC_STDC AC_PROG_INSTALL AC_PROG_RANLIB +# GNU M4 is needed to build the testsuite. +BISON_AC_PROG_GNU_M4 +if test "$ac_cv_prog_gnu_m4" != yes; then + missing_dir=`cd $ac_aux_dir && pwd` + M4="$missing_dir/missing m4" +fi AC_ARG_ENABLE(gcc-warnings, [ --enable-gcc-warnings turn on lots of GCC warnings (not recommended)], @@ -41,26 +44,28 @@ if test "${enableval}" = yes; then BISON_WARNING(-Wwrite-strings) fi -dnl Checks for libraries. +# Checks for libraries. +AC_DEFINE([_GNU_SOURCE],1,[Define to 1 for GNU C library extensions.]) -dnl Checks for header files. +# Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS(ctype.h locale.h memory.h stdlib.h string.h unistd.h) -dnl Checks for typedefs. +# Checks for typedefs. -dnl Checks for structures. +# Checks for structures. -dnl Checks for compiler characteristics. +# Checks for compiler characteristics. AC_C_CONST AC_C_INLINE AM_C_PROTOTYPES -dnl Checks for library functions. +# Checks for library functions. AC_FUNC_ALLOCA AC_CHECK_FUNCS(mkstemp setlocale) BISON_NEED_DECLARATIONS(calloc realloc) +ALL_LINGUAS="de es et fr ja nl ru" AM_GNU_GETTEXT jm_PREREQ_ERROR @@ -71,4 +76,6 @@ AC_SUBST(LIBOBJS) AC_OUTPUT([Makefile intl/Makefile po/Makefile.in - lib/Makefile src/Makefile doc/Makefile m4/Makefile]) + lib/Makefile src/Makefile doc/Makefile + m4/Makefile + tests/Makefile tests/atconfig]) diff --git a/m4/Makefile.am b/m4/Makefile.am index ea9bb9ee..6212284c 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,3 +1,10 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = bison-decl.m4 error.m4 gettext.m4 lcmessage.m4 progtest.m4 \ - warning.m4 +EXTRA_DIST = \ +atconfig.m4 \ +bison-decl.m4 \ +error.m4 \ +gettext.m4 \ +lcmessage.m4 \ +m4.m4 \ +progtest.m4 \ +warning.m4 diff --git a/m4/atconfig.m4 b/m4/atconfig.m4 new file mode 100644 index 00000000..4dd5c580 --- /dev/null +++ b/m4/atconfig.m4 @@ -0,0 +1,13 @@ +## ----------------------## +## Prepare for testing. ## +## ----------------------## + +# serial 1 + +# Single argument says where are built sources to test, relative to the +# built test directory. Maybe omitted if the same (flat distribution). + +AC_DEFUN(AT_CONFIG, +[AT_TESTPATH=ifelse($1, , ., $1) +AC_SUBST(AT_TESTPATH) +]) diff --git a/m4/m4.m4 b/m4/m4.m4 new file mode 100644 index 00000000..3ef79084 --- /dev/null +++ b/m4/m4.m4 @@ -0,0 +1,14 @@ +# serial 1 + +# BISON_AC_PROG_GNU_M4 +# -------------------- +# Check for GNU m4, at least 1.3 (supports frozen files). +AC_DEFUN([BISON_AC_PROG_GNU_M4], +[AC_PATH_PROGS(M4, gm4 gnum4 m4, m4) +AC_CACHE_CHECK(whether m4 supports frozen files, ac_cv_prog_gnu_m4, +[ac_cv_prog_gnu_m4=no +if test x"$M4" != x; then + case `$M4 --help < /dev/null 2>&1` in + *reload-state*) ac_cv_prog_gnu_m4=yes ;; + esac +fi])]) diff --git a/po/de.po b/po/de.po index 864f84ea..8e2b4c76 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper \n" "Language-Team: German \n" @@ -23,77 +23,77 @@ msgstr "" msgid "%s: memory exhausted\n" msgstr "%s: Hauptspeicher erschöpft\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "durch Reduzierung gelöst" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "durch Schieben gelöst" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "als Fehler betrachtet" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "Zustand %d enthält" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 Schiebe/Reduziere Konflikt" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d Schiebe/Reduziere Konflikte" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " und" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr " 1 Reduziere/Reduziere Konflikt" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d Reduziere/Reduziere Konflikte" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "Konflikte: " -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d Schiebe/Reduziere" -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d Reduziere/Reduziere" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s enthält" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduziere mit Regel %d (%s)]\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\treduziere mit Regel %d (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduziere mit Tegel %d (%s)\n" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduziere mit Regel %d (%s)\n" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -121,29 +121,29 @@ msgid "" "\n" msgstr "" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s leitet ab" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -151,7 +151,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -162,7 +162,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -171,71 +171,89 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "" -#: src/getargs.c:195 +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: keine Grammatik-Datei angegeben\n" -#: src/getargs.c:199 +#: src/getargs.c:232 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "unbeendeter Kommentar" -#: src/lex.c:172 +#: src/lex.c:173 #, fuzzy msgid "unexpected end of file" msgstr "Datei endet unerwartet" # Oder soll man den Begriff "Escapezeichen" verwenden? -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "nicht maskiertes Zeilenendezeichen in Konstante" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«" -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "unerwarteter Typname am Ende der Datei" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "unerwarteter Typname" -#: src/main.c:136 +#: src/main.c:144 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interner Fehler, %s\n" @@ -244,17 +262,17 @@ msgstr "interner Fehler, %s\n" msgid "Entering set_nullable" msgstr "Führe »set_nullable« aus" -#: src/output.c:1207 +#: src/output.c:1208 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale Tabellengröße (%s) überschritten" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr " Typ %d ist %s\n" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -267,42 +285,42 @@ msgstr "" "Zustand %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (Regel %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr " $default\takzeptiere\n" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " KEINE AKTIONEN\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tgehe zu Zustand %d über\n" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tSchiebe und gehe zu Zustand %d über\n" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tFehler (nicht assoziativ)\n" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tgehe zu Zustand %d über\n" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -310,17 +328,17 @@ msgstr "" "\n" "Grammatik\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "Regel %-4d %s ->" -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "\t\t/* leer */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -330,7 +348,7 @@ msgstr "" "Terminale und die Regeln un denen sie verwendet werden\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -340,242 +358,242 @@ msgstr "" "Nicht-Terminal und die Regeln in denen sie verwendet werden\n" "\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " auf der linken Seite:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " auf der rechten Seite:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " Überspringe Zeichen bis zum nächsten \\n" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " Überspringe Zeichen bis zum nächten %c" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "unbeendete Zeichenkette am Ende der Datei" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "unbeendete Zeichenkette" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "unbekannt: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "keine Eingabe-Grammatik" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "unbekanntes Zeichen: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "unbeendete »%{« Definition" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "»%s« ist in %s nicht erlaubt" -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "hier wird eine Zeichenkette erwartet, nicht %s" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "mehr als eine %start Deklaration" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ungültige %start Deklaration" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "%type Deklaration hat keinen " -#: src/reader.c:753 +#: src/reader.c:761 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "ungültige %%type Deklaration wegen »%s«" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "Stellenwertigkeit von %s wird erneut definiert" -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen" -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "unerwartetes Symbol: %s" -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "»{« hat kein Gegenstück" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "Argument von %expect ist keine ganze Zahl" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "@%s ist unzulässig" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "unzulässiger $ Wert" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ von »%s« hat keine deklarierten Wert" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "»%s« von »%s« hat keine deklarierten Wert" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "$%s ist unzulässig" -#: src/reader.c:1136 +#: src/reader.c:1144 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "unbeendeter %%guard Fall" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon " "gefolgt" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "Regel für %s vorhanden, welches aber ein Token ist" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "zwei @prec Anweisungen nacheinander" -#: src/reader.c:1507 +#: src/reader.c:1515 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "" "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine " "Regel" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "assoc Werte für %s nd %s widersprechen sich" -#: src/reader.c:1791 +#: src/reader.c:1800 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "Token %s und %s haben die selbe nummer %s" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten" -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -583,7 +601,7 @@ msgstr "" "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d " "Produktionen.\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -591,7 +609,7 @@ msgstr "" "Nutzlose Nicht-Terminale:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -603,7 +621,7 @@ msgstr "" "Nicht genutzte Terminale:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -615,7 +633,7 @@ msgstr "" "Ungenutzte Regeln:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -625,11 +643,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "Wert Sprec Sassoc Tag\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -639,7 +657,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -649,26 +667,26 @@ msgstr "" "----------------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d wurde niemals reduziert\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s enthält " -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ungenutzte Nicht-Terminal" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr " und " -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d ungenutzte Regel" diff --git a/po/es.po b/po/es.po index cb81fb22..60a69447 100644 --- a/po/es.po +++ b/po/es.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.25\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -48,55 +48,55 @@ msgstr "" msgid "%s: memory exhausted\n" msgstr "%s: memoria agotada\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "reduce" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "desplaza" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "un error" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve " "como %s.\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "El estado %d contiene" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 conflicto desplazamiento/reducción" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d conflictos desplazamiento/reducción" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " y" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr " 1 conflicto reducción/reducción" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d conflictos reducción/reducción" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "conflictos: " @@ -112,7 +112,7 @@ msgstr "conflictos: " # ok # ngp # -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d desplazamiento(s)/reducción(ones)" @@ -129,22 +129,22 @@ msgstr " %d desplazamiento(s)/reducci # # ok # ngp -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d reducción(ones)/reducción(ones)" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s contiene" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduce usando la regla %d (%s)]\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -153,17 +153,17 @@ msgstr "" " $default\treduce usando la regla %d (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduce usando la regla %d (%s)\n" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduce usando la regla %d (%s)\n" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -176,29 +176,29 @@ msgstr "" "\n" "DERIVACIONES\n" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s deriva" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -206,7 +206,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -217,7 +217,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -226,76 +226,94 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "" +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + # Me parece menos "computadora" decir "ningún fichero de gramática" - cll # -#: src/getargs.c:195 +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: no se ha especificado ningún fichero de gramática\n" # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv -#: src/getargs.c:199 +#: src/getargs.c:232 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, c-format msgid "too many gotos (max %d)" msgstr "" # to ignore no es ignorar. Pon otra cosa, please. sv -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "comentario sin terminar" -#: src/lex.c:172 +#: src/lex.c:173 #, fuzzy msgid "unexpected end of file" msgstr "Fin de fichero inesperado" # ¿unescaped? -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "salto de línea en constante sin secuencia de escape" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "valor octal fuera del rango 0...255: `\\%o'" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "valor hexadecimal mayor que 255: `\\x%x'" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "secuencia de escape desconocida: `\\' seguido de `%s'" # ¿multicarácter o multicaracteres? sv -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "use \"...\" para terminales literales multicarácter" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "nombre de tipo sin terminar al final del fichero" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "nombre de tipo sin terminar" -#: src/main.c:136 +#: src/main.c:144 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "error interno, %s\n" @@ -309,17 +327,17 @@ msgstr "Entrando set_nullable" # en inglés era así, pero quizás en español sea mejor como dices # ngp # -#: src/output.c:1207 +#: src/output.c:1208 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "excedido el tamaño máximo de la tabla (%s)" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr " el tipo %d es %s\n" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -332,42 +350,42 @@ msgstr "" "estado %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (regla %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr " $default\taceptar\n" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " SIN ACCIONES\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tir al estado %d\n" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tdesplazar e ir al estado %d\n" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\terror (no asociativo)\n" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tir al estado %d\n" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -375,7 +393,7 @@ msgstr "" "\n" "Gramática\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "regla %-4d %s ->" @@ -385,12 +403,12 @@ msgstr "regla %-4d %s ->" # como `vacía/o' - cll # según el código indica reglas vacías por eso lo puse así # ngp -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "\t\t/* vacía */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -400,7 +418,7 @@ msgstr "" "Terminales con las reglas donde aparecen\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -409,65 +427,65 @@ msgstr "" "\n" "No terminales con las reglas donde aparecen\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " en la izquierda:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " en la derecha:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " Saltando al siguiente \\n" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " Saltando al siguiente %c" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "cadena sin terminar al final del fichero" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "cadena sin terminar" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "no reconocido: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "no hay gramática de entrada" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "carácter desconocido: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "definición `%{' sin terminar" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' no es válido en %s" @@ -478,36 +496,36 @@ msgstr "`%s' no es v # - cll # ok - ngp # -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "no se reconoce el ítem %s, se esperaba un identificador" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "se esperaba una cadena constante en lugar de %s" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "múltiples declaraciones de %start" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "declaración de %start no válida" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "la declaración %type no tiene " -#: src/reader.c:753 +#: src/reader.c:761 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "declaración de %%type no válida debido al ítem: `%s'" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "redefinición de la precedencia de %s" @@ -516,7 +534,7 @@ msgstr "redefinici # de "to must" y aquí se emplea en su forma condicional. Por eso, he # cambiado `debe' por `debería' - cll # ahí me has pillado en un olvido del inglés - ngp -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" @@ -526,42 +544,42 @@ msgstr "" # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en # este caso, la segunda me parece más apropiada - cll # ok - ngp -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "ítem inesperado: %s" # Cambio el orden y el sexo. Ahora está "en español". sv -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "`{' desemparejada" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "el argumento de %expect no es un entero" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "@%s no es válido" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "valor $ no válido" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' no tiene tipo declarado" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s de `%s' no tiene tipo declarado" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "$%s no es válida" @@ -570,98 +588,98 @@ msgstr "$%s no es v # mejor que `sin terminar' que me parece más "computerizado" - cll # quizás un poco cacofónico lo de claúsula inconclusa - ngp # -#: src/reader.c:1136 +#: src/reader.c:1144 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "cláusula %%guard sin terminar" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "regla mal formada: el símbolo inicial no está seguido por :" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "la gramática comienza con una barra vertical" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "se ha dado una regla para %s, que es un terminal" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "dos @prec en una línea" # Insisto, el empleo de participios a secas me parece como hablar en # indio. Por favor, permíteme que añada un "está" :) - cll # ok - ngp -#: src/reader.c:1507 +#: src/reader.c:1515 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard presente pero %%semantic_parser está sin especificar" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "demasiados símbolos (terminales y no terminales); máximo %s" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "no hay reglas en la gramática de entrada" # `token' se debe traducir como `literal' - cll # en terminología de compiladores token es más un terminal - ngp # -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflicto de valores assoc para %s y %s" -#: src/reader.c:1791 +#: src/reader.c:1800 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "los terminales %s y %s tienen asignados ambos el número %s" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "el símbolo de inicio (axioma) %s es un terminal" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia" @@ -678,7 +696,7 @@ msgstr "El s # Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y # usar participios - cll # un error lo tiene cualquiera - ngp -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -686,7 +704,7 @@ msgstr "" "la reducción de %s define %d terminal%s, %d no terminal%s, y %d " "produccion%s.\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -694,7 +712,7 @@ msgstr "" "No terminales sin uso:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -706,7 +724,7 @@ msgstr "" "Terminales que no se usan:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -718,7 +736,7 @@ msgstr "" "Reglas sin uso:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -728,11 +746,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "Valor Sprec Sasoc Tag\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -742,7 +760,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -752,26 +770,26 @@ msgstr "" "--------------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d reglas que nunca se han reducido\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s contiene " -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d no terminales %s sin uso" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr " y " -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d regla%s sin uso" diff --git a/po/et.po b/po/et.po index 56574aae..c44554ed 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 2000-04-11 22:19+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -23,77 +23,77 @@ msgstr "liiga palju olekuid (maks %d)" msgid "%s: memory exhausted\n" msgstr "%s: mälu on otsas\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "redutseerimine" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "nihutamine" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "viga" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "Olek %d sisaldab" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 nihutamine/redutseerimine konflikt" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d nihutamine/redutseerimine konflikti" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " ja" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr " 1 redutseerimine/redutseerimine konflikt" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d redutseerimine/redutseerimine konflikti" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "konfliktid: " -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d nihutamine/redutseerimine" -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d redutseerimine/redutseerimine" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s sisaldab" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\tredutseerin kasutades reeglit %d (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tredutseerin kasutades reeglit %d (%s)\n" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tredutseerin kasutades reeglit %d (%s)\n" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -126,23 +126,23 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s derives" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kasuta: %s [VÕTI]...FAIL\n" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" @@ -150,7 +150,7 @@ msgstr "" "Kui pikk võti näitab, et argument on kohustuslik, siis on see kohustuslik \n" "ka lühikese võtme korral. Sama ka vabalt valitavate võtmete korral.\n" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -162,7 +162,7 @@ msgstr "" " -V, --version esita versiooniinfo ja lõpeta töö\n" " -y, --yacc emuleeri POSIX yacc\n" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -180,7 +180,7 @@ msgstr "" " -r, --raw sümbolite number alates 3\n" " -k, --token-table lisa ka sümbolite nimede tabel\n" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -194,69 +194,87 @@ msgstr "" " -b, --file-prefix=PREFIKS kasuta väljundfailide nimedes PREFIKSit\n" " -o, --output-file=FAIL jäta väljund FAILi\n" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "Teatage palun vigadest aadressil .\n" -#: src/getargs.c:195 +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: puudub grammatikafail\n" -#: src/getargs.c:199 +#: src/getargs.c:232 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ignoreerin lisaargumente peale `%s'\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, c-format msgid "too many gotos (max %d)" msgstr "liiga palju gotosid (maks %d)" -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "leidsin ja ignoreerin ootamatu `/'" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "lõpetamata kommentaar" -#: src/lex.c:172 +#: src/lex.c:173 msgid "unexpected end of file" msgstr "ootamatu faililõpp" -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "paojadata reavahetus konstandis" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "kuueteistkümnendväärtus suurem, kui above 255: `\\x%x'" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "tundmatu paojada: `\\' järgneb `%s'" -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "lõpetamata tüübinimi faili lõpus" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "lõpetamata tüübinimi" -#: src/main.c:136 +#: src/main.c:144 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: sisemine viga: %s\n" @@ -265,17 +283,17 @@ msgstr "%s: sisemine viga: %s\n" msgid "Entering set_nullable" msgstr "Entering set_nullable" -#: src/output.c:1207 +#: src/output.c:1208 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ületati maksimaalset tabelisuurust (%d)" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr " tüüp %d on %s\n" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -288,42 +306,42 @@ msgstr "" "olek %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (reegel %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr " $default\taktsepteerin\n" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " TEGEVUSI POLE\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tliigu olekule %d\n" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tnihuta ja liigu olekule %d\n" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tviga (mitteassotsiatiivne)\n" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tliigu olekule %d\n" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -331,17 +349,17 @@ msgstr "" "\n" "Grammatika\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "reegel %-4d %s ->" -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "\t\t/* tühi */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -351,7 +369,7 @@ msgstr "" "Terminalid, koos reeglitega, kus nad ilmuvad\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -361,238 +379,238 @@ msgstr "" "Mitteterminalid, koos reeglitega, kus nad ilmuvad\n" "\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " vasakul:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " paremal:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " Liigun järgmisele \\n" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " Liigun järgmisele %c" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "lõpetamata sõne faili lõpus" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "lõpetamata sõne" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "tundmatu: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "sisendgrammatikat pole" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "tundmatu sümbol: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "lõpetamata `%{' definitsioon" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "Enneaegne EOF peale %s" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ei ole %s sees lubatud" -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "tundmatu element %s, eeldasin identifikaatorit" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "eeldasin %s asemel sõnekonstanti" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "korduvad %start deklaratsioonid" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "vigane %start deklaratsioon" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "%type deklaratsioonis puudub " -#: src/reader.c:753 +#: src/reader.c:761 msgid "invalid %%type declaration due to item: %s" msgstr "vigane %%type deklaratsioon, element: %s" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "%s prioriteedi uus definitsioon" -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit" -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "ootamatu element: %s" -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "puudub `{'" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "%expect argument ei ole täisarv" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "@%s on vigane" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "vigane $ väärtus" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' $$ ei oma deklareeritud tüüpi" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d `%s' ei oma deklareeritud tüüpi" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "$%s on vigane" -#: src/reader.c:1136 +#: src/reader.c:1144 #, c-format msgid "unterminated %guard clause" msgstr "lõpetamata %guard klausel" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "grammatika algab püstkriipsuga" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "%s jaoks on antud reegel, aga see on märk" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1507 +#: src/reader.c:1515 #, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%guard on määratud, aga %semantic_parser ei ole" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad " "reeglid" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/reader.c:1791 +#: src/reader.c:1800 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "märkidele %s ja %s on mõlemale omistatud number %d" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Stardisümbolist %s ei tuletata ühtegi lauset" -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -600,7 +618,7 @@ msgstr "" "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d " "reeglit%s.\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -608,7 +626,7 @@ msgstr "" "Kasutamata mitteterminalid:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -620,7 +638,7 @@ msgstr "" "Terminalid, mida ei kasutatud:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -632,7 +650,7 @@ msgstr "" "Kasutamata reeglid:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -642,11 +660,11 @@ msgstr "" "--------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "Value Sprec Sassoc Tag\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -656,7 +674,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -666,26 +684,26 @@ msgstr "" "------------------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d reeglit ei redutseeritud\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s sisaldab " -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d kasutamata mitteterminali%s" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr " ja " -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d kasutamata reeglit%s" diff --git a/po/fr.po b/po/fr.po index 18edf8ae..df88756b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 1996-03-19 20:05 EST\n" "Last-Translator: Dominique Boucher \n" "Language-Team: French \n" @@ -23,78 +23,78 @@ msgstr "" msgid "%s: memory exhausted\n" msgstr "%s: mémoire épuisée\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "réduction" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "décalage" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "une erreur" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "L'état %d contient" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 conflit décalage/réduction" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d conflits décalage/réduction" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " et" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr "1 conflit réduction/réduction" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d conflits réduction/réduction" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "conflits: " -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d décalage/réduction" -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d réduction/réduction" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s contient" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[réduction par la règle %d (%s)\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -103,17 +103,17 @@ msgstr "" " $défaut\tréduction par la règle %d (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tréduction par la règle %d (%s)\n" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $défaut\tréduction par la règle %d (%s)\n" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -127,29 +127,29 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s dérive" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -157,7 +157,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -168,7 +168,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -177,70 +177,88 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "" -#: src/getargs.c:195 +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: grammaire manquante\n" -#: src/getargs.c:199 +#: src/getargs.c:232 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: paramètres supplémentaires ignorés après «%s»\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "`/' inattendu et ignoré" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "le commentaire ne se termine pas" -#: src/lex.c:172 +#: src/lex.c:173 #, fuzzy msgid "unexpected end of file" msgstr "Fin de fichier inattendue" -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "retour de chariot sans échappement dans une constante" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "valeur hexadécimale supérieure à 255: \\x%x" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'" -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "le nom de type ne se termine pas avant la fin de fichier" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "le nom de type ne se termine pas" -#: src/main.c:136 +#: src/main.c:144 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "erreur interne, %s\n" @@ -249,17 +267,17 @@ msgstr "erreur interne, %s\n" msgid "Entering set_nullable" msgstr "Entré dans set_nullable" -#: src/output.c:1207 +#: src/output.c:1208 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "taille maximum des tables (%s) dépassée" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr " le type %d est %s\n" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -272,42 +290,42 @@ msgstr "" "état %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (règle %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr " $défaut\taccepter\n" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " PAS D'ACTION\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \taller à l'état %d\n" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tdécalage et aller à l'état %d\n" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\terreur (non-associatif)\n" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\taller à l'état %d\n" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -315,17 +333,17 @@ msgstr "" "\n" "Grammaire\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "règle %-4d %s ->" -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "\t\t/* epsilon */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -335,7 +353,7 @@ msgstr "" "Terminaux, suivis des règles où ils apparaissent\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -345,240 +363,240 @@ msgstr "" "Catégories, suivis des règles où elles apparaissent\n" "\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " à gauche:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " à droite:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " Saut jusqu'au prochain \\n" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " Saut jusqu'au prochain %c" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "chaîne de caractères non terminée en fin de fichier" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "chaîne de caractère non terminée" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "non reconnu: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "aucune grammaire en entrée" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "caractère inconnu: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "La section de définition (%{) ne termine pas avant la fin du fichier" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' n'est pas valide dans %s" -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "item %s non reconnu, un identificateur est attendu" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "chaîne de caractères constante attendue plutôt que %s" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "multiples déclarations %start" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "la déclaration %start n'est pas valide" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "la déclaration %type n'a pas de " -#: src/reader.c:753 +#: src/reader.c:761 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "redéfinition du niveau de priorité de %s" -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur" -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "item inattendu: %s" -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "accolade ouvrante `{' non appariée" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "le paramètre de %expect n'est pas un entier" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "@%s n'est pas valide" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "la valeur de symbole $ n'est pas valide" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' n'a pas son type déclaré" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s cd `%s' n'a pas son type déclaré" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "$%s n'est pas valide" -#: src/reader.c:1136 +#: src/reader.c:1144 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "clause %%guard non terminée" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "la grammaire débute par une barre verticale" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1507 +#: src/reader.c:1515 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "conflit de type (`%s' `%s') pour l'action par défaut" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "règle vide pour une catégorie typée et aucune action" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "trop de symboles (terminaux et catégories); maximum de %s" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas " "de règle" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "les valeurs d'association de %s et %s entrent en conflit" -#: src/reader.c:1791 +#: src/reader.c:1800 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "les terminaux %s et %s se sont vus assigner le nombre %s" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "le symbole de départ %s est un terminal" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s" -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -586,7 +604,7 @@ msgstr "" "la réduction de %s définit %d terminal%s, %d catégorie%s et %d " "production%s.\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -594,7 +612,7 @@ msgstr "" "Catégories non productives:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -606,7 +624,7 @@ msgstr "" "Terminaux non utilisés:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -618,7 +636,7 @@ msgstr "" "Règles non productives:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -628,11 +646,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "Valeur Spréc Sassoc Tag\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -642,7 +660,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -652,26 +670,26 @@ msgstr "" "-------------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d règles jamais réduites\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s contient " -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d catégories non productives%s" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr " et " -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d règle(s) non productive(s)" diff --git a/po/ja.po b/po/ja.po index 0d86425c..bd5ebe28 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.28\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -23,77 +23,77 @@ msgstr "%s msgid "%s: memory exhausted\n" msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "´Ô¸µ" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "¥·¥Õ¥È" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "¥¨¥é¡¼" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " ¤ª¤è¤Ó" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "¾×ÆÍ: " -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d ¥·¥Õ¥È/´Ô¸µ" -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d ´Ô¸µ/´Ô¸µ" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s ¤Ë¤Ï¡¢" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -126,29 +126,29 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -156,7 +156,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -167,7 +167,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -176,70 +176,88 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "" -#: src/getargs.c:195 +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/getargs.c:199 +#: src/getargs.c:232 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, fuzzy, c-format msgid "too many gotos (max %d)" msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)" -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹" -#: src/lex.c:172 +#: src/lex.c:173 #, fuzzy msgid "unexpected end of file" msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹" -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'" -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹" -#: src/main.c:136 +#: src/main.c:144 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n" @@ -248,17 +266,17 @@ msgstr "%s: msgid "Entering set_nullable" msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹" -#: src/output.c:1207 +#: src/output.c:1208 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -271,42 +289,42 @@ msgstr "" "¾õÂÖ %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (µ¬Â§ %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr " $default\taccept\n" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " Æ°ºî̵¤·\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \t¾õÂÖ %d ¤Ø\n" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\t¾õÂÖ %d ¤Ø\n" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -314,17 +332,17 @@ msgstr "" "\n" "ʸˡ\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "µ¬Â§ %-4d %s ->" -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "\t\t/* ¶õ */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -334,7 +352,7 @@ msgstr "" "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -344,239 +362,239 @@ msgstr "" "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " º¸ÊÕ:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " ±¦ÊÕ:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/reader.c:753 +#: src/reader.c:761 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹" -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s" -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "@%s ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "̵¸ú¤Ê $ ¤ÎÃÍ" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "$%s ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:1136 +#: src/reader.c:1144 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1507 +#: src/reader.c:1515 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "̵¸ú¤ÊÆþÎÏ: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s " "¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ¤»¤ó" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1791 +#: src/reader.c:1800 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó" -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -584,7 +602,7 @@ msgstr "" "´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d " "¸Ä¤Îµ¬Â§%.0s¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -592,7 +610,7 @@ msgstr "" "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -604,7 +622,7 @@ msgstr "" "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -616,7 +634,7 @@ msgstr "" "ÉÔ»ÈÍѵ¬Â§:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -626,11 +644,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "ÃÍ Á°ÃÖ ·ë¹ç ¥¿¥°\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -640,7 +658,7 @@ msgstr "" "-----\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -650,26 +668,26 @@ msgstr "" "-----------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s ¤Ë¤Ï" -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr "¤ª¤è¤Ó" -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s" diff --git a/po/nl.po b/po/nl.po index 2bd59a70..c8dbc3f0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -23,77 +23,77 @@ msgstr "" msgid "%s: memory exhausted\n" msgstr "%s: geen geheugen meer beschikbaar\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "reduceer" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "verschuif" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "een fout" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "Stadium %d bevat" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 verschuif/reduceer conflict" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d verschuif/reduceer conflicten" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " en" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr " 1 reduceer/reduceer conflict" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d reduceer/reduceer conflicten" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "conflictueerd: " -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d vershuif/reduceer" -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d reduceer/reduceer" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s bevat" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduceer gebruikt regel %d (%s)]\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\treduce using rule %d (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr "" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr "" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -126,29 +126,29 @@ msgstr "" "AFGELEIDEN\n" "\n" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s afgeleiden" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -156,7 +156,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -167,7 +167,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -176,70 +176,88 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "" -#: src/getargs.c:195 +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: geen grammatica bestand gegeven\n" -#: src/getargs.c:199 +#: src/getargs.c:232 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: extra argumenten genegeerd na '%s'\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "onverwachte `/' gevonden en genegeerd" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "ongetermineerd commentaar" -#: src/lex.c:172 +#: src/lex.c:173 #, fuzzy msgid "unexpected end of file" msgstr "Onverwacht bestandseinde" -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "niet geescapete nieuwe regel in constante" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "octale waarde buiten domein 0...255: `\\%o'" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadecimale waarde boven 255: `\\x%x'" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "onbekende escape reeks: `\\' gevolgd door `%s'" -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "gebruik \"...\" voor meerdere karakters literal tekens" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "niet getermineerd type naam aan het einde van bestand" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "niet getermineerd type naam" -#: src/main.c:136 +#: src/main.c:144 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interne fout, %s\n" @@ -248,17 +266,17 @@ msgstr "interne fout, %s\n" msgid "Entering set_nullable" msgstr "Inkomende set nullable" -#: src/output.c:1207 +#: src/output.c:1208 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale tabel grootte (%s) overschreden" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr "" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -271,42 +289,42 @@ msgstr "" "stadium %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (regel %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr "" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " GEEN AKTIES\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr "" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr "" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr "" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr "" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -314,17 +332,17 @@ msgstr "" "\n" "Grammatica\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "regel %-4d %s ->" -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -334,7 +352,7 @@ msgstr "" "Terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -344,240 +362,240 @@ msgstr "" "Geen terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " links:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " rechts:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " Verder naar volgende \\n" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " Verder naar volgende %c" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "niet getermineerde string aan einde van bestand" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "niet getermineerde string" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "onbekend: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "geen invoer grammatica" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "onbekend karakter: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "niet getermineerde `%{' definitie" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' is onjuist in %s" -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "onbekend item %s, verwacht een identifier" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "verwacht string constante in plaats van %s" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "meerdere %start declaraties" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "onjuiste %start declaratie" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "%type declaratie heeft geen " -#: src/reader.c:753 +#: src/reader.c:761 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "onjuist %%type declaratie door item: `%s'" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "herdefinieren voorganger van %s" -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "onjuiste tekst (%s) - nummer hoort na de identifier" -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "onbekend item: %s" -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "niet overeenkomstige `{'" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "argument van %expect is niet een integer" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "@%s is onjuist" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "onjuiste $ waarde" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ van `%s' heeft geen gedeclareerd type" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s van `%s' heeft geen gedeclareerd type" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "$%s is onjuist" -#: src/reader.c:1136 +#: src/reader.c:1144 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "niet getermineerde %%guard voorwaarde" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "grammatica start met een verticale bar" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "regel geven voor %s, welke een teken is" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "twee @prec's in een regel" -#: src/reader.c:1507 +#: src/reader.c:1515 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van een regel" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type clash (`%s' `%s') bij standaard aktie" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor getypte niet terminal, en geen aktie" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "te veel symbolen (tekens plus nietterminals); maximum %s" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "geen regels voor invoer grammatica" -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n" "heeft geen regels" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "conflictuerende precedentein voor %s en %s" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflictuerende associatieve waarden voor %s en %s" -#: src/reader.c:1791 +#: src/reader.c:1800 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "het start symbool %s is een token" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Start symbool %s is niet afkomstig uit een zin" -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -585,7 +603,7 @@ msgstr "" "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d " "productie%s.\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -593,7 +611,7 @@ msgstr "" "Onbruikbare niet terminals:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -605,7 +623,7 @@ msgstr "" "Terminals welke niet worden gebruikt:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -617,7 +635,7 @@ msgstr "" "Onbruikbare regels:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -627,11 +645,11 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "Waarde Sprec Sassoc Tag\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -641,7 +659,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -651,26 +669,26 @@ msgstr "" "-----------------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d regels nooit gereduceerd\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s bevat" -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d onbruikbare niet terminal%s" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr " en " -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d onbruikbare regels%s" diff --git a/po/ru.po b/po/ru.po index 65022926..80fbd5d2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.28a\n" -"POT-Creation-Date: 2000-04-14 15:35+0200\n" +"POT-Creation-Date: 2000-09-18 14:58+0200\n" "PO-Revision-Date: 2000-04-12 13:16+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -23,78 +23,78 @@ msgstr " msgid "%s: memory exhausted\n" msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n" -#: src/conflicts.c:199 src/conflicts.c:223 +#: src/conflicts.c:200 src/conflicts.c:224 msgid "reduce" msgstr "×Ù×ÏÄ" -#: src/conflicts.c:205 src/conflicts.c:219 +#: src/conflicts.c:206 src/conflicts.c:220 msgid "shift" msgstr "ÓÄ×ÉÇ" -#: src/conflicts.c:227 +#: src/conflicts.c:228 msgid "an error" msgstr "ÏÛÉÂËÁ" -#: src/conflicts.c:299 +#: src/conflicts.c:300 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n" -#: src/conflicts.c:344 +#: src/conflicts.c:345 #, c-format msgid "State %d contains" msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ" -#: src/conflicts.c:347 src/conflicts.c:392 +#: src/conflicts.c:348 src/conflicts.c:393 msgid " 1 shift/reduce conflict" msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:349 src/conflicts.c:394 +#: src/conflicts.c:350 src/conflicts.c:395 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:352 src/conflicts.c:397 +#: src/conflicts.c:353 src/conflicts.c:398 msgid " and" msgstr " É" -#: src/conflicts.c:355 src/conflicts.c:400 +#: src/conflicts.c:356 src/conflicts.c:401 msgid " 1 reduce/reduce conflict" msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:357 src/conflicts.c:402 +#: src/conflicts.c:358 src/conflicts.c:403 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:378 +#: src/conflicts.c:379 msgid "conflicts: " msgstr "ËÏÎÆÌÉËÔÙ: " -#: src/conflicts.c:380 +#: src/conflicts.c:381 #, c-format msgid " %d shift/reduce" msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ" -#: src/conflicts.c:384 +#: src/conflicts.c:385 #, c-format msgid " %d reduce/reduce" msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ" -#: src/conflicts.c:389 +#: src/conflicts.c:390 #, c-format msgid "%s contains" msgstr "%s ÓÏÄÅÒÖÉÔ" -#: src/conflicts.c:598 src/conflicts.c:712 +#: src/conflicts.c:599 src/conflicts.c:713 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n" -#: src/conflicts.c:609 src/print.c:217 +#: src/conflicts.c:610 src/print.c:223 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -103,17 +103,17 @@ msgstr "" " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" "\n" -#: src/conflicts.c:695 src/conflicts.c:707 +#: src/conflicts.c:696 src/conflicts.c:708 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/conflicts.c:733 +#: src/conflicts.c:734 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/derives.c:106 +#: src/derives.c:109 msgid "" "\n" "\n" @@ -127,23 +127,23 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:110 +#: src/derives.c:113 #, c-format msgid "%s derives" msgstr "%s ×Ù×ÏÄÉÔ" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:69 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n" -#: src/getargs.c:73 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n" -#: src/getargs.c:77 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" @@ -152,7 +152,7 @@ msgstr "" "Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ. ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n" "ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/getargs.c:83 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -164,7 +164,7 @@ msgstr "" " -V, --version ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " -y, --yacc ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n" -#: src/getargs.c:90 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -182,7 +182,7 @@ msgstr "" " -r, --raw ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n" " -k, --token-table ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n" -#: src/getargs.c:101 +#: src/getargs.c:103 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -196,69 +196,87 @@ msgstr "" " -b, --file-prefix=ðòåæéëó ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n" " -o, --output-file=æáêì ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n" -#: src/getargs.c:109 +#: src/getargs.c:111 msgid "Report bugs to .\n" msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" -#: src/getargs.c:195 +#. Some efforts were made to ease the translators' task, please +#. continue. +#: src/getargs.c:125 +#, c-format +msgid "bison (GNU Bison) %s" +msgstr "" + +#: src/getargs.c:130 +msgid "" +"Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" +msgstr "" + +#: src/getargs.c:134 +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#: src/getargs.c:228 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n" -#: src/getargs.c:199 +#: src/getargs.c:232 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n" -#: src/lalr.c:293 +#: src/lalr.c:294 #, c-format msgid "too many gotos (max %d)" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)" -#: src/lex.c:115 +#: src/lex.c:116 msgid "unexpected `/' found and ignored" msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'" -#: src/lex.c:144 src/reader.c:256 +#: src/lex.c:145 src/reader.c:257 msgid "unterminated comment" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ" -#: src/lex.c:172 +#: src/lex.c:173 msgid "unexpected end of file" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ" -#: src/lex.c:193 +#: src/lex.c:194 msgid "unescaped newline in constant" msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ" -#: src/lex.c:225 +#: src/lex.c:226 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'" -#: src/lex.c:250 +#: src/lex.c:251 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'" -#: src/lex.c:261 +#: src/lex.c:262 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'" -#: src/lex.c:394 +#: src/lex.c:395 msgid "use \"...\" for multi-character literal tokens" msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ" -#: src/lex.c:473 +#: src/lex.c:474 msgid "unterminated type name at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/lex.c:476 +#: src/lex.c:477 msgid "unterminated type name" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ" -#: src/main.c:136 +#: src/main.c:144 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n" @@ -267,17 +285,17 @@ msgstr "%s: msgid "Entering set_nullable" msgstr "÷ÈÏÄ × set_nullable" -#: src/output.c:1207 +#: src/output.c:1208 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)" -#: src/print.c:85 +#: src/print.c:90 #, c-format msgid " type %d is %s\n" msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n" -#: src/print.c:92 +#: src/print.c:98 #, c-format msgid "" "\n" @@ -290,42 +308,42 @@ msgstr "" "ÓÏÓÔÏÑÎÉÅ %d\n" "\n" -#: src/print.c:136 +#: src/print.c:142 #, c-format msgid " (rule %d)" msgstr " (ÐÒÁ×ÉÌÏ %d)" -#: src/print.c:163 +#: src/print.c:169 msgid " $default\taccept\n" msgstr " $default\tÐÒÉÎÑÔÉÅ\n" -#: src/print.c:165 +#: src/print.c:171 msgid " NO ACTIONS\n" msgstr " îåô äåêóô÷éê\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:181 +#: src/print.c:187 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:183 +#: src/print.c:189 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:206 +#: src/print.c:212 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n" -#: src/print.c:232 +#: src/print.c:238 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" #. rule # : LHS -> RHS -#: src/print.c:253 +#: src/print.c:263 msgid "" "\n" "Grammar\n" @@ -333,17 +351,17 @@ msgstr "" "\n" "çÒÁÍÍÁÔÉËÁ\n" -#: src/print.c:258 +#: src/print.c:268 #, c-format msgid "rule %-4d %s ->" msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->" -#: src/print.c:264 +#: src/print.c:274 msgid "\t\t/* empty */" msgstr "\t\t/* ÐÕÓÔÏ */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:269 +#: src/print.c:279 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -353,7 +371,7 @@ msgstr "" "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n" "\n" -#: src/print.c:317 +#: src/print.c:327 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -363,237 +381,237 @@ msgstr "" "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n" "\n" -#: src/print.c:343 +#: src/print.c:353 msgid " on left:" msgstr " ÎÁÌÅ×Ï:" -#: src/print.c:358 +#: src/print.c:368 msgid " on right:" msgstr " ÎÁÐÒÁ×Ï:" -#: src/reader.c:154 +#: src/reader.c:155 msgid " Skipping to next \\n" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n" -#: src/reader.c:156 +#: src/reader.c:157 #, c-format msgid " Skipping to next %c" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c" -#: src/reader.c:180 src/reader.c:195 +#: src/reader.c:181 src/reader.c:196 msgid "unterminated string at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/reader.c:183 +#: src/reader.c:184 msgid "unterminated string" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ" -#: src/reader.c:444 +#: src/reader.c:452 #, c-format msgid "unrecognized: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/reader.c:449 +#: src/reader.c:457 msgid "no input grammar" msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ" -#: src/reader.c:452 +#: src/reader.c:460 #, c-format msgid "unknown character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/reader.c:504 +#: src/reader.c:512 msgid "unterminated `%{' definition" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'" -#: src/reader.c:545 src/reader.c:733 src/reader.c:782 +#: src/reader.c:553 src/reader.c:741 src/reader.c:790 #, c-format msgid "Premature EOF after %s" msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s" -#: src/reader.c:582 src/reader.c:804 +#: src/reader.c:590 src/reader.c:812 #, c-format msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673 +#: src/reader.c:600 src/reader.c:756 src/reader.c:819 src/reader.c:1681 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/reader.c:602 +#: src/reader.c:610 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ÎÅ×ÅÒÎÏ × %s" -#: src/reader.c:650 +#: src/reader.c:658 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ" -#: src/reader.c:672 +#: src/reader.c:680 #, c-format msgid "expected string constant instead of %s" msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ" -#: src/reader.c:694 src/reader.c:855 +#: src/reader.c:702 src/reader.c:863 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:696 src/reader.c:1649 +#: src/reader.c:704 src/reader.c:1657 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:716 +#: src/reader.c:724 msgid "%type declaration has no " msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>" -#: src/reader.c:753 +#: src/reader.c:761 msgid "invalid %%type declaration due to item: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s" -#: src/reader.c:800 +#: src/reader.c:808 #, c-format msgid "redefining precedence of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/reader.c:823 +#: src/reader.c:831 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ" -#: src/reader.c:833 +#: src/reader.c:841 #, c-format msgid "unexpected item: %s" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s" -#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276 +#: src/reader.c:904 src/reader.c:1067 src/reader.c:1284 #, fuzzy, c-format msgid "unmatched %s" msgstr "ÎÅÐÁÒÎÁÑ `{'" -#: src/reader.c:941 +#: src/reader.c:949 #, c-format msgid "argument of %expect is not an integer" msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ" -#: src/reader.c:973 +#: src/reader.c:981 #, c-format msgid "@%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s" -#: src/reader.c:988 src/reader.c:1000 +#: src/reader.c:996 src/reader.c:1008 msgid "invalid $ value" msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ" -#: src/reader.c:1106 src/reader.c:1246 +#: src/reader.c:1114 src/reader.c:1254 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:1122 src/reader.c:1262 +#: src/reader.c:1130 src/reader.c:1270 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:1127 src/reader.c:1267 +#: src/reader.c:1135 src/reader.c:1275 #, c-format msgid "$%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s" -#: src/reader.c:1136 +#: src/reader.c:1144 #, c-format msgid "unterminated %guard clause" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard" -#: src/reader.c:1362 +#: src/reader.c:1370 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ" -#: src/reader.c:1369 +#: src/reader.c:1377 msgid "grammar starts with vertical bar" msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ" -#: src/reader.c:1400 +#: src/reader.c:1408 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1498 +#: src/reader.c:1506 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1507 +#: src/reader.c:1515 #, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ" -#: src/reader.c:1516 +#: src/reader.c:1524 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1531 +#: src/reader.c:1539 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1537 +#: src/reader.c:1545 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1581 +#: src/reader.c:1589 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1589 +#: src/reader.c:1597 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1592 +#: src/reader.c:1600 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1610 +#: src/reader.c:1618 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/reader.c:1728 +#: src/reader.c:1737 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/reader.c:1740 +#: src/reader.c:1749 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/reader.c:1791 +#: src/reader.c:1800 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" -#: src/reader.c:1805 +#: src/reader.c:1814 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/reader.c:1807 +#: src/reader.c:1816 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reduce.c:141 +#: src/reduce.c:144 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ" -#: src/reduce.c:155 +#: src/reduce.c:158 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -601,7 +619,7 @@ msgstr "" "×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ " "×Ù×ÏÄÁ%s.\n" -#: src/reduce.c:493 +#: src/reduce.c:496 msgid "" "Useless nonterminals:\n" "\n" @@ -609,7 +627,7 @@ msgstr "" "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n" "\n" -#: src/reduce.c:505 +#: src/reduce.c:508 msgid "" "\n" "\n" @@ -621,7 +639,7 @@ msgstr "" "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n" "\n" -#: src/reduce.c:514 +#: src/reduce.c:517 msgid "" "\n" "\n" @@ -633,7 +651,7 @@ msgstr "" "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n" "\n" -#: src/reduce.c:542 +#: src/reduce.c:546 msgid "" "Variables\n" "---------\n" @@ -643,11 +661,11 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:543 +#: src/reduce.c:547 msgid "Value Sprec Sassoc Tag\n" msgstr "úÎÁÞ ðÒÉÏÒ áÓÓÏà ôÅÇ\n" -#: src/reduce.c:548 +#: src/reduce.c:552 msgid "" "Rules\n" "-----\n" @@ -657,7 +675,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:558 +#: src/reduce.c:562 msgid "" "Rules interpreted\n" "-----------------\n" @@ -667,26 +685,26 @@ msgstr "" "--------------------------\n" "\n" -#: src/reduce.c:574 +#: src/reduce.c:579 #, c-format msgid "%d rules never reduced\n" msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n" -#: src/reduce.c:576 +#: src/reduce.c:581 #, c-format msgid "%s contains " msgstr "%s ÓÏÄÅÒÖÉÔ " -#: src/reduce.c:580 +#: src/reduce.c:585 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s" -#: src/reduce.c:585 +#: src/reduce.c:590 msgid " and " msgstr " É " -#: src/reduce.c:589 +#: src/reduce.c:594 #, c-format msgid "%d useless rule%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s" diff --git a/src/getargs.c b/src/getargs.c index 558faaf8..67b880c7 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -37,7 +37,6 @@ extern int fixed_outfiles;/* for -y */ extern char *program_name; extern void warns PARAMS((char *, char *)); /* main.c */ -static void usage PARAMS((FILE *)); extern void getargs PARAMS((int argc, char *[])); static struct option longopts[] = @@ -63,6 +62,7 @@ static struct option longopts[] = /*---------------------------. | Display the help message. | `---------------------------*/ + static void usage (FILE *stream) { @@ -112,6 +112,37 @@ Output:\n\ Report bugs to .\n"), stream); } + +/*------------------------------. +| Display the version message. | +`------------------------------*/ + +static void +version (FILE *stream) +{ + /* Some efforts were made to ease the translators' task, please + continue. */ + fprintf (stream, _("\ +bison (GNU Bison) %s"), VERSION); + putc ('\n', stream); + putc ('\n', stream); + + fputs (_("\ +Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"), + stream); + + fputs (_("\ +This is free software; see the source for copying conditions. There is NO\n\ +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +"), + stream); +} + + +/*----------------------. +| Process the options. | +`----------------------*/ + void getargs (int argc, char *argv[]) { @@ -143,7 +174,7 @@ getargs (int argc, char *argv[]) exit (0); case 'V': - printf ("%s\n", VERSION_STRING); + version (stdout); exit (0); case 'v': @@ -194,12 +225,12 @@ getargs (int argc, char *argv[]) if (optind == argc) { - fprintf(stderr, _("%s: no grammar file given\n"), program_name); - exit(1); + fprintf (stderr, _("%s: no grammar file given\n"), program_name); + exit (1); } if (optind < argc - 1) - fprintf(stderr, _("%s: extra arguments ignored after `%s'\n"), - program_name, argv[optind]); + fprintf (stderr, _("%s: extra arguments ignored after `%s'\n"), + program_name, argv[optind]); infile = argv[optind]; } diff --git a/src/reader.c b/src/reader.c index 9d247c42..232e0b0c 100644 --- a/src/reader.c +++ b/src/reader.c @@ -283,11 +283,12 @@ reader (void) startval = NULL; /* start symbol not specified yet. */ #if 0 - translations = 0; /* initially assume token number translation not needed. */ + /* initially assume token number translation not needed. */ + translations = 0; #endif - /* Nowadays translations is always set to 1, - since we give `error' a user-token-number - to satisfy the Posix demand for YYERRCODE==256. */ + /* Nowadays translations is always set to 1, since we give `error' a + user-token-number to satisfy the Posix demand for YYERRCODE==256. + */ translations = 1; nsyms = 1; @@ -295,7 +296,7 @@ reader (void) nrules = 0; nitems = 0; rline_allocated = 10; - rline = NEW2(rline_allocated, short); + rline = NEW2 (rline_allocated, short); typed = 0; lastprec = 0; @@ -308,50 +309,56 @@ reader (void) grammar = NULL; - init_lex(); + init_lex (); lineno = 1; - /* initialize the symbol table. */ - tabinit(); - /* construct the error token */ - errtoken = getsym("error"); + /* Initialize the symbol table. */ + tabinit (); + /* Construct the error token */ + errtoken = getsym ("error"); errtoken->class = STOKEN; - errtoken->user_token_number = 256; /* Value specified by posix. */ - /* construct a token that represents all undefined literal tokens. */ - /* it is always token number 2. */ - undeftoken = getsym("$undefined."); + errtoken->user_token_number = 256; /* Value specified by POSIX. */ + /* Construct a token that represents all undefined literal tokens. + It is always token number 2. */ + undeftoken = getsym ("$undefined."); undeftoken->class = STOKEN; undeftoken->user_token_number = 2; - /* Read the declaration section. Copy %{ ... %} groups to ftable and fdefines file. - Also notice any %token, %left, etc. found there. */ - if (noparserflag) - fprintf(ftable, "\n/* Bison-generated parse tables, made from %s\n", - infile); - else - fprintf(ftable, "\n/* A Bison parser, made from %s\n", infile); - fprintf(ftable, " by %s */\n\n", VERSION_STRING); - fprintf(ftable, "#define YYBISON 1 /* Identify Bison output. */\n\n"); - read_declarations(); - /* start writing the guard and action files, if they are needed. */ - output_headers(); - /* read in the grammar, build grammar in list form. write out guards and actions. */ - readgram(); - /* Now we know whether we need the line-number stack. - If we do, write its type into the .tab.h file. */ + + /* Read the declaration section. Copy %{ ... %} groups to FTABLE + and FDEFINES file. Also notice any %token, %left, etc. found + there. */ + putc ('\n', ftable); + fprintf (ftable, "\ +/* %s, made from %s\n\ + by GNU bison %s. */\n\ +\n", + noparserflag ? "Bison-generated parse tables" : "A Bison parser", + infile, + VERSION); + + fputs ("#define YYBISON 1 /* Identify Bison output. */\n\n", ftable); + read_declarations (); + /* Start writing the guard and action files, if they are needed. */ + output_headers (); + /* Read in the grammar, build grammar in list form. Write out + guards and actions. */ + readgram (); + /* Now we know whether we need the line-number stack. If we do, + write its type into the .tab.h file. */ if (fdefines) - reader_output_yylsp(fdefines); - /* write closing delimiters for actions and guards. */ - output_trailers(); + reader_output_yylsp (fdefines); + /* Write closing delimiters for actions and guards. */ + output_trailers (); if (yylsp_needed) - fprintf(ftable, "#define YYLSP_NEEDED\n\n"); - /* assign the symbols their symbol numbers. - Write #defines for the token symbols into fdefines if requested. */ - packsymbols(); - /* convert the grammar into the format described in gram.h. */ - packgram(); - /* free the symbol table data structure - since symbols are now all referred to by symbol number. */ - free_symtab(); + fprintf ("#define YYLSP_NEEDED\n\n", ftable); + /* Assign the symbols their symbol numbers. Write #defines for the + token symbols into FDEFINES if requested. */ + packsymbols (); + /* Convert the grammar into the format described in gram.h. */ + packgram (); + /* Free the symbol table data structure since symbols are now all + referred to by symbol number. */ + free_symtab (); } void diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 00000000..3ea9fe34 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,40 @@ +## Process this file with automake to create Makefile.in. + +## Makefile for Bison testsuite. +## Copyright (C) 2000 Free Software Foundation, Inc. + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. + +# Distribute the testsuite since GNU M4 is needed to build it. +noinst_SCRIPTS = testsuite + +SUITE = + +EXTRA_DIST = atgeneral.m4 suite.m4 $(SUITE) + +check-local: atconfig testsuite + $(SHELL) testsuite + +testsuite: atgeneral.m4 suite.m4 $(SUITE) + $(M4) -I $(srcdir) atgeneral.m4 suite.m4 | \ + sed -e 's/[ ]*$$//' | \ + sed -e '/^$$/N;/\n$$/D' > $@-tmp + chmod +x $@-tmp + mv $@-tmp $@ + +CLEANFILES = debug-*.sh +DISTCLEANFILES = atconfig +MAINTAINERCLEANFILES = testsuite diff --git a/tests/atconfig.in b/tests/atconfig.in new file mode 100644 index 00000000..0c6c4beb --- /dev/null +++ b/tests/atconfig.in @@ -0,0 +1,82 @@ +# @configure_input@ -*- shell-script -*- +# Configurable variable values for building test suites. +# Copyright (C) 2000 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# This script is part of Autotest. Unlimited permission to copy, +# distribute and modify the testing scripts that are the output of +# that Autotest script is given. You need not follow the terms of the +# GNU General Public License when using or distributing such scripts, +# even though portions of the text of Autotest appear in them. The +# GNU General Public License (GPL) does govern all other use of the +# material that constitutes the Autotest. +# +# Certain portions of the Autotest source text are designed to be +# copied (in certain cases, depending on the input) into the output of +# Autotest. We call these the "data" portions. The rest of the +# Autotest source text consists of comments plus executable code that +# decides which of the data portions to output in any given case. We +# call these comments and executable code the "non-data" portions. +# Autotest never copies any of the non-data portions into its output. +# +# This special exception to the GPL applies to versions of Autotest +# released by the Free Software Foundation. When you make and +# distribute a modified version of Autotest, you may extend this +# special exception to the GPL to apply to your modified version as +# well, *unless* your modified version has the potential to copy into +# its output some of the text that was the non-data portion of the +# version that you started with. (In other words, unless your change +# moves or copies text from the non-data portions to the data +# portions.) If your modification has such potential, you must delete +# any notice of this special exception to the GPL from your modified +# version. + +# Snippet (1 +# This debugging script has been automatically generated from `make check'. +# Call it with `--help' to get a quick usage summary. + +at_package=@PACKAGE@ +at_version=@VERSION@ +# Snippet )1 +# Snippet (2 +at_n=@ECHO_N@ +at_c='@ECHO_C@' +test -f atlocal && . ./atlocal + +# LC_MESSAGES is always shadowed by LC_ALL. Here are the only cases: +# - GNU: LANGUAGE -> LC_ALL -> LC_MESSAGES -> LANG +# - POSIX: LC_ALL -> LC_MESSAGES -> LANG +# - XPG4: LC_ALL -> LANG +# - SysV/XPG2: LANG +export LANGUAGE; LANGUAGE=C +export LANG; LANG=C +export LC_ALL; LC_ALL=C + +srcdir=@srcdir@ +top_srcdir=@top_srcdir@ +# Use absolute file notations, as the test might change directories. +at_srcdir=`cd @srcdir@ && pwd` +at_top_srcdir=`cd @top_srcdir@ && pwd` +if test -n "@AT_TESTPATH@"; then + export PATH; PATH=`pwd`:`cd @AT_TESTPATH@ && pwd`:$PATH +else + export PATH; PATH=`pwd`:$PATH +fi + +# We need GNU m4. +M4=@M4@ +# Snippet )2 diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4 new file mode 100644 index 00000000..9077a1cc --- /dev/null +++ b/tests/atgeneral.m4 @@ -0,0 +1,388 @@ +divert(-1) -*- shell-script -*- +# `m4' macros used in building test suites. +# Copyright (C) 2000 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# This script is part of Autotest. Unlimited permission to copy, +# distribute and modify the testing scripts that are the output of +# that Autotest script is given. You need not follow the terms of the +# GNU General Public License when using or distributing such scripts, +# even though portions of the text of Autotest appear in them. The +# GNU General Public License (GPL) does govern all other use of the +# material that constitutes the Autotest. +# +# Certain portions of the Autotest source text are designed to be +# copied (in certain cases, depending on the input) into the output of +# Autotest. We call these the "data" portions. The rest of the +# Autotest source text consists of comments plus executable code that +# decides which of the data portions to output in any given case. We +# call these comments and executable code the "non-data" portions. +# Autotest never copies any of the non-data portions into its output. +# +# This special exception to the GPL applies to versions of Autotest +# released by the Free Software Foundation. When you make and +# distribute a modified version of Autotest, you may extend this +# special exception to the GPL to apply to your modified version as +# well, *unless* your modified version has the potential to copy into +# its output some of the text that was the non-data portion of the +# version that you started with. (In other words, unless your change +# moves or copies text from the non-data portions to the data +# portions.) If your modification has such potential, you must delete +# any notice of this special exception to the GPL from your modified +# version. + +changequote([, ]) + +define(AT_DEFINE, defn([define])) +define(AT_EVAL, defn([eval])) +define(AT_FORMAT, defn([format])) +define(AT_INCLUDE, defn([include])) +define(AT_SHIFT, defn([shift])) +define(AT_UNDEFINE, defn([undefine])) + +undefine([define]) +undefine([eval]) +undefine([format]) +undefine([include]) +undefine([shift]) +undefine([undefine]) + +# AT_CASE(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT) + +# m4 equivalent of +# switch (SWITCH) +# { +# case VAL1: +# IF-VAL1; +# break; +# case VAL2: +# IF-VAL2; +# break; +# ... +# default: +# DEFAULT; +# break; +# }. +# All the values are optional, and the macro is robust to active +# symbols properly quoted. +AT_DEFINE(AT_CASE, +[ifelse([$#], 0, [], + [$#], 1, [], + [$#], 2, [$2], + [$1], [$2], [$3], + [AT_CASE([$1], AT_SHIFT(AT_SHIFT(AT_SHIFT($@))))])]) + + +# Use of diversions: +# 0 - overall initialization; for each test group: skipping and cleanups; +# 1 - for each test group: proper code, to reinsert between cleanups; +# 2 - overall wrap up: generation of debugging scripts and statistics. + + +# AT_LINE + +# Return the current file sans directory, a colon, and the current line. + +AT_DEFINE(AT_LINE, +[patsubst(__file__, ^.*/\(.*\), \1):__line__]) + +# AT_INIT(PROGRAM) + +# Begin testing suite, using PROGRAM to check version. The search path +# should be already preset so the proper executable will be selected. + +AT_DEFINE(AT_INIT, +[AT_DEFINE(AT_ordinal, 0) +. ./atconfig +# Snippet (3 + +at_usage="Usage: [$]0 [OPTION]... + + -e Abort the full suite and inhibit normal clean up if a test fails + -n Do not redirect stdout and stderr and do not test their contents + -s Inhibit verbosity while generating or executing debugging scripts + -v Force more detailed output, default for debugging scripts unless -s + -x Have the shell to trace command execution; also implies option -n" + +while test [$][#] -gt 0; do + case "[$]1" in + --help) echo "$at_usage"; exit 0 ;; + --version) echo "[$]0 ($at_package) $at_version"; exit 0 ;; + -e) at_stop_on_error=1; shift ;; + -n) at_no_redirs=1; shift ;; + -s) at_verbose=; at_silent=1; shift ;; + -v) at_verbose=1; at_silent=; shift ;; + -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_no_redirs=1; shift ;; + *) echo 1>&2 "Try \`[$]0 --help' for more information."; exit 1 ;; + esac +done + + +# To check whether a test succeeded or not, we compare an expected +# output with a reference. In the testing suite, we just need `cmp' +# but in debugging scripts, we want more information, so we prefer +# `diff -u'. Nonetheless we will use `diff' only, because in DOS +# environments, `diff' considers that two files are equal included +# when there are only differences on the coding of new lines. `cmp' +# does not. +# +# Finally, not all the `diff' support `-u', and some, like Tru64, even +# refuse to `diff' /dev/null. +: >empty + +if diff -u empty empty >/dev/null 2>&1; then + at_diff='diff -u' +else + at_diff='diff' +fi + + + +# Each generated debugging script, containing a single test group, cleans +# up files at the beginning only, not at the end. This is so we can repeat +# the script many times and browse left over files. To cope with such left +# over files, the full test suite cleans up both before and after test groups. +# Snippet )3 + +if test -n "`$1 --version | sed -n s/$at_package.*$at_version/OK/p`"; then + at_banner="Testing suite for $at_package, version $at_version" + at_dashes=`echo $at_banner | sed s/./=/g` + echo "$at_dashes" + echo "$at_banner" + echo "$at_dashes" +else + echo '=======================================================' + echo 'ERROR: Not using the proper version, no tests performed' + echo '=======================================================' + exit 1 +fi + +# Remove any debugging script resulting from a previous run. +rm -f debug-*.sh + +at_failed_list= +at_ignore_count=0 +divert(2)[]dnl + +# Wrap up the testing suite with summary statistics. + +rm -f at-check-line +at_fail_count=0 +if test -z "$at_failed_list"; then + if test "$at_ignore_count" = 0; then + at_banner="All $at_test_count tests were successful" + else + at_banner="All $at_test_count tests were successful ($at_ignore_count ignored)" + fi +else + echo + echo $at_n "Writing \`debug-NN.sh' scripts, NN =$at_c" + for at_group in $at_failed_list; do + echo $at_n " $at_group$at_c" + ( echo '#!/bin/sh' + sed -n '/^[#] Snippet (1/,/^[#] Snippet )1/p' atconfig + test -z "$at_silent" && echo 'at_verbose=1' + sed -n '/^[#] Snippet (2/,/^[#] Snippet )2/p' atconfig + sed -n "/^[#] Snippet (3/,/^[#] Snippet )3/p" [$]0 + sed -n "/^[#] Snippet (c$at_group(/,/^[#] Snippet )c$at_group)/p" [$]0 + at_desc="`sed -n \ + '/^[#] Snippet (d'$at_group'(/,/^[#] Snippet )d'$at_group')/p' [$]0 \ + | sed -n '2s/^[#] //p'`" + echo 'if test -n "$at_verbose"; then' + echo ' at_banner="[$]0: '$at_desc'"' + echo ' at_dashes=`echo $at_banner | sed s/./=/g`' + echo ' echo' + echo ' echo "$at_dashes"' + echo ' echo "$at_banner"' + echo ' echo "$at_dashes"' + echo 'fi' + echo + sed -n "/^[#] Snippet (d$at_group(/,/^[#] Snippet )d$at_group)/p" [$]0 + sed -n "/^[#] Snippet (s$at_group(/,/^[#] Snippet )s$at_group)/p" [$]0 + echo 'exit 0' + ) | grep -v '^[#] Snippet' > debug-$at_group.sh + chmod +x debug-$at_group.sh + at_fail_count=`expr $at_fail_count + 1` + done + echo ', done' + if test -n "$at_stop_on_error"; then + at_banner='ERROR: One of the tests failed, inhibiting subsequent tests' + else + at_banner="ERROR: Suite unsuccessful, $at_fail_count of $at_test_count tests failed" + fi +fi +at_dashes=`echo $at_banner | sed s/./=/g` +echo +echo "$at_dashes" +echo "$at_banner" +echo "$at_dashes" + +if test -n "$at_failed_list"; then + if test -z "$at_silent"; then + echo + echo 'When reporting failed tests to maintainers, do not merely list test' + echo 'numbers, as the numbering changes between releases and pretests.' + echo 'Be careful to give at least all the information you got about them.' + echo 'You may investigate any problem if you feel able to do so, in which' + echo 'case the generated debugging scripts provide good starting points.' + echo "Go on and modify them at will. \`./debug-NN --help' gives usage" + echo 'information. Now, failed tests will be executed again, verbosely.' + for at_group in $at_failed_list; do + ./debug-$at_group.sh + done + fi + exit 1 +fi + +exit 0 +divert[]dnl +]) + +# AT_SETUP(DESCRIPTION) + +# Start a group of related tests, all to be executed in the same subshell. +# The group is testing what DESCRIPTION says. + +AT_DEFINE(AT_SETUP, +[AT_DEFINE([AT_ordinal], AT_EVAL(AT_ordinal + 1)) +pushdef([AT_group_description], [$1]) +pushdef([AT_data_files], ) +pushdef([AT_data_expout], ) +pushdef([AT_data_experr], ) +if test -z "$at_stop_on_error" || test -z "$at_failed_list"; then +divert(1)[]dnl + echo AT_LINE > at-check-line + if test -n "$at_verbose"; then + echo 'testing AT_group_description' + echo $at_n " $at_c" + fi + echo $at_n "substr(AT_ordinal. $srcdir/AT_LINE , 0, 30)[]$at_c" + if test -z "$at_skip_mode"; then + ( +[#] Snippet (d[]AT_ordinal[]( +[#] Testing AT_group_description +[#] Snippet )d[]AT_ordinal[]) +[#] Snippet (s[]AT_ordinal[]( +[#] starting from `AT_LINE'. +$at_traceon +]) + + +# AT_CLEANUP(FILES) + +# Complete a group of related tests, recursively remove those FILES +# created within the test. There is no need to list stdout, stderr, +# nor files created with AT_DATA. + +AT_DEFINE(AT_CLEANUP, +$at_traceoff +[[#] Snippet )s[]AT_ordinal[]) + ) + case [$]? in + 0) echo ok + ;; + 77) echo "ignored near \``cat at-check-line`'" + at_ignore_count=`expr $at_ignore_count + 1` + ;; + *) echo "FAILED near \``cat at-check-line`'" + at_failed_list="$at_failed_list AT_ordinal" + ;; + esac + else + echo 'ignored (skipped)' + at_ignore_count=`expr $at_ignore_count + 1` + fi + at_test_count=AT_ordinal + if test -z "$at_stop_on_error" || test -z "$at_failed_list"; then +divert(0)[]dnl +[#] Snippet (c[]AT_ordinal[]( + +rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr +[#] Snippet )c[]AT_ordinal[]) +undivert(1)[]dnl + rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr + fi +fi +popdef([AT_data_experr]) +popdef([AT_data_expout]) +popdef([AT_data_files]) +popdef([AT_group_description])]) + + +# AT_DATA(FILE, CONTENTS) + +# Initialize an input data FILE with given CONTENTS, which should end with +# an end of line. +# This macro is not robust to active symbols in CONTENTS *on purpose*. +# If you don't want CONTENT to be evaluated, quote it twice. + +AT_DEFINE(AT_DATA, +[AT_DEFINE([AT_data_files], AT_data_files[ ]$1) +cat > $1 <<'EOF' +$2[]EOF +]) + + +# AT_CHECK(COMMANDS, [STATUS], STDOUT, STDERR) + +# Execute a test by performing given shell COMMANDS. These commands +# should normally exit with STATUS, while producing expected STDOUT and +# STDERR contents. The special word `expout' for STDOUT means that file +# `expout' contents has been set to the expected stdout. The special word +# `experr' for STDERR means that file `experr' contents has been set to +# the expected stderr. +# STATUS is not checked if it is empty. +# STDOUT and STDERR can be the special value `ignore', in which case +# their content is not checked. + +AT_DEFINE(AT_CHECK, +[$at_traceoff +test -n "$at_verbose" \ + && echo "$srcdir/AT_LINE: testing..." +echo AT_LINE > at-check-line +test -z "$at_no_redirs" && exec 5>&1 6>&2 1>stdout 2>stderr +$at_traceon +$1 +ifelse([$2],,, +[at_status=$? +if test $at_status != $2; then +dnl Maybe there was an important message to read before it died. + test -n "$at_verbose" && test -z "$at_no_redirs" && cat stderr >&6 +dnl Exit with the same code, at least to preserve 77. + exit $at_status +fi +])dnl +$at_traceoff +if test -z "$at_no_redirs"; then + exec 1>&5 2>&6 + AT_CASE([$3], + ignore, [test -n "$at_verbose" && cat stdout;:], + expout, [AT_DEFINE([AT_data_expout], [ expout])dnl +$at_diff expout stdout || exit 1], + [], [$at_diff empty stdout || exit 1], + [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || exit 1]) + AT_CASE([$4], + ignore, [test -n "$at_verbose" && cat stderr;:], + experr, [AT_DEFINE([AT_data_experr], [ experr])dnl +$at_diff experr stderr || exit 1], + [], [$at_diff empty stderr || exit 1], + [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || exit 1]) +fi +$at_traceon +]) + +divert(0)dnl diff --git a/tests/suite.m4 b/tests/suite.m4 new file mode 100644 index 00000000..88905df9 --- /dev/null +++ b/tests/suite.m4 @@ -0,0 +1,5 @@ +#!/bin/sh +# Validation suite for Bison. +# Copyright (C) 2000 Free Software Foundation, Inc. + +AT_INIT(bison) -- 2.45.2