X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d7e0a1a776fa40b77e1c0afa423a6f6f95cad80d..ca2cc7aeec1b652a8aa78a8e481a57209c097d05:/src/getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 4ff38fb1..4e095eb2 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -5,20 +5,18 @@
 
    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"
@@ -50,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 */
 
@@ -276,7 +274,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);
@@ -289,6 +286,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);
 
@@ -391,7 +389,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
@@ -417,6 +415,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' },
 
@@ -434,7 +433,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' },
@@ -475,6 +473,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);
 
@@ -505,10 +510,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;