Fix unexpanded macros in GLR defines file.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index a8d1c5480ddb519257ff353e05b673daea27fc44..2a0611bc315ac9a245c539b0556e78c6637d33ea 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -176,6 +176,7 @@ static const char * const trace_args[] =
   "grammar    - reading, reducing the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",
+  "muscles    - m4 definitions passed to the skeleton",
   "tools      - m4 invocation",
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",
@@ -194,6 +195,7 @@ static const int trace_types[] =
   trace_grammar,
   trace_resource,
   trace_sets,
+  trace_muscles,
   trace_tools,
   trace_m4,
   trace_skeleton,
@@ -497,7 +499,7 @@ static struct option const long_options[] =
 /* Build a location for the current command line argument. */
 static
 location
-command_line_location()
+command_line_location (void)
 {
   location res;
   /* "<command line>" is used in GCC's messages about -D. */
@@ -529,9 +531,8 @@ getargs (int argc, char *argv[])
           char* value = strchr (optarg, '=');
           if (value)
             *value++ = 0;
-          else
-            value = "";
-          muscle_percent_define_insert (name, command_line_location (), value);
+          muscle_percent_define_insert (name, command_line_location (),
+                                        value ? value : "");
         }
        break;