* data/m4sugar/m4sugar.m4: Update from CVS Autoconf.

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 354fb8fd6bc41bb4ad61d00874141a6c365e7970..591c6b8e4057b87dc21ab7d7e88a3b2cc618485b 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,5 +1,6 @@
 /* Definitions for symtab.c and callers, part of bison,
-   Copyright (C) 1984, 1989, 1992, 2000 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,35 +41,42 @@ typedef enum
   nterm_sym            /* non-terminal */
 } symbol_class;
 
+/* Internal token numbers. */
+typedef short token_number_t;
+
+#define SUNDEF  -1              /* For undefined user number. */
 #define SALIAS -9991           /* for symbol generated with an alias */
 
-typedef struct bucket
-{
-  struct bucket *link;
-  struct bucket *next;
+#define NUMBER_UNDEFINED ((token_number_t) -1)
 
+struct symbol_s
+{
   /* The key, name of the symbol. */
   char *tag;
   /* Its type. */
   char *type_name;
-  short value;
+
+  token_number_t number;
   short prec;
   associativity assoc;
-  short user_token_number;
-  /* special value SALIAS in the identifier half of the
-     identifier-symbol pair for an alias */
-  struct bucket *alias;
-  /* 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. Special value SALIAS in the identifier half of the
+     identifier-symbol pair for an alias.  */
+  struct symbol_s *alias;
   symbol_class class;
-}
-bucket;
+};
 
+typedef struct symbol_s symbol_t;
 
-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_ */