* src/symtab.h, src/symtab.c (symbol_t): printer and

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index eb45f1de2b4b3a977d89c4035b85e4a048fc4ed2..f5aed3963203264f4a53f1ddfcc50ac28e2be6b5 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -22,6 +22,8 @@
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
+# include "location.h"
+
 /*----------.
 | Symbols.  |
 `----------*/
@@ -29,6 +31,7 @@
 /* Associativity values for tokens and rules.  */
 typedef enum
 {
+  undef_assoc,
   right_assoc,
   left_assoc,
   non_assoc
@@ -51,10 +54,17 @@ typedef short symbol_number_t;
 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. */
+  /* The location of its first occurence.  */
+  location_t location;
+
+  /* Its %type and associated printer and destructor.  */
   char *type_name;
+  char *destructor;
+  location_t destructor_location;
+  char *printer;
+  location_t printer_location;
 
   symbol_number_t number;
   short prec;
@@ -81,19 +91,39 @@ 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));
+symbol_t *getsym PARAMS ((const char *key, location_t location));
+
+/* Declare the new SYMBOL.  Make it an alias of SYMVAL.  */
+void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval));
+
+/* 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));
 
-/* Declare the new SYMBOL.  Make it an alias of SYMVAL, and type */
-/* them with TYPENAME.                                           */
-void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval,
-                               char *typename));
+/* Set the DESTRUCTOR associated to SYMBOL.  */
+void symbol_destructor_set PARAMS ((symbol_t *symbol, location_t location,
+                                   char *destructor));
 
-/* Set the TYPE_NAME associated to SYMBOL. */
-void symbol_type_set PARAMS ((symbol_t *symbol, char *type_name));
+/* Set the PRINTER associated to SYMBOL.  */
+void symbol_printer_set PARAMS ((symbol_t *symbol,
+                                char *printer, location_t location));
 
-/* Set the PRECEDENCE associated to SYMBOL.  */
-void symbol_precedence_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));
 
 /* Set the CLASS associated to SYMBOL.  */
@@ -111,6 +141,7 @@ extern symbol_t *undeftoken;
 extern symbol_t *eoftoken;
 extern symbol_t *axiom;
 extern symbol_t *startsymbol;
+extern location_t startsymbol_location;
 
 
 /*---------------.
@@ -131,8 +162,8 @@ void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
 /* Free all the memory allocated for symbols.  */
 void symbols_free PARAMS ((void));
 
-/* Check that all the symbols are defined.  Report any undefined */
-/* symbols and consider them nonterminals.                       */
+/* Check that all the symbols are defined.  Report any undefined
+   symbols and consider them nonterminals.  */
 void symbols_check_defined PARAMS ((void));
 
 /* Perform various sanity checks, assign symbol numbers, and set up