Bug #35139

Better fix.

* parser.y (YYEOF): If YYEOF is not defined, define it as zero.
(yybadtoken): Undo previous changes: do not test for zero.

2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e9e79c2..cba89b14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 
 	Bug #35139
 
+	Better fix.
+
+	* parser.y (YYEOF): If YYEOF is not defined, define it as zero.
+	(yybadtoken): Undo previous changes: do not test for zero.
+
+2011-12-21  Kaz Kylheku  <kaz@kylheku.com>
+
+	Bug #35139
+
 	* parser.y (yybadtoken): The current token (yychar) is 0 on byacc
 	rather than YYEOF or YYEMPTY, so we have to handle that.
 
diff --git a/parser.y b/parser.y
index d28acd69..ba440d91 100644
--- a/parser.y
+++ b/parser.y
@@ -962,7 +962,7 @@ val get_spec(void)
 }
 
 #ifndef YYEOF
-#define YYEOF YYEMPTY
+#define YYEOF 0
 #endif
 
 void yybadtoken(int tok, val context)
@@ -1013,7 +1013,7 @@ void yybadtoken(int tok, val context)
       yyerrorf(lit("unexpected ~a"), problem, nao);
   else
     if (context) /* Byacc sets yychar to 0 */
-      if (tok == YYEOF || tok == YYEMPTY || tok == 0)
+      if (tok == YYEOF || tok == YYEMPTY)
         yyerrorf(lit("unterminated ~a"), context, nao);
       else if (tok == '\n')
         yyerrorf(lit("newline in ~a"), context, nao);
@@ -1022,7 +1022,7 @@ void yybadtoken(int tok, val context)
     else
       if (tok == YYEOF)
         yyerrorf(lit("unexpected end of input"), nao);
-      else if (tok == YYEMPTY || tok == 0)
+      else if (tok == YYEMPTY)
         return;
       else
         yyerrorf(lit("unexpected ~s"), chr(tok), nao);