style: use %code for local function declarations in our parser

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 03a7339be754b808342a61228785ad0c3d1b5945..df310addd6d8081751eefce3297ffc5158c8e51a 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


@@ -574,15 +574,31 @@ getargs (int argc, char *argv[])
         /* Certain long options cause getopt_long to return 0.  */
         break;
 
         /* Certain long options cause getopt_long to return 0.  */
         break;
 

-      case 'D': /* -DNAME[=VALUE]. */
-      case 'F': /* -FNAME[=VALUE]. */
+      case 'D': /* -DNAME[=(VALUE|"VALUE"|{VALUE})]. */
+      case 'F': /* -FNAME[=(VALUE|"VALUE"|{VALUE})]. */

         {
         {

-          char* name = optarg;
-          char* value = strchr (optarg, '=');
+          char *name = optarg;
+          char *value = strchr (optarg, '=');
+          muscle_kind kind = muscle_keyword;

           if (value)
           if (value)

-            *value++ = 0;
+            {
+              char *end = value + strlen (value) - 1;
+              *value++ = 0;
+              if (*value == '{' && *end == '}')
+                {
+                  kind = muscle_code;
+                  ++value;
+                  *end = 0;
+                }
+              else if (*value == '"' && *end == '"')
+                {
+                  kind = muscle_string;
+                  ++value;
+                  *end = 0;
+                }
+            }

           muscle_percent_define_insert (name, command_line_location (),
           muscle_percent_define_insert (name, command_line_location (),

-                                        value ? value : "",
+                                        kind, value ? value : "",

                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
         }
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
         }


@@ -666,7 +682,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;