diagnostics: factor the list of warning names

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index 8d27e7175d12317a5fc974955ea1a75b09e1a8fe..2fba265a0d03278cc3c6054e63603701245ade0c 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,7 +1,7 @@
 /* Parse command line arguments for bison.
 
 /* Parse command line arguments for bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
+   Foundation, Inc.

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


@@ -21,9 +21,8 @@
 #ifndef GETARGS_H_
 # define GETARGS_H_
 
 #ifndef GETARGS_H_
 # define GETARGS_H_
 

-#include "location.h"
+# include "location.h"

 
 

-extern char *program_name;

 enum { command_line_prio, grammar_prio, default_prio };
 
 /* flags set by % directives */
 enum { command_line_prio, grammar_prio, default_prio };
 
 /* flags set by % directives */


@@ -35,16 +34,12 @@ extern int skeleton_prio;
 /* for -I */
 extern char const *include;
 
 /* for -I */
 extern char const *include;
 

-extern bool debug_flag;                        /* 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
 
 
 /* GLR_PARSER is true if the input file says to use the GLR


@@ -106,25 +101,32 @@ enum trace
     trace_time      = 1 << 8,  /**< Time consumption. */
     trace_skeleton  = 1 << 9,  /**< Skeleton postprocessing. */
     trace_m4        = 1 << 10, /**< M4 traces. */
     trace_time      = 1 << 8,  /**< Time consumption. */
     trace_skeleton  = 1 << 9,  /**< Skeleton postprocessing. */
     trace_m4        = 1 << 10, /**< M4 traces. */

+    trace_muscles   = 1 << 11, /**< M4 definitions of the muscles. */
+    trace_ielr      = 1 << 12, /**< IELR conversion. */

     trace_all       = ~0       /**< All of the above.  */
   };
 /** What debug items bison displays during its run.  */
 extern int trace_flag;
 
 /*-------------.
     trace_all       = ~0       /**< All of the above.  */
   };
 /** What debug items bison displays during its run.  */
 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_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;
+
+/*------------.
+| --warning.  |
+`------------*/
+/* Null-terminated list.  */
+extern const char * const warnings_args[];
+extern const int warnings_types[];

 
 
 /** Process the command line arguments.
 
 
 /** Process the command line arguments.


@@ -138,4 +140,7 @@ void getargs (int argc, char *argv[]);
 void language_argmatch (char const *arg, int prio, location loc);
 void skeleton_arg (const char *arg, int prio, location loc);
 
 void language_argmatch (char const *arg, int prio, location loc);
 void skeleton_arg (const char *arg, int prio, location loc);
 

+/** In the string \c s, replace all characters \c from by \c to.  */
+void tr (char *s, char from, char to);
+

 #endif /* !GETARGS_H_ */
 #endif /* !GETARGS_H_ */