warnings: use the regular interface for s/r and r/r conflicts

[bison.git] / data / bison.m4

diff --git a/data/bison.m4 b/data/bison.m4
index 1ec1799ffcacaacd5583d817ccb6b8962d699843..42a548dae0617a44b2259e209f037a9ffbf22285 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -206,23 +206,23 @@ m4_define([b4_subtract],
            [m4_eval([$1 - $2])],
            [($1) - ($2)])])
 
-# b4_args(ARG1, ...)
-# _b4_args(ARG1, ...)
+# b4_join(ARG1, ...)
+# _b4_join(ARG1, ...)
 # -------------------
 # Join with comma, skipping empty arguments.
-# b4_args calls itself recursively until it sees the first non-empty
-# argument, then calls _b4_args which prepends each non-empty argument
+# b4_join calls itself recursively until it sees the first non-empty
+# argument, then calls _b4_join which prepends each non-empty argument
 # with a comma.
-m4_define([b4_args],
+m4_define([b4_join],
 [m4_if([$#$1],
        [1], [],
        [m4_ifval([$1],
                  [$1[]_$0(m4_shift($@))],
                  [$0(m4_shift($@))])])])
 
-# _b4_args(ARGS1, ...)
+# _b4_join(ARGS1, ...)
 # --------------------
-m4_define([_b4_args],
+m4_define([_b4_join],
 [m4_if([$#$1],
        [1], [],
        [m4_ifval([$1], [, $1])[]$0(m4_shift($@))])])
@@ -376,19 +376,17 @@ m4_define([b4_symbol_action_location],
 # Same as in C, but using references instead of pointers.
 m4_define([b4_symbol_action],
 [b4_symbol_if([$1], [has_$2],
-[m4_pushdef([b4_dollar_dollar],
-    [b4_symbol_value([(*yyvaluep)],
-                     b4_symbol_if([$1], [has_type],
-                                  [b4_symbol([$1], [type])]))])dnl
-m4_pushdef([b4_at_dollar], [(*yylocationp)])dnl
-      b4_symbol_case_([$1])
+[b4_dollar_pushdef([(*yyvaluep)],
+                   b4_symbol_if([$1], [has_type],
+                                [m4_dquote(b4_symbol([$1], [type]))]),
+                   [(*yylocationp)])dnl
+      b4_symbol_case_([$1])[]dnl
 b4_syncline([b4_symbol([$1], [$2_line])], ["b4_symbol([$1], [$2_file])"])
         b4_symbol([$1], [$2])
 b4_syncline([@oline@], [@ofile@])
         break;
 
-m4_popdef([b4_at_dollar])dnl
-m4_popdef([b4_dollar_dollar])dnl
+b4_dollar_popdef[]dnl
 ])])