c++: fix several issues with locations

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index db1c3869554c9da412687b702dc1056060c977f8..e6f9d766db7afb5f14fc0e5d5a11b1611cbb17a6 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,72 +63,69 @@ 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.

  *
  *  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)
+{
+  int value = XARGMATCH (option, arg + no, keys, values);
+
+  /* -rnone == -rno-all, and -rno-none == -rall.  */
+  if (!value)
+    {
+      value = all;
+      no = !no;
+    }
+
+  if (no)
+    *flags &= ~value;
+  else
+    *flags |= value;
+}
+
+/** 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 = 0;
-          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);
-
-          if (!value)
-            {
-            /*  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;
-            }
-          else
-            {
-              if (no)
-                *flags &= ~value;
-              else
-                {
-                  if (err)
-                    warnings_flag |= value;
-                  *flags |= value;
-                }
-            }
-          flags = save_flags;
-          args = strtok (NULL, ",");
-        }
-    }
+    for (args = strtok (args, ","); args; args = strtok (NULL, ","))
+      {
+        size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+        flag_argmatch (option, keys,
+                       values, all, flags, args, no);
+      }

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

+

 /** Decode a set of sub arguments.
  *
  *  \param FlagName  the flag familly to update.
 /** Decode a set of sub arguments.
  *
  *  \param FlagName  the flag familly to update.


@@ -181,8 +179,6 @@ ARGMATCH_VERIFY (report_args, report_types);
 
 static const char * const trace_args[] =
 {
 
 static const char * const trace_args[] =
 {

-  /* In a series of synonyms, present the most meaningful first, so
-     that argmatch_valid be more readable.  */

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


@@ -223,40 +219,26 @@ static const int trace_types[] =
 ARGMATCH_VERIFY (trace_args, trace_types);
 
 
 ARGMATCH_VERIFY (trace_args, trace_types);
 
 

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

 
 

-static const char * const warnings_args[] =
+static const char * const feature_args[] =

 {
 {

-  /* In a series of synonyms, present the most meaningful first, so
-     that argmatch_valid be more readable.  */
-  "none            - no warnings",
-  "midrule-values  - unset or unused midrule values",
-  "yacc            - incompatibilities with POSIX Yacc",
-  "conflicts-sr    - S/R conflicts",
-  "conflicts-rr    - R/R conflicts",
-  "deprecated      - obsolete constructs",
-  "other           - all other warnings",
-  "all             - all of the above",
-  "error           - warnings are errors",
+  "none",
+  "caret", "diagnostics-show-caret",
+  "all",

   0
 };
 
   0
 };
 

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

 {
 {

-  Wnone,
-  Wmidrule_values,
-  Wyacc,
-  Wconflicts_sr,
-  Wconflicts_rr,
-  Wdeprecated,
-  Wother,
-  Wall,
-  Werror
+  feature_none,
+  feature_caret, feature_caret,
+  feature_all

 };
 
 };
 

-ARGMATCH_VERIFY (warnings_args, warnings_types);
+ARGMATCH_VERIFY (feature_args, feature_types);

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


@@ -268,7 +250,7 @@ static void
 usage (int status)
 {
   if (status != 0)
 usage (int status)
 {
   if (status != 0)

-    fprintf (stderr, _("Try `%s --help' for more information.\n"),
+    fprintf (stderr, _("Try '%s --help' for more information.\n"),

              program_name);
   else
     {
              program_name);
   else
     {


@@ -301,16 +283,16 @@ 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\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for tracing\n\

-                                   same as `-Dparse.trace'\n\
+                                   same as '-Dparse.trace'\n\

       --locations                  enable location support\n\
   -D, --define=NAME[=VALUE]        similar to '%define NAME \"VALUE\"'\n\
   -F, --force-define=NAME[=VALUE]  override '%define NAME \"VALUE\"'\n\
       --locations                  enable location support\n\
   -D, --define=NAME[=VALUE]        similar to '%define NAME \"VALUE\"'\n\
   -F, --force-define=NAME[=VALUE]  override '%define NAME \"VALUE\"'\n\


@@ -318,8 +300,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.  */


@@ -329,39 +311,49 @@ Output:\n\
   -d                         likewise but cannot specify FILE (for POSIX Yacc)\n\
   -r, --report=THINGS        also produce details on the automaton\n\
       --report-file=FILE     write report to FILE\n\
   -d                         likewise but cannot specify FILE (for POSIX Yacc)\n\
   -r, --report=THINGS        also produce details on the automaton\n\
       --report-file=FILE     write report to FILE\n\

-  -v, --verbose              same as `--report=state'\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[=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\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\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\
-  `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\
+  '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\
+  'empty-rule'        empty rules without %empty\n\
+  'precedence'        useless precedence and associativity\n\
+  'other'             all other warnings (enabled by default)\n\
+  'all'               all the warnings except 'yacc'\n\
+  'no-CATEGORY'       turn off warnings in CATEGORY\n\
+  'none'              turn off all the warnings\n\
+  'error[=CATEGORY]'  treat warnings as errors\n\

 "), stdout);
       putc ('\n', stdout);
 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\
 "), 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\
-  `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\
+  'state'        describe the states\n\
+  'itemset'      complete the core item sets with their closure\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);
 "), 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);


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

+  "f::"

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


@@ -524,6 +517,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' },


@@ -544,7 +538,7 @@ static struct option const long_options[] =
 };
 
 /* Under DOS, there is no difference on the case.  This can be
 };
 
 /* Under DOS, there is no difference on the case.  This can be

-   troublesome when looking for `.tab' etc.  */
+   troublesome when looking for '.tab' etc.  */

 #ifdef MSDOS
 # define AS_FILE_NAME(File) (strlwr (File), (File))
 #else
 #ifdef MSDOS
 # define AS_FILE_NAME(File) (strlwr (File), (File))
 #else


@@ -558,7 +552,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;
 }


@@ -588,6 +582,7 @@ getargs (int argc, char *argv[])
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),

+                                        muscle_string,

                                         value ? value : "",
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
                                         value ? value : "",
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);


@@ -616,8 +611,12 @@ getargs (int argc, char *argv[])
         version ();
         exit (EXIT_SUCCESS);
 
         version ();
         exit (EXIT_SUCCESS);
 

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

       case 'W':
       case 'W':

-        FLAGS_ARGMATCH (warnings, optarg, Wall);
+        warnings_argmatch (optarg);

         break;
 
       case 'b':
         break;
 
       case 'b':


@@ -668,7 +667,8 @@ getargs (int argc, char *argv[])
 
       case 't':
         muscle_percent_define_insert ("parse.trace",
 
       case 't':
         muscle_percent_define_insert ("parse.trace",

-                                      command_line_location (), "",
+                                      command_line_location (),
+                                      muscle_keyword, "",

                                       MUSCLE_PERCENT_DEFINE_D);
         break;
 
                                       MUSCLE_PERCENT_DEFINE_D);
         break;
 


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

-        warnings_flag |= Wyacc;
-        errors_flag |= Wyacc;
+        warning_argmatch ("error=yacc", 0, 6);

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