java: rename YYMORE as YYPUSH_MORE for consistency with C

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.

diff --git a/data/lalr1.java b/data/lalr1.java
index 159882395d689f892106231267e8b4fb9af15ade..d137ed814b9eddee6ce11ea08f949b2872686bf6 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -419,7 +419,7 @@ b4_lexer_if([[
   /**
    * 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
@@ -564,7 +564,7 @@ b4_define_state])[
    * @@param yylexval current lval
 ]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]))
       b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])])[
@@ -632,7 +632,7 @@ b4_dollar_popdef[]dnl
           {
 ]b4_push_if([[
             if (!push_token_consumed)
-              return YYMORE;
+              return YYPUSH_MORE;
             yycdebug ("Reading a token: ");
             yychar = yylextoken;
             yylval = yylexval;]b4_locations_if([
@@ -870,7 +870,7 @@ b4_dollar_popdef[]dnl
    * @@param yylexval current lval
    * @@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)
       b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])
@@ -901,7 +901,7 @@ b4_both_if([[
                                               yylexer.getEndPos ());])[
         ]b4_locations_if([status = push_parse(token,lval,yyloc);],[
         status = push_parse(token,lval);])[
-      } while (status == YYMORE);
+      } while (status == YYPUSH_MORE);
       return (status == YYACCEPT);
   }
 ]])[

diff --git a/doc/bison.texi b/doc/bison.texi
index bd023edf268f465d5a036e59c1ad5be468daeb83..78d7d060bb17c7a67f92748cbdabcc1bde3e7d08 100644 (file)
--- a/doc/bison.texi
+++ b/doc/bison.texi
@@ -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
 four constants: @code{YYABORT}, @code{YYACCEPT}, @code{YYERROR}, or
-@code{YYMORE}.  This new value, @code{YYMORE}, may be returned if more input
-is required to finish parsing the grammar.
+@code{YYPUSH_MORE}.  This new value, @code{YYPUSH_MORE}, may be returned if
+more input is required to finish parsing the grammar.
 
 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

diff --git a/tests/javapush.at b/tests/javapush.at
index 306b37d44e9b6076d51ee0b658b6dc648e041f9c..2f71053366b3c152b05b41456f5e40938fc25f72 100644 (file)
--- a/tests/javapush.at
+++ b/tests/javapush.at
@@ -83,7 +83,7 @@ m4_define([AT_TRIVIAL_COMMON],[
   }
 
   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)
   {
@@ -110,16 +110,16 @@ m4_define([AT_TRIVIAL_PARSER],[
       setup();
 
       teststate = parser.push_parse('a', null);
-      check(teststate,YYParser.YYMORE,"push_parse('a', null)");
+      check(teststate,YYParser.YYPUSH_MORE,"push_parse('a', null)");
 
       setup();
 
       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);
-      check(teststate,YYParser.YYMORE,"push_parse('b', null)");
+      check(teststate,YYParser.YYPUSH_MORE,"push_parse('b', 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);
       check(teststate,YYParser.YYACCEPT,"push_parse('\\0', null)");
 
@@ -147,11 +147,11 @@ m4_define([AT_TRIVIAL_PARSER_INITIAL_ACTION],[
       setup();
 
       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);
-      check(teststate,YYParser.YYMORE,"push_parse('b', null)");
+      check(teststate,YYParser.YYPUSH_MORE,"push_parse('b', 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);
       check(teststate,YYParser.YYACCEPT,"push_parse('\\0', null)");