* src/output.h: And put its extern declaration here.

* src/output.c (error_verbose): Define here.
(prepare): Echo name modification.
* src/getargs.h: Clean its extern declaration.
* src/getargs.c (error_verbose_flag): Remove.
(getargs): Remove case 'e'.
* src/options.c (option_table): 'error-verbose' is now seen as simple
percent option.
Include output.h.
* src/reader.c (read_declarations): Remove case tok_include.
(parse_include_decl): Remove.
* src/lex.h (token_t): Remove tok_include.
* src/options.c (option_table): 'include' is now a simple command line
option.

diff --git a/ChangeLog b/ChangeLog
index a08c9a918480f30ac5d9f44de8d785f934a9e5e5..68fd377d73e025e901b3c990ec0f3f33546cf0bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2001-11-28  Marc Autret  <autret_m@epita.fr>
+
+       * src/output.h: And put its extern declaration here.
+       * src/output.c (error_verbose): Define here.
+       (prepare): Echo name modification.
+       * src/getargs.h: Clean its extern declaration.
+       * src/getargs.c (error_verbose_flag): Remove.
+       (getargs): Remove case 'e'.
+       * src/options.c (option_table): 'error-verbose' is now seen as simple
+       percent option.
+       Include output.h.
+
+       * src/reader.c (read_declarations): Remove case tok_include.
+       (parse_include_decl): Remove.
+       * src/lex.h (token_t): Remove tok_include.
+       * src/options.c (option_table): 'include' is now a simple command line
+       option.
+
 2001-11-28  Marc Autret  <autret_m@epita.fr>
 
        * src/bison.simple: Adjust muscle names.

diff --git a/src/getargs.c b/src/getargs.c
index 0951e581e95fb5abc3baa08d80074b154dfffd1a..eee6314f0aff610a62e5c0d57441b487503624b6 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -34,7 +34,6 @@ int no_lines_flag = 0;
 int no_parser_flag = 0;
 int token_table_flag = 0;
 int verbose_flag = 0;
-int error_verbose_flag = 0;
 int yacc_flag = 0;     /* for -y */
 int graph_flag = 0;
 int trace_flag = 0;
@@ -166,10 +165,6 @@ getargs (int argc, char *argv[])
        verbose_flag = 1;
        break;
 
-      case 'e':
-       error_verbose_flag = 1;
-       break;
-
       case 'S':
        skeleton = optarg;
        break;

diff --git a/src/getargs.h b/src/getargs.h
index f97e9b58462a87f5dbd61d37dcaaff97365cc93f..5eef6404e30dd9b4d7967b4394a66d2d13aeedcc 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -34,7 +34,6 @@ extern int no_lines_flag;     /* for -l */
 extern int no_parser_flag;     /* for -n */
 extern int token_table_flag;           /* for -k */
 extern int verbose_flag;       /* for -v */
-extern int error_verbose_flag; /* for -e */
 extern int graph_flag;         /* for -g */
 extern int yacc_flag;                  /* for -y */
 extern int trace_flag;

diff --git a/src/lex.h b/src/lex.h
index 34954148677424c71e42dd2dc274454289a641dd..16ac115a56ee3bec65a4efee131adcbc57689144 100644 (file)
--- a/src/lex.h
+++ b/src/lex.h
@@ -50,7 +50,6 @@ typedef enum token_e
     tok_thong,
     tok_define,
     tok_skel,
-    tok_include,
     tok_noop,
     tok_intopt,
     tok_stropt,

diff --git a/src/options.c b/src/options.c
index add764b22d051258306bf66c674576bfa032e081..b951c5d6a399dafd98e8cc9191b509ab15dc83aa 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -27,6 +27,7 @@
 #include "gram.h"
 #include "symtab.h"
 #include "lex.h"
+#include "output.h"
 #include "options.h"
 
 /* Shorts options.  */
@@ -50,6 +51,7 @@ const struct option_table_struct option_table[] =
   /* Parser. */
   /* was 'a';  apparently unused -wjh */
   {opt_cmd_line, "name-prefix",        required_argument,         0,         0,   'p'},
+  {opt_cmd_line, "include",     required_argument,         0,         0,   'I'},
 
   /* Output. */
   {opt_cmd_line, "file-prefix",        required_argument,         0,         0,   'b'},
@@ -80,6 +82,7 @@ const struct option_table_struct option_table[] =
   {opt_percent, "nonassoc",            0,              NULL, tok_nonassoc,  0},
   {opt_percent, "binary",              0,              NULL, tok_nonassoc,  0},
   {opt_percent, "prec",                        0,              NULL, tok_prec,      0},
+  {opt_percent, "error-verbose",       0,    &error_verbose, tok_intopt,   0},
 
   /* FIXME: semantic parsers will output an `include' of an
      output file: be sure that the naem included is indeed the name of
@@ -104,7 +107,6 @@ const struct option_table_struct option_table[] =
   /* Output.  */
   {opt_both, "defines",         optional_argument,      &defines_flag, tok_intopt,   'd'},
   {opt_both, "verbose",               no_argument,      &verbose_flag, tok_intopt,   'v'},
-  {opt_both, "error-verbose",  no_argument,&error_verbose_flag, tok_intopt,   'e'},
 
   /* Operation modes.  */
   {opt_both, "fixed-output-files", no_argument,  &yacc_flag, tok_intopt,   'y'},
@@ -117,7 +119,6 @@ const struct option_table_struct option_table[] =
   {opt_both, "no-parser",      no_argument, &no_parser_flag, tok_intopt,          'n'},
   {opt_both, "raw",           no_argument,               0, tok_obsolete, 'r'},
   {opt_both, "skeleton",       required_argument,         0, tok_skel,    'S'},
-  {opt_both, "include",               required_argument,         0, tok_include,  'I'},
   {opt_both, "token-table",    no_argument, &token_table_flag, tok_intopt,   'k'},
 
   {0, 0, 0, 0, 0, 0}

diff --git a/src/output.c b/src/output.c
index 0e00c6345badb102c6e60947c0766adbdc803103..c78b0f9a52215045628aa1d2614d1fc2a813eefb 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -125,6 +125,8 @@ static int high;
 struct obstack muscle_obstack;
 struct obstack output_obstack;
 
+int error_verbose = 0;
+
 /* FIXME. */
 
 static inline void
@@ -1052,7 +1054,7 @@ prepare (void)
   MUSCLE_INSERT_INT ("final", final_state);
   MUSCLE_INSERT_INT ("maxtok", max_user_token_number);
   MUSCLE_INSERT_INT ("ntbase", ntokens);
-  MUSCLE_INSERT_INT ("error-verbose", error_verbose_flag);
+  MUSCLE_INSERT_INT ("error-verbose", error_verbose);
 
   MUSCLE_INSERT_INT ("nnts", nvars);
   MUSCLE_INSERT_INT ("nrules", nrules);

diff --git a/src/output.h b/src/output.h
index 9a2dcb8f3b7c00d523ad057ed1c855ae7c7dea42..2a00964f531d4b7020cbf7a1d28383f77b8e9748 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -21,6 +21,8 @@
 #ifndef OUTPUT_H_
 # define OUTPUT_H_
 
+extern int error_verbose;
+
 /* Output the parsing tables and the parser code to FTABLE.  */
 void output PARAMS ((void));
 

diff --git a/src/reader.c b/src/reader.c
index ac160aed449b93d59814299a2e1eee7a009374f2..73e79704a6024fcacda7a22a7c928d1550c3b6cd 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -974,16 +974,6 @@ parse_skel_decl (void)
   /* Complete with parse_dquoted_param () on the CVS branch 1.29.  */
 }
 
-/*---------------------------------------.
-| Parse what comes after %skeleton_path. |
-`---------------------------------------*/
-
-void
-parse_include_decl (void)
-{
-  /* Complete with parse_dquoted_param () on the CVS branch 1.29.  */
-}
-
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
 | any `%' declarations, and copy the contents of any `%{ ... %}'  |
@@ -1058,10 +1048,6 @@ read_declarations (void)
              parse_skel_decl ();
              break;
 
-           case tok_include:
-             parse_include_decl ();
-             break;
-             
            case tok_noop:
              break;