X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e776192e4fcb3b34d8a279d7cc1ea153e96ae2e7..d1a1114f7f257f89887ea5825ba0d896dfaa747b:/src/symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 19e65e5f..fd029d90 100644
--- 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.
@@ -91,31 +82,25 @@ struct symbol_s
 #define NUMBER_UNDEFINED ((symbol_number_t) -1)
 
 
-/* Return the tag of this SYMBOL in a printable form.  Warning: uses
-   the QUOTEARG slot 0.  */
-const char *symbol_tag_get PARAMS ((symbol_t *symbol));
-
-/* Return the tag of this SYMBOL in a printable form.  Use the
-   QUOTEARG slot number N.  */
-const char *symbol_tag_get_n PARAMS ((symbol_t *symbol, int n));
-
-/* Print the tag of this SYMBOL.  */
-void symbol_tag_print PARAMS ((symbol_t *symbol, FILE *out));
-
 /* Fetch (or create) the symbol associated to KEY.  */
-symbol_t *getsym PARAMS ((const char *key, location_t location));
+symbol_t *symbol_get PARAMS ((const char *key, location_t location));
+
+/* Generate a dummy nonterminal, whose name cannot conflict with the
+   user's names.  */
+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.  */
-void symbol_type_set PARAMS ((symbol_t *symbol, location_t location,
-			      char *type_name));
+void symbol_type_set PARAMS ((symbol_t *symbol,
+			      char *type_name, location_t location));
 
 /* Set the DESTRUCTOR associated to SYMBOL.  */
-void symbol_destructor_set PARAMS ((symbol_t *symbol, location_t location,
-				    char *destructor));
+void symbol_destructor_set PARAMS ((symbol_t *symbol,
+				    char *destructor, location_t location));
 
 /* Set the PRINTER associated to SYMBOL.  */
 void symbol_printer_set PARAMS ((symbol_t *symbol,
@@ -123,8 +108,9 @@ 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, location_t location,
-				    int prec, associativity assoc));
+void symbol_precedence_set PARAMS ((symbol_t *symbol,
+				    int prec, assoc_t assoc,
+				    location_t location));
 
 /* Set the CLASS associated to SYMBOL.  */
 void symbol_class_set PARAMS ((symbol_t *symbol,
@@ -141,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;