maint: prepare forthcoming changes

[bison.git] / data / java.m4

diff --git a/data/java.m4 b/data/java.m4
index 6636bd69fdc404f0c05b47a99ff616f0a041b751..1b8666e4672b3dfc1e72c2eb21ba9419875ef7e9 100644 (file)
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,7 +2,7 @@
 
 # Java language support for Bison
 
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -147,7 +147,7 @@ m4_define([b4_integral_parser_table_define],
 # Output the definition of this token as an enum.
 m4_define([b4_token_enum],
 [    /** Token number, to be returned by the scanner.  */
-    static final int b4_percent_define_get([token.prefix])$1 = $2;
+    static final int b4_percent_define_get([api.tokens.prefix])$1 = $2;
 ])
 
 
@@ -169,6 +169,13 @@ m4_define([b4_case], [  case $1:
   break;
     ])
 
+# b4_predicate_case(LABEL, CONDITIONS)
+# ------------------------------------
+m4_define([b4_predicate_case], [  case $1:
+     if (! ($2)) YYERROR;
+    break;
+    ])
+
 
 ## ---------------- ##
 ## Default values.  ##