Merge remote-tracking branch 'origin/maint'

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index ef97822ae3636af2588f77704540a66329a13a1e..3c081fe321b826d77fa029b38af8f01cdb8ed43a 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -34,16 +34,12 @@ extern int skeleton_prio;
 /* for -I */
 extern char const *include;
 
-extern bool debug;                     /* for -t */
-extern bool defines_flag;              /* for -d */
-extern bool graph_flag;                        /* for -g */
-extern bool xml_flag;                  /* for -x */
-extern bool locations_flag;
-extern bool no_lines_flag;             /* for -l */
-extern bool token_table_flag;          /* for -k */
-extern bool yacc_flag;                 /* for -y */
-
-extern bool error_verbose;
+extern bool defines_flag;               /* for -d */
+extern bool graph_flag;                 /* for -g */
+extern bool xml_flag;                   /* for -x */
+extern bool no_lines_flag;              /* for -l */
+extern bool token_table_flag;           /* for -k */
+extern bool yacc_flag;                  /* for -y */
 
 
 /* GLR_PARSER is true if the input file says to use the GLR
@@ -113,23 +109,17 @@ enum trace
 extern int trace_flag;
 
 /*-------------.
-| --warnings.  |
+| --features.  |
 `-------------*/
 
-enum warnings
+enum feature
   {
-    warnings_none             = 0,      /**< Issue no warnings.  */
-    warnings_error            = 1 << 0, /**< Warnings are treated as errors.  */
-    warnings_midrule_values   = 1 << 1, /**< Unset or unused midrule values.  */
-    warnings_yacc             = 1 << 2, /**< POSIXME.  */
-    warnings_conflicts_sr     = 1 << 3, /**< S/R conflicts.  */
-    warnings_conflicts_rr     = 1 << 4, /**< R/R conflicts.  */
-    warnings_other            = 1 << 5, /**< All other warnings.  */
-    warnings_all              = ~warnings_error /**< All above warnings.  */
+    feature_none  = 0,         /**< No additional feature.  */
+    feature_caret = 1 << 0,    /**< Enhance the output of errors with carets.  */
+    feature_all   = ~0         /**< All above features.  */
   };
-/** What warnings are issued.  */
-extern int warnings_flag;
-
+/** What additional features to use.  */
+extern int feature_flag;
 
 /** Process the command line arguments.
  *