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

diff --git a/src/symtab.h b/src/symtab.h
index f95e7701..ecf28cd0 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -22,16 +22,13 @@
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
-#define	TABSIZE	1009
-
-/* Associativity values for tokens and rules.  */
-typedef enum
-{
-  right_assoc,
-  left_assoc,
-  non_assoc
-} associativity;
+# include "struniq.h"
+# include "location.h"
+# include "assoc.h"
 
+/*----------.
+| Symbols.  |
+`----------*/
 
 /* Symbol classes.  */
 typedef enum
@@ -44,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.
@@ -79,13 +84,79 @@ struct symbol_s
 #define NUMBER_UNDEFINED ((symbol_number_t) -1)
 
 
+/* Fetch (or create) the symbol associated to 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 (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 (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 (symbol_t *symbol,
+			    int prec, assoc_t assoc, location_t location);
+
+/* Set the CLASS associated to SYMBOL.  */
+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 (symbol_t *symbol,
+				   int user_number, location_t location);
+
+
+/* Distinguished symbols.  AXIOM is the real start symbol, that used
+   by the automaton.  STARTSYMBOL is the one specified by the user.
+   */
+extern symbol_t *errtoken;
+extern symbol_t *undeftoken;
+extern symbol_t *endtoken;
+extern symbol_t *accept;
+extern symbol_t *startsymbol;
+extern location_t startsymbol_location;
+
+
+/*---------------.
+| Symbol table.  |
+`---------------*/
+
+
+/* Create the symbol table.  */
+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 (symbol_processor processor, void *processor_data);
+
+/* Free all the memory allocated for symbols.  */
+void symbols_free (void);
 
-symbol_t *getsym PARAMS ((const char *));
+/* Check that all the symbols are defined.  Report any undefined
+   symbols and consider them nonterminals.  */
+void symbols_check_defined (void);
 
-void symbols_new PARAMS ((void));
-void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
-void symbols_free PARAMS ((void));
+/* Perform various sanity checks, assign symbol numbers, and set up
+   TOKEN_TRANSLATIONS.  */
+void symbols_pack (void);
 
 #endif /* !SYMTAB_H_ */