Don't use m4_divert since it makes m4_divert_push and m4_divert_pop

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index 6954d80335aca232b30a8718795c51c09e8414cf..a2ae217fa460d0a731f80d7fbcbd9d2525a8127d 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 
 /* These type definitions are used to represent a nondeterministic
 
 
 /* These type definitions are used to represent a nondeterministic


@@ -46,11 +46,11 @@
    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.
 
    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 two types of actions are shifts/gotos (push the look-ahead token
+   The two types of actions are shifts/gotos (push the lookahead token

    and read another/goto to the state designated by a nterm) and
    reductions (combine the last n things on the stack via a rule,
    replace them with the symbol that the rule derives, and leave the
    and read another/goto to the state designated by a nterm) and
    reductions (combine the last n things on the stack via a rule,
    replace them with the symbol that the rule derives, and leave the

-   look-ahead token alone).  When the states are generated, these
+   lookahead token alone).  When the states are generated, these

    actions are represented in two other lists.
 
    Each transition structure describes the possible transitions out
    actions are represented in two other lists.
 
    Each transition structure describes the possible transitions out


@@ -94,8 +94,8 @@
 | Numbering states.  |
 `-------------------*/
 
 | Numbering states.  |
 `-------------------*/
 

-typedef short int state_number;
-# define STATE_NUMBER_MAXIMUM SHRT_MAX
+typedef int state_number;
+# define STATE_NUMBER_MAXIMUM INT_MAX

 
 /* Be ready to map a state_number to an int.  */
 static inline int
 
 /* Be ready to map a state_number to an int.  */
 static inline int


@@ -113,7 +113,7 @@ typedef struct state state;
 
 typedef struct
 {
 
 typedef struct
 {

-  short int num;
+  int num;

   state *states[1];
 } transitions;
 
   state *states[1];
 } transitions;
 


@@ -171,7 +171,7 @@ struct state *transitions_to (transitions *shifts, symbol_number sym);
 
 typedef struct
 {
 
 typedef struct
 {

-  short int num;
+  int num;

   symbol *symbols[1];
 } errs;
 
   symbol *symbols[1];
 } errs;
 


@@ -184,8 +184,8 @@ errs *errs_new (int num, symbol **tokens);
 
 typedef struct
 {
 
 typedef struct
 {

-  short int num;
-  bitset *look_ahead_tokens;
+  int num;
+  bitset *lookahead_tokens;

   rule *rules[1];
 } reductions;
 
   rule *rules[1];
 } reductions;
 


@@ -203,7 +203,7 @@ struct state
   reductions *reductions;
   errs *errs;
 
   reductions *reductions;
   errs *errs;
 

-  /* Nonzero if no look-ahead is needed to decide what to do in state S.  */
+  /* Nonzero if no lookahead is needed to decide what to do in state S.  */

   char consistent;
 
   /* If some conflicts were solved thanks to precedence/associativity,
   char consistent;
 
   /* If some conflicts were solved thanks to precedence/associativity,


@@ -212,7 +212,7 @@ struct state
 
   /* Its items.  Must be last, since ITEMS can be arbitrarily large.
      */
 
   /* Its items.  Must be last, since ITEMS can be arbitrarily large.
      */

-  unsigned short int nitems;
+  size_t nitems;

   item_number items[1];
 };
 
   item_number items[1];
 };
 


@@ -234,9 +234,9 @@ int state_reduction_find (state *s, rule *r);
 /* Set the errs of STATE.  */
 void state_errs_set (state *s, int num, symbol **errors);
 
 /* Set the errs of STATE.  */
 void state_errs_set (state *s, int num, symbol **errors);
 

-/* Print on OUT all the look-ahead tokens such that this STATE wants to
+/* Print on OUT all the lookahead tokens such that this STATE wants to

    reduce R.  */
    reduce R.  */

-void state_rule_look_ahead_tokens_print (state *s, rule *r, FILE *out);
+void state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out);

 
 /* Create/destroy the states hash table.  */
 void state_hash_new (void);
 
 /* Create/destroy the states hash table.  */
 void state_hash_new (void);