Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/lex.h: Rename all the tokens:

Browse Source 
s/bENDFILEb/tok_eof/g;
s/bIDENTIFIERb/tok_identifier/g;
etc.
Let them be enums, not #define, to ease debugging.
Adjust all the code.
This commit is contained in:
Akim Demaille
2001-01-19 18:10:32 +00:00
parent 0d6508efab
commit 511e79b3d4
17 changed files with 406 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2001-01-19 Akim Demaille <akim@epita.fr>
* src/lex.h: Rename all the tokens:
s/\bENDFILE\b/tok_eof/g;
s/\bIDENTIFIER\b/tok_identifier/g;
etc.
Let them be enums, not #define, to ease debugging.
Adjust all the code.
2001-01-18 Akim Demaille <akim@epita.fr>
* src/lex.h (MAXTOKEN, maxtoken, grow_token_buffer): Remove, private.

BIN
po/de.gmo
View File

Binary file not shown.

72
po/de.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bison 1.25\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
"Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
"Language-Team: German <de@li.org>\n"
@@ -203,48 +203,48 @@ msgstr "%s: zus
msgid "too many gotos (max %d)"
msgstr ""
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "unbeendeter Kommentar"
#: src/lex.c:144
#: src/lex.c:131
#, fuzzy
msgid "unexpected end of file"
msgstr "Datei endet unerwartet"
# Oder soll man den Begriff "Escapezeichen" verwenden?
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
#: src/lex.c:209
#: src/lex.c:196
#, c-format
msgid "octal value outside range 0...255: `\\%o'"
msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
#: src/lex.c:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
#: src/lex.c:340
#: src/lex.c:326
msgid "unterminated type name at end of file"
msgstr "unerwarteter Typname am Ende der Datei"
#: src/lex.c:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "unerwarteter Typname"
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
@@ -257,7 +257,7 @@ msgstr "interner Fehler, %s\n"
msgid "Entering set_nullable"
msgstr "Führe »set_nullable« aus"
#: src/output.c:985
#: src/output.c:993
#, fuzzy, c-format
msgid "maximum table size (%d) exceeded"
msgstr "maximale Tabellengröße (%s) überschritten"
@@ -409,7 +409,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "Symbol %s noch einmal definiert"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "erneute Deklaration des Typs für %s"
@@ -424,7 +424,7 @@ msgstr "
msgid "multiple %s declarations"
msgstr "mehr als eine %start Deklaration"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "ungültige %start Deklaration"
@@ -453,7 +453,7 @@ msgstr "unzul
msgid "unexpected item: %s"
msgstr "unerwartetes Symbol: %s"
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "»{« hat kein Gegenstück"
@@ -473,105 +473,105 @@ msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
msgid "expected string constant instead of %s"
msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "unbekannt: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "keine Eingabe-Grammatik"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "unbekanntes Zeichen: %s"
#: src/reader.c:1140
#: src/reader.c:1133
#, fuzzy, c-format
msgid "unterminated %guard clause"
msgstr "unbeendeter %%guard Fall"
#: src/reader.c:1302
#: src/reader.c:1295
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:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
#: src/reader.c:1340
#: src/reader.c:1333
#, 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:1442
#: src/reader.c:1435
msgid "two @prec's in a row"
msgstr "zwei @prec Anweisungen nacheinander"
#: src/reader.c:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr ""
"%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "Zwei Aktionen am Ende einer Regel"
#: src/reader.c:1473
#: src/reader.c:1466
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
#: src/reader.c:1479
#: src/reader.c:1472
msgid "empty rule for typed nonterminal, and no action"
msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
#: src/reader.c:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "ungültige Eingabe: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, 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:1534
#: src/reader.c:1527
msgid "no rules in the input grammar"
msgstr "Eingabegrammatik enthält keine Regeln"
#: src/reader.c:1558
#: src/reader.c:1551
#, 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:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
#: src/reader.c:1676
#: src/reader.c:1669
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "assoc Werte für %s nd %s widersprechen sich"
#: src/reader.c:1727
#: src/reader.c:1720
#, 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:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr "das Startsymbol %s ist undefiniert"
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "das Startsymbol %s ist ein Token"

72
po/es.po
View File

@@ -30,7 +30,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU bison 1.25\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 1998-09-21 10:19+0200\n"
"Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -263,49 +263,49 @@ msgid "too many gotos (max %d)"
msgstr ""
# to ignore no es ignorar. Pon otra cosa, please. sv
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "comentario sin terminar"
#: src/lex.c:144
#: src/lex.c:131
#, fuzzy
msgid "unexpected end of file"
msgstr "Fin de fichero inesperado"
# ¿unescaped?
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "salto de línea en constante sin secuencia de escape"
#: src/lex.c:209
#: src/lex.c:196
#, c-format
msgid "octal value outside range 0...255: `\\%o'"
msgstr "valor octal fuera del rango 0...255: `\\%o'"
#: src/lex.c:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "valor hexadecimal mayor que 255: `\\x%x'"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
#: src/lex.c:340
#: src/lex.c:326
msgid "unterminated type name at end of file"
msgstr "nombre de tipo sin terminar al final del fichero"
#: src/lex.c:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "nombre de tipo sin terminar"
# ¿multicarácter o multicaracteres? sv
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "use \"...\" para terminales literales multicarácter"
@@ -323,7 +323,7 @@ msgstr "Entrando set_nullable"
# en inglés era así, pero quizás en español sea mejor como dices
# ngp
#
#: src/output.c:985
#: src/output.c:993
#, fuzzy, c-format
msgid "maximum table size (%d) exceeded"
msgstr "excedido el tamaño máximo de la tabla (%s)"
@@ -479,7 +479,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "redefinido el símbolo %s"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "redeclaración del tipo de %s"
@@ -494,7 +494,7 @@ msgstr "`%s' no es v
msgid "multiple %s declarations"
msgstr "múltiples declaraciones de %start"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "declaración de %start no válida"
@@ -533,7 +533,7 @@ msgid "unexpected item: %s"
msgstr "ítem inesperado: %s"
# Cambio el orden y el sexo. Ahora está "en español". sv
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "`{' desemparejada"
@@ -559,16 +559,16 @@ msgstr "no se reconoce el
msgid "expected string constant instead of %s"
msgstr "se esperaba una cadena constante en lugar de %s"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "no reconocido: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "no hay gramática de entrada"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "carácter desconocido: %s"
@@ -577,93 +577,93 @@ msgstr "car
# 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:1140
#: src/reader.c:1133
#, fuzzy, c-format
msgid "unterminated %guard clause"
msgstr "cláusula %%guard sin terminar"
#: src/reader.c:1302
#: src/reader.c:1295
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:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "la gramática comienza con una barra vertical"
#: src/reader.c:1340
#: src/reader.c:1333
#, 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:1442
#: src/reader.c:1435
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:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%%guard presente pero %%semantic_parser está sin especificar"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "dos acciones al final de una regla"
#: src/reader.c:1473
#: src/reader.c:1466
#, 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:1479
#: src/reader.c:1472
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:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "entrada no válida: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, 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:1534
#: src/reader.c:1527
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:1558
#: src/reader.c:1551
#, 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:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "precedencias en conflicto entre %s y %s"
#: src/reader.c:1676
#: src/reader.c:1669
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "conflicto de valores assoc para %s y %s"
#: src/reader.c:1727
#: src/reader.c:1720
#, 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:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr "el símbolo de inicio (axioma) %s no está definido"
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "el símbolo de inicio (axioma) %s es un terminal"

BIN
po/et.gmo
View File

Binary file not shown.

72
po/et.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bison 1.25\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 2000-04-11 22:19+02:00\n"
"Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -228,46 +228,46 @@ msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
msgid "too many gotos (max %d)"
msgstr "liiga palju gotosid (maks %d)"
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "leidsin ja ignoreerin ootamatu `/'"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "lõpetamata kommentaar"
#: src/lex.c:144
#: src/lex.c:131
msgid "unexpected end of file"
msgstr "ootamatu faililõpp"
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "paojadata reavahetus konstandis"
#: src/lex.c:209
#: src/lex.c:196
#, c-format
msgid "octal value outside range 0...255: `\\%o'"
msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
#: src/lex.c:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "kuueteistkümnendväärtus suurem, kui above 255: `\\x%x'"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "tundmatu paojada: `\\' järgneb `%s'"
#: src/lex.c:340
#: src/lex.c:326
msgid "unterminated type name at end of file"
msgstr "lõpetamata tüübinimi faili lõpus"
#: src/lex.c:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "lõpetamata tüübinimi"
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
@@ -280,7 +280,7 @@ msgstr "%s: sisemine viga: %s\n"
msgid "Entering set_nullable"
msgstr "Entering set_nullable"
#: src/output.c:985
#: src/output.c:993
#, c-format
msgid "maximum table size (%d) exceeded"
msgstr "ületati maksimaalset tabelisuurust (%d)"
@@ -432,7 +432,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "sümbol %s on uuesti defineeritud"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "%s tüübi uuesti deklareerimine"
@@ -447,7 +447,7 @@ msgstr "`%s' ei ole %s sees lubatud"
msgid "multiple %s declarations"
msgstr "korduvad %start deklaratsioonid"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "vigane %start deklaratsioon"
@@ -475,7 +475,7 @@ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
msgid "unexpected item: %s"
msgstr "ootamatu element: %s"
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "puudub `{'"
@@ -495,102 +495,102 @@ msgstr "tundmatu element %s, eeldasin identifikaatorit"
msgid "expected string constant instead of %s"
msgstr "eeldasin %s asemel sõnekonstanti"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "tundmatu: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "sisendgrammatikat pole"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "tundmatu sümbol: %s"
#: src/reader.c:1140
#: src/reader.c:1133
#, c-format
msgid "unterminated %guard clause"
msgstr "lõpetamata %guard klausel"
#: src/reader.c:1302
#: src/reader.c:1295
msgid "ill-formed rule: initial symbol not followed by colon"
msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
#: src/reader.c:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "grammatika algab püstkriipsuga"
#: src/reader.c:1340
#: src/reader.c:1333
#, 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:1442
#: src/reader.c:1435
msgid "two @prec's in a row"
msgstr "kaks @prec ühel real"
#: src/reader.c:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%guard on määratud, aga %semantic_parser ei ole"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "kaks tegevust ühe reegli lõpus"
#: src/reader.c:1473
#: src/reader.c:1466
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
#: src/reader.c:1479
#: src/reader.c:1472
msgid "empty rule for typed nonterminal, and no action"
msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
#: src/reader.c:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "vigane sisend: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, 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:1534
#: src/reader.c:1527
msgid "no rules in the input grammar"
msgstr "sisendgrammatikas pole reegleid"
#: src/reader.c:1558
#: src/reader.c:1551
#, 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:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "%s ja %s omavad konfliktseid prioriteete"
#: src/reader.c:1676
#: src/reader.c:1669
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
#: src/reader.c:1727
#: src/reader.c:1720
#, 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:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr "stardisümbol %s ei ole defineeritud"
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "stardisümbol %s on märk"

BIN
po/fr.gmo
View File

Binary file not shown.

72
po/fr.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bison 1.25\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 1996-03-19 20:05 EST\n"
"Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
"Language-Team: French <fr@li.org>\n"
@@ -210,47 +210,47 @@ msgstr "%s: param
msgid "too many gotos (max %d)"
msgstr ""
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "`/' inattendu et ignoré"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "le commentaire ne se termine pas"
#: src/lex.c:144
#: src/lex.c:131
#, fuzzy
msgid "unexpected end of file"
msgstr "Fin de fichier inattendue"
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "retour de chariot sans échappement dans une constante"
#: src/lex.c:209
#: src/lex.c:196
#, 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:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "valeur hexadécimale supérieure à 255: \\x%x"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
#: src/lex.c:340
#: src/lex.c:326
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:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "le nom de type ne se termine pas"
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
@@ -263,7 +263,7 @@ msgstr "erreur interne, %s\n"
msgid "Entering set_nullable"
msgstr "Entré dans set_nullable"
#: src/output.c:985
#: src/output.c:993
#, fuzzy, c-format
msgid "maximum table size (%d) exceeded"
msgstr "taille maximum des tables (%s) dépassée"
@@ -415,7 +415,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "symbole %s redéfini"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "redéclaration du type de %s"
@@ -430,7 +430,7 @@ msgstr "`%s' n'est pas valide dans %s"
msgid "multiple %s declarations"
msgstr "multiples déclarations %start"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "la déclaration %start n'est pas valide"
@@ -460,7 +460,7 @@ msgstr ""
msgid "unexpected item: %s"
msgstr "item inattendu: %s"
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "accolade ouvrante `{' non appariée"
@@ -480,102 +480,102 @@ msgstr "item %s non reconnu, un identificateur est attendu"
msgid "expected string constant instead of %s"
msgstr "chaîne de caractères constante attendue plutôt que %s"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "non reconnu: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "aucune grammaire en entrée"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "caractère inconnu: %s"
#: src/reader.c:1140
#: src/reader.c:1133
#, fuzzy, c-format
msgid "unterminated %guard clause"
msgstr "clause %%guard non terminée"
#: src/reader.c:1302
#: src/reader.c:1295
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:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "la grammaire débute par une barre verticale"
#: src/reader.c:1340
#: src/reader.c:1333
#, c-format
msgid "rule given for %s, which is a token"
msgstr "la règle pour %s, qui est un terminal"
#: src/reader.c:1442
#: src/reader.c:1435
msgid "two @prec's in a row"
msgstr "deux @prec de suite"
#: src/reader.c:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "deux actions à la fin d'une même règle"
#: src/reader.c:1473
#: src/reader.c:1466
#, 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:1479
#: src/reader.c:1472
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:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "entrée non valide: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, 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:1534
#: src/reader.c:1527
msgid "no rules in the input grammar"
msgstr "la grammaire n'a pas de règles"
#: src/reader.c:1558
#: src/reader.c:1551
#, 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:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "les priorités pour %s et %s entrent en conflit"
#: src/reader.c:1676
#: src/reader.c:1669
#, 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:1727
#: src/reader.c:1720
#, 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:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr "le symbole de départ %s n'est pas défini"
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "le symbole de départ %s est un terminal"

BIN
po/ja.gmo
View File

Binary file not shown.

72
po/ja.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU bison 1.28\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 1999-09-28 21:10+0900\n"
"Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -209,47 +209,47 @@ msgstr "%s: '%s'
msgid "too many gotos (max %d)"
msgstr "%s の数が多すぎます (最大 %d)"
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "予期しない `/' が見つかり、無視されました"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "閉じていないコメントです"
#: src/lex.c:144
#: src/lex.c:131
#, fuzzy
msgid "unexpected end of file"
msgstr "予期しないファイルの終端です"
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "定数の中にエスケープされていない改行があります"
#: src/lex.c:209
#: src/lex.c:196
#, c-format
msgid "octal value outside range 0...255: `\\%o'"
msgstr "8 進数の値が 0...255 の範囲外です: `\\%o'"
#: src/lex.c:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "16 進数の値が 255 を越えています: `\\x%x'"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "未知のエスケープシーケンス: `\\' の後に `%s'"
#: src/lex.c:340
#: src/lex.c:326
msgid "unterminated type name at end of file"
msgstr "閉じられていないタイプ名が、ファイル末尾にあります"
#: src/lex.c:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "閉じられていないタイプ名があります"
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"
@@ -262,7 +262,7 @@ msgstr "%s:
msgid "Entering set_nullable"
msgstr "set_nullable に入ります"
#: src/output.c:985
#: src/output.c:993
#, fuzzy, c-format
msgid "maximum table size (%d) exceeded"
msgstr "最大テーブルサイズ (%s) を超えました"
@@ -414,7 +414,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "シンボル %s が再定義されました"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "%s の型が再定義されました"
@@ -429,7 +429,7 @@ msgstr "%2$s
msgid "multiple %s declarations"
msgstr "複数の %start が宣言されました"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "無効な %start が宣言されました"
@@ -458,7 +458,7 @@ msgstr "̵
msgid "unexpected item: %s"
msgstr "予期せぬアイテム: %s"
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "対応のない `{' です"
@@ -478,102 +478,102 @@ msgstr "ǧ
msgid "expected string constant instead of %s"
msgstr "ここでは %s ではなく文字列定数が期待されます"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "認識できない: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "文法の入力が無い"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "未知の文字: %s"
#: src/reader.c:1140
#: src/reader.c:1133
#, fuzzy, c-format
msgid "unterminated %guard clause"
msgstr "閉じられていない %%guard 節です"
#: src/reader.c:1302
#: src/reader.c:1295
msgid "ill-formed rule: initial symbol not followed by colon"
msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"
#: src/reader.c:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "文法は縦棒 (|) で始めます"
#: src/reader.c:1340
#: src/reader.c:1333
#, c-format
msgid "rule given for %s, which is a token"
msgstr "%s に規則が与えられ、それはトークンとなります"
#: src/reader.c:1442
#: src/reader.c:1435
msgid "two @prec's in a row"
msgstr "@prec のもの二つが同列になっています"
#: src/reader.c:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%%guard がありますが %%semantic_parser が指定されていません"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "一つの規則の終りに二つの動作を指定しています"
#: src/reader.c:1473
#: src/reader.c:1466
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
#: src/reader.c:1479
#: src/reader.c:1472
msgid "empty rule for typed nonterminal, and no action"
msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
#: src/reader.c:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "無効な入力: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, fuzzy, c-format
msgid "too many symbols (tokens plus nonterminals); maximum %d"
msgstr "シンボルが多すぎます (トークンと非終端アイテム) -- 最大 %s"
#: src/reader.c:1534
#: src/reader.c:1527
msgid "no rules in the input grammar"
msgstr "入力した文法に規則が定義されていません"
#: src/reader.c:1558
#: src/reader.c:1551
#, c-format
msgid "symbol %s is used, but is not defined as a token and has no rules"
msgstr ""
"シンボル %s "
"が使われていますが、トークンとして定義されておらず、規則を持ちません"
#: src/reader.c:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "先行している %s と %s で競合が生じています"
#: src/reader.c:1676
#: src/reader.c:1669
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "非結合値 %s と %s で競合が生じています"
#: src/reader.c:1727
#: src/reader.c:1720
#, fuzzy, c-format
msgid "tokens %s and %s both assigned number %d"
msgstr "トークン %s と %s の双方が番号 %s に割り当てられました"
#: src/reader.c:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr "開始シンボル %s は定義されていません"
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "開始シンボル %s はトークンです"

BIN
po/nl.gmo
View File

Binary file not shown.

72
po/nl.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bison 1.25\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
"Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -209,47 +209,47 @@ msgstr "%s: extra argumenten genegeerd na '%s'\n"
msgid "too many gotos (max %d)"
msgstr ""
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "onverwachte `/' gevonden en genegeerd"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "ongetermineerd commentaar"
#: src/lex.c:144
#: src/lex.c:131
#, fuzzy
msgid "unexpected end of file"
msgstr "Onverwacht bestandseinde"
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "niet geescapete nieuwe regel in constante"
#: src/lex.c:209
#: src/lex.c:196
#, c-format
msgid "octal value outside range 0...255: `\\%o'"
msgstr "octale waarde buiten domein 0...255: `\\%o'"
#: src/lex.c:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "hexadecimale waarde boven 255: `\\x%x'"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
#: src/lex.c:340
#: src/lex.c:326
msgid "unterminated type name at end of file"
msgstr "niet getermineerd type naam aan het einde van bestand"
#: src/lex.c:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "niet getermineerd type naam"
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
@@ -262,7 +262,7 @@ msgstr "interne fout, %s\n"
msgid "Entering set_nullable"
msgstr "Inkomende set nullable"
#: src/output.c:985
#: src/output.c:993
#, fuzzy, c-format
msgid "maximum table size (%d) exceeded"
msgstr "maximale tabel grootte (%s) overschreden"
@@ -414,7 +414,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "symbool %s opnieuw gedefinieerd"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "type herdeclaratie voor %s"
@@ -429,7 +429,7 @@ msgstr "`%s' is onjuist in %s"
msgid "multiple %s declarations"
msgstr "meerdere %start declaraties"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "onjuiste %start declaratie"
@@ -458,7 +458,7 @@ msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
msgid "unexpected item: %s"
msgstr "onbekend item: %s"
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "niet overeenkomstige `{'"
@@ -478,103 +478,103 @@ msgstr "onbekend item %s, verwacht een identifier"
msgid "expected string constant instead of %s"
msgstr "verwacht string constante in plaats van %s"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "onbekend: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "geen invoer grammatica"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "onbekend karakter: %s"
#: src/reader.c:1140
#: src/reader.c:1133
#, fuzzy, c-format
msgid "unterminated %guard clause"
msgstr "niet getermineerde %%guard voorwaarde"
#: src/reader.c:1302
#: src/reader.c:1295
msgid "ill-formed rule: initial symbol not followed by colon"
msgstr ""
"slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
#: src/reader.c:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "grammatica start met een verticale bar"
#: src/reader.c:1340
#: src/reader.c:1333
#, c-format
msgid "rule given for %s, which is a token"
msgstr "regel geven voor %s, welke een teken is"
#: src/reader.c:1442
#: src/reader.c:1435
msgid "two @prec's in a row"
msgstr "twee @prec's in een regel"
#: src/reader.c:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "twee akties aan het einde van een regel"
#: src/reader.c:1473
#: src/reader.c:1466
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "type clash (`%s' `%s') bij standaard aktie"
#: src/reader.c:1479
#: src/reader.c:1472
msgid "empty rule for typed nonterminal, and no action"
msgstr "lege regel voor getypte niet terminal, en geen aktie"
#: src/reader.c:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "ongeldige invoer: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, fuzzy, c-format
msgid "too many symbols (tokens plus nonterminals); maximum %d"
msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
#: src/reader.c:1534
#: src/reader.c:1527
msgid "no rules in the input grammar"
msgstr "geen regels voor invoer grammatica"
#: src/reader.c:1558
#: src/reader.c:1551
#, 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:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "conflictuerende precedentein voor %s en %s"
#: src/reader.c:1676
#: src/reader.c:1669
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "conflictuerende associatieve waarden voor %s en %s"
#: src/reader.c:1727
#: src/reader.c:1720
#, c-format
msgid "tokens %s and %s both assigned number %d"
msgstr ""
#: src/reader.c:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr ""
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "het start symbool %s is een token"

BIN
po/ru.gmo
View File

Binary file not shown.

72
po/ru.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bison 1.28a\n"
"POT-Creation-Date: 2001-01-15 14:43+0100\n"
"POT-Creation-Date: 2001-01-18 17:53+0100\n"
"PO-Revision-Date: 2000-04-12 13:16+04:00\n"
"Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -230,46 +230,46 @@ msgstr "%s:
msgid "too many gotos (max %d)"
msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
#: src/lex.c:83
#: src/lex.c:70
msgid "unexpected `/' found and ignored"
msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
#: src/lex.c:112 src/reader.c:273
#: src/lex.c:99 src/reader.c:273
msgid "unterminated comment"
msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
#: src/lex.c:144
#: src/lex.c:131
msgid "unexpected end of file"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
#: src/lex.c:167
#: src/lex.c:154
msgid "unescaped newline in constant"
msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
#: src/lex.c:209
#: src/lex.c:196
#, c-format
msgid "octal value outside range 0...255: `\\%o'"
msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
#: src/lex.c:234
#: src/lex.c:221
#, c-format
msgid "hexadecimal value above 255: `\\x%x'"
msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
#: src/lex.c:246
#: src/lex.c:233
#, c-format
msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
#: src/lex.c:340
#: src/lex.c:326
msgid "unterminated type name at end of file"
msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
#: src/lex.c:343
#: src/lex.c:329
msgid "unterminated type name"
msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
#: src/lex.c:447
#: src/lex.c:422
msgid "use \"...\" for multi-character literal tokens"
msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
@@ -282,7 +282,7 @@ msgstr "%s:
msgid "Entering set_nullable"
msgstr "÷ÈÏÄ × set_nullable"
#: src/output.c:985
#: src/output.c:993
#, c-format
msgid "maximum table size (%d) exceeded"
msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
@@ -434,7 +434,7 @@ msgstr ""
msgid "symbol %s redefined"
msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1237
#: src/reader.c:538 src/reader.c:617 src/reader.c:678 src/reader.c:1230
#, c-format
msgid "type redeclaration for %s"
msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
@@ -449,7 +449,7 @@ msgstr "`%s'
msgid "multiple %s declarations"
msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
#: src/reader.c:567 src/reader.c:1215
#: src/reader.c:567 src/reader.c:1208
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
@@ -477,7 +477,7 @@ msgstr "
msgid "unexpected item: %s"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
#: src/reader.c:763 src/reader.c:1046 src/reader.c:1117
#: src/reader.c:763 src/reader.c:1039 src/reader.c:1110
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "ÎÅÐÁÒÎÁÑ `{'"
@@ -497,101 +497,101 @@ msgstr "
msgid "expected string constant instead of %s"
msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
#: src/reader.c:962
#: src/reader.c:955
#, c-format
msgid "unrecognized: %s"
msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
#: src/reader.c:967
#: src/reader.c:960
msgid "no input grammar"
msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
#: src/reader.c:972
#: src/reader.c:965
#, c-format
msgid "unknown character: %s"
msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
#: src/reader.c:1140
#: src/reader.c:1133
#, c-format
msgid "unterminated %guard clause"
msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
#: src/reader.c:1302
#: src/reader.c:1295
msgid "ill-formed rule: initial symbol not followed by colon"
msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
#: src/reader.c:1309
#: src/reader.c:1302
msgid "grammar starts with vertical bar"
msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
#: src/reader.c:1340
#: src/reader.c:1333
#, c-format
msgid "rule given for %s, which is a token"
msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
#: src/reader.c:1442
#: src/reader.c:1435
msgid "two @prec's in a row"
msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
#: src/reader.c:1450
#: src/reader.c:1443
#, fuzzy
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
#: src/reader.c:1459
#: src/reader.c:1452
msgid "two actions at end of one rule"
msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
#: src/reader.c:1473
#: src/reader.c:1466
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
#: src/reader.c:1479
#: src/reader.c:1472
msgid "empty rule for typed nonterminal, and no action"
msgstr ""
"ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
#: src/reader.c:1523
#: src/reader.c:1516
#, c-format
msgid "invalid input: %s"
msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
#: src/reader.c:1531
#: src/reader.c:1524
#, c-format
msgid "too many symbols (tokens plus nonterminals); maximum %d"
msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
#: src/reader.c:1534
#: src/reader.c:1527
msgid "no rules in the input grammar"
msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
#: src/reader.c:1558
#: src/reader.c:1551
#, c-format
msgid "symbol %s is used, but is not defined as a token and has no rules"
msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
#: src/reader.c:1664
#: src/reader.c:1657
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
#: src/reader.c:1676
#: src/reader.c:1669
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
#: src/reader.c:1727
#: src/reader.c:1720
#, c-format
msgid "tokens %s and %s both assigned number %d"
msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
#: src/reader.c:1740
#: src/reader.c:1733
#, c-format
msgid "the start symbol %s is undefined"
msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
#: src/reader.c:1742
#: src/reader.c:1735
#, c-format
msgid "the start symbol %s is a token"
msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"

116
src/lex.c
View File

@@ -355,7 +355,7 @@ read_type_name (FILE *fin)
}
int
token_t
lex (void)
{
int c;
@@ -378,7 +378,7 @@ lex (void)
{
case EOF:
strcpy (token_buffer, "EOF");
return ENDFILE;
return tok_eof;
case 'A': case 'B': case 'C': case 'D': case 'E':
case 'F': case 'G': case 'H': case 'I': case 'J':
@@ -407,7 +407,7 @@ lex (void)
*p = 0;
ungetc (c, finput);
symval = getsym (token_buffer);
return IDENTIFIER;
return tok_identifier;
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
@@ -426,7 +426,7 @@ lex (void)
}
*p = 0;
ungetc (c, finput);
return NUMBER;
return tok_number;
}
case '\'':
@@ -458,7 +458,7 @@ lex (void)
symval->class = token_sym;
if (!symval->user_token_number)
symval->user_token_number = code;
return IDENTIFIER;
return tok_identifier;
}
case '\"':
@@ -480,23 +480,23 @@ lex (void)
symval = getsym (token_buffer);
symval->class = token_sym;
return IDENTIFIER;
return tok_identifier;
}
case ',':
return COMMA;
return tok_comma;
case ':':
return COLON;
return tok_colon;
case ';':
return SEMICOLON;
return tok_semicolon;
case '|':
return BAR;
return tok_bar;
case '{':
return LEFT_CURLY;
return tok_left_curly;
case '=':
do
@@ -510,23 +510,23 @@ lex (void)
if (c == '{')
{
strcpy (token_buffer, "={");
return LEFT_CURLY;
return tok_left_curly;
}
else
{
ungetc (c, finput);
return ILLEGAL;
return tok_illegal;
}
case '<':
read_type_name (finput);
return TYPENAME;
return tok_typename;
case '%':
return parse_percent_token ();
default:
return ILLEGAL;
return tok_illegal;
}
}
@@ -542,44 +542,44 @@ struct percent_table_struct
struct percent_table_struct percent_table[] =
{
{ "token", NULL, TOKEN },
{ "term", NULL, TOKEN },
{ "nterm", NULL, NTERM },
{ "type", NULL, TYPE },
{ "guard", NULL, GUARD },
{ "union", NULL, UNION },
{ "expect", NULL, EXPECT },
{ "thong", NULL, THONG },
{ "start", NULL, START },
{ "left", NULL, LEFT },
{ "right", NULL, RIGHT },
{ "nonassoc", NULL, NONASSOC },
{ "binary", NULL, NONASSOC },
{ "prec", NULL, PREC },
{ "locations", &locations_flag, NOOP }, /* -l */
{ "no_lines", &no_lines_flag, NOOP }, /* -l */
{ "raw", &raw_flag, NOOP }, /* -r */
{ "token_table", &token_table_flag, NOOP }, /* -k */
{ "yacc", &yacc_flag, NOOP }, /* -y */
{ "fixed_output_files",&yacc_flag, NOOP }, /* -y */
{ "defines", &defines_flag, NOOP }, /* -d */
{ "no_parser", &no_parser_flag, NOOP }, /* -n */
{ "token", NULL, tok_token },
{ "term", NULL, tok_token },
{ "nterm", NULL, tok_nterm },
{ "type", NULL, tok_type },
{ "guard", NULL, tok_guard },
{ "union", NULL, tok_union },
{ "expect", NULL, tok_expect },
{ "thong", NULL, tok_thong },
{ "start", NULL, tok_start },
{ "left", NULL, tok_left },
{ "right", NULL, tok_right },
{ "nonassoc", NULL, tok_nonassoc },
{ "binary", NULL, tok_nonassoc },
{ "prec", NULL, tok_prec },
{ "locations", &locations_flag, tok_noop }, /* -l */
{ "no_lines", &no_lines_flag, tok_noop }, /* -l */
{ "raw", &raw_flag, tok_noop }, /* -r */
{ "token_table", &token_table_flag, tok_noop }, /* -k */
{ "yacc", &yacc_flag, tok_noop }, /* -y */
{ "fixed_output_files",&yacc_flag, tok_noop }, /* -y */
{ "defines", &defines_flag, tok_noop }, /* -d */
{ "no_parser", &no_parser_flag, tok_noop }, /* -n */
#if 0
/* For the time being, this is not enabled yet, while it's possible
though, since we use obstacks. The only risk is with semantic
parsers which will output an `include' of an output file: be sure
that the naem included is indeed the name of the output file. */
{ "output_file", &spec_outfile, SETOPT }, /* -o */
{ "file_prefix", &spec_file_prefix, SETOPT }, /* -b */
{ "name_prefix", &spec_name_prefix, SETOPT }, /* -p */
{ "output_file", &spec_outfile, tok_setopt }, /* -o */
{ "file_prefix", &spec_file_prefix, tok_setopt }, /* -b */
{ "name_prefix", &spec_name_prefix, tok_setopt }, /* -p */
#endif
{ "verbose", &verbose_flag, NOOP }, /* -v */
{ "debug", &debug_flag, NOOP }, /* -t */
{ "semantic_parser", &semantic_parser, NOOP },
{ "pure_parser", &pure_parser, NOOP },
/* {"help", <print usage stmt>, NOOP}, *//* -h */
/* {"version", <print version number> , NOOP}, *//* -V */
{ NULL, NULL, ILLEGAL}
{ "verbose", &verbose_flag, tok_noop }, /* -v */
{ "debug", &debug_flag, tok_noop }, /* -t */
{ "semantic_parser", &semantic_parser, tok_noop },
{ "pure_parser", &pure_parser, tok_noop },
/* {"help", <print usage stmt>, tok_noop}, *//* -h */
/* {"version", <print version number> , tok_noop}, *//* -V */
{ NULL, NULL, tok_illegal}
};
/* Parse a token which starts with %.
@@ -601,28 +601,28 @@ parse_percent_token (void)
switch (c)
{
case '%':
return TWO_PERCENTS;
return tok_two_percents;
case '{':
return PERCENT_LEFT_CURLY;
return tok_percent_left_curly;
case '<':
return LEFT;
return tok_left;
case '>':
return RIGHT;
return tok_right;
case '2':
return NONASSOC;
return tok_nonassoc;
case '0':
return TOKEN;
return tok_token;
case '=':
return PREC;
return tok_prec;
}
if (!isalpha (c))
return ILLEGAL;
return tok_illegal;
p = token_buffer;
*p++ = '%';
@@ -646,15 +646,15 @@ parse_percent_token (void)
if (strcmp (token_buffer + 1, tx->name) == 0)
break;
if (tx->retval == SETOPT)
if (tx->retval == tok_setopt)
{
*((char **) (tx->set_flag)) = optarg;
return NOOP;
return tok_noop;
}
if (tx->set_flag)
{
*((int *) (tx->set_flag)) = 1;
return NOOP;
return tok_noop;
}
return tx->retval;
}

58
src/lex.h
View File

@@ -22,33 +22,35 @@
# define LEX_H_
/* Token-type codes. */
# define ENDFILE 0
# define IDENTIFIER 1
# define COMMA 2
# define COLON 3
# define SEMICOLON 4
# define BAR 5
# define LEFT_CURLY 6
# define TWO_PERCENTS 7
# define PERCENT_LEFT_CURLY 8
# define TOKEN 9
# define NTERM 10
# define GUARD 11
# define TYPE 12
# define UNION 13
# define START 14
# define LEFT 15
# define RIGHT 16
# define NONASSOC 17
# define PREC 18
# define TYPENAME 21
# define NUMBER 22
# define EXPECT 23
# define THONG 24
# define NOOP 25
# define SETOPT 26
# define ILLEGAL 27
typedef enum token_e
{
tok_eof,
tok_identifier,
tok_comma,
tok_colon,
tok_semicolon,
tok_bar,
tok_left_curly,
tok_two_percents,
tok_percent_left_curly,
tok_token,
tok_nterm,
tok_guard,
tok_type,
tok_union,
tok_start,
tok_left,
tok_right,
tok_nonassoc,
tok_prec,
tok_typename,
tok_number,
tok_expect,
tok_thong,
tok_noop,
tok_setopt,
tok_illegal
} token_t;
extern char *token_buffer;
extern bucket *symval;
@@ -64,7 +66,7 @@ void read_type_name PARAMS ((FILE *fin));
symbol table using symtab.c; symval is set to a pointer to the
entry found. */
int lex PARAMS ((void));
token_t lex PARAMS ((void));
int parse_percent_token PARAMS ((void));

114
src/reader.c
View File

@@ -486,18 +486,18 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
fatal (_("Premature EOF after %s"), token_buffer);
token = lex ();
if (token == COMMA)
if (token == tok_comma)
{
symbol = NULL;
continue;
}
if (token == TYPENAME)
if (token == tok_typename)
{
typename = xstrdup (token_buffer);
value_components_used = 1;
symbol = NULL;
}
else if (token == IDENTIFIER && *symval->tag == '\"' && symbol)
else if (token == tok_identifier && *symval->tag == '\"' && symbol)
{
if (symval->alias)
warn (_("symbol `%s' used more than once as a literal string"),
@@ -519,7 +519,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
translations = 1;
symbol = NULL;
}
else if (token == IDENTIFIER)
else if (token == tok_identifier)
{
int oldclass = symval->class;
symbol = symval;
@@ -538,7 +538,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
complain (_("type redeclaration for %s"), symbol->tag);
}
}
else if (symbol && token == NUMBER)
else if (symbol && token == tok_number)
{
symbol->user_token_number = numval;
translations = 1;
@@ -563,7 +563,7 @@ parse_start_decl (void)
{
if (start_flag)
complain (_("multiple %s declarations"), "%start");
if (lex () != IDENTIFIER)
if (lex () != tok_identifier)
complain (_("invalid %s declaration"), "%start");
else
{
@@ -582,7 +582,7 @@ parse_type_decl (void)
{
char *name;
if (lex () != TYPENAME)
if (lex () != tok_typename)
{
complain ("%s", _("%type declaration has no <typename>"));
skip_to_char ('%');
@@ -606,11 +606,11 @@ parse_type_decl (void)
switch (t)
{
case COMMA:
case SEMICOLON:
case tok_comma:
case tok_semicolon:
break;
case IDENTIFIER:
case tok_identifier:
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp (name, symval->type_name) != 0)
@@ -655,14 +655,14 @@ parse_assoc_decl (associativity assoc)
switch (t)
{
case TYPENAME:
case tok_typename:
name = xstrdup (token_buffer);
break;
case COMMA:
case tok_comma:
break;
case IDENTIFIER:
case tok_identifier:
if (symval->prec != 0)
complain (_("redefining precedence of %s"), symval->tag);
symval->prec = lastprec;
@@ -679,8 +679,8 @@ parse_assoc_decl (associativity assoc)
}
break;
case NUMBER:
if (prev == IDENTIFIER)
case tok_number:
if (prev == tok_identifier)
{
symval->user_token_number = numval;
translations = 1;
@@ -694,7 +694,7 @@ token_buffer);
}
break;
case SEMICOLON:
case tok_semicolon:
return;
default:
@@ -828,7 +828,7 @@ parse_thong_decl (void)
translations = 1;
token = lex (); /* fetch typename or first token */
if (token == TYPENAME)
if (token == tok_typename)
{
typename = xstrdup (token_buffer);
value_components_used = 1;
@@ -837,7 +837,7 @@ parse_thong_decl (void)
/* process first token */
if (token != IDENTIFIER)
if (token != tok_identifier)
{
complain (_("unrecognized item %s, expected an identifier"),
token_buffer);
@@ -851,7 +851,7 @@ parse_thong_decl (void)
token = lex (); /* get number or literal string */
if (token == NUMBER)
if (token == tok_number)
{
usrtoknum = numval;
token = lex (); /* okay, did number, now get literal */
@@ -861,7 +861,7 @@ parse_thong_decl (void)
/* process literal string token */
if (token != IDENTIFIER || *symval->tag != '\"')
if (token != tok_identifier || *symval->tag != '\"')
{
complain (_("expected string constant instead of %s"), token_buffer);
skip_to_char ('%');
@@ -901,54 +901,54 @@ read_declarations (void)
switch (tok)
{
case TWO_PERCENTS:
case tok_two_percents:
return;
case PERCENT_LEFT_CURLY:
case tok_percent_left_curly:
copy_definition ();
break;
case TOKEN:
case tok_token:
parse_token_decl (token_sym, nterm_sym);
break;
case NTERM:
case tok_nterm:
parse_token_decl (nterm_sym, token_sym);
break;
case TYPE:
case tok_type:
parse_type_decl ();
break;
case START:
case tok_start:
parse_start_decl ();
break;
case UNION:
case tok_union:
parse_union_decl ();
break;
case EXPECT:
case tok_expect:
parse_expect_decl ();
break;
case THONG:
case tok_thong:
parse_thong_decl ();
break;
case LEFT:
case tok_left:
parse_assoc_decl (left_assoc);
break;
case RIGHT:
case tok_right:
parse_assoc_decl (right_assoc);
break;
case NONASSOC:
case tok_nonassoc:
parse_assoc_decl (non_assoc);
break;
case NOOP:
case tok_noop:
break;
default:
@@ -1203,7 +1203,7 @@ get_type (void)
t = lex ();
if (t != TYPENAME)
if (t != tok_typename)
{
complain (_("invalid %s declaration"), "%type");
return t;
@@ -1217,13 +1217,13 @@ get_type (void)
switch (t)
{
case SEMICOLON:
case tok_semicolon:
return lex ();
case COMMA:
case tok_comma:
break;
case IDENTIFIER:
case tok_identifier:
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp (name, symval->type_name) != 0)
@@ -1269,9 +1269,9 @@ readgram (void)
t = lex ();
while (t != TWO_PERCENTS && t != ENDFILE)
while (t != tok_two_percents && t != tok_eof)
{
if (t == IDENTIFIER || t == BAR)
if (t == tok_identifier || t == tok_bar)
{
int action_flag = 0;
/* Number of symbols in rhs of this rule so far */
@@ -1279,7 +1279,7 @@ readgram (void)
int xactions = 0; /* JF for error checking */
bucket *first_rhs = 0;
if (t == IDENTIFIER)
if (t == tok_identifier)
{
lhs = symval;
@@ -1290,14 +1290,14 @@ readgram (void)
}
t = lex ();
if (t != COLON)
if (t != tok_colon)
{
complain (_("ill-formed rule: initial symbol not followed by colon"));
unlex (t);
}
}
if (nrules == 0 && t == BAR)
if (nrules == 0 && t == tok_bar)
{
complain (_("grammar starts with vertical bar"));
lhs = symval; /* BOGUS: use a random symval */
@@ -1337,19 +1337,19 @@ readgram (void)
for (;;)
{
t = lex ();
if (t == PREC)
if (t == tok_prec)
{
t = lex ();
crule->ruleprec = symval;
t = lex ();
}
if (!(t == IDENTIFIER || t == LEFT_CURLY))
if (!(t == tok_identifier || t == tok_left_curly))
break;
/* If next token is an identifier, see if a colon follows it.
If one does, exit this rule now. */
if (t == IDENTIFIER)
if (t == tok_identifier)
{
bucket *ssave;
int t1;
@@ -1358,7 +1358,7 @@ readgram (void)
t1 = lex ();
unlex (t1);
symval = ssave;
if (t1 == COLON)
if (t1 == tok_colon)
break;
if (!first_rhs) /* JF */
@@ -1408,7 +1408,7 @@ readgram (void)
action_flag = 0;
}
if (t == IDENTIFIER)
if (t == tok_identifier)
{
nitems++;
p = XCALLOC (symbol_list, 1);
@@ -1430,14 +1430,14 @@ readgram (void)
p1->next = p;
p1 = p;
if (t == PREC)
if (t == tok_prec)
{
complain (_("two @prec's in a row"));
t = lex ();
crule->ruleprec = symval;
t = lex ();
}
if (t == GUARD)
if (t == tok_guard)
{
if (!semantic_parser)
complain (_("%%guard present but %%semantic_parser not specified"));
@@ -1445,7 +1445,7 @@ readgram (void)
copy_guard (crule, rulelength);
t = lex ();
}
else if (t == LEFT_CURLY)
else if (t == tok_left_curly)
{
/* This case never occurs -wjh */
if (action_flag)
@@ -1470,7 +1470,7 @@ readgram (void)
/* Warn if there is no default for $$ but we need one. */
else if (!xactions && !first_rhs && lhs->type_name != 0)
complain (_("empty rule for typed nonterminal, and no action"));
if (t == SEMICOLON)
if (t == tok_semicolon)
t = lex ();
}
#if 0
@@ -1480,31 +1480,31 @@ readgram (void)
b) most of them scan forward until finding a next %
thus they may swallow lots of intervening rules
*/
else if (t == TOKEN)
else if (t == tok_token)
{
parse_token_decl (token_sym, nterm_sym);
t = lex ();
}
else if (t == NTERM)
else if (t == tok_nterm)
{
parse_token_decl (nterm_sym, token_sym);
t = lex ();
}
else if (t == TYPE)
else if (t == tok_type)
{
t = get_type ();
}
else if (t == UNION)
else if (t == tok_union)
{
parse_union_decl ();
t = lex ();
}
else if (t == EXPECT)
else if (t == tok_expect)
{
parse_expect_decl ();
t = lex ();
}
else if (t == START)
else if (t == tok_start)
{
parse_start_decl ();
t = lex ();