* src/symtab.h (SALIAS, SUNDEF): Rename as...

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index ccdfa0ee7cfcaa01b92a46748d783c4dc165956d..fd7f495cf5018d6a295c90b4dc7a89bf5788cd2b 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,5 +1,6 @@
 /* Definitions for symtab.c and callers, part of bison,
-   Copyright 1984, 1989, 1992, 2000, 2001  Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -20,12 +21,19 @@
 
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
-# include "gram.h"
 
 #define        TABSIZE 1009
 
-/*  symbol classes  */
+/* Associativity values for tokens and rules.  */
+typedef enum
+{
+  right_assoc,
+  left_assoc,
+  non_assoc
+} associativity;
+
 
+/* Symbol classes.  */
 typedef enum
 {
   unknown_sym,
@@ -33,37 +41,51 @@ typedef enum
   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
-{
-  /* Needed for the hash table. */
-  struct bucket *link;
-  struct bucket *next;
+/* Internal token numbers. */
+typedef short token_number_t;
+
 
+typedef struct symbol_s symbol_t;
+struct symbol_s
+{
   /* The key, name of the symbol. */
   char *tag;
   /* Its type. */
   char *type_name;
-  short number;
+
+  token_number_t number;
   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.  */
-  struct bucket *alias;
+  symbol_t *alias;
   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 ((token_number_t) -1)
 
 
-extern bucket *firstsymbol;
+/* A function to apply to each symbol. */
+typedef bool (*symbol_processor) PARAMS ((symbol_t *));
 
-bucket *getsym PARAMS ((const char *));
+symbol_t *getsym PARAMS ((const char *));
 
-void tabinit PARAMS ((void));
-void free_symtab PARAMS ((void));
+void symbols_new PARAMS ((void));
+void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
+void symbols_free PARAMS ((void));
 
 #endif /* !SYMTAB_H_ */