Check yyerrok in calc.at.

[bison.git] / data / bison.m4

diff --git a/data/bison.m4 b/data/bison.m4
index fbf375bda08cc97f3ea51d46b998bc41a0325b24..bad629631ba107d695a50e825f94c838b21e15ed 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -1,7 +1,8 @@
                                                             -*- Autoconf -*-
 
 # Language-independent M4 Macros for Bison.
-# Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005, 2006, 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
@@ -74,7 +75,8 @@ version 2.2 of Bison.])])
 m4_define([b4_cat],
 [m4_syscmd([cat <<'_m4eof'
 ]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@
-_m4eof])dnl
+_m4eof
+])dnl
 m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])])
 
 # b4_error(KIND, FORMAT, [ARG1], [ARG2], ...)
@@ -249,7 +251,6 @@ b4_define_flag_if([error_verbose])  # Whether error are verbose.
 b4_define_flag_if([glr])               # Whether a GLR parser is requested.
 b4_define_flag_if([locations])         # Whether locations are tracked.
 b4_define_flag_if([nondeterministic])  # Whether conflicts should be handled.
-b4_define_flag_if([pure])              # Whether the interface is pure.
 b4_define_flag_if([yacc])              # Whether POSIX Yacc is emulated.
 
 
@@ -521,7 +522,7 @@ m4_define([b4_percent_code_get],
 m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])dnl
 m4_ifdef(b4_macro_name,
 [b4_comment([m4_if([$#], [0], [[Unqualified %code]],
-                   [[%code "]$1["]])[ blocks.]])
+                   [["%code ]$1["]])[ blocks.]])
 b4_user_code([m4_indir(b4_macro_name)])
 ])dnl
 m4_popdef([b4_macro_name])])
@@ -549,7 +550,7 @@ m4_define([b4_check_user_names_wrap],
                                [b4_percent_]$1[_user_]$2[s],
                                [[b4_percent_]$1[_bison_]$2[s]])])])
 
-m4_wrap([
+m4_wrap_lifo([
 b4_check_user_names_wrap([[define]], [[variable]])
 b4_check_user_names_wrap([[code]], [[qualifier]])
 ])