X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/db8837cbe1210e9df3da80472abee9b9896fd152..0c2d3f4cba35c4bbea660794ab3cf91c030aafd3:/src/state.h

diff --git a/src/state.h b/src/state.h
index 9446f4f6..92378c70 100644
--- a/src/state.h
+++ b/src/state.h
@@ -41,7 +41,7 @@
    the last thing accepted to reach that state.  It is the
    accessing_symbol of the core.
 
-   Each core contains a vector of nitems items which are the indices
+   Each core contains a vector of NITEMS items which are the indices
    in the ritems vector of the items that are selected in this state.
 
    The link field is used for chaining symbols that hash states by
@@ -122,7 +122,7 @@ shifts *shifts_new PARAMS ((int n));
 /* Is the SHIFTS->shifts[Shift] then handling of the error token?. */
 
 #define SHIFT_IS_ERROR(Shifts, Shift) \
-  (SHIFT_SYMBOL (Shifts, Shift) == error_token_number)
+  (SHIFT_SYMBOL (Shifts, Shift) == errtoken->number)
 
 /* When resolving a SR conflicts, if the reduction wins, the shift is
    disabled.  */
@@ -171,7 +171,7 @@ typedef struct state_s
   struct state_s *link;
 
   short number;
-  short accessing_symbol;
+  token_number_t accessing_symbol;
   shifts     *shifts;
   reductions *reductions;
   errs       *errs;
@@ -185,12 +185,12 @@ typedef struct state_s
   int nlookaheads;
 
   /* Its items. */
-  short nitems;
-  short items[1];
+  unsigned short nitems;
+  item_number_t items[1];
 } state_t;
 
 #define STATE_ALLOC(Nitems)						\
   (state_t *) xcalloc ((unsigned) (sizeof (state_t) 			\
-                                  + (Nitems - 1) * sizeof (short)), 1)
+                                  + (Nitems - 1) * sizeof (item_number_t)), 1)
 
 #endif /* !STATE_H_ */