README-alpha: New.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 67b880c7f6240129386d31534eb844939b17a5bc..c45f11eb968fafb264989f960f26e508b8d958a0 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.
 
@@ -22,40 +22,40 @@
 #include "getopt.h"
 #include "system.h"
 #include "files.h"
-
-int verboseflag;
-int definesflag;
-int debugflag;
-int nolinesflag;
-int noparserflag = 0;
-int toknumflag = 0;
-int rawtoknumflag = 0;
-char *spec_name_prefix; /* for -p.  */
-char *spec_file_prefix; /* for -b. */
-extern int fixed_outfiles;/* for -y */
+#include "getargs.h"
+
+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;
 
-extern void warns PARAMS((char *, char *));    /* main.c */
-extern void getargs PARAMS((int argc, char *[]));
-
 static struct option longopts[] =
 {
-  {"debug", 0, &debugflag, 1},
-  {"defines", 0, &definesflag, 1},
+  {"debug", 0, &debug_flag, 1},
+  {"defines", 0, &defines_flag, 1},
   {"file-prefix", 1, 0, 'b'},
-  {"fixed-output-files", 0, &fixed_outfiles, 1},
+  {"fixed-output-files", 0, &yacc_flag, 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},
+  {"locations", 0, &locations_flag, 1},
+  {"no-lines", 0, &no_lines_flag, 1},
+  {"no-parser", 0, &no_parser_flag, 1},
   {"output", 1, 0, 'o'},
   {"output-file", 1, 0, 'o'},
-  {"raw", 0, &rawtoknumflag, 1},
-  {"token-table", 0, &toknumflag, 1},
-  {"verbose", 0, &verboseflag, 1},
+  {"raw", 0, &raw_flag, 1},
+  {"statistics", 0, &statistics_flag, 1},
+  {"token-table", 0, &token_table_flag, 1},
+  {"verbose", 0, &verbose_flag, 1},
   {"version", 0, 0, 'V'},
-  {"yacc", 0, &fixed_outfiles, 1},
+  {"yacc", 0, &yacc_flag, 1},
   {0, 0, 0, 0}
 };
 
@@ -92,6 +92,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\
@@ -128,7 +129,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 (_("\
@@ -146,15 +147,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 void
 getargs (int argc, char *argv[])
 {
-  register int c;
-
-  verboseflag = 0;
-  definesflag = 0;
-  debugflag = 0;
-  noparserflag = 0;
-  rawtoknumflag = 0;
-  toknumflag = 0;
-  fixed_outfiles = 0;
+  int c;
 
   while ((c = getopt_long (argc, argv, "yvdhrltknVo:b:p:", longopts, (int *)0))
         != EOF)
@@ -166,7 +159,7 @@ getargs (int argc, char *argv[])
          break;
 
        case 'y':
-         fixed_outfiles = 1;
+         yacc_flag = 1;
          break;
 
        case 'h':
@@ -178,31 +171,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':
@@ -218,7 +211,8 @@ getargs (int argc, char *argv[])
          break;
 
        default:
-         usage (stderr);
+         fprintf (stderr, _("Try `%s --help' for more information.\n"),
+                  program_name);
          exit (1);
        }
     }