diff options
author | Akim Demaille <akim.demaille@gmail.com> | 2019-08-30 07:38:13 -0500 |
---|---|---|
committer | Akim Demaille <akim.demaille@gmail.com> | 2019-09-14 10:09:08 +0200 |
commit | a3e201de023615009948ffab9f1701bd92e2dec3 (patch) | |
tree | 790f6ef81128992857337d851151481c3533400d /data/skeletons | |
parent | 5e95bb6251cc1089e95cb5b1ec8f08f029b60131 (diff) | |
download | bison-a3e201de023615009948ffab9f1701bd92e2dec3.tar.gz |
java: handle eof in yytranslate
* data/skeletons/lalr1.java (yytranslate_): Handle eof here, as is done
in lalr1.cc.
* tests/javapush.at: Adjust.
Diffstat (limited to 'data/skeletons')
-rw-r--r-- | data/skeletons/lalr1.java | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/data/skeletons/lalr1.java b/data/skeletons/lalr1.java index af120404..08e8f58b 100644 --- a/data/skeletons/lalr1.java +++ b/data/skeletons/lalr1.java @@ -1,4 +1,4 @@ -# Java skeleton for Bison -*- autoconf -*- +# Java skeleton for Bison -*- autoconf -*- # Copyright (C) 2007-2015, 2018-2019 Free Software Foundation, Inc. @@ -631,17 +631,9 @@ b4_dollar_popdef[]dnl } /* Convert token to internal form. */ - if (yychar <= Lexer.EOF) - { - yychar = yytoken = Lexer.EOF;]b4_parse_trace_if([[ - yycdebug ("Now at end of input.\n");]])[ - } - else - { - yytoken = yytranslate_ (yychar);]b4_parse_trace_if([[ - yySymbolPrint ("Next token is", yytoken, - yylval]b4_locations_if([, yylloc])[);]])[ - } + yytoken = yytranslate_ (yychar);]b4_parse_trace_if([[ + yySymbolPrint ("Next token is", yytoken, + yylval]b4_locations_if([, yylloc])[);]])[ /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ @@ -1026,7 +1018,9 @@ b4_dollar_popdef[]dnl } ]], [[ { - if (0 <= t && t <= yyuser_token_number_max_) + if (t <= 0) + return Lexer.EOF; + else if (t <= yyuser_token_number_max_) return yytranslate_table_[t]; else return yyundef_token_; |