Replace `%push-parser' and `%push-pull-parser' with

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 7e7d8a93c9e4686d896068512726f4ad2a1923d9..45b0dc847f22101eebd19dea64f4579ac4ff553f 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,30 +1,29 @@
 /* Parse command line arguments for Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
    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
-   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/>.  */
 
 #include <config.h>
 #include "system.h"
 #include "revision.h"
 
 #include <argmatch.h>
+#include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>
 
@@ -49,9 +48,9 @@
 bool debug_flag;
 bool defines_flag;
 bool graph_flag;
+bool xml_flag;
 bool locations_flag;
 bool no_lines_flag;
-bool no_parser_flag;
 bool token_table_flag;
 bool yacc_flag;        /* for -y */
 
@@ -60,7 +59,6 @@ bool error_verbose = false;
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 bool pure_parser = false;
-bool push_parser = false;
 
 int report_flag = report_none;
 int trace_flag = trace_none;
@@ -69,6 +67,7 @@ int warnings_flag = warnings_none;
 static struct bison_language const valid_languages[] = {
   { "c", "c-skel.m4", ".c", ".h", true },
   { "c++", "c++-skel.m4", ".cc", ".hh", true },
+  { "java", "java-skel.m4", ".java", ".java", false },
   { "", "", "", "", false }
 };
 
@@ -273,7 +272,6 @@ Parser:\n\
       --locations            enable locations computation\n\
   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
   -l, --no-lines             don't generate `#line' directives\n\
-  -n, --no-parser            generate the tables only\n\
   -k, --token-table          include a table of token names\n\
 \n\
 "), stdout);
@@ -286,6 +284,7 @@ Output:\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
   -g, --graph                also output a graph of the automaton\n\
+  -x, --xml                  also output an xml of the automaton\n\
 \n\
 "), stdout);
 
@@ -364,7 +363,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
     {
       int i;
       for (i = 0; valid_languages[i].language[0]; i++)
-       if (strcasecmp (arg, valid_languages[i].language) == 0)
+       if (c_strcasecmp (arg, valid_languages[i].language) == 0)
          {
            language_prio = prio;
            language = &valid_languages[i];
@@ -388,7 +387,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
 `----------------------*/
 
 /* Shorts options.  */
-static char const short_options[] = "yvegdhr:L:ltknVo:b:p:S:T::W";
+static char const short_options[] = "yvegxdhr:L:ltknVo:b:p:S:T::W";
 
 /* Values for long options that do not have single-letter equivalents.  */
 enum
@@ -414,6 +413,7 @@ static struct option const long_options[] =
   { "output",     required_argument,   0,   'o' },
   { "output-file", required_argument,  0,   'o' },
   { "graph",      optional_argument,   0,   'g' },
+  { "xml",         optional_argument,   0,   'x' },
   { "report",     required_argument,   0,   'r' },
   { "verbose",    no_argument,         0,   'v' },
 
@@ -431,7 +431,6 @@ static struct option const long_options[] =
   { "debug",         no_argument,               0,   't' },
   { "locations",      no_argument,              0, LOCATIONS_OPTION },
   { "no-lines",       no_argument,               0,   'l' },
-  { "no-parser",      no_argument,               0,   'n' },
   { "raw",            no_argument,               0,     0 },
   { "skeleton",       required_argument,         0,   'S' },
   { "language",       required_argument,         0,   'L' },
@@ -472,6 +471,13 @@ getargs (int argc, char *argv[])
          spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
        break;
 
+      case 'x':
+       /* Here, the -x and --xml=FILE options are differentiated.  */
+       xml_flag = true;
+       if (optarg)
+         spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+       break;
+
       case 'h':
        usage (EXIT_SUCCESS);
 
@@ -502,10 +508,6 @@ getargs (int argc, char *argv[])
        no_lines_flag = true;
        break;
 
-      case 'n':
-       no_parser_flag = true;
-       break;
-
       case 'o':
        spec_outfile = AS_FILE_NAME (optarg);
        break;