From 9e6e7ed2b275cba4dcc75fca6a8f0768285e4c6b Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 11 Jun 2006 08:16:04 +0000
Subject: [PATCH] * NEWS: Reword the post-2.3 change to not be so optimistic
 about removing the old "look-ahead" spelling. Update previous
 look-ahead/lookahead change reports. * REFERENCES: look-ahead -> lookahead
 (since that's what he actually wrote). * doc/refcard.tex: look ahead ->
 lookahead, look-ahead -> lookahead

---
 ChangeLog       | 10 ++++++++++
 NEWS            | 10 +++++-----
 REFERENCES      |  2 +-
 doc/refcard.tex |  6 +++---
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2e037d1..68088e4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* NEWS: Reword the post-2.3 change to not be so optimistic about
+	removing the old "look-ahead" spelling.
+	Update previous look-ahead/lookahead change reports.
+	* REFERENCES: look-ahead -> lookahead (since that's
+	what he actually wrote).
+	* doc/refcard.tex: look ahead -> lookahead,
+	look-ahead -> lookahead
+
 2006-06-09  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	For consistency, use `lookahead' instead of `look-ahead' or
diff --git a/NEWS b/NEWS
index 13eaa358..2e757516 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ Bison News
 Changes in version 2.3+:
 
 * The option `--report=look-ahead' has been changed to `--report=lookahead'.
-  The old spelling still works but is not documented and will be removed.
+  The old spelling still works, but is not documented and may be removed
+  in a future release.
 
 Changes in version 2.3, 2006-06-05:
 
@@ -164,8 +165,7 @@ Changes in version 2.0, 2004-12-25:
     This is a GNU extension.
 
   - The option `--report=lookahead' was changed to `--report=look-ahead'.
-    The old spelling still works, but is not documented and will be
-    removed.
+    [However, this was changed back after 2.3.]
 
   - Experimental %destructor support has been added to lalr1.cc.
 
@@ -432,8 +432,8 @@ Changes in version 1.50, 2002-10-04:
   produces additional information:
   - itemset
     complete the core item sets with their closure
-  - lookahead [changed to `look-ahead' in 1.875e and later]
-    explicitly associate look-ahead tokens to items
+  - lookahead [changed to `look-ahead' in 1.875e through 2.3, but changed back]
+    explicitly associate lookahead tokens to items
   - solved
     describe shift/reduce conflicts solving.
     Bison used to systematically output this information on top of
diff --git a/REFERENCES b/REFERENCES
index 075d9b9a..23084822 100644
--- a/REFERENCES
+++ b/REFERENCES
@@ -19,7 +19,7 @@ kludges that Johnson had to perpetrate to make Yacc fit in a PDP-11.
 Also, Bison uses a faster but less space-efficient encoding for the
 parse tables (see Corbett's PhD thesis from Berkeley, "Static
 Semantics in Compiler Error Recovery", June 1985, Report No. UCB/CSD
-85/251), and more modern technique for generating the look-ahead sets.
+85/251), and more modern technique for generating the lookahead sets.
 (See Frank DeRemer and Thomas Pennello, "Efficient Computation of
 LALR(1) Look-Ahead Sets", ACM Transactions on Programming Languages
 and Systems (TOPLAS) 4, 4 (October 1982), 615-649.  Their
diff --git a/doc/refcard.tex b/doc/refcard.tex
index 3f2ec9b3..659a8df8 100644
--- a/doc/refcard.tex
+++ b/doc/refcard.tex
@@ -458,7 +458,7 @@ as either {\tt first_column} or {\tt last_column}.
 \section {Variables and Types}
 %*****************************
 
-\key{Current look ahead token.}                {yychar}
+\key{Current lookahead token.}                 {yychar}
 \key{Debug mode flag.}                         {yydebug}
 \key{Data associated with the current token.}  {yylval}
 \key{Source position of current token.}        {yylloc}
@@ -489,8 +489,8 @@ as either {\tt first_column} or {\tt last_column}.
 \key{Quit parsing immediately. Return 1.}           {YYABORT}
 \key{Quit parsing immediately. Return 0.}           {YYACCEPT}
 \key{Pretend a syntax error occurred.}              {YYERROR}
-\key{Value in {\tt yychar} if no look-ahead token.} {YYEMPTY}
-\key{Clear previous look ahead token.}              {yyclearin}
+\key{Value in {\tt yychar} if no lookahead token.}  {YYEMPTY}
+\key{Clear previous lookahead token.}               {yyclearin}
 \key{Recover normally from an error.}               {yyerrok}
 
 % **************
-- 
2.50.0

