tests: minor fixes/simplifications

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index a5c027a2532b438b1a39ef5fb0c94463c9839fc5..78d8e9c0b7f82c896e6efd41a9ae84cf9ef44ecf 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,86 +1,98 @@
-m4_divert(-1)                                               -*- Autoconf -*-
+                                                            -*- Autoconf -*-

 
 # C M4 Macros for Bison.
 
 # C M4 Macros for Bison.

-# Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.

 
 

-# This program is free software; you can redistribute it and/or modify
+# Copyright (C) 2002, 2004-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
 # 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/>.

 
 ## ---------------- ##
 ## Identification.  ##
 ## ---------------- ##
 
 
 ## ---------------- ##
 ## Identification.  ##
 ## ---------------- ##
 

-# b4_copyright(TITLE, YEARS)
-# --------------------------
-m4_define([b4_copyright],
-[/* A Bison parser, made by GNU Bison b4_version.  */
+# b4_comment_(TEXT, OPEN, CONTINUE, END)
+# -------------------------------------
+# Put TEXT in comment.  Avoid trailing spaces: don't indent empty lines.
+# Avoid adding indentation to the first line, as the indentation comes
+# from OPEN.  That's why we don't patsubst([$1], [^\(.\)], [   \1]).
+#
+# Prefix all the output lines with PREFIX.
+m4_define([b4_comment_], [$2[]m4_bpatsubst([$1], [
+\(.\)], [
+$3\1])$4])

 
 

-/* $1,
-   Copyright (C) $2 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+# b4_c_comment(TEXT, [PREFIX])
+# ----------------------------
+# Put TEXT in comment.  Avoid trailing spaces: don't indent empty lines.
+# Avoid adding indentation to the first line, as the indentation comes
+# from "/*".  That's why we don't patsubst([$1], [^\(.\)], [   \1]).
+#
+# Prefix all the output lines with PREFIX.
+m4_define([b4_c_comment],
+[b4_comment_([$1], [$2/* ], [$2   ], [$2  */])])

 
 

-   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
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */])
+# b4_comment(TEXT, [PREFIX])
+# --------------------------
+# By default, C comments.
+m4_define([b4_comment], [b4_c_comment($@)])

 
 
 # b4_identification
 # -----------------
 
 
 # b4_identification
 # -----------------

+# Depends on individual skeletons to define b4_pure_flag, b4_push_flag, or
+# b4_pull_flag if they use the values of the %define variables api.pure or
+# api.push-pull.

 m4_define([b4_identification],
 m4_define([b4_identification],

-[/* Identify Bison output.  */
-[#]define YYBISON 1
+[[/* Identify Bison output.  */
+#define YYBISON 1

 
 /* Bison version.  */
 
 /* Bison version.  */

-[#]define YYBISON_VERSION "b4_version"
+#define YYBISON_VERSION "]b4_version["

 
 /* Skeleton name.  */
 
 /* Skeleton name.  */

-[#]define YYSKELETON_NAME b4_skeleton
+#define YYSKELETON_NAME ]b4_skeleton[]m4_ifdef([b4_pure_flag], [[

 
 /* Pure parsers.  */
 
 /* Pure parsers.  */

-[#]define YYPURE b4_pure
+#define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[

 
 

-/* Using locations.  */
-[#]define YYLSP_NEEDED b4_locations_flag
-])
+/* Push parsers.  */
+#define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[

 
 

+/* Pull parsers.  */
+#define YYPULL ]b4_pull_flag])[
+
+/* Using locations.  */
+#define YYLSP_NEEDED ]b4_locations_if([1], [0])[
+]])

 
 
 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##
 
 
 
 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##
 

-m4_define_default([b4_epilogue], [])
-
+# If the %union is not named, its name is YYSTYPE.
+m4_define_default([b4_union_name], [YYSTYPE])

 
 

+# If the %name-prefix is not given, it is yy.
+m4_define_default([b4_prefix], [yy])

 
 ## ------------------------ ##
 ## Pure/impure interfaces.  ##
 ## ------------------------ ##
 
 
 ## ------------------------ ##
 ## Pure/impure interfaces.  ##
 ## ------------------------ ##
 

-

 # b4_user_args
 # ------------
 m4_define([b4_user_args],
 # b4_user_args
 # ------------
 m4_define([b4_user_args],


@@ -91,9 +103,8 @@ m4_define([b4_user_args],
 # --------------
 # If defined, b4_parse_param arrives double quoted, but below we prefer
 # it to be single quoted.
 # --------------
 # If defined, b4_parse_param arrives double quoted, but below we prefer
 # it to be single quoted.

-m4_define_default([b4_parse_param])

 m4_define([b4_parse_param],
 m4_define([b4_parse_param],

-b4_parse_param))
+b4_parse_param)

 
 
 # b4_parse_param_for(DECL, FORMAL, BODY)
 
 
 # b4_parse_param_for(DECL, FORMAL, BODY)


@@ -102,33 +113,30 @@ b4_parse_param))
 # the formal name to FORMAL, and evaluating the BODY.
 m4_define([b4_parse_param_for],
 [m4_foreach([$1_$2], m4_defn([b4_parse_param]),
 # the formal name to FORMAL, and evaluating the BODY.
 m4_define([b4_parse_param_for],
 [m4_foreach([$1_$2], m4_defn([b4_parse_param]),

-[m4_pushdef([$1], m4_fst($1_$2))dnl
+[m4_pushdef([$1], m4_unquote(m4_car($1_$2)))dnl

 m4_pushdef([$2], m4_shift($1_$2))dnl
 $3[]dnl
 m4_popdef([$2])dnl
 m4_popdef([$1])dnl
 ])])
 
 m4_pushdef([$2], m4_shift($1_$2))dnl
 $3[]dnl
 m4_popdef([$2])dnl
 m4_popdef([$1])dnl
 ])])
 

-# b4_parse_param_use
-# ------------------
-# `YYUSE' all the parse-params.
+# b4_parse_param_use([VAL], [LOC])
+# --------------------------------
+# `YYUSE' VAL, LOC if locations are enabled, and all the parse-params.

 m4_define([b4_parse_param_use],
 m4_define([b4_parse_param_use],

-[b4_parse_param_for([Decl], [Formal], [  YYUSE (Formal);
+[m4_ifval([$1], [  YYUSE([$1]);
+])dnl
+m4_ifval([$2], [b4_locations_if([  YYUSE ([$2]);
+])])dnl
+b4_parse_param_for([Decl], [Formal], [  YYUSE (Formal);

 ])dnl
 ])
 
 ])dnl
 ])
 

+

 ## ------------ ##
 ## Data Types.  ##
 ## ------------ ##
 
 ## ------------ ##
 ## Data Types.  ##
 ## ------------ ##
 

-
-# b4_ints_in(INT1, INT2, LOW, HIGH)
-# ---------------------------------
-# Return 1 iff both INT1 and INT2 are in [LOW, HIGH], 0 otherwise.
-m4_define([b4_ints_in],
-[m4_eval([$3 <= $1 && $1 <= $4 && $3 <= $2 && $2 <= $4])])
-
-

 # b4_int_type(MIN, MAX)
 # ---------------------
 # Return the smallest int type able to handle numbers ranging from
 # b4_int_type(MIN, MAX)
 # ---------------------
 # Return the smallest int type able to handle numbers ranging from


@@ -142,7 +150,7 @@ m4_define([b4_int_type],
 
        m4_eval([0 <= $1]),                [1], [unsigned int],
 
 
        m4_eval([0 <= $1]),                [1], [unsigned int],
 

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

 
 
 # b4_int_type_for(NAME)
 
 
 # b4_int_type_for(NAME)


@@ -153,37 +161,40 @@ m4_define([b4_int_type_for],
 [b4_int_type($1_min, $1_max)])
 
 
 [b4_int_type($1_min, $1_max)])
 
 

-## ------------------ ##
-## Decoding options.  ##
-## ------------------ ##
+# b4_table_value_equals(TABLE, VALUE, LITERAL)
+# --------------------------------------------
+# Without inducing a comparison warning from the compiler, check if the
+# literal value LITERAL equals VALUE from table TABLE, which must have
+# TABLE_min and TABLE_max defined.  YYID must be defined as an identity
+# function that suppresses warnings about constant conditions.
+m4_define([b4_table_value_equals],
+[m4_if(m4_eval($3 < m4_indir([b4_]$1[_min])
+               || m4_indir([b4_]$1[_max]) < $3), [1],
+       [[YYID (0)]],
+       [[((]$2[) == (]$3[))]])])

 
 

+## ---------##
+## Values.  ##
+## ---------##

 
 

-# b4_error_verbose_if(IF-TRUE, IF-FALSE)
-# --------------------------------------
-# Expand IF-TRUE, if errors are verbose, IF-FALSE otherwise.
-m4_define([b4_error_verbose_if],
-[m4_if(b4_error_verbose, [1],
-       [$1],
-       [$2])])
-
+# b4_null
+---------
+# Return a null pointer constant.  NULL infringes on the user name
+# space in C, so use 0 rather than NULL.
+m4_define([b4_null], [0])

 
 

-# b4_location_if(IF-TRUE, IF-FALSE)
-# ---------------------------------
-# Expand IF-TRUE, if locations are used, IF-FALSE otherwise.
-m4_define([b4_location_if],
-[m4_if(b4_locations_flag, [1],
-       [$1],
-       [$2])])
-
-
-# b4_pure_if(IF-TRUE, IF-FALSE)
-# -----------------------------
-# Expand IF-TRUE, if %pure-parser, IF-FALSE otherwise.
-m4_define([b4_pure_if],
-[m4_if(b4_pure, [1],
-       [$1],
-       [$2])])

 
 

+# b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
+# -------------------------------------------------------------
+# Define "yy<TABLE-NAME>" which contents is CONTENT.
+m4_define([b4_integral_parser_table_define],
+[m4_ifval([$3], [b4_c_comment([$3], [  ])
+])dnl
+static const b4_int_type_for([$2]) yy$1[[]] =
+{
+  $2
+};dnl
+])

 
 
 ## ------------------------- ##
 
 
 ## ------------------------- ##


@@ -194,7 +205,7 @@ m4_define([b4_pure_if],
 # -----------------------------------------
 # Output the definition of this token as #define.
 m4_define([b4_token_define],
 # -----------------------------------------
 # Output the definition of this token as #define.
 m4_define([b4_token_define],

-[#define $1 $2
+[#define b4_percent_define_get([api.tokens.prefix])$1 $2

 ])
 
 
 ])
 
 


@@ -202,7 +213,7 @@ m4_define([b4_token_define],
 # -------------------------------------------------------
 # Output the definition of the tokens (if there are) as #defines.
 m4_define([b4_token_defines],
 # -------------------------------------------------------
 # Output the definition of the tokens (if there are) as #defines.
 m4_define([b4_token_defines],

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

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


@@ -212,14 +223,14 @@ m4_map([b4_token_define], [$@])])
 # ---------------------------------------
 # Output the definition of this token as an enum.
 m4_define([b4_token_enum],
 # ---------------------------------------
 # Output the definition of this token as an enum.
 m4_define([b4_token_enum],

-[$1 = $2])
+[b4_percent_define_get([api.tokens.prefix])$1 = $2])

 
 
 # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
 # -----------------------------------------------------
 # Output the definition of the tokens (if there are) as enums.
 m4_define([b4_token_enums],
 
 
 # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
 # -----------------------------------------------------
 # Output the definition of the tokens (if there are) as enums.
 m4_define([b4_token_enums],

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

 [/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
 [/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE


@@ -236,12 +247,28 @@ m4_map_sep([     b4_token_enum], [,
 
 # b4_token_enums_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
 # -------------------------------------------------------------
 
 # b4_token_enums_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
 # -------------------------------------------------------------

-# Output the definition of the tokens (if there are) as enums and #defines.
+# Output the definition of the tokens (if there are any) as enums and, if POSIX
+# Yacc is enabled, as #defines.

 m4_define([b4_token_enums_defines],
 m4_define([b4_token_enums_defines],

-[b4_token_enums($@)b4_token_defines($@)
+[b4_token_enums($@)b4_yacc_if([b4_token_defines($@)], [])

 ])
 
 
 ])
 
 

+## ----------------- ##
+## Semantic Values.  ##
+## ----------------- ##
+
+
+# b4_symbol_value(VAL, [TYPE])
+# ----------------------------
+# Given a semantic value VAL ($$, $1 etc.), extract its value of type
+# TYPE if TYPE is given, otherwise just return VAL.  The result can be
+# used safetly, it is put in parens to avoid nasty precedence issues.
+# TYPE is *not* put in braces, provide some if needed.
+m4_define([b4_symbol_value],
+[($1[]m4_ifval([$2], [.$2]))])
+
+

 
 ## --------------------------------------------- ##
 ## Defining C functions in both K&R and ANSI-C.  ##
 
 ## --------------------------------------------- ##
 ## Defining C functions in both K&R and ANSI-C.  ##


@@ -256,11 +283,11 @@ m4_define([b4_token_enums_defines],
 # as 'cc' doesn't define __STDC__ (or __STDC_VERSION__) for pedantic
 # reasons, but it defines __C99__FUNC__ so check that as well.
 # Microsoft C normally doesn't define these macros, but it defines _MSC_VER.
 # as 'cc' doesn't define __STDC__ (or __STDC_VERSION__) for pedantic
 # reasons, but it defines __C99__FUNC__ so check that as well.
 # Microsoft C normally doesn't define these macros, but it defines _MSC_VER.

-# Consider a C++ compiler to be modern if it defines __cplusplus.  */
+# Consider a C++ compiler to be modern if it defines __cplusplus.

 #
 m4_define([b4_c_modern],
 #
 m4_define([b4_c_modern],

-  [[(defined (__STDC__) || defined (__C99__FUNC__) \
-     || defined (__cplusplus) || defined (_MSC_VER))]])
+  [[(defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)]])

 
 # b4_c_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
 # ----------------------------------------------------------
 
 # b4_c_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...)
 # ----------------------------------------------------------


@@ -270,8 +297,8 @@ m4_define([b4_c_function_def],
 b4_c_ansi_function_def($@)
 #else
 $2
 b4_c_ansi_function_def($@)
 #else
 $2

-$1 (b4_c_knr_formal_names(m4_shiftn(2, $@)))
-b4_c_knr_formal_decls(m4_shiftn(2, $@))
+$1 (b4_c_knr_formal_names(m4_shift2($@)))
+b4_c_knr_formal_decls(m4_shift2($@))

 #endif[]dnl
 ])
 
 #endif[]dnl
 ])
 


@@ -281,7 +308,7 @@ b4_c_knr_formal_decls(m4_shiftn(2, $@))
 # Declare the function NAME in ANSI.
 m4_define([b4_c_ansi_function_def],
 [$2
 # Declare the function NAME in ANSI.
 m4_define([b4_c_ansi_function_def],
 [$2

-$1 (b4_c_ansi_formals(m4_shiftn(2, $@)))[]dnl
+$1 (b4_c_ansi_formals(m4_shift2($@)))[]dnl

 ])
 
 
 ])
 
 


@@ -289,9 +316,8 @@ $1 (b4_c_ansi_formals(m4_shiftn(2, $@)))[]dnl
 # --------------------------------------
 # Output the arguments ANSI-C definition.
 m4_define([b4_c_ansi_formals],
 # --------------------------------------
 # Output the arguments ANSI-C definition.
 m4_define([b4_c_ansi_formals],

-[m4_case([$@],
-         [],   [void],
-         [[]], [void],
+[m4_if([$#], [0], [void],
+       [$#$1], [1], [void],

                [m4_map_sep([b4_c_ansi_formal], [, ], [$@])])])
 
 m4_define([b4_c_ansi_formal],
                [m4_map_sep([b4_c_ansi_formal], [, ], [$@])])])
 
 m4_define([b4_c_ansi_formal],


@@ -331,7 +357,7 @@ m4_define([b4_c_knr_formal_decl],
 # -----------------------------------------------------------
 # Declare the function NAME.
 m4_define([b4_c_function_decl],
 # -----------------------------------------------------------
 # Declare the function NAME.
 m4_define([b4_c_function_decl],

-[#if defined (__STDC__) || defined (__cplusplus)
+[#if b4_c_modern

 b4_c_ansi_function_decl($@)
 #else
 $2 $1 ();
 b4_c_ansi_function_decl($@)
 #else
 $2 $1 ();


@@ -343,7 +369,7 @@ $2 $1 ();
 # ----------------------------------------------------------------
 # Declare the function NAME.
 m4_define([b4_c_ansi_function_decl],
 # ----------------------------------------------------------------
 # Declare the function NAME.
 m4_define([b4_c_ansi_function_decl],

-[$2 $1 (b4_c_ansi_formals(m4_shiftn(2, $@)));[]dnl
+[$2 $1 (b4_c_ansi_formals(m4_shift2($@)));[]dnl

 ])
 
 
 ])
 
 


@@ -358,7 +384,7 @@ m4_define([b4_c_ansi_function_decl],
 # -----------------------------------------------------------
 # Call the function NAME with arguments NAME1, NAME2 etc.
 m4_define([b4_c_function_call],
 # -----------------------------------------------------------
 # Call the function NAME with arguments NAME1, NAME2 etc.
 m4_define([b4_c_function_call],

-[$1 (b4_c_args(m4_shiftn(2, $@)))[]dnl
+[$1 (b4_c_args(m4_shift2($@)))[]dnl

 ])
 
 
 ])
 
 


@@ -376,34 +402,31 @@ m4_define([b4_c_arg],
 ## Synclines.  ##
 ## ----------- ##
 
 ## Synclines.  ##
 ## ----------- ##
 

-# b4_syncline(LINE, FILE)
+# b4_sync_start(LINE, FILE)

 # -----------------------
 # -----------------------

-m4_define([b4_syncline],
-[m4_if(b4_synclines_flag, 1,
-       [[#]line $1 $2])])
-
+m4_define([b4_sync_start], [[#]line $1 $2])

 
 
 ## -------------- ##
 ## User actions.  ##
 ## -------------- ##
 
 
 
 ## -------------- ##
 ## User actions.  ##
 ## -------------- ##
 

-# b4_symbol_actions(FILENAME, LINENO,
-#                   SYMBOL-TAG, SYMBOL-NUM,
-#                   SYMBOL-ACTION, SYMBOL-TYPENAME)
-# -------------------------------------------------
-m4_define([b4_symbol_actions],
-[m4_pushdef([b4_dollar_dollar],
-   [m4_ifval([$6], [(yyvaluep->$6)], [(*yyvaluep)])])dnl
-m4_pushdef([b4_at_dollar], [(*yylocationp)])dnl
-      case $4: /* $3 */
-b4_syncline([$2], [$1])
-        $5;
+# b4_case(LABEL, STATEMENTS)
+# --------------------------
+m4_define([b4_case],
+[  case $1:
+$2

 b4_syncline([@oline@], [@ofile@])
 b4_syncline([@oline@], [@ofile@])

-        break;
-m4_popdef([b4_at_dollar])dnl
-m4_popdef([b4_dollar_dollar])dnl
-])
+    break;])
+
+
+# b4_predicate_case(LABEL, CONDITIONS)
+# ------------------------------------
+m4_define([b4_predicate_case],
+[  case $1:
+    if (! ($2)) YYERROR;
+b4_syncline([@oline@], [@ofile@])
+    break;])

 
 
 # b4_yydestruct_generate(FUNCTION-DECLARATOR)
 
 
 # b4_yydestruct_generate(FUNCTION-DECLARATOR)


@@ -422,22 +445,18 @@ m4_define_default([b4_yydestruct_generate],
     [[const char *yymsg],    [yymsg]],
     [[int yytype],           [yytype]],
     [[YYSTYPE *yyvaluep],    [yyvaluep]][]dnl
     [[const char *yymsg],    [yymsg]],
     [[int yytype],           [yytype]],
     [[YYSTYPE *yyvaluep],    [yyvaluep]][]dnl

-b4_location_if(            [, [[YYLTYPE *yylocationp], [yylocationp]]])[]dnl
+b4_locations_if(            [, [[YYLTYPE *yylocationp], [yylocationp]]])[]dnl

 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {
 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {

-  YYUSE (yyvaluep);
-]b4_location_if([  YYUSE (yylocationp);
-])dnl
-b4_parse_param_use[]dnl
-[
+]b4_parse_param_use([yyvaluep], [yylocationp])[

   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {

-]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
-      default:
+]b4_symbol_foreach([b4_symbol_destructor])dnl
+[      default:

         break;
     }
 }]dnl
         break;
     }
 }]dnl


@@ -460,21 +479,20 @@ m4_define_default([b4_yy_symbol_print_generate],
     [static void],
                [[FILE *yyoutput],                       [yyoutput]],
                [[int yytype],                           [yytype]],
     [static void],
                [[FILE *yyoutput],                       [yyoutput]],
                [[int yytype],                           [yytype]],

-               [[const YYSTYPE * const yyvaluep],       [yyvaluep]][]dnl
-b4_location_if([, [[const YYLTYPE * const yylocationp], [yylocationp]]])[]dnl
+               [[YYSTYPE const * const yyvaluep],       [yyvaluep]][]dnl
+b4_locations_if([, [[YYLTYPE const * const yylocationp], [yylocationp]]])[]dnl

 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {
 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {

-  YYUSE (yyvaluep);
-]b4_location_if([  YYUSE (yylocationp);
-])dnl
-b4_parse_param_use[]dnl
-[# ifdef YYPRINT
+]b4_parse_param_use([yyoutput], [yylocationp])[
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT

   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
 # endif
   switch (yytype)
     {
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
 # endif
   switch (yytype)
     {

-]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
+]b4_symbol_foreach([b4_symbol_printer])dnl

 [      default:
         break;
     }
 [      default:
         break;
     }


@@ -489,8 +507,8 @@ b4_parse_param_use[]dnl
     [static void],
                [[FILE *yyoutput],                       [yyoutput]],
                [[int yytype],                           [yytype]],
     [static void],
                [[FILE *yyoutput],                       [yyoutput]],
                [[int yytype],                           [yytype]],

-               [[const YYSTYPE * const yyvaluep],       [yyvaluep]][]dnl
-b4_location_if([, [[const YYLTYPE * const yylocationp], [yylocationp]]])[]dnl
+               [[YYSTYPE const * const yyvaluep],       [yyvaluep]][]dnl
+b4_locations_if([, [[YYLTYPE const * const yylocationp], [yylocationp]]])[]dnl

 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {
   if (yytype < YYNTOKENS)
 m4_ifset([b4_parse_param], [, b4_parse_param]))[
 {
   if (yytype < YYNTOKENS)


@@ -498,11 +516,11 @@ m4_ifset([b4_parse_param], [, b4_parse_param]))[
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 

-]b4_location_if([  YY_LOCATION_PRINT (yyoutput, *yylocationp);
+]b4_locations_if([  YY_LOCATION_PRINT (yyoutput, *yylocationp);

   YYFPRINTF (yyoutput, ": ");
 ])dnl
 [  yy_symbol_value_print (yyoutput, yytype, yyvaluep]dnl
   YYFPRINTF (yyoutput, ": ");
 ])dnl
 [  yy_symbol_value_print (yyoutput, yytype, yyvaluep]dnl

-b4_location_if([, yylocationp])[]b4_user_args[);
+b4_locations_if([, yylocationp])[]b4_user_args[);

   YYFPRINTF (yyoutput, ")");
 }]dnl
 ])
   YYFPRINTF (yyoutput, ")");
 }]dnl
 ])