For associating token numbers with token names for "yacc.c", don't use

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 7bc9a767dcd98903c6ac86b728983d8e8f2126d0..0a7f3727bbf8350aa48724479ba5229d9381a040 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"

+#include "revision.h"

 
 #include <argmatch.h>
 #include <error.h>
 
 #include <argmatch.h>
 #include <error.h>


@@ -46,19 +47,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 +85,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 +104,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


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

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

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


@@ -150,9 +156,9 @@ 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_look_ahead_tokens,
-  report_states | report_look_ahead_tokens,
-  report_states | report_look_ahead_tokens,
+  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
 };


@@ -193,7 +199,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 LALR(1) and GLR parsers.\n"), stdout);

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


@@ -211,7 +217,7 @@ 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\
   -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"), stdout);
+  -y, --yacc                 emulate POSIX Yacc\n"), stdout);

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


@@ -241,7 +247,7 @@ Output:\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\
 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\

-  `look-ahead'   explicitly associate look-ahead tokens 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\


@@ -267,6 +273,7 @@ version (void)
      continue.  */
   printf (_("bison (GNU Bison) %s"), VERSION);
   putc ('\n', stdout);
      continue.  */
   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);
 
   fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
   putc ('\n', stdout);