06-yyr1-token-number.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * data/bison.simple (yyr1): Its type is that of a token number.
        * data/bison.c++ (r1_): Likewise.
        * tests/regression.at (Web2c Actions): Adjust.

Index: data/bison.simple
--- data/bison.simple Tue, 09 Apr 2002 19:37:32 +0200 akim
+++ data/bison.simple Thu, 18 Apr 2002 20:54:12 +0200 akim
@@ -318,7 +318,7 @@ m4_define([b4_token_defines],
 };

 /* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */
-static const short yyr1[[]] =
+static const yy_token_number_type yyr1[[]] =
 {
   b4_r1
 };
Index: data/bison.c++
--- data/bison.c++ Tue, 09 Apr 2002 19:37:32 +0200 akim
+++ data/bison.c++ Thu, 18 Apr 2002 20:56:05 +0200 akim
@@ -228,7 +228,7 @@ m4_define([b4_copyright],
     static const short defgoto_[[]];
     static const short table_[[]];
     static const short check_[[]];
-    static const short r1_[[]];
+    static const TokenNumberType r1_[[]];
     static const short r2_[[]];

 #if YYDEBUG || YYERROR_VERBOSE
@@ -666,7 +666,7 @@ yy::b4_name::check_[[]] =
 };

 /* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */
-const short
+const yy::b4_name::TokenNumberType
 yy::b4_name::r1_[[]] =
 {
   b4_r1
Index: tests/regression.at
--- tests/regression.at Tue, 09 Apr 2002 19:37:32 +0200 akim
+++ tests/regression.at Thu, 18 Apr 2002 21:05:05 +0200 akim
@@ -485,7 +485,7 @@ else: "else" statement;
 {
        0,   256,   257,   258,   259,   260,   261,    -1
 };
-static const short yyr1[] =
+static const yy_token_number_type yyr1[] =
 {
        0,     7,     8,     9,     9,    10,    11
 };