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

Wrap strings in _() if they need translation.

Browse Source 
Use strings rather than escapes when possible,
to minimize the number of warnings from xgettext.

(handle_action_dollar, handle_action_at): Don't use isdigit,
as it mishandles negative chars and it may not work as expected
outside the C locale.
This commit is contained in:
Paul Eggert
2002-08-12 14:52:47 +00:00
parent 7e78575709
commit db2cc12fd0
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/scan-gram.l
View File

@@ -167,10 +167,10 @@ blanks [ \t\f]+
{int} yylval->integer = strtol (yytext, 0, 10); return INT; {int} yylval->integer = strtol (yytext, 0, 10); return INT;
/* Characters. We don't check there is only one. */ /* Characters. We don't check there is only one. */
\' YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER); "'" YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);
/* Strings. */ /* Strings. */
\" YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING); "\"" YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);
/* Comments. */ /* Comments. */
"/*" yy_push_state (SC_COMMENT); "/*" yy_push_state (SC_COMMENT);
@@ -199,7 +199,7 @@ blanks [ \t\f]+
. { . {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": invalid character: `%c'\n", *yytext); fprintf (stderr, _(": invalid character: `%c'\n"), *yytext);
YY_STEP; YY_STEP;
} }
} }
@@ -243,7 +243,7 @@ blanks [ \t\f]+
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a comment\n"); fprintf (stderr, _(": unexpected end of file in a comment\n"));
yy_pop_state (); yy_pop_state ();
} }
} }
@@ -256,7 +256,7 @@ blanks [ \t\f]+
<SC_ESCAPED_STRING> <SC_ESCAPED_STRING>
{ {
\" { "\"" {
assert (yy_top_state () == INITIAL); assert (yy_top_state () == INITIAL);
YY_OBS_GROW; YY_OBS_GROW;
YY_OBS_FINISH; YY_OBS_FINISH;
@@ -271,7 +271,7 @@ blanks [ \t\f]+
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a string\n"); fprintf (stderr, _(": unexpected end of file in a string\n"));
assert (yy_top_state () == INITIAL); assert (yy_top_state () == INITIAL);
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -287,7 +287,7 @@ blanks [ \t\f]+
<SC_ESCAPED_CHARACTER> <SC_ESCAPED_CHARACTER>
{ {
\' { "'" {
YY_OBS_GROW; YY_OBS_GROW;
assert (yy_top_state () == INITIAL); assert (yy_top_state () == INITIAL);
{ {
@@ -302,13 +302,13 @@ blanks [ \t\f]+
} }
} }
[^\'\n\r\\] YY_OBS_GROW; [^\n\r\\] YY_OBS_GROW;
{eols} obstack_1grow (&string_obstack, '\n'); YY_LINES; {eols} obstack_1grow (&string_obstack, '\n'); YY_LINES;
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a character\n"); fprintf (stderr, _(": unexpected end of file in a character\n"));
assert (yy_top_state () == INITIAL); assert (yy_top_state () == INITIAL);
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -329,7 +329,7 @@ blanks [ \t\f]+
if (c > 255) if (c > 255)
{ {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": invalid escape: %s\n", quote (yytext)); fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));
YY_STEP; YY_STEP;
} }
else else
@@ -350,7 +350,7 @@ blanks [ \t\f]+
\\[\\""] obstack_1grow (&string_obstack, yytext[1]); \\[\\""] obstack_1grow (&string_obstack, yytext[1]);
\\(.|\n) { \\(.|\n) {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unrecognized escape: %s\n", quote (yytext)); fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext));
YY_OBS_GROW; YY_OBS_GROW;
} }
/* FLex wants this rule, in case of a `\<<EOF>>'. */ /* FLex wants this rule, in case of a `\<<EOF>>'. */
@@ -365,7 +365,7 @@ blanks [ \t\f]+
<SC_CHARACTER> <SC_CHARACTER>
{ {
\' { "'" {
YY_OBS_GROW; YY_OBS_GROW;
assert (yy_top_state () != INITIAL); assert (yy_top_state () != INITIAL);
yy_pop_state (); yy_pop_state ();
@@ -380,7 +380,7 @@ blanks [ \t\f]+
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a character\n"); fprintf (stderr, _(": unexpected end of file in a character\n"));
assert (yy_top_state () != INITIAL); assert (yy_top_state () != INITIAL);
yy_pop_state (); yy_pop_state ();
} }
@@ -394,7 +394,7 @@ blanks [ \t\f]+
<SC_STRING> <SC_STRING>
{ {
\" { "\"" {
assert (yy_top_state () != INITIAL); assert (yy_top_state () != INITIAL);
YY_OBS_GROW; YY_OBS_GROW;
yy_pop_state (); yy_pop_state ();
@@ -409,7 +409,7 @@ blanks [ \t\f]+
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a string\n"); fprintf (stderr, _(": unexpected end of file in a string\n"));
assert (yy_top_state () != INITIAL); assert (yy_top_state () != INITIAL);
yy_pop_state (); yy_pop_state ();
} }
@@ -423,10 +423,10 @@ blanks [ \t\f]+
<SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE> <SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
{ {
/* Characters. We don't check there is only one. */ /* Characters. We don't check there is only one. */
\' YY_OBS_GROW; yy_push_state (SC_CHARACTER); "'" YY_OBS_GROW; yy_push_state (SC_CHARACTER);
/* Strings. */ /* Strings. */
\" YY_OBS_GROW; yy_push_state (SC_STRING); "\"" YY_OBS_GROW; yy_push_state (SC_STRING);
/* Comments. */ /* Comments. */
"/*" YY_OBS_GROW; yy_push_state (SC_COMMENT); "/*" YY_OBS_GROW; yy_push_state (SC_COMMENT);
@@ -470,7 +470,7 @@ blanks [ \t\f]+
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a braced code\n"); fprintf (stderr, _(": unexpected end of file in a braced code\n"));
yy_pop_state (); yy_pop_state ();
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -499,7 +499,7 @@ blanks [ \t\f]+
<<EOF>> { <<EOF>> {
LOCATION_PRINT (stderr, *yylloc); LOCATION_PRINT (stderr, *yylloc);
fprintf (stderr, ": unexpected end of file in a prologue\n"); fprintf (stderr, _(": unexpected end of file in a prologue\n"));
yy_pop_state (); yy_pop_state ();
YY_OBS_FINISH; YY_OBS_FINISH;
yylval->string = last_string; yylval->string = last_string;
@@ -564,7 +564,7 @@ handle_action_dollar (char *text, location_t location)
obstack_fgrow1 (&string_obstack, obstack_fgrow1 (&string_obstack,
"]b4_lhs_value([%s])[", type_name); "]b4_lhs_value([%s])[", type_name);
} }
else if (isdigit (*cp) || *cp == '-') else if (('0' <= *cp && *cp <= '9') || *cp == '-')
{ {
/* RULE_LENGTH is the number of values in the current rule so /* RULE_LENGTH is the number of values in the current rule so
far, which says where to find `$0' with respect to the top of far, which says where to find `$0' with respect to the top of
@@ -651,7 +651,7 @@ handle_action_at (char *text, location_t location)
{ {
obstack_sgrow (&string_obstack, "]b4_lhs_location["); obstack_sgrow (&string_obstack, "]b4_lhs_location[");
} }
else if (isdigit (*cp) || *cp == '-') else if (('0' <= *cp && *cp <= '9') || *cp == '-')
{ {
/* RULE_LENGTH is the number of values in the current rule so /* RULE_LENGTH is the number of values in the current rule so
far, which says where to find `$0' with respect to the top of far, which says where to find `$0' with respect to the top of