Style changes.

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index 518c05b6282b4a77587dab8c18fbd901237d64d5..ffa4a84a6e751b34d5588e32a8a22234342ea17a 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -1,8 +1,8 @@
                                                             -*- Autoconf -*-
 
 # C M4 Macros for Bison.
                                                             -*- Autoconf -*-
 
 # C M4 Macros for Bison.

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


@@ -169,10 +169,10 @@ m4_define([b4_int_type_for],
 m4_define([b4_null], [0])
 
 
 m4_define([b4_null], [0])
 
 

-# b4_table_define(TABLE-NAME, CONTENT, COMMENT)
-# ---------------------------------------------
+# b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
+# -------------------------------------------------------------

 # Define "yy<TABLE-NAME>" which contents is CONTENT.
 # Define "yy<TABLE-NAME>" which contents is CONTENT.

-m4_define([b4_table_define],
+m4_define([b4_integral_parser_table_define],

 [m4_ifval([$3], [b4_c_comment([$3], [  ])
 ])dnl
 static const b4_int_type_for([$2]) yy$1[[]] =
 [m4_ifval([$3], [b4_c_comment([$3], [  ])
 ])dnl
 static const b4_int_type_for([$2]) yy$1[[]] =


@@ -342,7 +342,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 ();


@@ -404,23 +404,6 @@ $2
 b4_syncline([@oline@], [@ofile@])
     break;])
 
 b4_syncline([@oline@], [@ofile@])
     break;])
 

-# b4_symbol_actions(FILENAME, LINENO,
-#                   SYMBOL-TAG, SYMBOL-NUM,
-#                   SYMBOL-ACTION, SYMBOL-TYPENAME)
-# -------------------------------------------------
-m4_define([b4_symbol_actions],
-[m4_pushdef([b4_dollar_dollar],
-   [b4_symbol_value([(*yyvaluep)], [$6])])dnl
-m4_pushdef([b4_at_dollar], [(*yylocationp)])dnl
-      case $4: /* $3 */
-b4_syncline([$2], [$1])
-       $5;
-b4_syncline([@oline@], [@ofile@])
-       break;
-m4_popdef([b4_at_dollar])dnl
-m4_popdef([b4_dollar_dollar])dnl
-])
-

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


@@ -452,8 +435,8 @@ b4_parse_param_use[]dnl
 
   switch (yytype)
     {
 
   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


@@ -493,7 +476,7 @@ b4_parse_param_use[]dnl
 # endif
   switch (yytype)
     {
 # 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;
     }