* data/bison.simple (b4_token_defines): Also define YYTOKENTYPE

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 03e2ea1cab9725ddbe4aef71d6531ecb6080adf8..591c6b8e4057b87dc21ab7d7e88a3b2cc618485b 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,60 +1,82 @@
 /* Definitions for symtab.c and callers, part of bison,
-   Copyright (C) 1984, 1989, 1992 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.
+   This file is part of Bison, the GNU Compiler Compiler.
 
-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#ifndef SYMTAB_H_
+# define SYMTAB_H_
 
 #define        TABSIZE 1009
 
+/* Associativity values for tokens and rules.  */
+typedef enum
+{
+  right_assoc,
+  left_assoc,
+  non_assoc
+} associativity;
 
-/*  symbol classes  */
 
-#define SUNKNOWN 0
-#define STOKEN  1      /* terminal symbol */
-#define SNTERM  2      /* non-terminal */
+/* Symbol classes.  */
+typedef enum
+{
+  unknown_sym,
+  token_sym,           /* terminal symbol */
+  nterm_sym            /* non-terminal */
+} symbol_class;
 
-#define SALIAS -9991   /* for symbol generated with an alias */
+/* Internal token numbers. */
+typedef short token_number_t;
 
-typedef
-  struct bucket
-    {
-      struct bucket *link;
-      struct bucket *next;
-      char *tag;
-      char *type_name;
-      short value;
-      short prec;
-      short 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 */
-      char class;
-    }
-  bucket;
+#define SUNDEF  -1              /* For undefined user number. */
+#define SALIAS -9991           /* for symbol generated with an alias */
 
+#define NUMBER_UNDEFINED ((token_number_t) -1)
 
-extern bucket **symtab;
-extern bucket *firstsymbol;
+struct symbol_s
+{
+  /* The key, name of the symbol. */
+  char *tag;
+  /* Its type. */
+  char *type_name;
 
-extern bucket *getsym PARAMS((char *));
+  token_number_t number;
+  short prec;
+  associativity assoc;
+  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;
+};
+
+typedef struct symbol_s symbol_t;
+
+/* A function to apply to each symbol. */
+typedef bool (*symbol_processor) PARAMS ((symbol_t *));
+
+symbol_t *getsym PARAMS ((const char *));
+
+void symbols_new PARAMS ((void));
+void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
+void symbols_free PARAMS ((void));
+
+#endif /* !SYMTAB_H_ */