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

java: prefer null to YYSYMBOL_YYEMPTY

Browse Source 
That's one nice benefit from using enums.

* data/skeletons/lalr1.java (YYSYMBOL_YYEMPTY): No longer define it.
Use 'null' instead.
* examples/java/calc/Calc.y, tests/local.at: Adjust.
This commit is contained in:
Akim Demaille
2020-04-06 15:13:19 +02:00
parent c0ccb8e5b4
commit 3dcfb4fd88
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/skeletons/lalr1.java
View File

@@ -55,7 +55,7 @@ b4_use_push_for_pull_if([
m4_define([b4_define_state],[[
/* Lookahead and lookahead in internal form. */
int yychar = YYEMPTY_;
SymbolKind yytoken = SymbolKind.YYSYMBOL_YYEMPTY;
SymbolKind yytoken = null;
/* State. */
int yyn = 0;
@@ -681,7 +681,7 @@ b4_dollar_popdef[]dnl
{
++yynerrs;
if (yychar == YYEMPTY_)
yytoken = SymbolKind.YYSYMBOL_YYEMPTY;
yytoken = null;
yyreportSyntaxError (new Context (yystack, yytoken]b4_locations_if([[, yylloc]])[));
}
@@ -795,7 +795,7 @@ b4_dollar_popdef[]dnl
{
/* Lookahead and lookahead in internal form. */
this.yychar = YYEMPTY_;
this.yytoken = SymbolKind.YYSYMBOL_YYEMPTY;
this.yytoken = null;
/* State. */
this.yyn = 0;
@@ -972,7 +972,7 @@ b4_dollar_popdef[]dnl
to an error action in a later state.
*/
int yycount = 0;
if (yyctx.getToken () != SymbolKind.YYSYMBOL_YYEMPTY)
if (yyctx.getToken () != null)
{
yyarg[yycount++] = yyctx.getToken ();
yycount += yyctx.getExpectedTokens (yyarg, 1, yyargn);