X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/17bd8a736a491f4867176b3885e39e74dc07f854..d782395d52519fabb2cac3bd479246cc6de7efa8:/src/getargs.c
diff --git a/src/getargs.c b/src/getargs.c
index 177255e7..45b0dc84 100644
--- 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 . */
#include
#include "system.h"
#include "revision.h"
#include
+#include
#include
#include
@@ -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,24 +59,33 @@ 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;
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 }
+};
+
+static int skeleton_prio = 2;
const char *skeleton = NULL;
+static int language_prio = 2;
+struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
-extern char *program_name;
+char *program_name;
/** Decode an option's set of keys.
*
* \param option option being decoded.
- * \paran keys array of valid subarguments.
+ * \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
- * \param flag the flags to update
+ * \param flags the flags to update
* \param args colon separated list of effective subarguments to decode.
* If 0, then activate all the flags.
*
@@ -98,7 +106,7 @@ flags_argmatch (const char *option,
*flags = 0;
else
*flags |= value;
- args = strtok (NULL, ",");
+ args = strtok (NULL, ",");
}
}
else
@@ -108,7 +116,7 @@ flags_argmatch (const char *option,
/** Decode a set of sub arguments.
*
* \param FlagName the flag familly to update.
- * \param args the effective sub arguments to decode.
+ * \param Args the effective sub arguments to decode.
*
* \arg FlagName_args the list of keys.
* \arg FlagName_types the list of values.
@@ -264,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);
@@ -277,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);
@@ -323,12 +331,63 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
}
+/*-------------------------------------.
+| --skeleton and --language handling. |
+`--------------------------------------*/
+
+void
+skeleton_arg (char const *arg, int prio, location const *loc)
+{
+ if (prio < skeleton_prio)
+ {
+ skeleton_prio = prio;
+ skeleton = arg;
+ }
+ else if (prio == skeleton_prio)
+ {
+ char const *msg =
+ _("multiple skeleton declarations are invalid");
+ if (loc)
+ complain_at (*loc, msg);
+ else
+ complain (msg);
+ }
+}
+
+void
+language_argmatch (char const *arg, int prio, location const *loc)
+{
+ char const *msg;
+
+ if (prio < language_prio)
+ {
+ int i;
+ for (i = 0; valid_languages[i].language[0]; i++)
+ if (c_strcasecmp (arg, valid_languages[i].language) == 0)
+ {
+ language_prio = prio;
+ language = &valid_languages[i];
+ return;
+ }
+ msg = _("invalid language `%s'");
+ }
+ else if (language_prio == prio)
+ msg = _("multiple language declarations are invalid");
+ else
+ return;
+
+ if (loc)
+ complain_at (*loc, msg, arg);
+ else
+ complain (msg, arg);
+}
+
/*----------------------.
| Process the options. |
`----------------------*/
/* Shorts options. */
-static char const short_options[] = "yvegdhr: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
@@ -354,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' },
@@ -371,9 +431,9 @@ 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' },
{ "token-table", no_argument, 0, 'k' },
{0, 0, 0, 0}
@@ -408,14 +468,25 @@ getargs (int argc, char *argv[])
/* Here, the -g and --graph=FILE options are differentiated. */
graph_flag = true;
if (optarg)
- spec_graph_file = AS_FILE_NAME (optarg);
+ 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);
+ case 'L':
+ language_argmatch (optarg, 0, NULL);
+ break;
+
case 'S':
- skeleton = AS_FILE_NAME (optarg);
+ skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
break;
case 'I':
@@ -426,7 +497,7 @@ getargs (int argc, char *argv[])
/* Here, the -d and --defines options are differentiated. */
defines_flag = true;
if (optarg)
- spec_defines_file = AS_FILE_NAME (optarg);
+ spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
break;
case 'k':
@@ -437,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;