Use ASCII for Sebastien Fricker's name.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index bc490a85feb5d2f9b274e69db79e8717a1fd323b..4ff38fb188594e2ce0373bf6f5dd98c89fe5ccbe 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,7 @@
-/* Parse command line arguments for bison.
-   Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+/* Parse command line arguments for Bison.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.

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


@@ -16,87 +17,119 @@
 
    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
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

+#include <config.h>

 #include "system.h"
 #include "system.h"

-#include "getopt.h"
-#include "argmatch.h"
+#include "revision.h"
+
+#include <argmatch.h>
+#include <c-strcase.h>
+#include <configmake.h>
+#include <error.h>
+
+/* Hack to get <getopt.h> to declare getopt with a prototype.  */
+#if lint && ! defined __GNU_LIBRARY__
+# define __GNU_LIBRARY__
+# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1
+#endif
+
+#include <getopt.h>
+
+#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+# undef __GNU_LIBRARY__
+# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+#endif
+

 #include "complain.h"
 #include "complain.h"

-#include "getargs.h"

 #include "files.h"
 #include "files.h"

+#include "getargs.h"
+#include "uniqstr.h"

 
 

-int debug_flag = 0;
-int defines_flag = 0;
-int locations_flag = 0;
-int no_lines_flag = 0;
-int no_parser_flag = 0;
-int report_flag = report_none;
-int token_table_flag = 0;
-int yacc_flag = 0;     /* for -y */
-int graph_flag = 0;
-int trace_flag = trace_none;
-
-const char *skeleton = NULL;
-const char *include = NULL;
+bool debug_flag;
+bool defines_flag;
+bool graph_flag;
+bool locations_flag;
+bool no_lines_flag;
+bool no_parser_flag;
+bool token_table_flag;
+bool yacc_flag;        /* for -y */

 
 

-extern char *program_name;
+bool error_verbose = false;

 
 

+bool nondeterministic_parser = false;
+bool glr_parser = false;
+bool pull_parser = true;
+bool pure_parser = false;
+bool push_parser = false;

 
 

-/*---------------------.
-| --trace's handling.  |
-`---------------------*/
+int report_flag = report_none;
+int trace_flag = trace_none;
+int warnings_flag = warnings_none;

 
 

-static const char * const trace_args[] =
-{
-  /* In a series of synonyms, present the most meaningful first, so
-     that argmatch_valid be more readable.  */
-  "none       - no report",
-  "automaton  - contruction of the automaton",
-  "bitsets    - use of bitsets",
-  "grammar    - reading, reducing of the grammar",
-  "resource   - time and memory (where available)",
-  "sets       - grammar sets: firsts, nullable etc.",
-  "tools      - m4 invocation and preserve the temporary file",
-  "all        - all of the above",
-  0
+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 const int trace_types[] =
-{
-  trace_none,
-  trace_automaton,
-  trace_bitsets,
-  trace_grammar,
-  trace_resource,
-  trace_sets,
-  trace_tools,
-  trace_all
-};
+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;
+
+char *program_name;

 
 
 
 

+/** Decode an option's set of keys.
+ *
+ *  \param option   option being decoded.
+ *  \param keys     array of valid subarguments.
+ *  \param values   array of corresponding (int) values.
+ *  \param flags    the flags to update
+ *  \param args     colon separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ *
+ *  The special value 0 resets the flags to 0.
+ */

 static void
 static void

-trace_argmatch (char *args)
+flags_argmatch (const char *option,
+               const char * const keys[], const int values[],
+               int *flags, char *args)

 {
 {

-  ARGMATCH_ASSERT (trace_args, trace_types);

   if (args)
     {
       args = strtok (args, ",");
   if (args)
     {
       args = strtok (args, ",");

-      do
+      while (args)

        {
        {

-         int trace = XARGMATCH ("--trace", args,
-                                trace_args, trace_types);
-         if (trace == trace_none)
-           trace_flag = trace_none;
+         int value = XARGMATCH (option, args, keys, values);
+         if (value == 0)
+           *flags = 0;

          else
          else

-           trace_flag |= trace;
+           *flags |= value;
+         args = strtok (NULL, ",");

        }
        }

-      while ((args = strtok (NULL, ",")));

     }
   else
     }
   else

-    trace_flag = trace_all;
+    *flags = ~0;

 }
 
 }
 

+/** Decode a set of sub arguments.
+ *
+ *  \param FlagName  the flag familly to update.
+ *  \param Args      the effective sub arguments to decode.
+ *
+ *  \arg FlagName_args   the list of keys.
+ *  \arg FlagName_types  the list of values.
+ *  \arg FlagName_flag   the flag to update.
+ */
+#define FLAGS_ARGMATCH(FlagName, Args)                                 \
+  flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
+                 &FlagName ## _flag, Args)
+

 
 /*----------------------.
 | --report's handling.  |
 
 /*----------------------.
 | --report's handling.  |


@@ -109,7 +142,7 @@ static const char * const report_args[] =
   "none",
   "state", "states",
   "itemset", "itemsets",
   "none",
   "state", "states",
   "itemset", "itemsets",

-  "lookahead", "lookaheads",
+  "lookahead", "lookaheads", "look-ahead",

   "solved",
   "all",
   0
   "solved",
   "all",
   0


@@ -120,60 +153,123 @@ static const int report_types[] =
   report_none,
   report_states, report_states,
   report_states | report_itemsets, report_states | report_itemsets,
   report_none,
   report_states, report_states,
   report_states | report_itemsets, report_states | report_itemsets,

-  report_states | report_lookaheads, report_states | report_lookaheads,
+  report_states | report_lookahead_tokens,
+  report_states | report_lookahead_tokens,
+  report_states | report_lookahead_tokens,

   report_states | report_solved_conflicts,
   report_all
 };
 
   report_states | report_solved_conflicts,
   report_all
 };
 

+ARGMATCH_VERIFY (report_args, report_types);

 
 

-static void
-report_argmatch (char *args)
+
+/*---------------------.
+| --trace's handling.  |
+`---------------------*/
+
+static const char * const trace_args[] =

 {
 {

-  ARGMATCH_ASSERT (report_args, report_types);
-  args = strtok (args, ",");
-  do
-    {
-      int report = XARGMATCH ("--report", args,
-                             report_args, report_types);
-      if (report == report_none)
-       report_flag = report_none;
-      else
-       report_flag |= report;
-    }
-  while ((args = strtok (NULL, ",")));
-}
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none       - no traces",
+  "scan       - grammar scanner traces",
+  "parse      - grammar parser traces",
+  "automaton  - construction of the automaton",
+  "bitsets    - use of bitsets",
+  "grammar    - reading, reducing the grammar",
+  "resource   - memory consumption (where available)",
+  "sets       - grammar sets: firsts, nullable etc.",
+  "tools      - m4 invocation",
+  "m4         - m4 traces",
+  "skeleton   - skeleton postprocessing",
+  "time       - time consumption",
+  "all        - all of the above",
+  0
+};
+
+static const int trace_types[] =
+{
+  trace_none,
+  trace_scan,
+  trace_parse,
+  trace_automaton,
+  trace_bitsets,
+  trace_grammar,
+  trace_resource,
+  trace_sets,
+  trace_tools,
+  trace_m4,
+  trace_skeleton,
+  trace_time,
+  trace_all
+};

 
 

-/*---------------------------.
-| Display the help message.  |
-`---------------------------*/
+ARGMATCH_VERIFY (trace_args, trace_types);

 
 

-static void
-usage (FILE *stream)
+
+/*------------------------.
+| --warnings's handling.  |
+`------------------------*/
+
+static const char * const warnings_args[] =

 {
 {

-  /* Some efforts were made to ease the translators' task, please
-     continue.  */
-  fputs (_("\
-GNU bison generates parsers for LALR(1) grammars.\n"), stream);
-  putc ('\n', stream);
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none            - no warnings",
+  "midrule-values  - unset or unused midrule values",
+  "yacc            - incompatibilities with POSIX YACC",
+  "all             - all of the above",
+  "error           - warnings are errors",
+  0
+};
+
+static const int warnings_types[] =
+{
+  warnings_none,
+  warnings_midrule_values,
+  warnings_yacc,
+  warnings_all,
+  warnings_error
+};

 
 

-  fprintf (stream, _("\
-Usage: %s [OPTION]... FILE\n"), program_name);
-  putc ('\n', stream);
+ARGMATCH_VERIFY (warnings_args, warnings_types);

 
 

-  fputs (_("\
-If a long option shows an argument as mandatory, then it is mandatory\n\
-for the equivalent short option also.  Similarly for optional arguments.\n"),
-        stream);
-  putc ('\n', stream);

 
 

-  fputs (_("\
-Operation modes:\n\
-  -h, --help      display this help and exit\n\
-  -V, --version   output version information and exit\n\
-  -y, --yacc      emulate POSIX yacc\n"), stream);
-  putc ('\n', stream);
+/*-------------------------------------------.
+| Display the help message and exit STATUS.  |
+`-------------------------------------------*/

 
 

-  fputs (_("\
+static void usage (int) ATTRIBUTE_NORETURN;
+
+static void
+usage (int status)
+{
+  if (status != 0)
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
+            program_name);
+  else
+    {
+      printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
+      fputs (_("\
+Generate LALR(1) and GLR parsers.\n\
+\n\
+"), stdout);
+
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+
+      fputs (_("\
+\n\
+Operation modes:\n\
+  -h, --help                 display this help and exit\n\
+  -V, --version              output version information and exit\n\
+      --print-localedir      output directory containing locale-dependent data\n\
+  -y, --yacc                 emulate POSIX Yacc\n\
+\n\
+"), stdout);
+
+      fputs (_("\

 Parser:\n\
   -S, --skeleton=FILE        specify the skeleton to use\n\
   -t, --debug                instrument the parser for debugging\n\
 Parser:\n\
   -S, --skeleton=FILE        specify the skeleton to use\n\
   -t, --debug                instrument the parser for debugging\n\


@@ -182,33 +278,34 @@ Parser:\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\
   -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\

-"), stream);
-  putc ('\n', stream);
+\n\
+"), stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 Output:\n\
   -d, --defines              also produce a header file\n\
   -r, --report=THINGS        also produce details on the automaton\n\
   -v, --verbose              same as `--report=state'\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
 Output:\n\
   -d, --defines              also produce a header file\n\
   -r, --report=THINGS        also produce details on the automaton\n\
   -v, --verbose              same as `--report=state'\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\

-  -g, --graph                also produce a VCG description of the automaton\n\
-"), stream);
-  putc ('\n', stream);
+  -g, --graph                also output a graph of the automaton\n\
+\n\
+"), stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\
 THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\

-  `lookahead'    explicitly associate lookaheads to items\n\
+  `lookahead'    explicitly associate lookahead tokens to items\n\

   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\

-"), stream);
-  putc ('\n', stream);
+"), stdout);

 
 

-  fputs (_("\
-Report bugs to <bug-bison@gnu.org>.\n"), stream);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+    }
+
+  exit (status);

 }
 
 
 }
 
 


@@ -217,38 +314,99 @@ Report bugs to <bug-bison@gnu.org>.\n"), stream);
 `------------------------------*/
 
 static void
 `------------------------------*/
 
 static void

-version (FILE *stream)
+version (void)

 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */
 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */

-  fprintf (stream, _("bison (GNU Bison) %s"), VERSION);
-  putc ('\n', stream);
-  fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stream);
-  putc ('\n', stream);
+  printf (_("bison (GNU Bison) %s"), VERSION);
+  putc ('\n', stdout);
+  printf ("%s", revision);
+  fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
+  putc ('\n', stdout);

 
 

-  fprintf (stream,
-          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002);
+  fprintf (stdout,
+          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006);

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 "),
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 "),

-        stream);
+        stdout);
+}
+
+
+/*-------------------------------------.
+| --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.  */
 
 /*----------------------.
 | Process the options.  |
 `----------------------*/
 
 /* Shorts options.  */

-const char *short_options = "yvegdhr:ltknVo:b:p:S:T::";
+static char const short_options[] = "yvegdhr:L:ltknVo:b:p:S:T::W";
+
+/* Values for long options that do not have single-letter equivalents.  */
+enum
+{
+  LOCATIONS_OPTION = CHAR_MAX + 1,
+  PRINT_LOCALEDIR_OPTION
+};

 
 static struct option const long_options[] =
 {
   /* Operation modes. */
 
 static struct option const long_options[] =
 {
   /* Operation modes. */

-  { "help",          no_argument,              0,   'h' },
-  { "version",       no_argument,              0,   'V' },
+  { "help",            no_argument,      0,   'h' },
+  { "version",         no_argument,      0,   'V' },
+  { "print-localedir", no_argument,      0,   PRINT_LOCALEDIR_OPTION },
+  { "warnings",        optional_argument, 0,   'W' },

 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },
 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },


@@ -265,18 +423,6 @@ static struct option const long_options[] =
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
 
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
 

-  /* FIXME: semantic parsers will output an `include' of an
-     output file: be sure that the naem included is indeed the name of
-     the output file.  */ /* FIXME Should we activate this options ?
-     */
-  { "output",      required_argument,     0, 'o' },
-  { "file-prefix", required_argument,     0, 'b' },
-  { "name-prefix", required_argument,     0, 'p' },
-
-  /*
-   * Percent and command line declarations.
-   */
-

   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 


@@ -286,11 +432,12 @@ static struct option const long_options[] =
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },

-  { "locations",      no_argument, &locations_flag,     1 },
+  { "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' },
   { "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}
   { "token-table",    no_argument,               0,   'k' },
 
   {0, 0, 0, 0}


@@ -309,37 +456,34 @@ getargs (int argc, char *argv[])
 {
   int c;
 
 {
   int c;
 

-  while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF)
+  while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
+        != -1)

     switch (c)
       {
       case 0:
        /* Certain long options cause getopt_long to return 0.  */
        break;
 
     switch (c)
       {
       case 0:
        /* Certain long options cause getopt_long to return 0.  */
        break;
 

-      case 'y':
-       yacc_flag = 1;
+      case 'b':
+       spec_file_prefix = AS_FILE_NAME (optarg);

        break;
 
        break;
 

-      case 'h':
-       usage (stdout);
-       exit (0);
-
-      case 'V':
-       version (stdout);
-       exit (0);
-

       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */

-       graph_flag = 1;
-       spec_graph_file = AS_FILE_NAME (optarg);
+       graph_flag = true;
+       if (optarg)
+         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));

        break;
 
        break;
 

-      case 'v':
-       report_flag |= report_states;
+      case 'h':
+       usage (EXIT_SUCCESS);
+
+      case 'L':
+       language_argmatch (optarg, 0, NULL);

        break;
 
       case 'S':
        break;
 
       case 'S':

-       skeleton = AS_FILE_NAME (optarg);
+       skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);

        break;
 
       case 'I':
        break;
 
       case 'I':


@@ -348,61 +492,82 @@ getargs (int argc, char *argv[])
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */

-       defines_flag = 1;
+       defines_flag = true;

        if (optarg)
        if (optarg)

-         spec_defines_file = AS_FILE_NAME (optarg);
-       break;
-
-      case 'l':
-       no_lines_flag = 1;
+         spec_defines_file = xstrdup (AS_FILE_NAME (optarg));

        break;
 
       case 'k':
        break;
 
       case 'k':

-       token_table_flag = 1;
+       token_table_flag = true;

        break;
 
        break;
 

-      case 'n':
-       no_parser_flag = 1;
+      case 'l':
+       no_lines_flag = true;

        break;
 
        break;
 

-      case 't':
-       debug_flag = 1;
+      case 'n':
+       no_parser_flag = true;

        break;
 
       case 'o':
        spec_outfile = AS_FILE_NAME (optarg);
        break;
 
        break;
 
       case 'o':
        spec_outfile = AS_FILE_NAME (optarg);
        break;
 

-      case 'b':
-       spec_file_prefix = AS_FILE_NAME (optarg);
-       break;
-

       case 'p':
        spec_name_prefix = optarg;
        break;
 
       case 'r':
       case 'p':
        spec_name_prefix = optarg;
        break;
 
       case 'r':

-       report_argmatch (optarg);
+       FLAGS_ARGMATCH (report, optarg);

        break;
 
       case 'T':
        break;
 
       case 'T':

-       trace_argmatch (optarg);
+       FLAGS_ARGMATCH (trace, optarg);
+       break;
+
+      case 't':
+       debug_flag = true;
+       break;
+
+      case 'V':
+       version ();
+       exit (EXIT_SUCCESS);
+
+      case 'v':
+       report_flag |= report_states;

        break;
 
        break;
 

+      case 'y':
+       yacc_flag = true;
+       break;
+
+      case 'W':
+       if (optarg)
+         FLAGS_ARGMATCH (warnings, optarg);
+       else
+         warnings_flag |= warnings_all;
+       break;
+
+      case LOCATIONS_OPTION:
+       locations_flag = true;
+       break;
+
+      case PRINT_LOCALEDIR_OPTION:
+       printf ("%s\n", LOCALEDIR);
+       exit (EXIT_SUCCESS);
+

       default:
       default:

-       fprintf (stderr, _("Try `%s --help' for more information.\n"),
-                program_name);
-       exit (1);
+       usage (EXIT_FAILURE);

       }
 
       }
 

-  if (optind == argc)
+  if (argc - optind != 1)

     {
     {

-      fprintf (stderr, _("%s: no grammar file given\n"), program_name);
-      exit (1);
+      if (argc - optind < 1)
+       error (0, 0, _("missing operand after `%s'"), argv[argc - 1]);
+      else
+       error (0, 0, _("extra operand `%s'"), argv[optind + 1]);
+      usage (EXIT_FAILURE);

     }
     }

-  if (optind < argc - 1)
-    fprintf (stderr, _("%s: extra arguments ignored after `%s'\n"),
-            program_name, argv[optind]);

 
 

-  infile = argv[optind];
+  current_file = grammar_file = uniqstr_new (argv[optind]);

 }
 }