X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ee000ba4fcd5b051bef4476341a7fdffbddf8ad3..0ced3098fd97e1483b4ac938bdce99bfc7942539:/src/symtab.h?ds=sidebyside

diff --git a/src/symtab.h b/src/symtab.h
index 2f53c8b8..3cf2f588 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,4 +1,5 @@
-/* Definitions for symtab.c and callers, part of bison,
+/* Definitions for symtab.c and callers, part of Bison.
+
    Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
@@ -22,22 +23,14 @@
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
+# include "assoc.h"
 # include "location.h"
+# include "uniqstr.h"
 
 /*----------.
 | Symbols.  |
 `----------*/
 
-/* Associativity values for tokens and rules.  */
-typedef enum
-{
-  undef_assoc,
-  right_assoc,
-  left_assoc,
-  non_assoc
-} associativity;
-
-
 /* Symbol classes.  */
 typedef enum
 {
@@ -48,29 +41,34 @@ typedef enum
 
 
 /* Internal token numbers. */
-typedef short symbol_number_t;
+typedef short symbol_number;
+#define SYMBOL_NUMBER_MAXIMUM SHRT_MAX
 
 
-typedef struct symbol_s symbol_t;
-struct symbol_s
+typedef struct symbol symbol;
+struct symbol
 {
-  /* The key, name of the symbol. */
-  char *tag;
-  /* Its type. */
-  char *type_name;
-
-  /* The location of its first occurence. */
-  location_t location;
-
-  symbol_number_t number;
+  /* The key, name of the symbol.  */
+  uniqstr tag;
+  /* The location of its first occurrence.  */
+  location location;
+
+  /* Its %type and associated printer and destructor.  */
+  uniqstr type_name;
+  char *destructor;
+  location destructor_location;
+  char *printer;
+  location printer_location;
+
+  symbol_number number;
   short prec;
-  associativity assoc;
+  assoc assoc;
   int user_token_number;
 
   /* Points to the other in the identifier-symbol pair for an alias.
      Special value USER_NUMBER_ALIAS in the identifier half of the
      identifier-symbol pair for an alias.  */
-  symbol_t *alias;
+  symbol *alias;
   symbol_class class;
 };
 
@@ -84,40 +82,49 @@ struct symbol_s
 #define USER_NUMBER_ALIAS -9991
 
 /* Undefined internal token number.  */
-#define NUMBER_UNDEFINED ((symbol_number_t) -1)
+#define NUMBER_UNDEFINED (-1)
 
 
 /* Fetch (or create) the symbol associated to KEY.  */
-symbol_t *getsym PARAMS ((const char *key, location_t location));
+symbol *symbol_get (const char *key, location loc);
+
+/* Generate a dummy nonterminal, whose name cannot conflict with the
+   user's names.  */
+symbol *dummy_symbol_get (location loc);
 
-/* Declare the new SYMBOL.  Make it an alias of SYMVAL.  */
-void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval));
+/* Declare the new symbol SYM.  Make it an alias of SYMVAL.  */
+void symbol_make_alias (symbol *sym, symbol *symval, location loc);
 
-/* Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 as
+/* Set the TYPE_NAME associated with SYM.  Do nothing if passed 0 as
    TYPE_NAME.  */
-void symbol_type_set PARAMS ((symbol_t *symbol, char *type_name));
+void symbol_type_set (symbol *sym, uniqstr type_name, location loc);
+
+/* Set the DESTRUCTOR associated with SYM.  */
+void symbol_destructor_set (symbol *sym, char *destructor, location loc);
 
-/* 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));
+/* Set the PRINTER associated with SYM.  */
+void symbol_printer_set (symbol *sym, char *printer, location loc);
 
-/* Set the CLASS associated to SYMBOL.  */
-void symbol_class_set PARAMS ((symbol_t *symbol, symbol_class class));
+/* Set the PRECEDENCE associated with SYM.  Ensure that SYMBOL is a
+   terminal.  Do nothing if invoked with UNDEF_ASSOC as ASSOC.  */
+void symbol_precedence_set (symbol *sym, int prec, assoc a, location loc);
 
-/* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */
-void symbol_user_token_number_set PARAMS ((symbol_t *symbol, int user_number));
+/* Set the CLASS associated with SYM.  */
+void symbol_class_set (symbol *sym, symbol_class class, location loc);
+
+/* Set the USER_TOKEN_NUMBER associated with SYM.  */
+void symbol_user_token_number_set (symbol *sym, int user_number, location loc);
 
 
 /* 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 *eoftoken;
-extern symbol_t *axiom;
-extern symbol_t *startsymbol;
-extern location_t startsymbol_location;
+extern symbol *errtoken;
+extern symbol *undeftoken;
+extern symbol *endtoken;
+extern symbol *accept;
+extern symbol *startsymbol;
+extern location startsymbol_location;
 
 
 /*---------------.
@@ -126,24 +133,17 @@ extern location_t startsymbol_location;
 
 
 /* Create the symbol table.  */
-void symbols_new PARAMS ((void));
-
-/* A function to apply to each symbol. */
-typedef bool (*symbol_processor) PARAMS ((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));
+void symbols_new (void);
 
 /* 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_ */