X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/58697c6d89f2db69aa2321fe92fc388f87bf2a3c..6c88b51e8395fe490c15ede2f1b2562258a4260d:/src/getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 34cb5874..2a0611bc 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -72,9 +72,9 @@ static struct bison_language const valid_languages[] = {
   { "", "", "", "", false }
 };
 
-static int skeleton_prio = 2;
+int skeleton_prio = default_prio;
 const char *skeleton = NULL;
-static int language_prio = 2;
+int language_prio = default_prio;
 struct bison_language const *language = &valid_languages[0];
 const char *include = NULL;
 
@@ -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,
@@ -361,7 +363,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `--------------------------------------*/
 
 void
-skeleton_arg (char const *arg, int prio, location const *loc)
+skeleton_arg (char const *arg, int prio, location loc)
 {
   if (prio < skeleton_prio)
     {
@@ -372,15 +374,12 @@ skeleton_arg (char const *arg, int prio, location const *loc)
     {
       char const *msg =
 	_("multiple skeleton declarations are invalid");
-      if (loc)
-	complain_at (*loc, msg);
-      else
-	complain (msg);
+      complain_at (loc, msg);
     }
 }
 
 void
-language_argmatch (char const *arg, int prio, location const *loc)
+language_argmatch (char const *arg, int prio, location loc)
 {
   char const *msg;
 
@@ -401,10 +400,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
   else
     return;
 
-  if (loc)
-    complain_at (*loc, msg, arg);
-  else
-    complain (msg, arg);
+  complain_at (loc, msg, arg);
 }
 
 /*----------------------.
@@ -503,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. */
@@ -535,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;
 
@@ -546,11 +541,13 @@ getargs (int argc, char *argv[])
 	break;
 
       case 'L':
-	language_argmatch (optarg, 0, NULL);
+	language_argmatch (optarg, command_line_prio,
+			   command_line_location ());
 	break;
 
       case 'S':
-	skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
+	skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+		      command_line_location ());
 	break;
 
       case 'T':