Regen.

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 5fa705937dc04a4388599e70744e0eb2d61e72b8..fd029d9094a200a56c8ecf0a096604f083a11d63 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -23,21 +23,12 @@
 # define SYMTAB_H_
 
 # include "location.h"
+# include "assoc.h"
 
 /*----------.
 | Symbols.  |
 `----------*/
 
-/* Associativity values for tokens and rules.  */
-typedef enum
-{
-  undef_assoc,
-  right_assoc,
-  left_assoc,
-  non_assoc
-} associativity;
-
-
 /* Symbol classes.  */
 typedef enum
 {
@@ -68,7 +59,7 @@ struct symbol_s
 
   symbol_number_t number;
   short prec;
-  associativity assoc;
+  assoc_t assoc;
   int user_token_number;
 
   /* Points to the other in the identifier-symbol pair for an alias.
@@ -99,7 +90,8 @@ symbol_t *symbol_get PARAMS ((const char *key, location_t location));
 symbol_t *dummy_symbol_get PARAMS ((location_t location));
 
 /* Declare the new SYMBOL.  Make it an alias of SYMVAL.  */
-void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval));
+void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval,
+                               location_t location));
 
 /* Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 as
    TYPE_NAME.  */
@@ -117,7 +109,7 @@ void symbol_printer_set PARAMS ((symbol_t *symbol,
 /* Set the PRECEDENCE associated to SYMBOL.  Ensures that SYMBOL is a
    terminal.  Does nothing if invoked with UNDEF_ASSOC as ASSOC.  */
 void symbol_precedence_set PARAMS ((symbol_t *symbol,
-                                   int prec, associativity assoc,
+                                   int prec, assoc_t assoc,
                                    location_t location));
 
 /* Set the CLASS associated to SYMBOL.  */
@@ -135,8 +127,8 @@ void symbol_user_token_number_set PARAMS ((symbol_t *symbol,
    */
 extern symbol_t *errtoken;
 extern symbol_t *undeftoken;
-extern symbol_t *eoftoken;
-extern symbol_t *axiom;
+extern symbol_t *endtoken;
+extern symbol_t *accept;
 extern symbol_t *startsymbol;
 extern location_t startsymbol_location;