* src/gram.h (associativity): New enum type which replaces the

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 03ae90f4f48e9adbc2901bcfb8801eb046717742..c68ec8feee89a4076da08ac86b96bdded2491780 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -20,14 +20,18 @@
 
 #ifndef SYMTAB_H_
 # define SYMTAB_H_
 
 #ifndef SYMTAB_H_
 # define SYMTAB_H_

+# include "gram.h"

 
 #define        TABSIZE 1009
 
 /*  symbol classes  */
 
 
 #define        TABSIZE 1009
 
 /*  symbol classes  */
 

-#define SUNKNOWN 0
-#define STOKEN  1              /* terminal symbol */
-#define SNTERM  2              /* non-terminal */
+typedef enum
+{
+  unknown_sym,
+  token_sym,           /* terminal symbol */
+  nterm_sym            /* non-terminal */
+} symbol_class;

 
 #define SALIAS -9991           /* for symbol generated with an alias */
 
 
 #define SALIAS -9991           /* for symbol generated with an alias */
 


@@ -39,13 +43,13 @@ typedef struct bucket
   char *type_name;
   short value;
   short prec;
   char *type_name;
   short value;
   short prec;

-  short assoc;
+  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 */
   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;
+  symbol_class class;

 }
 bucket;
 
 }
 bucket;