yysyntax_error: fix for consistent error with lookahead.

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index f75ec1005fb17f8fec17df0ae3b84f4da294ab39..9d439d04d268bbec9c5cd6c45affc57a22af397e 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,7 +1,7 @@
 /* Parse command line arguments for bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
 /* Parse command line arguments for bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

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


@@ -24,11 +24,13 @@
 #include "location.h"
 
 extern char *program_name;
 #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;


@@ -51,11 +53,6 @@ extern bool error_verbose;
 
 extern bool glr_parser;
 
 
 extern bool glr_parser;
 

-/* PURE_PARSER is true if should generate a parser that is all pure
-   and reentrant.  */
-
-extern bool pure_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.  */


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


@@ -108,6 +106,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.  */


@@ -137,7 +137,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_ */