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

glr2.cc: use the same format for traces as glr.c

Browse Source 
* data/skeletons/glr2.cc: here.
This allows to share the same expected output.
This commit is contained in:
Akim Demaille
2020-12-06 10:08:19 +01:00
parent 3301849f0f
commit 4beefee4bf
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/skeletons/glr2.cc
View File

@@ -1589,7 +1589,8 @@ class state_stack {
int yynrhs = yyrhsLength (yyrule);]b4_locations_if([ int yynrhs = yyrhsLength (yyrule);]b4_locations_if([
int yylow = 1;])[ int yylow = 1;])[
int yyi; int yyi;
std::cerr << "Reducing stack " << yyk.get() << " by rule " << yyrule - 1 << " (line " << yyrline[yyrule] << "):\n"; std::cerr << "Reducing stack " << yyk.get() << " by rule " << yyrule - 1
<< " (line " << int (yyrline[yyrule]) << "):\n";
if (! yynormal) if (! yynormal)
yyfillin (yyvsp, 1, -yynrhs); yyfillin (yyvsp, 1, -yynrhs);
/* The symbols being reduced. */ /* The symbols being reduced. */
@@ -2077,7 +2078,7 @@ public:
{ {
state_set_index yynewStack = yystateStack.yysplitStack (yyk); state_set_index yynewStack = yystateStack.yysplitStack (yyk);
YY_DEBUG_STREAM << "Splitting off stack " << yynewStack.get() YY_DEBUG_STREAM << "Splitting off stack " << yynewStack.get()
<< " from " << yyk.get() << '\n'; << " from " << yyk.get() << ".\n";
YYRESULTTAG yyflag = YYRESULTTAG yyflag =
yyglrReduce (yynewStack, *yyconflicts, yyglrReduce (yynewStack, *yyconflicts,
yyimmediate[*yyconflicts]); yyimmediate[*yyconflicts]);
@@ -2274,10 +2275,11 @@ public:
YYRESULTTAG yyflag = yydoAction (yyk, yyrule, &yysval]b4_locations_if([, &loc])[); YYRESULTTAG yyflag = yydoAction (yyk, yyrule, &yysval]b4_locations_if([, &loc])[);
if (yyflag == yyerr && yystateStack.isSplit()) if (yyflag == yyerr && yystateStack.isSplit())
{ {]b4_parse_trace_if([[
YY_DEBUG_STREAM << "Parse on stack " << yyk.get() YY_DEBUG_STREAM << "Parse on stack " << yyk.get()
<< " rejected by rule #" << yyrule - 1 << ".\n"; << " rejected by rule " << yyrule - 1
} << " (line " << int (yyrline[yyrule]) << ").\n";
]])[}
if (yyflag != yyok) if (yyflag != yyok)
return yyflag; return yyflag;
YY_SYMBOL_PRINT ("-> $$ =", static_cast<yysymbol_kind_t>(yyr1[yyrule]), &yysval, &loc); YY_SYMBOL_PRINT ("-> $$ =", static_cast<yysymbol_kind_t>(yyr1[yyrule]), &yysval, &loc);
@@ -2296,11 +2298,11 @@ public:
YYASSERT (yys != YY_NULLPTR); YYASSERT (yys != YY_NULLPTR);
} }
yystateStack.yyupdateSplit (*yys); yystateStack.yyupdateSplit (*yys);
state_num yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule)); state_num yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule));]b4_parse_trace_if([[
YY_DEBUG_STREAM << "Reduced stack " << yyk.get() YY_DEBUG_STREAM << "Reduced stack " << yyk.get()
<< " by rule #" << yyrule - 1 << " by rule " << yyrule - 1 << " (line " << int (yyrline[yyrule])
<< "; action deferred. Now in state " << yynewLRState << "); action deferred. Now in state " << yynewLRState
<< ".\n"; << ".\n";]])[
for (state_set_index yyi = create_state_set_index(0); yyi.uget() < yystateStack.numTops(); ++yyi) for (state_set_index yyi = create_state_set_index(0); yyi.uget() < yystateStack.numTops(); ++yyi)
if (yyi != yyk && yystateStack.topAt(yyi) != YY_NULLPTR) if (yyi != yyk && yystateStack.topAt(yyi) != YY_NULLPTR)
{ {