Treat %debug as %define debug.

	* data/bison.m4 (b4_debug_if): New.
	* data/glr.c, data/glr.cc, data/lalr1.cc, data/yacc.c,
	* data/lalr1.java: Use it instead of b4_debug_flag.
	* src/getargs.h, src/getargs.c (debug_flag): Remove.
	* src/output.c (prepare): Don't output it.
	* src/parse-gram.y: Treat %debug as %define debug.

diff --git a/data/bison.m4 b/data/bison.m4
index 09b799403913ee53cb88d4b605c5b7b5045012cb..fa8b043a2ce823f56c7cb0fe6ceed9d6ab36372e 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -678,11 +678,13 @@ b4_percent_define_if_define_([$1], $[1], $[2])])
 
 
 # b4_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])
 
 
 # b4_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])

+# b4_debug_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT])

 # b4_error_verbose_if([IF-ERRORS-ARE-VERBOSE], [IF-NOT])
 # b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT])
 # b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT])
 # ----------------------------------------------
 b4_percent_define_if_define([assert])
 # b4_error_verbose_if([IF-ERRORS-ARE-VERBOSE], [IF-NOT])
 # b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT])
 # b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT])
 # ----------------------------------------------
 b4_percent_define_if_define([assert])

+b4_percent_define_if_define([debug])

 b4_percent_define_if_define([error_verbose])
 b4_percent_define_if_define([lex_symbol])
 b4_percent_define_if_define([variant])
 b4_percent_define_if_define([error_verbose])
 b4_percent_define_if_define([lex_symbol])
 b4_percent_define_if_define([variant])

diff --git a/data/glr.c b/data/glr.c
index 3e49a5f23a87bc49f557207f6b2035a25583847c..3add5b27dfc3929580014383f4c3135fbafb1df2 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -224,7 +224,7 @@ b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG ]b4_debug_flag[
+# define YYDEBUG ]b4_debug_if([1], [0])[

 #endif
 
 /* Enabling verbose error messages.  */
 #endif
 
 /* Enabling verbose error messages.  */

diff --git a/data/glr.cc b/data/glr.cc
index dada42c390933917c5cca9c04dde0ea1c940bf09..2d9fc4c6ed69139d3d17d326c8f7460379b38779 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -1,6 +1,6 @@
 # C++ GLR skeleton for Bison
 # C++ GLR skeleton for Bison

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


@@ -215,7 +215,7 @@ m4_popdef([b4_parse_param])
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 m4_divert_push(0)
 @output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],

-  [2002, 2003, 2004, 2005, 2006])[
+             [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009])[

 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 


@@ -239,7 +239,7 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG ]b4_debug_flag[
+# define YYDEBUG ]b4_debug_if([1], [0])[

 #endif
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
 #endif
 
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 9079bbee5057e7523c9b899537ab7dda3d5c6656..cf955edcd882ab78055c106dd849ddda3a32d945 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -161,7 +161,7 @@ dnl FIXME: This is wrong, we want computed header guards.
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG ]b4_debug_flag[
+# define YYDEBUG ]b4_debug_if([1], [0])[

 #endif
 
 /* Enabling verbose error messages.  */
 #endif
 
 /* Enabling verbose error messages.  */

diff --git a/data/lalr1.java b/data/lalr1.java
index 11ed606dbf087782f4ea0e04560cf04f0926cef4..b1e74f022c69fd3b36c84aba6b6e3aa8d69b81d7 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -1,6 +1,6 @@
 # Java skeleton for Bison -*- autoconf -*-
 
 # Java skeleton for Bison -*- autoconf -*-
 

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


@@ -20,6 +20,9 @@ m4_include(b4_pkgdatadir/[java.m4])
 b4_defines_if([b4_fatal([%s: %%defines does not make sense in Java],
               [b4_skeleton])])
 
 b4_defines_if([b4_fatal([%s: %%defines does not make sense in Java],
               [b4_skeleton])])
 

+# We don't depend on %debug in Java, but pacify warnings about non-used flags.
+b4_debug_if([0], [0])
+

 m4_define([b4_symbol_no_destructor_assert],
 [b4_symbol_if([$1], [has_destructor],
               [b4_fatal([%s: %s: %%destructor does not make sense in Java],
 m4_define([b4_symbol_no_destructor_assert],
 [b4_symbol_if([$1], [has_destructor],
               [b4_fatal([%s: %s: %%destructor does not make sense in Java],

diff --git a/data/yacc.c b/data/yacc.c
index 2c6024c68a03696e419c5b4d27d92e2007ee9443..c02ecf2d9bc453bc9a41d30ee3ae4095cdd67cba 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -192,7 +192,7 @@ m4_if(b4_prefix, [yy], [],
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

-# define YYDEBUG ]b4_debug_flag[
+# define YYDEBUG ]b4_debug_if([1], [0])[

 #endif
 
 /* Enabling verbose error messages.  */
 #endif
 
 /* Enabling verbose error messages.  */

diff --git a/src/getargs.c b/src/getargs.c
index 14cba3eddb24dff2d43536ae8e69de240a69c152..7a67878a1a6f4133c71b97a39d4abddd11bc1648 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -47,7 +47,6 @@
 #include "muscle_tab.h"
 #include "uniqstr.h"
 
 #include "muscle_tab.h"
 #include "uniqstr.h"
 

-bool debug_flag;

 bool defines_flag;
 bool graph_flag;
 bool xml_flag;
 bool defines_flag;
 bool graph_flag;
 bool xml_flag;


@@ -618,7 +617,7 @@ getargs (int argc, char *argv[])
        break;
 
       case 't':
        break;
 
       case 't':

-       debug_flag = true;
+        muscle_percent_define_insert ("debug", command_line_location (), "");

        break;
 
       case 'v':
        break;
 
       case 'v':

diff --git a/src/getargs.h b/src/getargs.h
index 12bf6450a20458345d2793e36050e8901e49d6fe..c85cb5fa60af1d632b62aa9a871e5538627b311b 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -35,7 +35,6 @@ extern int skeleton_prio;
 /* for -I */
 extern char const *include;
 
 /* for -I */
 extern char const *include;
 

-extern bool debug_flag;                        /* for -t */

 extern bool defines_flag;              /* for -d */
 extern bool graph_flag;                        /* for -g */
 extern bool xml_flag;                  /* for -x */
 extern bool defines_flag;              /* for -d */
 extern bool graph_flag;                        /* for -g */
 extern bool xml_flag;                  /* for -x */

diff --git a/src/output.c b/src/output.c
index 09d89a52672c9d2ed99f6aa2f1f15a6ff82db30f..a06698ce7ff32e755d824b4eb7ae55b354d90cc6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -700,7 +700,6 @@ prepare (void)
     use_push_for_pull_flag = true;
 
   /* Flags. */
     use_push_for_pull_flag = true;
 
   /* Flags. */

-  MUSCLE_INSERT_BOOL ("debug_flag", debug_flag);

   MUSCLE_INSERT_BOOL ("defines_flag", defines_flag);
   MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);
   MUSCLE_INSERT_BOOL ("locations_flag", locations_flag);
   MUSCLE_INSERT_BOOL ("defines_flag", defines_flag);
   MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);
   MUSCLE_INSERT_BOOL ("locations_flag", locations_flag);

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 264e1d32d2b06e50abecb829a06e6416876a0648..53df3a430be2bf4012846cb85d55e2965f19d0c0 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -225,7 +225,10 @@ prologue_declaration:
                         plain_code.code, @1);
       code_scanner_last_string_free ();
     }
                         plain_code.code, @1);
       code_scanner_last_string_free ();
     }

-| "%debug"                         { debug_flag = true; }
+| "%debug"
+    {
+      muscle_percent_define_insert ("debug", @$, "");
+    }

 | "%define" variable content.opt
     {
       muscle_percent_define_insert ($2, @2, $3);
 | "%define" variable content.opt
     {
       muscle_percent_define_insert ($2, @2, $3);