* src/gram.h, src/gram.c (error_token_number): Remove, use

errtoken->number.
* src/reader.c (reader): Don't specify the user token number (2)
for $undefined, as it uselessly prevents using it.
* src/gram.h (token_number_t): Move to...
* src/symtab.h: here.
(state_t.number): Is a token_number_t.
* src/print.c, src/reader.c: Use undeftoken->number instead of
hard coded 2.
(Even though this 2 is not the same as above: the number of the
undeftoken remains being 2, it is its user token number which
might not be 2).
* src/output.c (prepare_tokens): Rename the `maxtok' muscle with
`user_token_number_max'.
Output `undef_token_number'.
* data/bison.simple, data/bison.c++: Use them.
Be sure to map invalid yylex return values to
`undef_token_number'.  This saves us from gratuitous SEGV.
* tests/conflicts.at (Solved SR Conflicts)
(Unresolved SR Conflicts): Adjust.
* tests/regression.at (Web2c Actions): Adjust.

src/gram.c

@@ -48,8 +48,6 @@ int semantic_parser = 0;
 
 int pure_parser = 0;
 
-int error_token_number = 0;
-
 
 /*--------------------------------------.
 | Return the number of symbols in RHS.  |

src/gram.h

@@ -154,7 +154,6 @@ extern symbol_t **symbols;
 /* TOKEN_TRANSLATION -- a table indexed by a token number as returned
    by the user's yylex routine, it yields the internal token number
    used by the parser and throughout bison.  */
-typedef short token_number_t;
 extern token_number_t *token_translations;
 extern int max_user_token_number;
 
@@ -169,10 +168,6 @@ extern int semantic_parser;
 
 extern int pure_parser;
 
-/* ERROR_TOKEN_NUMBER is the token number of the error token.  */
-
-extern int error_token_number;
-
 /* Report the length of the RHS. */
 int rule_rhs_length PARAMS ((rule_t *rule));
 

src/output.c

@@ -417,7 +417,7 @@ action_row (state_t *state)
 
       /* Do not use any default reduction if there is a shift for
 	 error */
-      if (symbol == error_token_number)
+      if (symbol == errtoken->number)
 	nodefault = 1;
     }
 
@@ -614,7 +614,7 @@ token_definitions_output (FILE *out)
       if (number == SALIAS)
 	continue;
       /* Skip error token.  */
-      if (symbol->number == error_token_number)
+      if (symbol == errtoken)
 	continue;
       if (symbol->tag[0] == '\'')
 	continue;               /* skip literal character */
@@ -1078,7 +1078,8 @@ prepare (void)
   MUSCLE_INSERT_INT ("nsym", nsyms);
   MUSCLE_INSERT_INT ("debug", debug_flag);
   MUSCLE_INSERT_INT ("final", final_state);
-  MUSCLE_INSERT_INT ("maxtok", max_user_token_number);
+  MUSCLE_INSERT_INT ("undef_token_number", undeftoken->number);
+  MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number);
   MUSCLE_INSERT_INT ("error_verbose", error_verbose);
   MUSCLE_INSERT_STRING ("prefix", spec_name_prefix ? spec_name_prefix : "yy");
 

src/print.c

@@ -386,7 +386,7 @@ print_grammar (FILE *out)
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
   for (i = 0; i < max_user_token_number + 1; i++)
-    if (token_translations[i] != 2)
+    if (token_translations[i] != undeftoken->number)
       {
 	buffer[0] = 0;
 	column = strlen (escape (symbols[token_translations[i]]->tag));

src/reader.c

@@ -237,7 +237,7 @@ symbol_translation (symbol_t *this)
       && this->user_token_number != SALIAS)
     {
       /* A token which translation has already been set? */
-      if (token_translations[this->user_token_number] != 2)
+      if (token_translations[this->user_token_number] != undeftoken->number)
 	complain (_("tokens %s and %s both assigned number %d"),
 		  symbols[token_translations[this->user_token_number]]->tag,
 		  this->tag, this->user_token_number);
@@ -1697,7 +1697,7 @@ token_translations_init (void)
      token number for $undefined., which represents all invalid
      inputs.  */
   for (i = 0; i < max_user_token_number + 1; i++)
-    token_translations[i] = 2;
+    token_translations[i] = undeftoken->number;
 
   symbols_do (symbol_translation, NULL);
 }
@@ -1718,8 +1718,6 @@ packsymbols (void)
 
   token_translations_init ();
 
-  error_token_number = errtoken->number;
-
   if (startval->class == unknown_sym)
     fatal (_("the start symbol %s is undefined"), startval->tag);
   else if (startval->class == token_sym)
@@ -1831,7 +1829,6 @@ reader (void)
   undeftoken = getsym ("$undefined.");
   undeftoken->class = token_sym;
   undeftoken->number = ntokens++;
-  undeftoken->user_token_number = 2;
 
   /* Initialize the obstacks. */
   obstack_init (&action_obstack);

src/state.h

@@ -122,7 +122,7 @@ shifts *shifts_new PARAMS ((int n));
 /* Is the SHIFTS->shifts[Shift] then handling of the error token?. */
 
 #define SHIFT_IS_ERROR(Shifts, Shift) \
-  (SHIFT_SYMBOL (Shifts, Shift) == error_token_number)
+  (SHIFT_SYMBOL (Shifts, Shift) == errtoken->number)
 
 /* When resolving a SR conflicts, if the reduction wins, the shift is
    disabled.  */

src/symtab.h

@@ -41,6 +41,8 @@ typedef enum
   nterm_sym		/* non-terminal */
 } symbol_class;
 
+/* Internal token numbers. */
+typedef short token_number_t;
 #define SUNDEF  -1              /* For undefined user number. */
 #define SALIAS	-9991		/* for symbol generated with an alias */
 
@@ -50,7 +52,7 @@ struct symbol_s
   char *tag;
   /* Its type. */
   char *type_name;
-  short number;
+  token_number_t number;
   short prec;
   associativity assoc;
   int user_token_number;