For consistency, use `lookahead' instead of `look-ahead' or

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index abcdcd5d604163278d29f19f5b5919ad55cfd556..b8877f82600c9aafe4d6af6180279f941054fc1c 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -156,7 +156,7 @@ b4_syncline([@oline@], [@ofile@])
 
     /// Generate an error message.
     /// \param state   the state where the error occurred.
-    /// \param tok     the look-ahead token.
+    /// \param tok     the lookahead token.
     virtual std::string yysyntax_error_ (int yystate]dnl
 b4_error_verbose_if([, int tok])[);
 
@@ -515,7 +515,7 @@ namespace ]b4_namespace[
   int
   ]b4_parser_class_name[::parse ()
   {
-    /// Look-ahead and look-ahead in internal form.
+    /// Lookahead and lookahead in internal form.
     int yychar = yyempty_;
     int yytoken = 0;
 
@@ -528,9 +528,9 @@ namespace ]b4_namespace[
     int yynerrs_ = 0;
     int yyerrstatus_ = 0;
 
-    /// Semantic value of the look-ahead.
+    /// Semantic value of the lookahead.
     semantic_type yylval;
-    /// Location of the look-ahead.
+    /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
     location yyerror_range[2];
@@ -573,12 +573,12 @@ b4_syncline([@oline@], [@ofile@])])dnl
     /* Backup.  */
   yybackup:
 
-    /* Try to take a decision without look-ahead.  */
+    /* Try to take a decision without lookahead.  */
     yyn = yypact_[yystate];
     if (yyn == yypact_ninf_)
       goto yydefault;
 
-    /* Read a look-ahead token.  */
+    /* Read a lookahead token.  */
     if (yychar == yyempty_)
       {
        YYCDEBUG << "Reading a token: ";
@@ -621,7 +621,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
     if (yyn == yyfinal_)
       goto yyacceptlab;
 
-    /* Shift the look-ahead token.  */
+    /* Shift the lookahead token.  */
     YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
     /* Discard the token being shifted unless it is eof.  */
@@ -710,7 +710,7 @@ b4_error_verbose_if([, yytoken])[));
     yyerror_range[0] = yylloc;
     if (yyerrstatus_ == 3)
       {
-       /* If just tried and failed to reuse look-ahead token after an
+       /* If just tried and failed to reuse lookahead token after an
         error, discard it.  */
 
        if (yychar <= yyeof_)
@@ -726,7 +726,7 @@ b4_error_verbose_if([, yytoken])[));
          }
       }
 
-    /* Else will try to reuse look-ahead token after shifting the error
+    /* Else will try to reuse lookahead token after shifting the error
        token.  */
     goto yyerrlab1;
 
@@ -788,7 +788,7 @@ b4_error_verbose_if([, yytoken])[));
 
     yyerror_range[1] = yylloc;
     // Using YYLLOC is tempting, but would change the location of
-    // the look-ahead.  YYLOC is available though.
+    // the lookahead.  YYLOC is available though.
     YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yyloc);