* src/state.h (state_t): Replace the `lookaheadsp' member, a

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index fd355e1fc4515d9df9e0e19a6325493c19313400..1424a41b7cdd723467eb92f2d309c6d665c02572 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -22,11 +22,16 @@
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 

-#define        TABSIZE 1009
+# include "location.h"
+
+/*----------.
+| Symbols.  |
+`----------*/

 
 /* Associativity values for tokens and rules.  */
 typedef enum
 {
 
 /* Associativity values for tokens and rules.  */
 typedef enum
 {

+  undef_assoc,

   right_assoc,
   left_assoc,
   non_assoc
   right_assoc,
   left_assoc,
   non_assoc


@@ -41,34 +46,115 @@ typedef enum
   nterm_sym            /* non-terminal */
 } symbol_class;
 
   nterm_sym            /* non-terminal */
 } symbol_class;
 

-#define SUNDEF  -1              /* For undefined user number. */
-#define SALIAS -9991           /* for symbol generated with an alias */

 
 

-typedef struct bucket
+/* Internal token numbers. */
+typedef short symbol_number_t;
+
+
+typedef struct symbol_s symbol_t;
+struct symbol_s

 {
   /* The key, name of the symbol. */
   char *tag;
   /* Its type. */
   char *type_name;
 {
   /* The key, name of the symbol. */
   char *tag;
   /* Its type. */
   char *type_name;

-  short number;
+
+  /* The location of its first occurence. */
+  location_t location;
+
+  symbol_number_t number;

   short prec;
   associativity assoc;
   short prec;
   associativity assoc;

-  short user_token_number;
+  int user_token_number;

 
 

-  /* Points to the other in the identifier-symbol pair for an
-     alias. Special value SALIAS in the identifier half of the
+  /* 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.  */
      identifier-symbol pair for an alias.  */

-  struct bucket *alias;
+  symbol_t *alias;

   symbol_class class;
   symbol_class class;

-} bucket;
+};
+
+/* Undefined user number.  */
+#define USER_NUMBER_UNDEFINED -1
+
+/* `symbol->user_token_number == USER_NUMBER_ALIAS' means this symbol
+   *has* (not is) a string literal alias.  For instance, `%token foo
+   "foo"' has `"foo"' numbered regularly, and `foo' numbered as
+   USER_NUMBER_ALIAS.  */
+#define USER_NUMBER_ALIAS -9991
+
+/* Undefined internal token number.  */
+#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, 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, char *type_name));
+
+/* 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 CLASS associated to SYMBOL.  */
+void symbol_class_set PARAMS ((symbol_t *symbol, symbol_class class));
+
+/* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */
+void symbol_user_token_number_set PARAMS ((symbol_t *symbol, int user_number));
+
+
+/* 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;
+
+
+/*---------------.
+| Symbol table.  |
+`---------------*/
+
+
+/* Create the symbol table.  */
+void symbols_new PARAMS ((void));

 
 /* A function to apply to each symbol. */
 
 /* A function to apply to each symbol. */

-typedef bool (*bucket_processor) PARAMS ((bucket *));
+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));
+
+/* Free all the memory allocated for symbols.  */
+void symbols_free PARAMS ((void));

 
 

-bucket *getsym PARAMS ((const char *));
+/* Check that all the symbols are defined.  Report any undefined
+   symbols and consider them nonterminals.  */
+void symbols_check_defined PARAMS ((void));

 
 

-void buckets_new PARAMS ((void));
-void buckets_do PARAMS ((bucket_processor processor, void *processor_data));
-void buckets_free PARAMS ((void));
+/* Perform various sanity checks, assign symbol numbers, and set up
+   TOKEN_TRANSLATIONS.  */
+void symbols_pack PARAMS ((void));

 
 #endif /* !SYMTAB_H_ */
 
 #endif /* !SYMTAB_H_ */