bison: factoring.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 7a67878a1a6f4133c71b97a39d4abddd11bc1648..368470fb7a135169e950b480215bfaf3cc20af56 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -44,13 +44,12 @@
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
-#include "muscle_tab.h"
+#include "muscle-tab.h"
 #include "uniqstr.h"
 
 bool defines_flag;
 bool graph_flag;
 bool xml_flag;
-bool locations_flag;
 bool no_lines_flag;
 bool token_table_flag;
 bool yacc_flag;        /* for -y */
@@ -222,7 +221,7 @@ static const char * const warnings_args[] =
      that argmatch_valid be more readable.  */
   "none            - no warnings",
   "midrule-values  - unset or unused midrule values",
-  "yacc            - incompatibilities with POSIX YACC",
+  "yacc            - incompatibilities with POSIX Yacc",
   "all             - all of the above",
   "error           - warnings are errors",
   0
@@ -289,7 +288,8 @@ Parser:\n\
   -L, --language=LANGUAGE    specify the output programming language\n\
                              (this is an experimental feature)\n\
   -S, --skeleton=FILE        specify the skeleton to use\n\
-  -t, --debug                instrument the parser for debugging\n\
+  -t, --debug                instrument the parser for tracing\n\
+                             same as `-Dparse.trace'\n\
       --locations            enable location support\n\
   -D, --define=NAME[=VALUE]  same as `%define NAME \"VALUE\"'\n\
   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
@@ -318,7 +318,7 @@ Output:\n\
       fputs (_("\
 Warning categories include:\n\
   `midrule-values'  unset or unused midrule values\n\
-  `yacc'            incompatibilities with POSIX YACC\n\
+  `yacc'            incompatibilities with POSIX Yacc\n\
   `all'             all the warnings\n\
   `no-CATEGORY'     turn off warnings in CATEGORY\n\
   `none'            turn off all the warnings\n\
@@ -617,7 +617,8 @@ getargs (int argc, char *argv[])
        break;
 
       case 't':
-        muscle_percent_define_insert ("debug", command_line_location (), "");
+        muscle_percent_define_insert ("parse.trace",
+                                      command_line_location (), "");
        break;
 
       case 'v':
@@ -635,7 +636,8 @@ getargs (int argc, char *argv[])
        break;
 
       case LOCATIONS_OPTION:
-       locations_flag = true;
+        muscle_percent_define_ensure ("locations",
+                                      command_line_location (), true);
        break;
 
       case PRINT_LOCALEDIR_OPTION: