NEWS: update.

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index ffab49709179d6e6aab69c5063ab28692652fffb..e0e58cdb82b1c4644d4c56d42297138eefa104e8 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,22 +1,21 @@
                                                             -*- Autoconf -*-
 
 # C M4 Macros for Bison.
                                                             -*- Autoconf -*-
 
 # 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.  ##


@@ -30,28 +29,31 @@ m4_define([b4_comment], [/* m4_bpatsubst([$1], [
 
 # 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_flag
+#define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[

 
 /* Push parsers.  */
 
 /* Push parsers.  */

-[#]define YYPUSH b4_push_flag
+#define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[

 
 /* Pull parsers.  */
 
 /* Pull parsers.  */

-[#]define YYPULL b4_pull_flag
+#define YYPULL ]b4_pull_flag])[

 
 /* Using locations.  */
 
 /* Using locations.  */

-[#]define YYLSP_NEEDED b4_locations_flag
-])
+#define YYLSP_NEEDED ]b4_locations_flag[
+]])

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


@@ -79,7 +81,7 @@ m4_define([b4_user_args],
 # If defined, b4_parse_param arrives double quoted, but below we prefer
 # it to be single quoted.
 m4_define([b4_parse_param],
 # If defined, b4_parse_param arrives double quoted, but below we prefer
 # it to be single quoted.
 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)


@@ -88,7 +90,7 @@ 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_pushdef([$2], m4_shift($1_$2))dnl
 $3[]dnl
 m4_popdef([$2])dnl


@@ -131,6 +133,19 @@ m4_define([b4_int_type],
 m4_define([b4_int_type_for],
 [b4_int_type($1_min, $1_max)])
 
 m4_define([b4_int_type_for],
 [b4_int_type($1_min, $1_max)])
 

+
+# 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.  ##
 ## ---------##
 ## ---------##
 ## Values.  ##
 ## ---------##


@@ -142,6 +157,8 @@ m4_define([b4_int_type_for],
 m4_define([b4_null], [0])
 
 
 m4_define([b4_null], [0])
 
 

+
+

 ## ------------------------- ##
 ## Assigning token numbers.  ##
 ## ------------------------- ##
 ## ------------------------- ##
 ## Assigning token numbers.  ##
 ## ------------------------- ##


@@ -158,7 +175,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], [$@])])
 ])


@@ -175,7 +192,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.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
 [/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE


@@ -227,8 +244,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
 ])
 


@@ -238,7 +255,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

 ])
 
 
 ])
 
 


@@ -246,9 +263,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],


@@ -300,7 +316,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

 ])
 
 
 ])
 
 


@@ -315,7 +331,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

 ])
 
 
 ])