Use 'short int' rather than 'short', and similarly for 'long', 'unsigned', etc.

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index 6b0a3de1e6711a62ebd5448a531f716f6b24beff..2c6c45a54c016401368cf14cf5187ecdfa2fb593 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -1,7 +1,7 @@
-/* Type definitions for nondeterministic finite state machine for bison,
+/* Type definitions for nondeterministic finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004 Free
+   Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -94,11 +94,15 @@
 | Numbering states.  |
 `-------------------*/
 
-typedef short state_number;
+typedef short int state_number;
 # define STATE_NUMBER_MAXIMUM SHRT_MAX
 
 /* Be ready to map a state_number to an int.  */
-# define state_number_as_int(Tok) ((int) (Tok))
+static inline int
+state_number_as_int (state_number s)
+{
+  return s;
+}
 
 
 typedef struct state state;
@@ -109,7 +113,7 @@ typedef struct state state;
 
 typedef struct
 {
-  short num;
+  short int num;
   state *states[1];
 } transitions;
 
@@ -156,9 +160,9 @@ typedef struct
     if (!TRANSITION_IS_DISABLED (Transitions, Iter))
 
 
-/* Return the state such SHIFTS contain a shift/goto to it on S.
+/* Return the state such SHIFTS contain a shift/goto to it on SYM.
    Abort if none found.  */
-struct state *transitions_to (transitions *shifts, symbol_number s);
+struct state *transitions_to (transitions *shifts, symbol_number sym);
 
 
 /*-------.
@@ -167,7 +171,7 @@ struct state *transitions_to (transitions *shifts, symbol_number s);
 
 typedef struct
 {
-  short num;
+  short int num;
   symbol *symbols[1];
 } errs;
 
@@ -180,7 +184,7 @@ errs *errs_new (int num, symbol **tokens);
 
 typedef struct
 {
-  short num;
+  short int num;
   bitset *lookaheads;
   rule *rules[1];
 } reductions;
@@ -208,7 +212,7 @@ struct state
 
   /* Its items.  Must be last, since ITEMS can be arbitrarily large.
      */
-  unsigned short nitems;
+  unsigned short int nitems;
   item_number items[1];
 };