* data/yacc.c: Guard the declaration of yytoknum also with

[bison.git] / src / scan-gram.c

diff --git a/src/scan-gram.c b/src/scan-gram.c
index cd75ac0a470eab43c9c76e4dba98bd094299dc7c..7457d9498869ae705f5631d2448c8a1d56abc717 100644 (file)
--- a/src/scan-gram.c
+++ b/src/scan-gram.c
@@ -499,7 +499,7 @@ static yyconst short int yy_nxt[891] =
     {   0,
        20,   21,   22,   23,   24,   20,   25,   26,   20,   20,
        27,   28,   29,   29,   30,   31,   32,   33,   20,   20,
     {   0,
        20,   21,   22,   23,   24,   20,   25,   26,   20,   20,
        27,   28,   29,   29,   30,   31,   32,   33,   20,   20,

-       27,   20,   20,   20,   20,   27,   27,   27,   27,   27,
+       27,   20,   20,   20,   27,   27,   27,   27,   27,   27,

        27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
        27,   27,   27,   27,   27,   27,   27,   34,   35,   20,
        37,   38,  112,   37,   38,  113,   39,   89,   90,   39,
        27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
        27,   27,   27,   27,   27,   27,   27,   34,   35,   20,
        37,   38,  112,   37,   38,  113,   39,   89,   90,   39,


@@ -1373,7 +1373,7 @@ YY_RULE_SETUP
 #line 200 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 200 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": invalid character: `%c'\n", *yytext);
+    fprintf (stderr, _(": invalid character: `%c'\n"), *yytext);

     YY_STEP;
   }
        YY_BREAK
     YY_STEP;
   }
        YY_BREAK


@@ -1435,7 +1435,7 @@ case YY_STATE_EOF(SC_COMMENT):
 #line 244 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 244 "scan-gram.l"
 {
     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_BREAK
     yy_pop_state ();
   }
        YY_BREAK


@@ -1472,7 +1472,7 @@ case YY_STATE_EOF(SC_ESCAPED_STRING):
 #line 272 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 272 "scan-gram.l"
 {
     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);
     YY_OBS_FINISH;
     yylval->string = last_string;
     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1519,7 +1519,7 @@ case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
 #line 309 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 309 "scan-gram.l"
 {
     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);
     YY_OBS_FINISH;
     yylval->string = last_string;
     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1541,7 +1541,7 @@ YY_RULE_SETUP
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);

-       fprintf (stderr, ": invalid escape: %s\n", quote (yytext));
+       fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));

        YY_STEP;
       }
     else
        YY_STEP;
       }
     else


@@ -1600,7 +1600,7 @@ YY_RULE_SETUP
 #line 351 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 351 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unrecognized escape: %s\n", quote (yytext));
+    fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext));

     YY_OBS_GROW;
   }
        YY_BREAK
     YY_OBS_GROW;
   }
        YY_BREAK


@@ -1651,7 +1651,7 @@ case YY_STATE_EOF(SC_CHARACTER):
 #line 381 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 381 "scan-gram.l"
 {
     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);
     yy_pop_state ();
   }
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }


@@ -1697,7 +1697,7 @@ case YY_STATE_EOF(SC_STRING):
 #line 410 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 410 "scan-gram.l"
 {
     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);
     yy_pop_state ();
   }
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }


@@ -1795,7 +1795,7 @@ case YY_STATE_EOF(SC_BRACED_CODE):
 #line 471 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 471 "scan-gram.l"
 {
     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_OBS_FINISH;
     yylval->string = last_string;
     yy_pop_state ();
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -1837,7 +1837,7 @@ case YY_STATE_EOF(SC_PROLOGUE):
 #line 500 "scan-gram.l"
 {
     LOCATION_PRINT (stderr, *yylloc);
 #line 500 "scan-gram.l"
 {
     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_OBS_FINISH;
     yylval->string = last_string;
     yy_pop_state ();
     YY_OBS_FINISH;
     yylval->string = last_string;


@@ -2800,7 +2800,7 @@ handle_action_dollar (char *text, location_t location)
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }
       obstack_fgrow1 (&string_obstack,
                      "]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
         far, which says where to find `$0' with respect to the top of
     {
       /* 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


@@ -2887,7 +2887,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
         far, which says where to find `$0' with respect to the top of
     {
       /* 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