b4_args is more general than only C++.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 34cb5874267e1b238bbc55f652e7ddbbbedaef89..cff6ff3fecdb553d679d7e8ec3999eaedd4ac4a5 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -72,9 +72,9 @@ static struct bison_language const valid_languages[] = {
   { "", "", "", "", false }
 };
 
   { "", "", "", "", false }
 };
 

-static int skeleton_prio = 2;
+int skeleton_prio = default_prio;

 const char *skeleton = NULL;
 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;
 
 struct bison_language const *language = &valid_languages[0];
 const char *include = NULL;
 


@@ -87,10 +87,12 @@ char *program_name;
  *  \param keys     array of valid subarguments.
  *  \param values   array of corresponding (int) values.
  *  \param flags    the flags to update
  *  \param keys     array of valid subarguments.
  *  \param values   array of corresponding (int) values.
  *  \param flags    the flags to update

- *  \param args     colon separated list of effective subarguments to decode.
+ *  \param args     comma separated list of effective subarguments to decode.

  *                  If 0, then activate all the flags.
  *
  *                  If 0, then activate all the flags.
  *

- *  The special value 0 resets the flags to 0.
+ *  If VALUE != 0 then KEY sets flags and no-KEY clears them.
+ *  If VALUE == 0 then KEY clears all flags and no-KEY sets all flags.
+ *  Thus no-none = all and no-all = none.

  */
 static void
 flags_argmatch (const char *option,
  */
 static void
 flags_argmatch (const char *option,


@@ -102,11 +104,18 @@ flags_argmatch (const char *option,
       args = strtok (args, ",");
       while (args)
        {
       args = strtok (args, ",");
       while (args)
        {

-         int value = XARGMATCH (option, args, keys, values);
+         int no = strncmp (args, "no-", 3) == 0 ? 3 : 0;
+         int value = XARGMATCH (option, args + no, keys, values);

          if (value == 0)
          if (value == 0)

-           *flags = 0;
+           if (no)
+             *flags = ~0;
+           else
+             *flags = 0;

          else
          else

-           *flags |= value;
+           if (no)
+             *flags &= ~value;
+           else
+             *flags |= value;

          args = strtok (NULL, ",");
        }
     }
          args = strtok (NULL, ",");
        }
     }


@@ -176,6 +185,7 @@ static const char * const trace_args[] =
   "grammar    - reading, reducing the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",
   "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",
   "tools      - m4 invocation",
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",


@@ -194,6 +204,7 @@ static const int trace_types[] =
   trace_grammar,
   trace_resource,
   trace_sets,
   trace_grammar,
   trace_resource,
   trace_sets,

+  trace_muscles,

   trace_tools,
   trace_m4,
   trace_skeleton,
   trace_tools,
   trace_m4,
   trace_skeleton,


@@ -246,6 +257,11 @@ usage (int status)
             program_name);
   else
     {
             program_name);
   else
     {

+      /* For ../build-aux/cross-options.pl to work, use the format:
+               ^  -S, --long[=ARGS] (whitespace)
+        A --long option is required.
+        Otherwise, add exceptions to ../build-aux/cross-options.pl.  */
+

       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
 Generate LALR(1) and GLR parsers.\n\
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
 Generate LALR(1) and GLR parsers.\n\


@@ -361,7 +377,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `--------------------------------------*/
 
 void
 `--------------------------------------*/
 
 void

-skeleton_arg (char const *arg, int prio, location const *loc)
+skeleton_arg (char const *arg, int prio, location loc)

 {
   if (prio < skeleton_prio)
     {
 {
   if (prio < skeleton_prio)
     {


@@ -372,15 +388,12 @@ skeleton_arg (char const *arg, int prio, location const *loc)
     {
       char const *msg =
        _("multiple skeleton declarations are invalid");
     {
       char const *msg =
        _("multiple skeleton declarations are invalid");

-      if (loc)
-       complain_at (*loc, msg);
-      else
-       complain (msg);
+      complain_at (loc, msg);

     }
 }
 
 void
     }
 }
 
 void

-language_argmatch (char const *arg, int prio, location const *loc)
+language_argmatch (char const *arg, int prio, location loc)

 {
   char const *msg;
 
 {
   char const *msg;
 


@@ -401,10 +414,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
   else
     return;
 
   else
     return;
 

-  if (loc)
-    complain_at (*loc, msg, arg);
-  else
-    complain (msg, arg);
+  complain_at (loc, msg, arg);

 }
 
 /*----------------------.
 }
 
 /*----------------------.


@@ -503,7 +513,7 @@ static struct option const long_options[] =
 /* Build a location for the current command line argument. */
 static
 location
 /* 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. */
 {
   location res;
   /* "<command line>" is used in GCC's messages about -D. */


@@ -535,9 +545,8 @@ getargs (int argc, char *argv[])
           char* value = strchr (optarg, '=');
           if (value)
             *value++ = 0;
           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;
 
         }
        break;
 


@@ -546,11 +555,13 @@ getargs (int argc, char *argv[])
        break;
 
       case 'L':
        break;
 
       case 'L':

-       language_argmatch (optarg, 0, NULL);
+       language_argmatch (optarg, command_line_prio,
+                          command_line_location ());

        break;
 
       case 'S':
        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':
        break;
 
       case 'T':