2007-01-30 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index 440cd466bf2a67e51cbe93093f221c5f079afb1e..a2ae217fa460d0a731f80d7fbcbd9d2525a8127d 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -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


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

-  bitset *look_ahead_tokens;
+  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,


@@ -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);