doc: document experimental features better.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 14cba3eddb24dff2d43536ae8e69de240a69c152..35b6a2a6132d4abc18b11569c26c7ee8834fb51f 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, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software
+   Foundation, Inc.

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


@@ -44,14 +44,12 @@
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"

-#include "muscle_tab.h"
+#include "muscle-tab.h"

 #include "uniqstr.h"
 
 #include "uniqstr.h"
 

-bool debug_flag;

 bool defines_flag;
 bool graph_flag;
 bool xml_flag;
 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 */
 bool no_lines_flag;
 bool token_table_flag;
 bool yacc_flag;        /* for -y */


@@ -188,6 +186,7 @@ static const char * const trace_args[] =
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",
   "time       - time consumption",
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",
   "time       - time consumption",

+  "ielr       - IELR conversion",

   "all        - all of the above",
   0
 };
   "all        - all of the above",
   0
 };


@@ -207,6 +206,7 @@ static const int trace_types[] =
   trace_m4,
   trace_skeleton,
   trace_time,
   trace_m4,
   trace_skeleton,
   trace_time,

+  trace_ielr,

   trace_all
 };
 
   trace_all
 };
 


@@ -223,7 +223,7 @@ static const char * const warnings_args[] =
      that argmatch_valid be more readable.  */
   "none            - no warnings",
   "midrule-values  - unset or unused midrule values",
      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
   "all             - all of the above",
   "error           - warnings are errors",
   0


@@ -262,7 +262,9 @@ usage (int status)
 
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
 
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\

-Generate LALR(1) and GLR parsers.\n\
+Generate a deterministic LR or generalized LR (GLR) parser employing\n\
+LALR(1), IELR(1), or canonical LR(1) parser tables.  IELR(1) and\n\
+canonical LR(1) support is experimental.\n\

 \n\
 "), stdout);
 
 \n\
 "), stdout);
 


@@ -287,15 +289,17 @@ Operation modes:\n\
 
       fputs (_("\
 Parser:\n\
 
       fputs (_("\
 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\
-      --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\
-  -l, --no-lines             don't generate `#line' directives\n\
-  -k, --token-table          include a table of token names\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 tracing\n\
+                                   same as `-Dparse.trace'\n\
+      --locations                  enable location support\n\
+  -D, --define=NAME[=VALUE]        similar to `%define NAME \"VALUE\"'\n\
+  -F, --force-define=NAME[=VALUE]  override `%define NAME \"VALUE\"'\n\
+  -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols\n\
+  -l, --no-lines                   don't generate `#line' directives\n\
+  -k, --token-table                include a table of token names\n\

 \n\
 "), stdout);
 
 \n\
 "), stdout);
 


@@ -319,7 +323,7 @@ Output:\n\
       fputs (_("\
 Warning categories include:\n\
   `midrule-values'  unset or unused midrule values\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\
   `all'             all the warnings\n\
   `no-CATEGORY'     turn off warnings in CATEGORY\n\
   `none'            turn off all the warnings\n\


@@ -383,11 +387,7 @@ skeleton_arg (char const *arg, int prio, location loc)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)

-    {
-      char const *msg =
-       _("multiple skeleton declarations are invalid");
-      complain_at (loc, msg);
-    }
+    complain_at (loc, _("multiple skeleton declarations are invalid"));

 }
 
 void
 }
 
 void


@@ -423,6 +423,7 @@ language_argmatch (char const *arg, int prio, location loc)
    Should be computed from long_options.  */
 static char const short_options[] =
   "D:"
    Should be computed from long_options.  */
 static char const short_options[] =
   "D:"

+  "F:"

   "L:"
   "S:"
   "T::"
   "L:"
   "S:"
   "T::"


@@ -490,6 +491,7 @@ static struct option const long_options[] =
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
   { "define",        required_argument,         0,   'D' },
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
   { "define",        required_argument,         0,   'D' },

+  { "force-define",   required_argument,         0,   'F' },

   { "locations",      no_argument,              0, LOCATIONS_OPTION },
   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },
   { "locations",      no_argument,              0, LOCATIONS_OPTION },
   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },


@@ -538,13 +540,16 @@ getargs (int argc, char *argv[])
        break;
 
       case 'D': /* -DNAME[=VALUE]. */
        break;
 
       case 'D': /* -DNAME[=VALUE]. */

+      case 'F': /* -FNAME[=VALUE]. */

         {
           char* name = optarg;
           char* value = strchr (optarg, '=');
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),
         {
           char* name = optarg;
           char* value = strchr (optarg, '=');
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),

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

         }
        break;
 
         }
        break;
 


@@ -618,7 +623,9 @@ getargs (int argc, char *argv[])
        break;
 
       case 't':
        break;
 
       case 't':

-       debug_flag = true;
+        muscle_percent_define_insert ("parse.trace",
+                                      command_line_location (), "",
+                                      MUSCLE_PERCENT_DEFINE_D);

        break;
 
       case 'v':
        break;
 
       case 'v':


@@ -636,7 +643,8 @@ getargs (int argc, char *argv[])
        break;
 
       case LOCATIONS_OPTION:
        break;
 
       case LOCATIONS_OPTION:

-       locations_flag = true;
+        muscle_percent_define_ensure ("locations",
+                                      command_line_location (), true);

        break;
 
       case PRINT_LOCALEDIR_OPTION:
        break;
 
       case PRINT_LOCALEDIR_OPTION:


@@ -667,3 +675,11 @@ getargs (int argc, char *argv[])
   current_file = grammar_file = uniqstr_new (argv[optind]);
   MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
 }
   current_file = grammar_file = uniqstr_new (argv[optind]);
   MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
 }

+
+void
+tr (char *s, char from, char to)
+{
+  for (; *s; s++)
+    if (*s == from)
+      *s = to;
+}