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

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

3
TODO
View File

@@ -1,4 +1,7 @@
* Bison 3.6 * Bison 3.6
** syntax_error_arguments
Don't store the lookahead if !argv.
** Documentation ** Documentation
- yyexpected_tokens in all the languages. - yyexpected_tokens in all the languages.
- YYNOMEM - YYNOMEM

8
data/skeletons/lalr1.java
View File

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

2
examples/java/calc/Calc.y
View File

@@ -129,7 +129,7 @@ class CalcLexer implements Calc.Lexer {
} }
{ {
Calc.SymbolKind lookahead = ctx.getToken (); Calc.SymbolKind lookahead = ctx.getToken ();
if (lookahead != Calc.SymbolKind.YYSYMBOL_YYEMPTY) if (lookahead != null)
System.err.print (" before " + ctx.yysymbolName (lookahead)); System.err.print (" before " + ctx.yysymbolName (lookahead));
} }
System.err.println (""); System.err.println ("");

2
tests/local.at
View File

@@ -982,7 +982,7 @@ m4_define([AT_YYERROR_DEFINE(java)],
+ )["syntax error"); + )["syntax error");
{ {
Calc.SymbolKind token = ctx.getToken (); Calc.SymbolKind token = ctx.getToken ();
if (token != Calc.SymbolKind.YYSYMBOL_YYEMPTY) if (token != null)
System.err.print (" on token @<:@" + ctx.yysymbolName (token) + "@:>@"); System.err.print (" on token @<:@" + ctx.yysymbolName (token) + "@:>@");
} }
{ {