* bootstrap (runtime-po/Makevars): Derive from po/Makevars

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 673da188351525518b7820b27e0d8fd1e9097926..177255e70e67a634030d446102d5587371d78ed3 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -91,15 +91,15 @@ flags_argmatch (const char *option,
   if (args)
     {
       args = strtok (args, ",");
   if (args)
     {
       args = strtok (args, ",");

-      do
+      while (args)

        {
          int value = XARGMATCH (option, args, keys, values);
          if (value == 0)
            *flags = 0;
          else
            *flags |= value;
        {
          int value = XARGMATCH (option, args, keys, values);
          if (value == 0)
            *flags = 0;
          else
            *flags |= value;

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

        }
        }

-      while ((args = strtok (NULL, ",")));

     }
   else
     *flags = ~0;
     }
   else
     *flags = ~0;


@@ -203,19 +203,21 @@ static const char * const warnings_args[] =
 {
   /* In a series of synonyms, present the most meaningful first, so
      that argmatch_valid be more readable.  */
 {
   /* In a series of synonyms, present the most meaningful first, so
      that argmatch_valid be more readable.  */

-  "none       - no warnings",
-  "error      - warnings are errors",
-  "yacc       - incompatibilities with POSIX YACC",
-  "all        - all of the above",
+  "none            - no warnings",
+  "midrule-values  - unset or unused midrule values",
+  "yacc            - incompatibilities with POSIX YACC",
+  "all             - all of the above",
+  "error           - warnings are errors",

   0
 };
 
 static const int warnings_types[] =
 {
   warnings_none,
   0
 };
 
 static const int warnings_types[] =
 {
   warnings_none,

-  warnings_error,
+  warnings_midrule_values,

   warnings_yacc,
   warnings_yacc,

-  warnings_all
+  warnings_all,
+  warnings_error

 };
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);
 };
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);


@@ -274,7 +276,7 @@ Output:\n\
   -v, --verbose              same as `--report=state'\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
   -v, --verbose              same as `--report=state'\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\

-  -g, --graph                also produce a VCG description of the automaton\n\
+  -g, --graph                also output a graph of the automaton\n\

 \n\
 "), stdout);
 
 \n\
 "), stdout);
 


@@ -472,7 +474,10 @@ getargs (int argc, char *argv[])
        break;
 
       case 'W':
        break;
 
       case 'W':

-       FLAGS_ARGMATCH (warnings, optarg);
+       if (optarg)
+         FLAGS_ARGMATCH (warnings, optarg);
+       else
+         warnings_flag |= warnings_all;

        break;
 
       case LOCATIONS_OPTION:
        break;
 
       case LOCATIONS_OPTION: