Finish implementing --warnings=error, which should not be implied by

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 0113f3370f5e877773394d0cf35bf0bf8b5e2a1e..c34efa2120b0ad190899f2e02a4b021c2ce26849 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,7 @@
-/* Parse command line arguments for bison.
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+/* Parse command line arguments for Bison.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -16,28 +17,54 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free

-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

+#include <config.h>

 #include "system.h"
 #include "system.h"

-#include "getopt.h"
-#include "argmatch.h"
-#include "error.h"
+#include "revision.h"
+
+#include <argmatch.h>
+#include <configmake.h>
+#include <error.h>
+
+/* Hack to get <getopt.h> to declare getopt with a prototype.  */
+#if lint && ! defined __GNU_LIBRARY__
+# define __GNU_LIBRARY__
+# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1
+#endif
+
+#include <getopt.h>
+
+#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+# undef __GNU_LIBRARY__
+# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+#endif
+

 #include "complain.h"
 #include "complain.h"

-#include "struniq.h"
-#include "getargs.h"

 #include "files.h"
 #include "files.h"

+#include "getargs.h"
+#include "uniqstr.h"
+
+bool debug_flag;
+bool defines_flag;
+bool graph_flag;
+bool locations_flag;
+bool no_lines_flag;
+bool no_parser_flag;
+bool token_table_flag;
+bool yacc_flag;        /* for -y */
+
+bool error_verbose = false;
+
+bool nondeterministic_parser = false;
+bool glr_parser = false;
+bool pure_parser = false;
+bool push_parser = false;

 
 

-int debug_flag = 0;
-int defines_flag = 0;
-int locations_flag = 0;
-int no_lines_flag = 0;
-int no_parser_flag = 0;

 int report_flag = report_none;
 int report_flag = report_none;

-int token_table_flag = 0;
-int yacc_flag = 0;     /* for -y */
-int graph_flag = 0;

 int trace_flag = trace_none;
 int trace_flag = trace_none;

+int warnings_flag = warnings_none;

 
 const char *skeleton = NULL;
 const char *include = NULL;
 
 const char *skeleton = NULL;
 const char *include = NULL;


@@ -45,6 +72,85 @@ const char *include = NULL;
 extern char *program_name;
 
 
 extern char *program_name;
 
 

+/** Decode an option's set of keys.
+ *
+ *  \param option   option being decoded.
+ *  \paran keys     array of valid subarguments.
+ *  \param values   array of corresponding (int) values.
+ *  \param flag     the flags to update
+ *  \param args     colon separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ *
+ *  The special value 0 resets the flags to 0.
+ */
+static void
+flags_argmatch (const char *option,
+               const char * const keys[], const int values[],
+               int *flags, char *args)
+{
+  if (args)
+    {
+      args = strtok (args, ",");
+      while (args)
+       {
+         int value = XARGMATCH (option, args, keys, values);
+         if (value == 0)
+           *flags = 0;
+         else
+           *flags |= value;
+          args = strtok (NULL, ",");
+       }
+    }
+  else
+    *flags = ~0;
+}
+
+/** Decode a set of sub arguments.
+ *
+ *  \param FlagName  the flag familly to update.
+ *  \param args      the effective sub arguments to decode.
+ *
+ *  \arg FlagName_args   the list of keys.
+ *  \arg FlagName_types  the list of values.
+ *  \arg FlagName_flag   the flag to update.
+ */
+#define FLAGS_ARGMATCH(FlagName, Args)                                 \
+  flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
+                 &FlagName ## _flag, Args)
+
+
+/*----------------------.
+| --report's handling.  |
+`----------------------*/
+
+static const char * const report_args[] =
+{
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none",
+  "state", "states",
+  "itemset", "itemsets",
+  "lookahead", "lookaheads", "look-ahead",
+  "solved",
+  "all",
+  0
+};
+
+static const int report_types[] =
+{
+  report_none,
+  report_states, report_states,
+  report_states | report_itemsets, report_states | report_itemsets,
+  report_states | report_lookahead_tokens,
+  report_states | report_lookahead_tokens,
+  report_states | report_lookahead_tokens,
+  report_states | report_solved_conflicts,
+  report_all
+};
+
+ARGMATCH_VERIFY (report_args, report_types);
+
+

 /*---------------------.
 | --trace's handling.  |
 `---------------------*/
 /*---------------------.
 | --trace's handling.  |
 `---------------------*/


@@ -53,15 +159,16 @@ static const char * const trace_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 report",
+  "none       - no traces",

   "scan       - grammar scanner traces",
   "parse      - grammar parser traces",
   "scan       - grammar scanner traces",
   "parse      - grammar parser traces",

-  "automaton  - contruction of the automaton",
+  "automaton  - construction of the automaton",

   "bitsets    - use of bitsets",
   "bitsets    - use of bitsets",

-  "grammar    - reading, reducing of the grammar",
+  "grammar    - reading, reducing the grammar",

   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",

-  "tools      - m4 invocation and preserve the temporary file",
+  "tools      - m4 invocation",
+  "m4         - m4 traces",

   "skeleton   - skeleton postprocessing",
   "time       - time consumption",
   "all        - all of the above",
   "skeleton   - skeleton postprocessing",
   "time       - time consumption",
   "all        - all of the above",


@@ -79,79 +186,39 @@ static const int trace_types[] =
   trace_resource,
   trace_sets,
   trace_tools,
   trace_resource,
   trace_sets,
   trace_tools,

+  trace_m4,

   trace_skeleton,
   trace_time,
   trace_all
 };
 
   trace_skeleton,
   trace_time,
   trace_all
 };
 

-
-static void
-trace_argmatch (char *args)
-{
-  ARGMATCH_ASSERT (trace_args, trace_types);
-  if (args)
-    {
-      args = strtok (args, ",");
-      do
-       {
-         int trace = XARGMATCH ("--trace", args,
-                                trace_args, trace_types);
-         if (trace == trace_none)
-           trace_flag = trace_none;
-         else
-           trace_flag |= trace;
-       }
-      while ((args = strtok (NULL, ",")));
-    }
-  else
-    trace_flag = trace_all;
-}
+ARGMATCH_VERIFY (trace_args, trace_types);

 
 
 
 

-/*----------------------.
-| --report's handling.  |
-`----------------------*/
+/*------------------------.
+| --warnings's handling.  |
+`------------------------*/

 
 

-static const char * const report_args[] =
+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",
-  "state", "states",
-  "itemset", "itemsets",
-  "lookahead", "lookaheads",
-  "solved",
-  "all",
+  "none       - no warnings",
+  "yacc       - incompatibilities with POSIX YACC",
+  "all        - all of the above",
+  "error      - warnings are errors",

   0
 };
 
   0
 };
 

-static const int report_types[] =
+static const int warnings_types[] =

 {
 {

-  report_none,
-  report_states, report_states,
-  report_states | report_itemsets, report_states | report_itemsets,
-  report_states | report_lookaheads, report_states | report_lookaheads,
-  report_states | report_solved_conflicts,
-  report_all
+  warnings_none,
+  warnings_yacc,
+  warnings_all,
+  warnings_error

 };
 
 };
 

-
-static void
-report_argmatch (char *args)
-{
-  ARGMATCH_ASSERT (report_args, report_types);
-  args = strtok (args, ",");
-  do
-    {
-      int report = XARGMATCH ("--report", args,
-                             report_args, report_types);
-      if (report == report_none)
-       report_flag = report_none;
-      else
-       report_flag |= report;
-    }
-  while ((args = strtok (NULL, ",")));
-}
+ARGMATCH_VERIFY (warnings_args, warnings_types);

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


@@ -168,28 +235,25 @@ usage (int status)
             program_name);
   else
     {
             program_name);
   else
     {

-      /* Some efforts were made to ease the translators' task, please
-        continue.  */
+      printf (_("Usage: %s [OPTION]... FILE\n"), program_name);

       fputs (_("\
       fputs (_("\

-GNU bison generates parsers for LALR(1) grammars.\n"), stdout);
-      putc ('\n', stdout);
-
-      fprintf (stdout, _("\
-Usage: %s [OPTION]... FILE\n"), program_name);
-      putc ('\n', stdout);
+Generate LALR(1) and GLR parsers.\n\
+\n\
+"), stdout);

 
       fputs (_("\
 
       fputs (_("\

-If a long option shows an argument as mandatory, then it is mandatory\n\
-for the equivalent short option also.  Similarly for optional arguments.\n"),
-            stdout);
-      putc ('\n', stdout);
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);

 
       fputs (_("\
 
       fputs (_("\

+\n\

 Operation modes:\n\
 Operation modes:\n\

-  -h, --help      display this help and exit\n\
-  -V, --version   output version information and exit\n\
-  -y, --yacc      emulate POSIX yacc\n"), stdout);
-      putc ('\n', stdout);
+  -h, --help                 display this help and exit\n\
+  -V, --version              output version information and exit\n\
+      --print-localedir      output directory containing locale-dependent data\n\
+  -y, --yacc                 emulate POSIX Yacc\n\
+\n\
+"), stdout);

 
       fputs (_("\
 Parser:\n\
 
       fputs (_("\
 Parser:\n\


@@ -200,8 +264,8 @@ Parser:\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\
   -k, --token-table          include a table of token names\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\
   -k, --token-table          include a table of token names\n\

+\n\

 "), stdout);
 "), stdout);

-      putc ('\n', stdout);

 
       fputs (_("\
 Output:\n\
 
       fputs (_("\
 Output:\n\


@@ -210,23 +274,21 @@ 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);
 "), stdout);

-      putc ('\n', stdout);

 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\
 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\

-  `lookahead'    explicitly associate lookaheads to items\n\
+  `lookahead'    explicitly associate lookahead tokens to items\n\

   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stdout);
   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stdout);

-      putc ('\n', stdout);

 
 

-      fputs (_("\
-Report bugs to <bug-bison@gnu.org>.\n"), stdout);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);

     }
 
   exit (status);
     }
 
   exit (status);


@@ -244,11 +306,12 @@ version (void)
      continue.  */
   printf (_("bison (GNU Bison) %s"), VERSION);
   putc ('\n', stdout);
      continue.  */
   printf (_("bison (GNU Bison) %s"), VERSION);
   putc ('\n', stdout);

+  printf ("%s", revision);

   fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
   putc ('\n', stdout);
 
   fprintf (stdout,
   fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
   putc ('\n', stdout);
 
   fprintf (stdout,

-          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002);
+          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006);

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\


@@ -263,13 +326,22 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `----------------------*/
 
 /* Shorts options.  */
 `----------------------*/
 
 /* Shorts options.  */

-const char *short_options = "yvegdhr:ltknVo:b:p:S:T::";
+static char const short_options[] = "yvegdhr:ltknVo:b:p:S:T::W";
+
+/* Values for long options that do not have single-letter equivalents.  */
+enum
+{
+  LOCATIONS_OPTION = CHAR_MAX + 1,
+  PRINT_LOCALEDIR_OPTION
+};

 
 static struct option const long_options[] =
 {
   /* Operation modes. */
 
 static struct option const long_options[] =
 {
   /* Operation modes. */

-  { "help",          no_argument,              0,   'h' },
-  { "version",       no_argument,              0,   'V' },
+  { "help",            no_argument,      0,   'h' },
+  { "version",         no_argument,      0,   'V' },
+  { "print-localedir", no_argument,      0,   PRINT_LOCALEDIR_OPTION },
+  { "warnings",        optional_argument, 0,   'W' },

 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },
 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },


@@ -295,7 +367,7 @@ static struct option const long_options[] =
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },

-  { "locations",      no_argument, &locations_flag,     1 },
+  { "locations",      no_argument,              0, LOCATIONS_OPTION },

   { "no-lines",       no_argument,               0,   'l' },
   { "no-parser",      no_argument,               0,   'n' },
   { "raw",            no_argument,               0,     0 },
   { "no-lines",       no_argument,               0,   'l' },
   { "no-parser",      no_argument,               0,   'n' },
   { "raw",            no_argument,               0,     0 },


@@ -318,33 +390,27 @@ getargs (int argc, char *argv[])
 {
   int c;
 
 {
   int c;
 

-  while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF)
+  while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
+        != -1)

     switch (c)
       {
       case 0:
        /* Certain long options cause getopt_long to return 0.  */
        break;
 
     switch (c)
       {
       case 0:
        /* Certain long options cause getopt_long to return 0.  */
        break;
 

-      case 'y':
-       yacc_flag = 1;
+      case 'b':
+       spec_file_prefix = AS_FILE_NAME (optarg);

        break;
 
        break;
 

-      case 'h':
-       usage (EXIT_SUCCESS);
-
-      case 'V':
-       version ();
-       exit (EXIT_SUCCESS);
-

       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */

-       graph_flag = 1;
-       spec_graph_file = AS_FILE_NAME (optarg);
+       graph_flag = true;
+       if (optarg)
+         spec_graph_file = AS_FILE_NAME (optarg);

        break;
 
        break;
 

-      case 'v':
-       report_flag |= report_states;
-       break;
+      case 'h':
+       usage (EXIT_SUCCESS);

 
       case 'S':
        skeleton = AS_FILE_NAME (optarg);
 
       case 'S':
        skeleton = AS_FILE_NAME (optarg);


@@ -356,47 +422,70 @@ getargs (int argc, char *argv[])
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */

-       defines_flag = 1;
+       defines_flag = true;

        if (optarg)
          spec_defines_file = AS_FILE_NAME (optarg);
        break;
 
        if (optarg)
          spec_defines_file = AS_FILE_NAME (optarg);
        break;
 

-      case 'l':
-       no_lines_flag = 1;
-       break;
-

       case 'k':
       case 'k':

-       token_table_flag = 1;
+       token_table_flag = true;

        break;
 
        break;
 

-      case 'n':
-       no_parser_flag = 1;
+      case 'l':
+       no_lines_flag = true;

        break;
 
        break;
 

-      case 't':
-       debug_flag = 1;
+      case 'n':
+       no_parser_flag = true;

        break;
 
       case 'o':
        spec_outfile = AS_FILE_NAME (optarg);
        break;
 
        break;
 
       case 'o':
        spec_outfile = AS_FILE_NAME (optarg);
        break;
 

-      case 'b':
-       spec_file_prefix = AS_FILE_NAME (optarg);
-       break;
-

       case 'p':
        spec_name_prefix = optarg;
        break;
 
       case 'r':
       case 'p':
        spec_name_prefix = optarg;
        break;
 
       case 'r':

-       report_argmatch (optarg);
+       FLAGS_ARGMATCH (report, optarg);

        break;
 
       case 'T':
        break;
 
       case 'T':

-       trace_argmatch (optarg);
+       FLAGS_ARGMATCH (trace, optarg);
+       break;
+
+      case 't':
+       debug_flag = true;

        break;
 
        break;
 

+      case 'V':
+       version ();
+       exit (EXIT_SUCCESS);
+
+      case 'v':
+       report_flag |= report_states;
+       break;
+
+      case 'y':
+       yacc_flag = true;
+       break;
+
+      case 'W':
+       if (optarg)
+         FLAGS_ARGMATCH (warnings, optarg);
+       else
+         warnings_flag |= warnings_all;
+       break;
+
+      case LOCATIONS_OPTION:
+       locations_flag = true;
+       break;
+
+      case PRINT_LOCALEDIR_OPTION:
+       printf ("%s\n", LOCALEDIR);
+       exit (EXIT_SUCCESS);
+

       default:
        usage (EXIT_FAILURE);
       }
       default:
        usage (EXIT_FAILURE);
       }


@@ -410,5 +499,5 @@ getargs (int argc, char *argv[])
       usage (EXIT_FAILURE);
     }
 
       usage (EXIT_FAILURE);
     }
 

-  current_file = grammar_file = struniq_new (argv[optind]);
+  current_file = grammar_file = uniqstr_new (argv[optind]);

 }
 }