Fix.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index ba7627efbeb1ca4eb7b717eb823eefc8c3eacdb9..7bc9a767dcd98903c6ac86b728983d8e8f2126d0 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
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.

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


@@ -17,9 +17,10 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free

-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

+#include <config.h>

 #include "system.h"
 
 #include <argmatch.h>
 #include "system.h"
 
 #include <argmatch.h>


@@ -103,11 +104,11 @@ static const int trace_types[] =
   trace_all
 };
 
   trace_all
 };
 

+ARGMATCH_VERIFY (trace_args, trace_types);

 
 static void
 trace_argmatch (char *args)
 {
 
 static void
 trace_argmatch (char *args)
 {

-  verify (trace_constraint, ARGMATCH_CONSTRAINT (trace_args, trace_types));

   if (args)
     {
       args = strtok (args, ",");
   if (args)
     {
       args = strtok (args, ",");


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

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

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


@@ -149,16 +150,18 @@ 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_lookaheads, report_states | report_lookaheads,
+  report_states | report_look_ahead_tokens,
+  report_states | report_look_ahead_tokens,
+  report_states | report_look_ahead_tokens,

   report_states | report_solved_conflicts,
   report_all
 };
 
   report_states | report_solved_conflicts,
   report_all
 };
 

+ARGMATCH_VERIFY (report_args, report_types);

 
 static void
 report_argmatch (char *args)
 {
 
 static void
 report_argmatch (char *args)
 {

-  verify (report_constraint, ARGMATCH_CONSTRAINT (report_args, report_types));

   args = strtok (args, ",");
   do
     {
   args = strtok (args, ",");
   do
     {


@@ -205,9 +208,10 @@ for the equivalent short option also.  Similarly for optional arguments.\n"),
 
       fputs (_("\
 Operation modes:\n\
 
       fputs (_("\
 Operation modes:\n\

-  -h, --help      display this help and exit\n\
-  -V, --version   output version information and exit\n\
-  -y, --yacc      emulate POSIX yacc\n"), stdout);
+  -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);

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


@@ -237,7 +241,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\

-  `lookahead'    explicitly associate lookaheads to items\n\
+  `look-ahead'   explicitly associate look-ahead 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,7 +271,7 @@ version (void)
   putc ('\n', stdout);
 
   fprintf (stdout,
   putc ('\n', stdout);
 
   fprintf (stdout,

-          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2004);
+          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006);

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\


@@ -282,19 +286,21 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `----------------------*/
 
 /* Shorts options.  */
 `----------------------*/
 
 /* Shorts options.  */

-const char *short_options = "yvegdhr:ltknVo:b:p:S:T::";
+static char const short_options[] = "yvegdhr:ltknVo:b:p:S:T::";

 
 /* Values for long options that do not have single-letter equivalents.  */
 enum
 {
 
 /* Values for long options that do not have single-letter equivalents.  */
 enum
 {

-  LOCATIONS_OPTION = CHAR_MAX + 1
+  LOCATIONS_OPTION = CHAR_MAX + 1,
+  PRINT_LOCALEDIR_OPTION

 };
 
 static struct option const long_options[] =
 {
   /* Operation modes. */
 };
 
 static struct option const long_options[] =
 {
   /* Operation modes. */

-  { "help",          no_argument,              0,   'h' },
-  { "version",       no_argument,              0,   'V' },
+  { "help",            no_argument,    0,   'h' },
+  { "version",         no_argument,    0,   'V' },
+  { "print-localedir", no_argument,    0,   PRINT_LOCALEDIR_OPTION },

 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },
 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },


@@ -362,6 +368,10 @@ getargs (int argc, char *argv[])
        version ();
        exit (EXIT_SUCCESS);
 
        version ();
        exit (EXIT_SUCCESS);
 

+      case PRINT_LOCALEDIR_OPTION:
+       printf ("%s\n", LOCALEDIR);
+       exit (EXIT_SUCCESS);
+

       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
        graph_flag = true;
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
        graph_flag = true;