]> git.saurik.com Git - bison.git/commit - data/lalr1.cc
yysyntax_error: adjust prior fixes for branch-2.5's lalr1.cc.
authorJoel E. Denny <joeldenny@joeldenny.org>
Sun, 7 Nov 2010 21:10:09 +0000 (16:10 -0500)
committerJoel E. Denny <joeldenny@joeldenny.org>
Sun, 7 Nov 2010 21:10:09 +0000 (16:10 -0500)
commit3b8378825ea8c3d2cae8c615a9ebf1f679730895
treebad67e5dfd0e0036ec03585638423ad875f26cbc
parent095a1d11ca90852ad224bbf9823bf88b7fff9a57
yysyntax_error: adjust prior fixes for branch-2.5's lalr1.cc.

On master, there is no yychar in lalr1.cc, but there is on
branch-2.5, and the prior cherry-pick of "Fix handling of yychar
manipulation in user semantic actions" wasn't adjusted for that
difference.
* data/lalr1.cc (yy::parser::parse): Translate yychar before
every use of yytoken, and add comments explaining this approach.
* tests/conflicts.at (%error-verbose and consistent errors):
Extend to test yychar manipulation with lalr1.cc.
ChangeLog
data/lalr1.cc
tests/conflicts.at