c++: please G++ 4.8 with -O3: type puning issue

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index f0eddbc690f277a1351bb81c4a12e0c4dd2d33fd..f6d61c3ac7cfc6aab244b03ab4e3deaeb354133d 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,6 @@
 /* Parse command line arguments for Bison.
 
 /* Parse command line arguments for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software

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


@@ -46,6 +46,7 @@ bool yacc_flag; /* for -y */
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 

+int feature_flag = feature_caret;

 int report_flag = report_none;
 int trace_flag = trace_none;
 
 int report_flag = report_none;
 int trace_flag = trace_none;
 


@@ -62,63 +63,82 @@ 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;
 

-
-/** Decode an option's set of keys.
+/** Decode an option's key.

  *
  *  \param option   option being decoded.
  *  \param keys     array of valid subarguments.
  *  \param values   array of corresponding (int) values.
  *  \param all      the all value.
  *  \param flags    the flags to update
  *
  *  \param option   option being decoded.
  *  \param keys     array of valid subarguments.
  *  \param values   array of corresponding (int) values.
  *  \param all      the all value.
  *  \param flags    the flags to update

- *  \param args     comma separated list of effective subarguments to decode.
- *                  If 0, then activate all the flags.
+ *  \param arg      the subarguments to decode.
+ *                  If null, then activate all the flags.
+ *  \param no       length of the potential "no-" prefix.
+ *                  Can be 0 or 3. If 3, negate the action of the subargument.
+ *  \param err      length of a potential "error=".
+ *                  Can be 0 or 6. If 6, treat the subargument as a CATEGORY

  *
  *  If VALUE != 0 then KEY sets flags and no-KEY clears them.
  *  If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all
  *  flags from \c all.  Thus no-none = all and no-all = none.
  */
 static void
  *
  *  If VALUE != 0 then KEY sets flags and no-KEY clears them.
  *  If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all
  *  flags from \c all.  Thus no-none = all and no-all = none.
  */
 static void

+flag_argmatch (const char *option,
+               const char * const keys[], const int values[],
+               int all, int *flags, char *arg, size_t no, size_t err)
+{
+  int value = 0;
+  if (!err || arg[no + err++] != '\0')
+    value = XARGMATCH (option, arg + no + err, keys, values);
+
+  if (value)
+    {
+      if (no)
+        *flags &= ~value;
+      else
+        {
+          if (err)
+            warnings_flag |= value;
+          *flags |= value;
+        }
+    }
+  else
+    {
+      /* With a simpler 'if (no)' version, -Werror means -Werror=all
+         (or rather, -Werror=no-none, but that syntax is invalid).
+         The difference is:
+         - Werror activates all errors, but not the warnings
+         - Werror=all activates errors, and all warnings */
+      if (no ? !err : err)
+        *flags |= all;
+      else
+        *flags &= ~all;
+    }
+}
+/** Decode an option's set of keys.
+ *
+ *  \param option   option being decoded.
+ *  \param keys     array of valid subarguments.
+ *  \param values   array of corresponding (int) values.
+ *  \param all      the all value.
+ *  \param flags    the flags to update
+ *  \param args     comma separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ */
+static void

 flags_argmatch (const char *option,
                 const char * const keys[], const int values[],
                 int all, int *flags, char *args)
 {
   if (args)
 flags_argmatch (const char *option,
                 const char * const keys[], const int values[],
                 int all, int *flags, char *args)
 {
   if (args)

-  {
-    args = strtok (args, ",");
-    while (args)
-    {
-      int value = all;
-      int *save_flags = flags;
-      int no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
-      int err = STRPREFIX_LIT ("error", args + no) ? 5 : 0; 
-
-      if (err)
-        flags = &errors_flag;
-      if (!err || args[no + err++] != '\0')
-        value = XARGMATCH (option, args + no + err, keys, values);
+    for (args = strtok (args, ","); args; args = strtok (NULL, ","))
+      {
+        size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+        size_t err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;

 
 

-        if (!value)
-        {
-          if (no)
-            *flags |= all;
-          else
-             *flags &= ~all;
-        }
-        else
-        {
-          if (no)
-            *flags &= ~value;
-          else
-          {
-            if (err)
-              warnings_flag |= value;
-           *flags |= value;
-          }
-        }
-      flags = save_flags;
-      args = strtok (NULL, ",");
-    }
-  }
+        flag_argmatch (option, keys,
+                       values, all, err ? &errors_flag : flags,
+                       args, no, err);
+      }

   else
     *flags |= all;
 }
   else
     *flags |= all;
 }


@@ -253,6 +273,27 @@ static const int warnings_types[] =
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);
 
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);
 

+/*-----------------------.
+| --feature's handling.  |
+`-----------------------*/
+
+static const char * const feature_args[] =
+{
+  "none",
+  "caret", "diagnostics-show-caret",
+  "all",
+  0
+};
+
+static const int feature_types[] =
+{
+  feature_none,
+  feature_caret, feature_caret,
+  feature_all
+};
+
+ARGMATCH_VERIFY (feature_args, feature_types);
+

 /*-------------------------------------------.
 | Display the help message and exit STATUS.  |
 `-------------------------------------------*/
 /*-------------------------------------------.
 | Display the help message and exit STATUS.  |
 `-------------------------------------------*/


@@ -296,13 +337,13 @@ Operation modes:\n\
       --print-datadir        output directory containing skeletons and XSLT\n\
   -y, --yacc                 emulate POSIX Yacc\n\
   -W, --warnings[=CATEGORY]  report the warnings falling in CATEGORY\n\
       --print-datadir        output directory containing skeletons and XSLT\n\
   -y, --yacc                 emulate POSIX Yacc\n\
   -W, --warnings[=CATEGORY]  report the warnings falling in CATEGORY\n\

+  -f, --feature[=FEATURE]    activate miscellaneous features\n\

 \n\
 "), stdout);
 
       fputs (_("\
 Parser:\n\
   -L, --language=LANGUAGE          specify the output programming language\n\
 \n\
 "), stdout);
 
       fputs (_("\
 Parser:\n\
   -L, --language=LANGUAGE          specify the output programming language\n\

-                                   (this is an experimental feature)\n\

   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for tracing\n\
                                    same as `-Dparse.trace'\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for tracing\n\
                                    same as `-Dparse.trace'\n\


@@ -313,8 +354,8 @@ Parser:\n\
                                    deprecated by '-Dapi.prefix=PREFIX'\n\
   -l, --no-lines                   don't generate '#line' directives\n\
   -k, --token-table                include a table of token names\n\
                                    deprecated by '-Dapi.prefix=PREFIX'\n\
   -l, --no-lines                   don't generate '#line' directives\n\
   -k, --token-table                include a table of token names\n\

-\n\

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

+      putc ('\n', stdout);

 
       /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
        * won't assume that -d also takes an argument.  */
 
       /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
        * won't assume that -d also takes an argument.  */


@@ -330,22 +371,23 @@ Output:\n\
   -g, --graph[=FILE]         also output a graph of the automaton\n\
   -x, --xml[=FILE]           also output an XML report of the automaton\n\
                              (the XML schema is experimental)\n\
   -g, --graph[=FILE]         also output a graph of the automaton\n\
   -x, --xml[=FILE]           also output an XML report of the automaton\n\
                              (the XML schema is experimental)\n\

-\n\

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

+      putc ('\n', stdout);

 
       fputs (_("\
 Warning categories include:\n\
 
       fputs (_("\
 Warning categories include:\n\

-  `midrule-values'  unset or unused midrule values\n\
-  `yacc'            incompatibilities with POSIX Yacc\n\
-  `conflicts-sr'    S/R conflicts (enabled by default)\n\
-  `conflicts-rr'    R/R conflicts (enabled by default)\n\
-  `other'           all other warnings (enabled by default)\n\
-  `all'             all the warnings\n\
-  `no-CATEGORY'     turn off warnings in CATEGORY\n\
-  `none'            turn off all the warnings\n\
-  `error'           treat warnings as errors\n\
-\n\
+  `midrule-values'    unset or unused midrule values\n\
+  `yacc'              incompatibilities with POSIX Yacc\n\
+  `conflicts-sr'      S/R conflicts (enabled by default)\n\
+  `conflicts-rr'      R/R conflicts (enabled by default)\n\
+  `deprecated'        obsolete constructs\n\
+  `other'             all other warnings (enabled by default)\n\
+  `all'               all the warnings\n\
+  `no-CATEGORY'       turn off warnings in CATEGORY\n\
+  `none'              turn off all the warnings\n\
+  `error[=CATEGORY]'  treat warnings as errors\n\

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

+      putc ('\n', stdout);

 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\
 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\


@@ -356,6 +398,14 @@ THINGS is a list of comma separated words that can include:\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stdout);
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stdout);

+      putc ('\n', stdout);
+
+      fputs (_("\
+FEATURE is a list of comma separated words that can include:\n\
+  `caret'        show errors with carets\n\
+  `all'          all of the above\n\
+  `none'         disable all of the above\n\
+  "), stdout);

 
       putc ('\n', stdout);
       printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
 
       putc ('\n', stdout);
       printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);


@@ -421,8 +471,8 @@ skeleton_arg (char const *arg, int prio, location loc)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)

-    complain_at (loc, complaint,
-                 _("multiple skeleton declarations are invalid"));
+    complain (&loc, complaint,
+              _("multiple skeleton declarations are invalid"));

 }
 
 void
 }
 
 void


@@ -447,7 +497,7 @@ language_argmatch (char const *arg, int prio, location loc)
   else
     return;
 
   else
     return;
 

-  complain_at (loc, complaint, msg, quotearg_colon (arg));
+  complain (&loc, complaint, msg, quotearg_colon (arg));

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


@@ -466,6 +516,7 @@ static char const short_options[] =
   "W::"
   "b:"
   "d"
   "W::"
   "b:"
   "d"

+  "f::"

   "e"
   "g::"
   "h"
   "e"
   "g::"
   "h"


@@ -518,6 +569,7 @@ static struct option const long_options[] =
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },

+  { "feature",     optional_argument,   0,   'f' },

 
   /* Operation modes.  */
   { "fixed-output-files", no_argument,  0,   'y' },
 
   /* Operation modes.  */
   { "fixed-output-files", no_argument,  0,   'y' },


@@ -552,7 +604,7 @@ 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. */

-  boundary_set (&res.start, uniqstr_new ("<command line>"), optind, -1);
+  boundary_set (&res.start, uniqstr_new ("<command line>"), optind - 1, -1);

   res.end = res.start;
   return res;
 }
   res.end = res.start;
   return res;
 }


@@ -610,6 +662,10 @@ getargs (int argc, char *argv[])
         version ();
         exit (EXIT_SUCCESS);
 
         version ();
         exit (EXIT_SUCCESS);
 

+      case 'f':
+        FLAGS_ARGMATCH (feature, optarg, feature_all);
+        break;
+

       case 'W':
         FLAGS_ARGMATCH (warnings, optarg, Wall);
         break;
       case 'W':
         FLAGS_ARGMATCH (warnings, optarg, Wall);
         break;


@@ -680,6 +736,8 @@ getargs (int argc, char *argv[])
         break;
 
       case 'y':
         break;
 
       case 'y':

+        warnings_flag |= Wyacc;
+        errors_flag |= Wyacc;

         yacc_flag = true;
         break;
 
         yacc_flag = true;
         break;