Update.

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index eb45f1de2b4b3a977d89c4035b85e4a048fc4ed2..fd029d9094a200a56c8ecf0a096604f083a11d63 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -22,19 +22,13 @@
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 

+# include "location.h"
+# include "assoc.h"
+

 /*----------.
 | Symbols.  |
 `----------*/
 
 /*----------.
 | Symbols.  |
 `----------*/
 

-/* Associativity values for tokens and rules.  */
-typedef enum
-{
-  right_assoc,
-  left_assoc,
-  non_assoc
-} associativity;
-
-

 /* Symbol classes.  */
 typedef enum
 {
 /* Symbol classes.  */
 typedef enum
 {


@@ -51,14 +45,21 @@ typedef short symbol_number_t;
 typedef struct symbol_s symbol_t;
 struct symbol_s
 {
 typedef struct symbol_s symbol_t;
 struct symbol_s
 {

-  /* The key, name of the symbol. */
+  /* The key, name of the symbol.  */

   char *tag;
   char *tag;

-  /* Its type. */
+  /* The location of its first occurence.  */
+  location_t location;
+
+  /* Its %type and associated printer and destructor.  */

   char *type_name;
   char *type_name;

+  char *destructor;
+  location_t destructor_location;
+  char *printer;
+  location_t printer_location;

 
   symbol_number_t number;
   short prec;
 
   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.
   int user_token_number;
 
   /* Points to the other in the identifier-symbol pair for an alias.


@@ -82,25 +83,43 @@ struct symbol_s
 
 
 /* Fetch (or create) the symbol associated to KEY.  */
 
 
 /* Fetch (or create) the symbol associated to KEY.  */

-symbol_t *getsym PARAMS ((const char *key));
+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, and type */
-/* them with TYPENAME.                                           */
+/* 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,

-                               char *typename));
+                               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, location_t location));
+
+/* Set the DESTRUCTOR associated to SYMBOL.  */
+void symbol_destructor_set PARAMS ((symbol_t *symbol,
+                                   char *destructor, location_t location));

 
 

-/* 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.  */
+/* 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,
 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.  */
 
 /* Set the CLASS associated to SYMBOL.  */

-void symbol_class_set PARAMS ((symbol_t *symbol, symbol_class class));
+void symbol_class_set PARAMS ((symbol_t *symbol,
+                              symbol_class class, location_t location));

 
 /* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */
 
 /* 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 PARAMS ((symbol_t *symbol,
+                                          int user_number,
+                                          location_t location));

 
 
 /* Distinguished symbols.  AXIOM is the real start symbol, that used
 
 
 /* Distinguished symbols.  AXIOM is the real start symbol, that used


@@ -108,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 *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 symbol_t *startsymbol;

+extern location_t startsymbol_location;

 
 
 /*---------------.
 
 
 /*---------------.


@@ -131,8 +151,8 @@ void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
 /* Free all the memory allocated for symbols.  */
 void symbols_free PARAMS ((void));
 
 /* 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
 void symbols_check_defined PARAMS ((void));
 
 /* Perform various sanity checks, assign symbol numbers, and set up