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

java: rename YYMORE as YYPUSH_MORE for consistency with C

Browse Source 
http://lists.gnu.org/archive/html/bison-patches/2013-06/msg00008.html

* data/lalr1.java, doc/bison.texi, tests/javapush.at:
s/YYMORE/YYPUSH_MORE.
This commit is contained in:
Akim Demaille
2013-06-24 09:32:22 +02:00
parent 58b465ae5f
commit 45c64fa627
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/lalr1.java
View File

@@ -419,7 +419,7 @@ b4_lexer_if([[
/** /**
* Returned by a Bison action in order to request a new token. * Returned by a Bison action in order to request a new token.
*/ */
public static final int YYMORE = 4;])[ public static final int YYPUSH_MORE = 4;])[
/** /**
* Returned by a Bison action in order to start error recovery without * Returned by a Bison action in order to start error recovery without
@@ -564,7 +564,7 @@ b4_define_state])[
* @@param yylexval current lval * @@param yylexval current lval
]b4_locations_if([ * @@param yylexloc current position])[ ]b4_locations_if([ * @@param yylexloc current position])[
* *
* @@return <tt>YYACCEPT, YYABORT, YYMORE</tt> * @@return <tt>YYACCEPT, YYABORT, YYPUSH_MORE</tt>
*/ */
public int push_parse (int yylextoken, b4_yystype yylexval[]b4_locations_if([, b4_location_type yylexloc])) public int push_parse (int yylextoken, b4_yystype yylexval[]b4_locations_if([, b4_location_type yylexloc]))
b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])])[ b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])])[
@@ -632,7 +632,7 @@ b4_dollar_popdef[]dnl
{ {
]b4_push_if([[ ]b4_push_if([[
if (!push_token_consumed) if (!push_token_consumed)
return YYMORE; return YYPUSH_MORE;
yycdebug ("Reading a token: "); yycdebug ("Reading a token: ");
yychar = yylextoken; yychar = yylextoken;
yylval = yylexval;]b4_locations_if([ yylval = yylexval;]b4_locations_if([
@@ -870,7 +870,7 @@ b4_dollar_popdef[]dnl
* @@param yylexval current lval * @@param yylexval current lval
* @@param yyylexpos current position * @@param yyylexpos current position
* *
* @@return <tt>YYACCEPT, YYABORT, YYMORE</tt> * @@return <tt>YYACCEPT, YYABORT, YYPUSH_MORE</tt>
*/ */
public int push_parse (int yylextoken, b4_yystype yylexval, b4_position_type yylexpos) public int push_parse (int yylextoken, b4_yystype yylexval, b4_position_type yylexpos)
b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])]) b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])
@@ -901,7 +901,7 @@ b4_both_if([[
yylexer.getEndPos ());])[ yylexer.getEndPos ());])[
]b4_locations_if([status = push_parse(token,lval,yyloc);],[ ]b4_locations_if([status = push_parse(token,lval,yyloc);],[
status = push_parse(token,lval);])[ status = push_parse(token,lval);])[
} while (status == YYMORE); } while (status == YYPUSH_MORE);
return (status == YYACCEPT); return (status == YYACCEPT);
} }
]])[ ]])[

4
doc/bison.texi
View File

@@ -11927,8 +11927,8 @@ parameters are available only if location tracking is active.
The value returned by the @code{push_parse} method is one of the following The value returned by the @code{push_parse} method is one of the following
four constants: @code{YYABORT}, @code{YYACCEPT}, @code{YYERROR}, or four constants: @code{YYABORT}, @code{YYACCEPT}, @code{YYERROR}, or
@code{YYMORE}. This new value, @code{YYMORE}, may be returned if more input @code{YYPUSH_MORE}. This new value, @code{YYPUSH_MORE}, may be returned if
is required to finish parsing the grammar. more input is required to finish parsing the grammar.
If api.push-pull is declared as @code{both}, then the generated parser class If api.push-pull is declared as @code{both}, then the generated parser class
will also implement the @code{parse} method. This method's body is a loop will also implement the @code{parse} method. This method's body is a loop

16
tests/javapush.at
View File

@@ -83,7 +83,7 @@ m4_define([AT_TRIVIAL_COMMON],[
} }
static String[[]] teststatename static String[[]] teststatename
= new String[[]]{"YYACCEPT","YYABORT","YYERROR","UNKNOWN","YYMORE"}; = new String[[]]{"YYACCEPT","YYABORT","YYERROR","UNKNOWN","YYPUSH_MORE"};
static void check(int teststate, int expected, String msg) static void check(int teststate, int expected, String msg)
{ {
@@ -110,16 +110,16 @@ m4_define([AT_TRIVIAL_PARSER],[
setup(); setup();
teststate = parser.push_parse('a', null); teststate = parser.push_parse('a', null);
check(teststate,YYParser.YYMORE,"push_parse('a', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('a', null)");
setup(); setup();
teststate = parser.push_parse('a', null); teststate = parser.push_parse('a', null);
check(teststate,YYParser.YYMORE,"push_parse('a', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('a', null)");
teststate = parser.push_parse('b', null); teststate = parser.push_parse('b', null);
check(teststate,YYParser.YYMORE,"push_parse('b', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('b', null)");
teststate = parser.push_parse('c', null); teststate = parser.push_parse('c', null);
check(teststate,YYParser.YYMORE,"push_parse('c', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('c', null)");
teststate = parser.push_parse('\0', null); teststate = parser.push_parse('\0', null);
check(teststate,YYParser.YYACCEPT,"push_parse('\\0', null)"); check(teststate,YYParser.YYACCEPT,"push_parse('\\0', null)");
@@ -147,11 +147,11 @@ m4_define([AT_TRIVIAL_PARSER_INITIAL_ACTION],[
setup(); setup();
teststate = parser.push_parse('a', null); teststate = parser.push_parse('a', null);
check(teststate,YYParser.YYMORE,"push_parse('a', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('a', null)");
teststate = parser.push_parse('b', null); teststate = parser.push_parse('b', null);
check(teststate,YYParser.YYMORE,"push_parse('b', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('b', null)");
teststate = parser.push_parse('c', null); teststate = parser.push_parse('c', null);
check(teststate,YYParser.YYMORE,"push_parse('c', null)"); check(teststate,YYParser.YYPUSH_MORE,"push_parse('c', null)");
teststate = parser.push_parse('\0', null); teststate = parser.push_parse('\0', null);
check(teststate,YYParser.YYACCEPT,"push_parse('\\0', null)"); check(teststate,YYParser.YYACCEPT,"push_parse('\\0', null)");