yacc.c: scope reduction

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index 4f62d3dc8e2a5092a79ef6852b26b603641c8faa..b2126fc21319bc85a02471b85637f400f368518b 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 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,19 +23,21 @@
 
 #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 debug;                     /* for -t */

 extern bool defines_flag;              /* for -d */
 extern bool graph_flag;                        /* for -g */
 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 locations_flag;
 extern bool no_lines_flag;             /* for -l */
 extern bool token_table_flag;          /* for -k */


@@ -50,19 +52,6 @@ extern bool error_verbose;
 
 extern bool glr_parser;
 
 
 extern bool glr_parser;
 

-/* PULL_PARSER is true if should generate a pull parser.  */
-
-extern bool pull_parser;
-
-/* PURE_PARSER is true if should generate a parser that is all pure
-   and reentrant.  */
-
-extern bool pure_parser;
-
-/* PUSH_PARSER is true if should generate a push parser.  */
-
-extern bool push_parser;
-

 /* NONDETERMINISTIC_PARSER is true iff conflicts are accepted.  This
    is used by the GLR parser, and might be used in BackTracking
    parsers too.  */
 /* NONDETERMINISTIC_PARSER is true iff conflicts are accepted.  This
    is used by the GLR parser, and might be used in BackTracking
    parsers too.  */


@@ -80,6 +69,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;
 
 /*-----------.


@@ -115,6 +105,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.  */


@@ -130,11 +122,26 @@ 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.  */
 extern int warnings_flag;
 
     warnings_all              = ~warnings_error /**< All above warnings.  */
   };
 /** What warnings are issued.  */
 extern int warnings_flag;
 

+/*-------------.
+| --features.  |
+`-------------*/
+
+enum feature
+  {
+    feature_none  = 0,         /**< No additional feature.  */
+    feature_caret = 1 << 0,    /**< Enhance the output of errors with carets.  */
+    feature_all   = ~0         /**< All above features.  */
+  };
+/** What additional features to use.  */
+extern int feature_flag;

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


@@ -144,7 +151,10 @@ extern int warnings_flag;
 void getargs (int argc, char *argv[]);
 
 /* Used by parse-gram.y.  */
 void getargs (int argc, char *argv[]);
 
 /* Used by parse-gram.y.  */

-void language_argmatch (char const *arg, int prio, location const *loc);
-void skeleton_arg (const char *arg, int prio, location const *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_ */