* src/getargs.c (usage): Mention GLR not just LALR(1) in --help output.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 3d45a3c60e16ca8e2190b0125ac7ee8724545443..ec7ddf17e93af2d8146861ced2c95fb2d7ed8ae4 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,7 +1,7 @@
 /* Parse command line arguments for Bison.
 
 /* Parse command line arguments for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.

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


@@ -46,19 +46,22 @@
 
 bool debug_flag;
 bool defines_flag;
 
 bool debug_flag;
 bool defines_flag;

+bool graph_flag;

 bool locations_flag;
 bool no_lines_flag;
 bool no_parser_flag;
 bool locations_flag;
 bool no_lines_flag;
 bool no_parser_flag;

-int report_flag = report_none;

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

-bool graph_flag;
-int trace_flag = trace_none;
+
+bool error_verbose = false;

 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 bool pure_parser = false;
 
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 bool pure_parser = false;
 

+int report_flag = report_none;
+int trace_flag = trace_none;
+

 const char *skeleton = NULL;
 const char *include = NULL;
 
 const char *skeleton = NULL;
 const char *include = NULL;
 


@@ -81,7 +84,8 @@ static const char * const trace_args[] =
   "grammar    - reading, reducing of the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",
   "grammar    - reading, reducing of the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",

-  "tools      - m4 invocation and preserve the temporary file",
+  "tools      - m4 invocation",
+  "m4         - m4 traces",

   "skeleton   - skeleton postprocessing",
   "time       - time consumption",
   "all        - all of the above",
   "skeleton   - skeleton postprocessing",
   "time       - time consumption",
   "all        - all of the above",


@@ -99,6 +103,7 @@ static const int trace_types[] =
   trace_resource,
   trace_sets,
   trace_tools,
   trace_resource,
   trace_sets,
   trace_tools,

+  trace_m4,

   trace_skeleton,
   trace_time,
   trace_all
   trace_skeleton,
   trace_time,
   trace_all


@@ -193,7 +198,7 @@ usage (int status)
       /* Some efforts were made to ease the translators' task, please
         continue.  */
       fputs (_("\
       /* Some efforts were made to ease the translators' task, please
         continue.  */
       fputs (_("\

-GNU bison generates parsers for LALR(1) grammars.\n"), stdout);
+GNU bison generates parsers for LALR(1) or GLR grammars.\n"), stdout);

       putc ('\n', stdout);
 
       fprintf (stdout, _("\
       putc ('\n', stdout);
 
       fprintf (stdout, _("\


@@ -271,7 +276,7 @@ version (void)
   putc ('\n', stdout);
 
   fprintf (stdout,
   putc ('\n', stdout);
 
   fprintf (stdout,

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

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\