Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 01:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let yytranslate handle the eof case.

Browse Source 
* data/lalr1.cc (yytranslate_): Handle the EOF case.
	Adjust callers.
	No longer expect yychar to be equal to yyeof_, rather, test the
	lookahead's (translated) kind.
This commit is contained in:
Akim Demaille
2008-08-18 22:16:40 +02:00
parent 27cb5b5901
commit aba12ad162
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2008-11-11 Akim Demaille <demaille@gostai.com>
Let yytranslate handle the eof case.
* data/lalr1.cc (yytranslate_): Handle the EOF case.
Adjust callers.
No longer expect yychar to be equal to yyeof_, rather, test the
lookahead's (translated) kind.
2008-11-11 Akim Demaille <demaille@gostai.com> 2008-11-11 Akim Demaille <demaille@gostai.com>
yychar cannot be empty in yyerrlab. yychar cannot be empty in yyerrlab.

23
data/lalr1.cc
View File

@@ -1149,19 +1149,14 @@ m4_popdef([b4_at_dollar])])dnl
[[YYSTYPE*], [&yyla.value]][]dnl [[YYSTYPE*], [&yyla.value]][]dnl
b4_locations_if([, [[location*], [&yyla.location]]])dnl b4_locations_if([, [[location*], [&yyla.location]]])dnl
m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
// Convert token to internal form.
yyla.type = yytranslate_ (yychar);
// Beware that yylex may return -2 to mean EOF, but which
// turns out to the be value of YYEMPTY.
yychar = !yyempty_;
} }
/* Convert token to internal form. */ YY_SYMBOL_PRINT ("Next token is", yyla);
if (yychar <= yyeof_)
{
yychar = yyla.type = yyeof_;
YYCDEBUG << "Now at end of input." << std::endl;
}
else
{
yyla.type = yytranslate_ (yychar);
YY_SYMBOL_PRINT ("Next token is", yyla);
}
/* If the proper action on seeing token YYLA.TYPE is to reduce or /* If the proper action on seeing token YYLA.TYPE is to reduce or
to detect an error, take that action. */ to detect an error, take that action. */
@@ -1284,7 +1279,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
error, discard it. */ error, discard it. */
/* Return failure if at end of input. */ /* Return failure if at end of input. */
if (yychar == yyeof_) if (yyla.type == yyeof_)
YYABORT; YYABORT;
else else
{]b4_assert_if([ {]b4_assert_if([
@@ -1536,7 +1531,9 @@ b4_error_verbose_if([ tok])[)
const unsigned int user_token_number_max_ = ]b4_user_token_number_max[; const unsigned int user_token_number_max_ = ]b4_user_token_number_max[;
const token_number_type undef_token_ = ]b4_undef_token_number[; const token_number_type undef_token_ = ]b4_undef_token_number[;
if (static_cast<unsigned int> (t) <= user_token_number_max_) if (t <= yyeof_)
return yyeof_;
else if (static_cast<unsigned int> (t) <= user_token_number_max_)
return translate_table[t]; return translate_table[t];
else else
return undef_token_; return undef_token_;