Version 2.4.1.

[bison.git] / src / getargs.h

diff --git a/src/getargs.h b/src/getargs.h
index 886f200484add70d13f5a7de9099bea0a3bffff3..eb7f448e2f0b56c1000076a9cf12fe8cf196c262 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -1,24 +1,22 @@
 /* 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 Free Software Foundation, Inc.

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

-   Bison is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
    You should have received a copy of the GNU General Public License
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef GETARGS_H_
 # define GETARGS_H_
 
 #ifndef GETARGS_H_
 # define GETARGS_H_


@@ -26,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;


@@ -38,9 +38,9 @@ extern char const *include;
 extern bool debug_flag;                        /* for -t */
 extern bool defines_flag;              /* for -d */
 extern bool graph_flag;                        /* for -g */
 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 locations_flag;
 extern bool no_lines_flag;             /* for -l */

-extern bool no_parser_flag;            /* for -n */

 extern bool token_table_flag;          /* for -k */
 extern bool yacc_flag;                 /* for -y */
 
 extern bool token_table_flag;          /* for -k */
 extern bool yacc_flag;                 /* for -y */
 


@@ -53,19 +53,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.  */


@@ -83,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;
 
 /*-----------.