"Use" parse parameters.

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index 58d8e1a92a6d625e460d0f007047dea22295eb95..cef534b2d37ecac0b27774be7943d07e0dfbd877 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,7 +1,7 @@
 m4_divert(-1)                                               -*- Autoconf -*-
 
 # C M4 Macros for Bison.
 m4_divert(-1)                                               -*- Autoconf -*-
 
 # C M4 Macros for Bison.

-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005 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


@@ -15,8 +15,8 @@ m4_divert(-1)                                               -*- Autoconf -*-
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
 # 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., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301  USA

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


@@ -43,8 +43,8 @@ m4_define([b4_copyright],
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */])
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */])

 
 
 # b4_identification
 
 
 # b4_identification


@@ -53,6 +53,9 @@ m4_define([b4_identification],
 [/* Identify Bison output.  */
 [#]define YYBISON 1
 
 [/* Identify Bison output.  */
 [#]define YYBISON 1
 

+/* Bison version.  */
+[#]define YYBISON_VERSION "b4_version"
+

 /* Skeleton name.  */
 [#]define YYSKELETON_NAME b4_skeleton
 
 /* Skeleton name.  */
 [#]define YYSKELETON_NAME b4_skeleton
 


@@ -92,7 +95,27 @@ m4_define_default([b4_parse_param])
 m4_define([b4_parse_param],
 b4_parse_param))
 
 m4_define([b4_parse_param],
 b4_parse_param))
 

-
+# b4_parse_param_for(DECL, FORMAL, BODY)
+# ---------------------------------------
+# Iterate over the user parameters, binding the declaration to DECL,
+# 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([$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.
+# WARNING: Ends with a dnl, there must be nothing behind it.
+m4_define([b4_parse_param_use],
+[b4_parse_param_for([Decl], [Formal], [  YYUSE (Formal);
+])dnl
+])

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


@@ -114,12 +137,12 @@ m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
        b4_ints_in($@,   [-128],   [127]), [1], [signed char],
 
 [m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
        b4_ints_in($@,   [-128],   [127]), [1], [signed char],
 

-       b4_ints_in($@,      [0], [65535]), [1], [unsigned short],
-       b4_ints_in($@, [-32768], [32767]), [1], [short],
+       b4_ints_in($@,      [0], [65535]), [1], [unsigned short int],
+       b4_ints_in($@, [-32768], [32767]), [1], [short int],

 
        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)


@@ -135,6 +158,15 @@ m4_define([b4_int_type_for],
 ## ------------------ ##
 
 
 ## ------------------ ##
 
 

+# 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_location_if(IF-TRUE, IF-FALSE)
 # ---------------------------------
 # Expand IF-TRUE, if locations are used, IF-FALSE otherwise.
 # b4_location_if(IF-TRUE, IF-FALSE)
 # ---------------------------------
 # Expand IF-TRUE, if locations are used, IF-FALSE otherwise.


@@ -166,6 +198,16 @@ m4_define([b4_token_define],
 ])
 
 
 ])
 
 

+# b4_token_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
+# -------------------------------------------------------
+# Output the definition of the tokens (if there are) as #defines.
+m4_define([b4_token_defines],
+[m4_if([$@], [[]], [],
+[/* Tokens.  */
+m4_map([b4_token_define], [$@])])
+])
+
+

 # b4_token_enum(TOKEN-NAME, TOKEN-NUMBER)
 # ---------------------------------------
 # Output the definition of this token as an enum.
 # b4_token_enum(TOKEN-NAME, TOKEN-NUMBER)
 # ---------------------------------------
 # Output the definition of this token as an enum.


@@ -173,10 +215,10 @@ m4_define([b4_token_enum],
 [$1 = $2])
 
 
 [$1 = $2])
 
 

-# b4_token_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
-# -------------------------------------------------------
-# Output the definition of the tokens (if there are) as enums and #define.
-m4_define([b4_token_defines],
+# 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([$@], [[]], [],
 [/* Tokens.  */
 #ifndef YYTOKENTYPE
 [m4_if([$@], [[]], [],
 [/* Tokens.  */
 #ifndef YYTOKENTYPE


@@ -189,8 +231,14 @@ m4_map_sep([     b4_token_enum], [,
            [$@])
    };
 #endif
            [$@])
    };
 #endif

-m4_map([b4_token_define], [$@])
-])
+])])
+
+
+# b4_token_enums_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)
+# -------------------------------------------------------------
+# Output the definition of the tokens (if there are) as enums and #defines.
+m4_define([b4_token_enums_defines],
+[b4_token_enums($@)b4_token_defines($@)

 ])
 
 
 ])
 
 


@@ -204,7 +252,7 @@ m4_map([b4_token_define], [$@])
 # ----------------------------------------------------------
 # Declare the function NAME.
 m4_define([b4_c_function_def],
 # ----------------------------------------------------------
 # Declare the function NAME.
 m4_define([b4_c_function_def],

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

 b4_c_ansi_function_def($@)
 #else
 $2
 b4_c_ansi_function_def($@)
 #else
 $2


@@ -314,7 +362,6 @@ m4_define([b4_c_arg],
 ## Synclines.  ##
 ## ----------- ##
 
 ## Synclines.  ##
 ## ----------- ##
 

-

 # b4_syncline(LINE, FILE)
 # -----------------------
 m4_define([b4_syncline],
 # b4_syncline(LINE, FILE)
 # -----------------------
 m4_define([b4_syncline],


@@ -322,12 +369,18 @@ m4_define([b4_syncline],
        [[#]line $1 $2])])
 
 
        [[#]line $1 $2])])
 
 

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

 # b4_symbol_actions(FILENAME, LINENO,
 #                   SYMBOL-TAG, SYMBOL-NUM,
 #                   SYMBOL-ACTION, SYMBOL-TYPENAME)
 # -------------------------------------------------
 m4_define([b4_symbol_actions],
 # b4_symbol_actions(FILENAME, LINENO,
 #                   SYMBOL-TAG, SYMBOL-NUM,
 #                   SYMBOL-ACTION, SYMBOL-TYPENAME)
 # -------------------------------------------------
 m4_define([b4_symbol_actions],

-[m4_pushdef([b4_dollar_dollar], [yyvaluep->$6])dnl
+[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])
 m4_pushdef([b4_at_dollar], [(*yylocationp)])dnl
       case $4: /* $3 */
 b4_syncline([$2], [$1])


@@ -339,26 +392,33 @@ m4_popdef([b4_dollar_dollar])dnl
 ])
 
 
 ])
 
 

-# b4_yydestruct_generate(FUNTION-DECLARATOR)
-# ------------------------------------------
+# b4_yydestruct_generate(FUNCTION-DECLARATOR)
+# -------------------------------------------

 # Generate the "yydestruct" function, which declaration is issued using
 # Generate the "yydestruct" function, which declaration is issued using

-# FUNTION-DECLARATOR, which may be "b4_c_ansi_function_def" for ISO C
+# FUNCTION-DECLARATOR, which may be "b4_c_ansi_function_def" for ISO C

 # or "b4_c_function_def" for K&R.
 # or "b4_c_function_def" for K&R.

-m4_define([b4_yydestruct_generate],
+m4_define_default([b4_yydestruct_generate],

 [[/*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 ]$1([yydestruct],
     [static void],
 [[/*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 ]$1([yydestruct],
     [static void],

+    [[const char *yymsg],    [yymsg]],

     [[int yytype],           [yytype]],
     [[int yytype],           [yytype]],

-    [[YYSTYPE *yyvaluep],    [yyvaluep]]b4_location_if([,
-    [[YYLTYPE *yylocationp], [yylocationp]]]))[
+    [[YYSTYPE *yyvaluep],    [yyvaluep]][]dnl
+b4_location_if(            [, [[YYLTYPE *yylocationp], [yylocationp]]])[]dnl
+m4_ifset([b4_parse_param], [, b4_parse_param]))[

 {
 {

-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-]b4_location_if([  (void) yylocationp;
-])[
+  YYUSE (yyvaluep);
+]b4_location_if([  YYUSE (yylocationp);
+])dnl
+b4_parse_param_use[]dnl
+[
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+

   switch (yytype)
     {
 ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[
   switch (yytype)
     {
 ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[


@@ -369,44 +429,47 @@ m4_define([b4_yydestruct_generate],
 ])
 
 
 ])
 
 

-# b4_yysymprint_generate(FUNTION-DECLARATOR)
-# ------------------------------------------
+# b4_yysymprint_generate(FUNCTION-DECLARATOR)
+# -------------------------------------------

 # Generate the "yysymprint" function, which declaration is issued using
 # Generate the "yysymprint" function, which declaration is issued using

-# FUNTION-DECLARATOR, which may be "b4_c_ansi_function_def" for ISO C
+# FUNCTION-DECLARATOR, which may be "b4_c_ansi_function_def" for ISO C

 # or "b4_c_function_def" for K&R.
 # or "b4_c_function_def" for K&R.

-m4_define([b4_yysymprint_generate],
-[[/*-----------------------------.
-| Print this symbol on YYOUT.  |
-`-----------------------------*/
+m4_define_default([b4_yysymprint_generate],
+[[/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/

 
 ]$1([yysymprint],
     [static void],
 
 ]$1([yysymprint],
     [static void],

-    [[FILE *yyout],          [yyout]],
-    [[int yytype],           [yytype]],
-    [[YYSTYPE *yyvaluep],    [yyvaluep]]b4_location_if([,
-    [[YYLTYPE *yylocationp], [yylocationp]]]))
+               [[FILE *yyoutput],                       [yyoutput]],
+               [[int yytype],                           [yytype]],
+               [[const YYSTYPE * const yyvaluep],       [yyvaluep]][]dnl
+b4_location_if([, [[const YYLTYPE * const yylocationp], [yylocationp]]])[]dnl
+m4_ifset([b4_parse_param], [, b4_parse_param]))[

 {
 {

-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-b4_location_if([  (void) yylocationp;
+  YYUSE (yyvaluep);
+]b4_location_if([  YYUSE (yylocationp);

 ])dnl
 ])dnl

+b4_parse_param_use[]dnl
+[  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

 
 

-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyout, "token %s (", yytname[[yytype]]);
+]b4_location_if([  YY_LOCATION_PRINT (yyoutput, *yylocationp);
+  YYFPRINTF (yyoutput, ": ");
+])dnl
+[

 # ifdef YYPRINT
 # ifdef YYPRINT

-      YYPRINT (yyout, yytoknum[[yytype]], yyvalue);
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

 # endif
 # endif

-    }
-  else
-    YYFPRINTF (yyout, "nterm %s (", yytname[[yytype]]);
-

   switch (yytype)
     {
   switch (yytype)
     {

-m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
-      default:
+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
+[      default:

         break;
     }
         break;
     }

-  YYFPRINTF (yyout, ")");
-}
+  YYFPRINTF (yyoutput, ")");
+}]dnl

 ])
 ])