Merge remote-tracking branch 'origin/maint'

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index c9e3f48bc2e04b64d766ba0bb2a3b162cb79a2e4..1d8c9d545d7457552a36a5e8df3d5b2ff3c751b4 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-2012 Free Software
+   Foundation, Inc.

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


@@ -23,26 +23,23 @@
 
 #include "location.h"
 
 
 #include "location.h"
 

-extern char *program_name;
+enum { command_line_prio, grammar_prio, default_prio };

 
 /* flags set by % directives */
 
 /* for -S */
 extern char const *skeleton;
 
 /* flags set by % directives */
 
 /* for -S */
 extern char const *skeleton;

+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


@@ -68,6 +65,7 @@ struct bison_language
   bool add_tab;
 };
 
   bool add_tab;
 };
 

+extern int language_prio;

 extern struct bison_language const *language;
 
 /*-----------.
 extern struct bison_language const *language;
 
 /*-----------.


@@ -103,6 +101,8 @@ 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.  */
     trace_all       = ~0       /**< All of the above.  */
   };
 /** What debug items bison displays during its run.  */


@@ -118,6 +118,9 @@ enum 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_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.  */
   };
 /** What warnings are issued.  */
     warnings_all              = ~warnings_error /**< All above warnings.  */
   };
 /** What warnings are issued.  */


@@ -135,4 +138,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_ */