c++: fix several issues with locations

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 03a7339be754b808342a61228785ad0c3d1b5945..e6f9d766db7afb5f14fc0e5d5a11b1611cbb17a6 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -330,7 +330,7 @@ Warning categories include:\n\
   'empty-rule'        empty rules without %empty\n\
   'precedence'        useless precedence and associativity\n\
   'other'             all other warnings (enabled by default)\n\
   'empty-rule'        empty rules without %empty\n\
   'precedence'        useless precedence and associativity\n\
   'other'             all other warnings (enabled by default)\n\

-  'all'               all the warnings\n\
+  'all'               all the warnings except 'yacc'\n\

   'no-CATEGORY'       turn off warnings in CATEGORY\n\
   'none'              turn off all the warnings\n\
   'error[=CATEGORY]'  treat warnings as errors\n\
   'no-CATEGORY'       turn off warnings in CATEGORY\n\
   'none'              turn off all the warnings\n\
   'error[=CATEGORY]'  treat warnings as errors\n\


@@ -538,7 +538,7 @@ static struct option const long_options[] =
 };
 
 /* Under DOS, there is no difference on the case.  This can be
 };
 
 /* Under DOS, there is no difference on the case.  This can be

-   troublesome when looking for `.tab' etc.  */
+   troublesome when looking for '.tab' etc.  */

 #ifdef MSDOS
 # define AS_FILE_NAME(File) (strlwr (File), (File))
 #else
 #ifdef MSDOS
 # define AS_FILE_NAME(File) (strlwr (File), (File))
 #else


@@ -582,6 +582,7 @@ getargs (int argc, char *argv[])
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),

+                                        muscle_string,

                                         value ? value : "",
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
                                         value ? value : "",
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);


@@ -666,7 +667,8 @@ getargs (int argc, char *argv[])
 
       case 't':
         muscle_percent_define_insert ("parse.trace",
 
       case 't':
         muscle_percent_define_insert ("parse.trace",

-                                      command_line_location (), "",
+                                      command_line_location (),
+                                      muscle_keyword, "",

                                       MUSCLE_PERCENT_DEFINE_D);
         break;
 
                                       MUSCLE_PERCENT_DEFINE_D);
         break;