X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e9955c83734d0a545d7822a1feb9c4a8038a62cb..3e6656f9ab66ae7e629f8e5d5b41810bf070f09d:/src/symtab.h?ds=sidebyside

diff --git a/src/symtab.h b/src/symtab.h
index 3f167d9f..ecf28cd0 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -22,20 +22,14 @@
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
+# include "struniq.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
 {
@@ -47,19 +41,27 @@ typedef enum
 
 /* Internal token numbers. */
 typedef short symbol_number_t;
+#define SYMBOL_NUMBER_MAX ((symbol_number_t) SHRT_MAX)
 
 
 typedef struct symbol_s symbol_t;
 struct symbol_s
 {
-  /* The key, name of the symbol. */
+  /* The key, name of the symbol.  */
   char *tag;
-  /* Its type. */
-  char *type_name;
+  /* The location of its first occurence.  */
+  location_t location;
+
+  /* Its %type and associated printer and destructor.  */
+  struniq_t type_name;
+  char *destructor;
+  location_t destructor_location;
+  char *printer;
+  location_t printer_location;
 
   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.
@@ -83,25 +85,41 @@ struct symbol_s
 
 
 /* Fetch (or create) the symbol associated to KEY.  */
-symbol_t *getsym PARAMS ((const char *key));
+symbol_t *symbol_get (const char *key, location_t location);
+
+/* Generate a dummy nonterminal, whose name cannot conflict with the
+   user's names.  */
+symbol_t *dummy_symbol_get (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 (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, char *type_name));
+void symbol_type_set (symbol_t *symbol,
+		      char *type_name, location_t location);
+
+/* Set the DESTRUCTOR associated to SYMBOL.  */
+void symbol_destructor_set (symbol_t *symbol,
+			    char *destructor, location_t location);
+
+/* Set the PRINTER associated to SYMBOL.  */
+void symbol_printer_set (symbol_t *symbol,
+			 char *printer, location_t location);
 
 /* 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));
+void symbol_precedence_set (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, symbol_class class));
+void symbol_class_set (symbol_t *symbol,
+		       symbol_class class, location_t location);
 
 /* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */
-void symbol_user_token_number_set PARAMS ((symbol_t *symbol, int user_number));
+void symbol_user_token_number_set (symbol_t *symbol,
+				   int user_number, location_t location);
 
 
 /* Distinguished symbols.  AXIOM is the real start symbol, that used
@@ -109,9 +127,10 @@ void symbol_user_token_number_set PARAMS ((symbol_t *symbol, int user_number));
    */
 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;
 
 
 /*---------------.
@@ -120,24 +139,24 @@ extern symbol_t *startsymbol;
 
 
 /* Create the symbol table.  */
-void symbols_new PARAMS ((void));
+void symbols_new (void);
 
 /* A function to apply to each symbol. */
-typedef bool (*symbol_processor) PARAMS ((symbol_t *));
+typedef bool (*symbol_processor) (symbol_t *);
 
-/* Apply PROCESSOR to all the symbols.  PROCESSOR must return TRUE: on
-   FALSE, the processing stops.  */
-void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
+/* Apply PROCESSOR to all the symbols.  PROCESSOR must return true: on
+   false, the processing stops.  */
+void symbols_do (symbol_processor processor, void *processor_data);
 
 /* Free all the memory allocated for symbols.  */
-void symbols_free PARAMS ((void));
+void symbols_free (void);
 
 /* Check that all the symbols are defined.  Report any undefined
    symbols and consider them nonterminals.  */
-void symbols_check_defined PARAMS ((void));
+void symbols_check_defined (void);
 
 /* Perform various sanity checks, assign symbol numbers, and set up
    TOKEN_TRANSLATIONS.  */
-void symbols_pack PARAMS ((void));
+void symbols_pack (void);
 
 #endif /* !SYMTAB_H_ */