Check yyerrok in calc.at.

[bison.git] / data / java.m4

diff --git a/data/java.m4 b/data/java.m4
index 3f259fd5d7759523a1b25bbef755cd28318d0d29..9ee581a2ac17e6318e2bf5ee14c68dbb3a2f7b03 100644 (file)
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,7 +2,7 @@
 
 # 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
 # it under the terms of the GNU General Public License as published by
 
 # 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


@@ -75,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)
 # ---------------------


@@ -106,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], [$@])])
 ])


@@ -205,7 +205,7 @@ m4_define([b4_param_decls],
          [m4_map([b4_param_decl], [$@])])
 m4_define([b4_param_decl], [, $1])
 
          [m4_map([b4_param_decl], [$@])])
 m4_define([b4_param_decl], [, $1])
 

-m4_define([b4_remove_comma], [m4_ifval($1, [$1, ], [])m4_shiftn(2, $@)])
+m4_define([b4_remove_comma], [m4_ifval($1, [$1, ], [])m4_shift2($@)])