* src/getargs.c (longopts): Clean up.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index ad0f13f66d6c68a365ae5562128c61ff0c82ce46..9882af917b44f4b60af50cc4eb5adbb1f21ce692 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,5 +1,5 @@
 /* Parse command line arguments for bison.
-   Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -24,39 +24,45 @@
 #include "files.h"
 #include "getargs.h"
 
-char *spec_file_prefix; /* for -b. */
-char *spec_name_prefix; /* for -p.  */
-
-int debugflag = 0;
-int definesflag = 0;
-int nolinesflag = 0;
-int noparserflag = 0;
-int rawtoknumflag = 0;
-int toknumflag = 0;
-int verboseflag = 0;
-int statisticsflag = 0;
-int yaccflag = 0;      /* for -y */
+int debug_flag = 0;
+int defines_flag = 0;
+int locations_flag = 0;
+int no_lines_flag = 0;
+int no_parser_flag = 0;
+int raw_flag = 0;
+int token_table_flag = 0;
+int verbose_flag = 0;
+int statistics_flag = 0;
+int yacc_flag = 0;     /* for -y */
 
 extern char *program_name;
-
+const char *shortopts = "yvdhrltknVo:b:p:";
 static struct option longopts[] =
 {
-  {"debug", 0, &debugflag, 1},
-  {"defines", 0, &definesflag, 1},
-  {"file-prefix", 1, 0, 'b'},
-  {"fixed-output-files", 0, &yaccflag, 1},
-  {"help", 0, 0, 'h'},
-  {"name-prefix", 1, 0, 'p'}, /* was 'a';  apparently unused -wjh */
-  {"no-lines", 0, &nolinesflag, 1},
-  {"no-parser", 0, &noparserflag, 1},
-  {"output", 1, 0, 'o'},
-  {"output-file", 1, 0, 'o'},
-  {"raw", 0, &rawtoknumflag, 1},
-  {"token-table", 0, &toknumflag, 1},
-  {"verbose", 0, &verboseflag, 1},
-  {"version", 0, 0, 'V'},
-  {"yacc", 0, &yaccflag, 1},
-  {"statistics", 0, &statisticsflag, 1},
+  /* Operation modes. */
+  {"help",             no_argument,    0, 'h'},
+  {"version",          no_argument,    0, 'V'},
+  {"yacc",             no_argument,    0, 'y'},
+  {"fixed-output-files",no_argument,   0, 'y'},
+
+  /* Parser. */
+  {"locations",                no_argument,    &locations_flag, 1},
+  /* was 'a';  apparently unused -wjh */
+  {"name-prefix",      required_argument,      0, 'p'},
+  {"no-lines",         no_argument,            0, 'l'},
+  {"no-parser",                no_argument,            0, 'n'},
+  {"raw",              no_argument,            0, 'r'},
+  {"token-table",      no_argument,            0, 'k'},
+  {"debug",            no_argument,            0, 'd'},
+
+  /* Output. */
+  {"defines",          no_argument,            0, 'd'},
+  {"verbose",          no_argument,            0, 'v'},
+  {"file-prefix",      required_argument,      0, 'b'},
+  {"output-file",      required_argument,      0, 'o'},
+
+  /* Hidden. */
+  {"statistics",       no_argument,    &statistics_flag, 1},
   {0, 0, 0, 0}
 };
 
@@ -93,6 +99,7 @@ Operation modes:\n\
   fputs (_("\
 Parser:\n\
   -t, --debug                instrument the parser for debugging\n\
+      --locations            enable locations computation\n\
   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\
@@ -129,7 +136,7 @@ bison (GNU Bison) %s"), VERSION);
   putc ('\n', stream);
 
   fputs (_("\
-Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"),
+Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"),
         stream);
 
   fputs (_("\
@@ -159,7 +166,7 @@ getargs (int argc, char *argv[])
          break;
 
        case 'y':
-         yaccflag = 1;
+         yacc_flag = 1;
          break;
 
        case 'h':
@@ -171,31 +178,31 @@ getargs (int argc, char *argv[])
          exit (0);
 
        case 'v':
-         verboseflag = 1;
+         verbose_flag = 1;
          break;
 
        case 'd':
-         definesflag = 1;
+         defines_flag = 1;
          break;
 
        case 'l':
-         nolinesflag = 1;
+         no_lines_flag = 1;
          break;
 
        case 'k':
-         toknumflag = 1;
+         token_table_flag = 1;
          break;
 
        case 'r':
-         rawtoknumflag = 1;
+         raw_flag = 1;
          break;
 
        case 'n':
-         noparserflag = 1;
+         no_parser_flag = 1;
          break;
 
        case 't':
-         debugflag = 1;
+         debug_flag = 1;
          break;
 
        case 'o':
@@ -211,7 +218,8 @@ getargs (int argc, char *argv[])
          break;
 
        default:
-         usage (stderr);
+         fprintf (stderr, _("Try `%s --help' for more information.\n"),
+                  program_name);
          exit (1);
        }
     }