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

Make it possible to return a symbol_type from yylex.

Browse Source 
* data/lalr1.cc (b4_lex_symbol_if): New.
	(parse): When lex_symbol is defined, expected yylex to return the
	complete lookahead.
	* etc/bench.pl.in (generate_grammar_list): Extend to support this
	yylex interface.
	(bench_variant_parser): Exercise it.
This commit is contained in:
Akim Demaille
2008-08-19 21:39:03 +02:00
parent 64c1b92a4f
commit 0927787504
3 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
data/lalr1.cc
View File

@@ -53,6 +53,12 @@ b4_variant_if([
]) # b4_variant_if
# b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT])
# ----------------------------------------------------------------
m4_define([b4_lex_symbol_if],
[b4_percent_define_ifdef([[lex_symbol]], [$1], [$2])])
# b4_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])
# ------------------------------------------------
m4_define([b4_assert_if],
@@ -1144,14 +1150,15 @@ m4_popdef([b4_at_dollar])])dnl
/* Read a lookahead token. */
if (yyempty)
{
YYCDEBUG << "Reading a token: ";
yyla.type = yytranslate_ (]b4_c_function_call([yylex], [int],
YYCDEBUG << "Reading a token: ";
]b4_lex_symbol_if(
[ yyla = yylex();],
[ yyla.type = yytranslate_ (b4_c_function_call([yylex], [int],
[[YYSTYPE*], [&yyla.value]][]dnl
b4_locations_if([, [[location*], [&yyla.location]]])dnl
m4_ifdef([b4_lex_param], [, ]b4_lex_param))[);
m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
yyempty = false;
}
YY_SYMBOL_PRINT ("Next token is", yyla);
/* If the proper action on seeing token YYLA.TYPE is to reduce or