* lib/memchr.c, lib/stpcpy.c, lib/strndup.c, lib/strnlen.c:

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 647c0f70d52c98a223763132e4b45ca0e7b7db91..c45f11eb968fafb264989f960f26e508b8d958a0 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,5 +1,5 @@
 /* Parse command line arguments for bison.
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -22,52 +22,54 @@
 #include "getopt.h"
 #include "system.h"
 #include "files.h"
 #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 char *program_name;
 

-extern void warns PARAMS((char *, char *));    /* main.c */
-
-struct option longopts[] =
+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'},
   {"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 */
   {"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'},
   {"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'},
   {"version", 0, 0, 'V'},

-  {"yacc", 0, &fixed_outfiles, 1},
+  {"yacc", 0, &yacc_flag, 1},

   {0, 0, 0, 0}
 };
 
 /*---------------------------.
 | Display the help message.  |
 `---------------------------*/
   {0, 0, 0, 0}
 };
 
 /*---------------------------.
 | Display the help message.  |
 `---------------------------*/

-void
+
+static void

 usage (FILE *stream)
 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */
 usage (FILE *stream)
 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */

-  fprintf (stream, _("\
-GNU bison generates parsers for LALR(1) grammars.\n"));
+  fputs (_("\
+GNU bison generates parsers for LALR(1) grammars.\n"), stream);

   putc ('\n', stream);
 
   fprintf (stream, _("\
   putc ('\n', stream);
 
   fprintf (stream, _("\


@@ -80,49 +82,72 @@ for the equivalent short option also.  Similarly for optional arguments.\n"),
         stream);
   putc ('\n', stream);
 
         stream);
   putc ('\n', stream);
 

-  fprintf (stream, _("\
+  fputs (_("\

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

   putc ('\n', stream);
 
   putc ('\n', stream);
 

-  fprintf (stream, _("\
+  fputs (_("\

 Parser:\n\
   -t, --debug                instrument the parser for debugging\n\
 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\
   -r, --raw                  number the tokens from 3\n\
   -k, --token-table          include a table of token names\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\
   -r, --raw                  number the tokens from 3\n\
   -k, --token-table          include a table of token names\n\

-"));
+"), stream);

   putc ('\n', stream);
 
   putc ('\n', stream);
 

-  fprintf (stream, _("\
+  fputs (_("\

 Output:\n\
   -d, --defines              also produce a header file\n\
   -v, --verbose              also produce an explanation of the automaton\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
 Output:\n\
   -d, --defines              also produce a header file\n\
   -v, --verbose              also produce an explanation of the automaton\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\

-  -o, --output-file=FILE     leave output to FILE\n"));
+  -o, --output-file=FILE     leave output to FILE\n"), stream);

   putc ('\n', stream);
 
   putc ('\n', stream);
 

+  fputs (_("\
+Report bugs to <bug-bison@gnu.org>.\n"), stream);
+}
+
+
+/*------------------------------.
+| Display the version message.  |
+`------------------------------*/
+
+static void
+version (FILE *stream)
+{
+  /* Some efforts were made to ease the translators' task, please
+     continue.  */

   fprintf (stream, _("\
   fprintf (stream, _("\

-Report bugs to <bug-bison@gnu.org>.\n"),
-          program_name);
+bison (GNU Bison) %s"), VERSION);
+  putc ('\n', stream);
+  putc ('\n', stream);
+
+  fputs (_("\
+Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n"),
+        stream);
+
+  fputs (_("\
+This is free software; see the source for copying conditions.  There is NO\n\
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
+"),
+        stream);

 }
 
 }
 

+
+/*----------------------.
+| Process the options.  |
+`----------------------*/
+

 void
 getargs (int argc, char *argv[])
 {
 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)
 
   while ((c = getopt_long (argc, argv, "yvdhrltknVo:b:p:", longopts, (int *)0))
         != EOF)


@@ -134,7 +159,7 @@ getargs (int argc, char *argv[])
          break;
 
        case 'y':
          break;
 
        case 'y':

-         fixed_outfiles = 1;
+         yacc_flag = 1;

          break;
 
        case 'h':
          break;
 
        case 'h':


@@ -142,35 +167,35 @@ getargs (int argc, char *argv[])
          exit (0);
 
        case 'V':
          exit (0);
 
        case 'V':

-         printf ("%s\n", VERSION_STRING);
+         version (stdout);

          exit (0);
 
        case 'v':
          exit (0);
 
        case 'v':

-         verboseflag = 1;
+         verbose_flag = 1;

          break;
 
        case 'd':
          break;
 
        case 'd':

-         definesflag = 1;
+         defines_flag = 1;

          break;
 
        case 'l':
          break;
 
        case 'l':

-         nolinesflag = 1;
+         no_lines_flag = 1;

          break;
 
        case 'k':
          break;
 
        case 'k':

-         toknumflag = 1;
+         token_table_flag = 1;

          break;
 
        case 'r':
          break;
 
        case 'r':

-         rawtoknumflag = 1;
+         raw_flag = 1;

          break;
 
        case 'n':
          break;
 
        case 'n':

-         noparserflag = 1;
+         no_parser_flag = 1;

          break;
 
        case 't':
          break;
 
        case 't':

-         debugflag = 1;
+         debug_flag = 1;

          break;
 
        case 'o':
          break;
 
        case 'o':


@@ -186,19 +211,20 @@ getargs (int argc, char *argv[])
          break;
 
        default:
          break;
 
        default:

-         usage (stderr);
+         fprintf (stderr, _("Try `%s --help' for more information.\n"),
+                  program_name);

          exit (1);
        }
     }
 
   if (optind == argc)
     {
          exit (1);
        }
     }
 
   if (optind == argc)
     {

-      fprintf(stderr, _("%s: no grammar file given\n"), program_name);
-      exit(1);
+      fprintf (stderr, _("%s: no grammar file given\n"), program_name);
+      exit (1);

     }
   if (optind < argc - 1)
     }
   if (optind < argc - 1)

-    fprintf(stderr, _("%s: extra arguments ignored after `%s'\n"),
-           program_name, argv[optind]);
+    fprintf (stderr, _("%s: extra arguments ignored after `%s'\n"),
+            program_name, argv[optind]);

 
   infile = argv[optind];
 }
 
   infile = argv[optind];
 }