Check yyerrok in calc.at.

[bison.git] / data / java.m4

diff --git a/data/java.m4 b/data/java.m4
index 47b6008a4eb4083d911a002340a98569a6a88b02..9ee581a2ac17e6318e2bf5ee14c68dbb3a2f7b03 100644 (file)
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,22 +2,20 @@
 
 # Java language support for Bison
 
 
 # Java language support for Bison
 

-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.

 
 

-# This program is free software; you can redistribute it and/or modify
+# 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
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or

 # (at your option) any later version.
 # (at your option) any later version.

-
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-
+#

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 
 # b4_comment(TEXT)
 
 
 # b4_comment(TEXT)


@@ -34,21 +32,22 @@ m4_define([b4_flag_value], [b4_flag_if([$1], [true], [false])])
 
 # b4_public_if(TRUE, FALSE)
 # -------------------------
 
 # b4_public_if(TRUE, FALSE)
 # -------------------------

-b4_percent_define_default([public], 0)
+b4_percent_define_default([[public]], [[false]])

 m4_define([b4_public_if],
 [b4_percent_define_flag_if([public], [$1], [$2])])
 
 m4_define([b4_public_if],
 [b4_percent_define_flag_if([public], [$1], [$2])])
 

-# b4_single_class_if(TRUE, FALSE)
-# -------------------------------
-b4_percent_define_default([single_class], 0)
-m4_define([b4_single_class_if],
-[b4_percent_define_flag_if([single_class], [$1], [$2])])
-

 
 # b4_abstract_if(TRUE, FALSE)
 # ---------------------------
 
 # b4_abstract_if(TRUE, FALSE)
 # ---------------------------

+b4_percent_define_default([[abstract]], [[false]])

 m4_define([b4_abstract_if],
 m4_define([b4_abstract_if],

-[b4_pure_if([$2], [b4_single_class_if([$2], [$1])])])
+[b4_percent_define_flag_if([abstract], [$1], [$2])])
+
+
+# b4_lexer_if(TRUE, FALSE)
+# ------------------------
+m4_define([b4_lexer_if],
+[b4_percent_code_ifdef([[lexer]], [$1], [$2])])

 
 
 # b4_identification
 
 
 # b4_identification


@@ -76,7 +75,7 @@ m4_define([b4_identification],
 m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,   [-128],   [127]), [1], [byte],
        b4_ints_in($@, [-32768], [32767]), [1], [short],
 m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,   [-128],   [127]), [1], [byte],
        b4_ints_in($@, [-32768], [32767]), [1], [short],

-                                                      [int])])
+                                              [int])])

 
 # b4_int_type_for(NAME)
 # ---------------------
 
 # b4_int_type_for(NAME)
 # ---------------------


@@ -107,7 +106,7 @@ m4_define([b4_token_enum],
 # -----------------------------------------------------
 # Output the definition of the tokens (if there are) as enums.
 m4_define([b4_token_enums],
 # -----------------------------------------------------
 # Output the definition of the tokens (if there are) as enums.
 m4_define([b4_token_enums],

-[m4_if([$@], [[]], [],
+[m4_if([$#$1], [1], [],

 [/* Tokens.  */
 m4_map([b4_token_enum], [$@])])
 ])
 [/* Tokens.  */
 m4_map([b4_token_enum], [$@])])
 ])


@@ -126,8 +125,8 @@ m4_define([b4_case], [  case $1:
 ## Default values.  ##
 ## ---------------- ##
 
 ## Default values.  ##
 ## ---------------- ##
 

-m4_define([b4_union_name], [b4_percent_define_get([[union_name]])])
-b4_percent_define_default([[union_name]], [[Object]])])
+m4_define([b4_yystype], [b4_percent_define_get([[stype]])])
+b4_percent_define_default([[stype]], [[Object]])])

 
 m4_define_default([[b4_prefix]], [[YY]])])
 b4_percent_define_default([[parser_class_name]], [b4_prefix[]Parser])])
 
 m4_define_default([[b4_prefix]], [[YY]])])
 b4_percent_define_default([[parser_class_name]], [b4_prefix[]Parser])])


@@ -165,7 +164,7 @@ m4_define([b4_lhs_value], [yyval])
 # In this simple implementation, %token and %type have class names
 # between the angle brackets.
 m4_define([b4_rhs_value],
 # In this simple implementation, %token and %type have class names
 # between the angle brackets.
 m4_define([b4_rhs_value],

-[(m4_ifval([$3], [($3)])[](yystack.valueAt ($1-($2))))])
+[(m4_ifval($3, [($3)])[](yystack.valueAt ($1-($2))))])

 
 # b4_lhs_location()
 # -----------------
 
 # b4_lhs_location()
 # -----------------


@@ -199,25 +198,14 @@ m4_define([b4_parse_param], b4_parse_param))
 m4_define([b4_lex_param_decl],
 [m4_ifset([b4_lex_param],
           [b4_remove_comma([$1],
 m4_define([b4_lex_param_decl],
 [m4_ifset([b4_lex_param],
           [b4_remove_comma([$1],

-                          [m4_map([b4_lex_param_decl_1], [b4_lex_param])])],
+                          b4_param_decls(b4_lex_param))],

          [$1])])
 
          [$1])])
 

-m4_define([b4_lex_param_decl_1], [, $1])
-m4_define([b4_remove_comma], [m4_ifval([$1], [$1, ], [])m4_cdr([m4_cdr($@)])])
-
+m4_define([b4_param_decls],
+         [m4_map([b4_param_decl], [$@])])
+m4_define([b4_param_decl], [, $1])

 
 

-
-# b4_lex_param_call
-# -------------------
-# Extra initialisations of the constructor.
-m4_define([b4_lex_param_call],
-          [m4_ifset([b4_lex_param],
-                   [b4_remove_comma([$1],
-                                    [b4_lex_param_calls(b4_lex_param)])],
-                   [$1])])
-m4_define([b4_lex_param_calls],
-         [m4_map([b4_lex_param_call_1], [$@])])
-m4_define([b4_lex_param_call_1], [, $2])
+m4_define([b4_remove_comma], [m4_ifval($1, [$1, ], [])m4_shift2($@)])

 
 
 
 
 
 


@@ -227,11 +215,22 @@ m4_define([b4_lex_param_call_1], [, $2])
 m4_define([b4_parse_param_decl],
 [m4_ifset([b4_parse_param],
           [b4_remove_comma([$1],
 m4_define([b4_parse_param_decl],
 [m4_ifset([b4_parse_param],
           [b4_remove_comma([$1],

-                          [m4_map([b4_parse_param_decl_1],
-                                  [b4_parse_param])])],
+                          b4_param_decls(b4_parse_param))],

          [$1])])
 
          [$1])])
 

-m4_define([b4_parse_param_decl_1], [, $1])
+
+
+# b4_lex_param_call
+# -------------------
+# Delegating the lexer parameters to the lexer constructor.
+m4_define([b4_lex_param_call],
+          [m4_ifset([b4_lex_param],
+                   [b4_remove_comma([$1],
+                                    b4_param_calls(b4_lex_param))],
+                   [$1])])
+m4_define([b4_param_calls],
+         [m4_map([b4_param_call], [$@])])
+m4_define([b4_param_call], [, $2])

 
 
 
 
 
 


@@ -241,12 +240,15 @@ m4_define([b4_parse_param_decl_1], [, $1])
 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],
                    [b4_constructor_calls(b4_parse_param)])])
 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],
                    [b4_constructor_calls(b4_parse_param)])])

+

 m4_define([b4_constructor_calls],
          [m4_map([b4_constructor_call], [$@])])
 m4_define([b4_constructor_call],
          [this.$2 = $2;
          ])
 
 m4_define([b4_constructor_calls],
          [m4_map([b4_constructor_call], [$@])])
 m4_define([b4_constructor_call],
          [this.$2 = $2;
          ])
 

+
+

 # b4_parse_param_vars
 # -------------------
 # Extra instance variables.
 # b4_parse_param_vars
 # -------------------
 # Extra instance variables.


@@ -255,14 +257,17 @@ m4_define([b4_parse_param_vars],
                    [
     /* User arguments.  */
 b4_var_decls(b4_parse_param)])])
                    [
     /* User arguments.  */
 b4_var_decls(b4_parse_param)])])

+

 m4_define([b4_var_decls],
          [m4_map_sep([b4_var_decl], [
 ], [$@])])
 m4_define([b4_var_decl],
          [    protected final $1;])
 
 m4_define([b4_var_decls],
          [m4_map_sep([b4_var_decl], [
 ], [$@])])
 m4_define([b4_var_decl],
          [    protected final $1;])
 

+
+

 # b4_maybe_throws(THROWS)
 # -----------------------
 # Expand to either an empty string or "throws THROWS".
 m4_define([b4_maybe_throws],
 # b4_maybe_throws(THROWS)
 # -----------------------
 # Expand to either an empty string or "throws THROWS".
 m4_define([b4_maybe_throws],

-         [m4_ifval([$1], [throws $1])])
+         [m4_ifval($1, [throws $1])])