diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | parser.y | 6 |
2 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,12 @@ 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. + +2011-12-21 Kaz Kylheku <kaz@kylheku.com> + * Makefile (distclean): use rm -rf on mpi directory. 2011-12-20 Kaz Kylheku <kaz@kylheku.com> @@ -1012,8 +1012,8 @@ void yybadtoken(int tok, val context) else yyerrorf(lit("unexpected ~a"), problem, nao); else - if (context) - if (tok == YYEOF || tok == YYEMPTY) + if (context) /* Byacc sets yychar to 0 */ + if (tok == YYEOF || tok == YYEMPTY || tok == 0) 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) + else if (tok == YYEMPTY || tok == 0) return; else yyerrorf(lit("unexpected ~s"), chr(tok), nao); |