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

glr: comment changes

Browse Source 
* data/skeletons/glr.c: A bit more doc.
(yypstates): Rename yyst (only occurrence) to yys (commonly used for
yyGLRState).
* data/skeletons/glr2.cc: Ditto.
Prefer '\n' to "\n".
This commit is contained in:
Akim Demaille
2020-12-25 08:52:28 +01:00
parent 32bb53870b
commit 7dc942dca3
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/skeletons/glr.c
View File

@@ -2651,6 +2651,7 @@ b4_dollar_popdef])[]dnl
/* DEBUGGING ONLY */ /* DEBUGGING ONLY */
#if ]b4_api_PREFIX[DEBUG #if ]b4_api_PREFIX[DEBUG
/* Print *YYS and its predecessors. */
static void static void
yy_yypstack (yyGLRState* yys) yy_yypstack (yyGLRState* yys)
{ {
@@ -2662,22 +2663,25 @@ yy_yypstack (yyGLRState* yys)
YY_FPRINTF ((stderr, "%d@@%ld", yys->yylrState, YY_CAST (long, yys->yyposn))); YY_FPRINTF ((stderr, "%d@@%ld", yys->yylrState, YY_CAST (long, yys->yyposn)));
} }
/* Print YYS (possibly NULL) and its predecessors. */
static void static void
yypstates (yyGLRState* yyst) yypstates (yyGLRState* yys)
{ {
if (yyst == YY_NULLPTR) if (yys == YY_NULLPTR)
YY_FPRINTF ((stderr, "<null>")); YY_FPRINTF ((stderr, "<null>"));
else else
yy_yypstack (yyst); yy_yypstack (yys);
YY_FPRINTF ((stderr, "\n")); YY_FPRINTF ((stderr, "\n"));
} }
/* Print the stack #YYK. */
static void static void
yypstack (yyGLRStack* yystackp, YYPTRDIFF_T yyk) yypstack (yyGLRStack* yystackp, YYPTRDIFF_T yyk)
{ {
yypstates (yystackp->yytops.yystates[yyk]); yypstates (yystackp->yytops.yystates[yyk]);
} }
/* Print all the stacks. */
static void static void
yypdumpstack (yyGLRStack* yystackp) yypdumpstack (yyGLRStack* yystackp)
{ {

15
data/skeletons/glr2.cc
View File

@@ -1820,7 +1820,7 @@ public:
yyreportTree (*yyx0, 2); yyreportTree (*yyx0, 2);
std::cerr << "\nOption 2,\n"; std::cerr << "\nOption 2,\n";
yyreportTree (*yyx1, 2); yyreportTree (*yyx1, 2);
std::cerr << "\n"; std::cerr << '\n';
#endif #endif
yyparser.error (]b4_locations_if([*yylocp, ])[YY_("syntax is ambiguous")); yyparser.error (]b4_locations_if([*yylocp, ])[YY_("syntax is ambiguous"));
@@ -1829,14 +1829,15 @@ public:
/* DEBUGGING ONLY */ /* DEBUGGING ONLY */
#if ]b4_api_PREFIX[DEBUG #if ]b4_api_PREFIX[DEBUG
/* Print YYS (possibly NULL) and its predecessors. */
void void
yypstates (const glr_state* yyst) yypstates (const glr_state* yys)
{ {
if (yyst != YY_NULLPTR) if (yys != YY_NULLPTR)
yyst->yy_yypstack(); yys->yy_yypstack();
else else
std::cerr << "<null>"; std::cerr << "<null>";
std::cerr << "\n"; std::cerr << '\n';
} }
#endif #endif
@@ -2778,7 +2779,7 @@ yygetToken (int& yycharp, ]b4_namespace_ref[::]b4_parser_class[& yyparser, glr_s
} }
catch (const ]b4_namespace_ref[::]b4_parser_class[::syntax_error& yyexc) catch (const ]b4_namespace_ref[::]b4_parser_class[::syntax_error& yyexc)
{ {
YY_DEBUG_STREAM << "Caught exception: " << yyexc.what() << "\n";]b4_locations_if([ YY_DEBUG_STREAM << "Caught exception: " << yyexc.what() << '\n';]b4_locations_if([
yylloc = yyexc.location;])[ yylloc = yyexc.location;])[
yyparser.error (]b4_locations_if([yylloc, ])[yyexc.what ()); yyparser.error (]b4_locations_if([yylloc, ])[yyexc.what ());
// Map errors caught in the scanner to the error token, so that error // Map errors caught in the scanner to the error token, so that error
@@ -2993,7 +2994,7 @@ b4_dollar_popdef])[]dnl
while (true) while (true)
{ {
const state_num yystate = yystack.firstTopState()->yylrState; const state_num yystate = yystack.firstTopState()->yylrState;
YY_DEBUG_STREAM << "Entering state " << yystate << "\n"; YY_DEBUG_STREAM << "Entering state " << yystate << '\n';
if (yystate == YYFINAL) if (yystate == YYFINAL)
goto yyacceptlab; goto yyacceptlab;
if (yyisDefaultedState (yystate)) if (yyisDefaultedState (yystate))