* src/output.c (table_size, table_grow): New.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index acb586931a451a67e5088d024ffa6cd0d7f79703..1120b89784052d47955509f7df7d3e5699b35277 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -27,21 +27,20 @@
 
 /* comments for these variables are in gram.h  */
 
-int nitems = 0;
-int nrules = 0;
-int nsyms = 0;
-int ntokens = 0;
-int nvars = 0;
-
-short *ritem = NULL;
+item_number_t *ritem = NULL;
 int nritems = 0;
 
 rule_t *rules = NULL;
+int nrules = 0;
 
-struct bucket **symbols = NULL;
-short *token_translations = NULL;
+symbol_t **symbols = NULL;
+int nsyms = 0;
+int ntokens = 1;
+int nvars = 0;
 
-int start_symbol = 0;
+token_number_t *token_translations = NULL;
+
+token_number_t start_symbol = 0;
 
 int max_user_token_number = 256;
 
@@ -49,8 +48,6 @@ int semantic_parser = 0;
 
 int pure_parser = 0;
 
-int error_token_number = 0;
-
 
 /*--------------------------------------.
 | Return the number of symbols in RHS.  |
@@ -60,7 +57,7 @@ int
 rule_rhs_length (rule_t *rule)
 {
   int res = 0;
-  short *rhsp;
+  item_number_t *rhsp;
   for (rhsp = rule->rhs; *rhsp >= 0; ++rhsp)
     ++res;
   return res;