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

* data/lalr1.cc (_): New.

Browse Source 
Translate the various messages.
This commit is contained in:
Akim Demaille
2005-05-30 07:02:40 +00:00
parent 4b43d40257
commit 989b5b8e3d
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2005-05-30 Akim Demaille <akim@epita.fr>
* data/lalr1.cc (_): New.
Translate the various messages.
2005-05-27 Paul Eggert <eggert@cs.ucla.edu> 2005-05-27 Paul Eggert <eggert@cs.ucla.edu>
Fix infringement on user name space reported by Bruno Haible. Fix infringement on user name space reported by Bruno Haible.

39
data/lalr1.cc
View File

@@ -417,6 +417,11 @@ m4_if(b4_defines_flag, 0, [],
[ [
#include @output_header_name@])[ #include @output_header_name@])[
/* INFRINGES ON USER NAME SPACE */
#ifndef _
# define _(msgid) msgid
#endif
/* A pseudo ostream that takes yydebug_ into account. */ /* A pseudo ostream that takes yydebug_ into account. */
# define YYCDEBUG \ # define YYCDEBUG \
for (bool yydebugcond_ = yydebug_; yydebugcond_; yydebugcond_ = false) \ for (bool yydebugcond_ = yydebug_; yydebugcond_; yydebugcond_ = false) \
@@ -546,7 +551,7 @@ yy::]b4_parser_class_name[::parse ()
{ {
int yyresult_; int yyresult_;
YYCDEBUG << "Starting parse" << std::endl; YYCDEBUG << _("Starting parse") << std::endl;
yynerrs_ = 0; yynerrs_ = 0;
yyerrstatus_ = 0; yyerrstatus_ = 0;
@@ -578,7 +583,7 @@ b4_syncline([@oline@], [@ofile@])])dnl
/* New state. */ /* New state. */
yynewstate: yynewstate:
yystate_stack_.push (yystate_); yystate_stack_.push (yystate_);
YYCDEBUG << "Entering state " << yystate_ << std::endl; YYCDEBUG << _("Entering state ") << yystate_ << std::endl;
goto yybackup; goto yybackup;
/* Backup. */ /* Backup. */
@@ -597,12 +602,12 @@ yybackup:
if (yylooka_ <= yyeof_) if (yylooka_ <= yyeof_)
{ {
yylooka_ = yyilooka_ = yyeof_; yylooka_ = yyilooka_ = yyeof_;
YYCDEBUG << "Now at end of input." << std::endl; YYCDEBUG << _("Now at end of input.") << std::endl;
} }
else else
{ {
yyilooka_ = yytranslate_ (yylooka_); yyilooka_ = yytranslate_ (yylooka_);
YY_SYMBOL_PRINT ("Next token is", yyilooka_, &yylval, &yylloc); YY_SYMBOL_PRINT (_("Next token is"), yyilooka_, &yylval, &yylloc);
} }
/* If the proper action on seeing token ILOOKA_ is to reduce or to /* If the proper action on seeing token ILOOKA_ is to reduce or to
@@ -631,7 +636,7 @@ yybackup:
goto yyacceptlab; goto yyacceptlab;
/* Shift the look-ahead token. */ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yyilooka_, &yylval, &yylloc); YY_SYMBOL_PRINT (_("Shifting"), yyilooka_, &yylval, &yylloc);
/* Discard the token being shifted unless it is eof. */ /* Discard the token being shifted unless it is eof. */
if (yylooka_ != yyeof_) if (yylooka_ != yyeof_)
@@ -729,7 +734,7 @@ yyerrlab:
yypop_ (); yypop_ ();
if (yystate_stack_.height () == 1) if (yystate_stack_.height () == 1)
YYABORT; YYABORT;
yydestruct_ ("Error: popping", yydestruct_ (_("Error: popping"),
yystos_[yystate_stack_[0]], yystos_[yystate_stack_[0]],
&yysemantic_stack_[0], &yysemantic_stack_[0],
&yylocation_stack_[0]); &yylocation_stack_[0]);
@@ -737,7 +742,7 @@ yyerrlab:
} }
else else
{ {
yydestruct_ ("Error: discarding", yyilooka_, &yylval, &yylloc); yydestruct_ (_("Error: discarding"), yyilooka_, &yylval, &yylloc);
yylooka_ = yyempty_; yylooka_ = yyempty_;
} }
} }
@@ -788,7 +793,7 @@ yyerrlab1:
YYABORT; YYABORT;
yyerror_range_[0] = yylocation_stack_[0]; yyerror_range_[0] = yylocation_stack_[0];
yydestruct_ ("Error: popping", yydestruct_ (_("Error: popping"),
yystos_[yystate_], yystos_[yystate_],
&yysemantic_stack_[0], &yylocation_stack_[0]); &yysemantic_stack_[0], &yylocation_stack_[0]);
yypop_ (); yypop_ ();
@@ -807,7 +812,7 @@ yyerrlab1:
yylocation_stack_.push (yyloc); yylocation_stack_.push (yyloc);
/* Shift the error token. */ /* Shift the error token. */
YY_SYMBOL_PRINT ("Shifting", yystos_[yyn_], YY_SYMBOL_PRINT (_("Shifting"), yystos_[yyn_],
&yysemantic_stack_[0], &yylocation_stack_[0]); &yysemantic_stack_[0], &yylocation_stack_[0]);
yystate_ = yyn_; yystate_ = yyn_;
@@ -825,14 +830,14 @@ yyabortlab:
yyreturn: yyreturn:
if (yylooka_ != yyeof_ && yylooka_ != yyempty_) if (yylooka_ != yyeof_ && yylooka_ != yyempty_)
yydestruct_ ("Error: discarding lookahead", yyilooka_, &yylval, &yylloc); yydestruct_ (_("Error: discarding lookahead"), yyilooka_, &yylval, &yylloc);
return yyresult_; return yyresult_;
} }
void void
yy::]b4_parser_class_name[::yylex_ () yy::]b4_parser_class_name[::yylex_ ()
{ {
YYCDEBUG << "Reading a token: "; YYCDEBUG << _("Reading a token: ");
#if YYLSP_NEEDED #if YYLSP_NEEDED
yylooka_ = yylex (&yylval, &yylloc); yylooka_ = yylex (&yylval, &yylloc);
#else #else
@@ -865,7 +870,7 @@ yy::]b4_parser_class_name[::yyreport_syntax_error_ ()
if (yycheck_[x + yyn_] == x && x != yyterror_) if (yycheck_[x + yyn_] == x && x != yyterror_)
++count; ++count;
message = "syntax error, unexpected "; message = _("syntax error, unexpected ");
message += yyname_[yyilooka_]; message += yyname_[yyilooka_];
if (count < 5) if (count < 5)
{ {
@@ -873,14 +878,14 @@ yy::]b4_parser_class_name[::yyreport_syntax_error_ ()
for (int x = yyxbegin; x < yyxend; ++x) for (int x = yyxbegin; x < yyxend; ++x)
if (yycheck_[x + yyn_] == x && x != yyterror_) if (yycheck_[x + yyn_] == x && x != yyterror_)
{ {
message += (!count++) ? ", expecting " : " or "; message += (!count++) ? _(", expecting ") : _(" or ");
message += yyname_[x]; message += yyname_[x];
} }
} }
} }
else else
#endif #endif
message = "syntax error"; message = _("syntax error");
error (yylloc, message); error (yylloc, message);
} }
} }
@@ -1004,7 +1009,7 @@ yy::]b4_parser_class_name[::yyrline_[] =
void void
yy::]b4_parser_class_name[::yystack_print_ () yy::]b4_parser_class_name[::yystack_print_ ()
{ {
*yycdebug_ << "Stack now"; *yycdebug_ << _("Stack now");
for (state_stack_type::const_iterator i = yystate_stack_.begin (); for (state_stack_type::const_iterator i = yystate_stack_.begin ();
i != yystate_stack_.end (); ++i) i != yystate_stack_.end (); ++i)
*yycdebug_ << ' ' << *i; *yycdebug_ << ' ' << *i;
@@ -1017,8 +1022,8 @@ yy::]b4_parser_class_name[::yyreduce_print_ (int yyrule)
{ {
unsigned int yylno = yyrline_[yyrule]; unsigned int yylno = yyrline_[yyrule];
/* Print the symbols being reduced, and their result. */ /* Print the symbols being reduced, and their result. */
*yycdebug_ << "Reducing stack by rule " << yyn_ - 1 *yycdebug_ << _("Reducing stack by rule ") << yyn_ - 1
<< " (line " << yylno << "), "; << " (" << _("line") << ' ' << yylno << "), ";
for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyn_]; for (]b4_int_type_for([b4_prhs])[ i = yyprhs_[yyn_];
0 <= yyrhs_[i]; ++i) 0 <= yyrhs_[i]; ++i)
*yycdebug_ << yyname_[yyrhs_[i]] << ' '; *yycdebug_ << yyname_[yyrhs_[i]] << ' ';