[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI [trunk]: rm-useless-options.patch
From: |
Marc Autret |
Subject: |
FYI [trunk]: rm-useless-options.patch |
Date: |
28 Nov 2001 16:25:56 -0500 |
User-agent: |
Gnus/5.0807 (Gnus v5.8.7) Emacs/20.7 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.322
diff -u -r1.322 ChangeLog
--- ChangeLog 2001/11/28 20:32:53 1.322
+++ ChangeLog 2001/11/28 21:19:20
@@ -1,5 +1,23 @@
2001-11-28 Marc Autret <address@hidden>
+ * 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 <address@hidden>
+
* src/bison.simple: Adjust muscle names.
* src/muscle_tab.c (muscle_init): Also rename the muscles.
* src/output.c (prepare): s/_/-/ for the muscles names.
Index: src/getargs.c
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.c,v
retrieving revision 1.30
diff -u -r1.30 getargs.c
--- src/getargs.c 2001/11/27 20:30:13 1.30
+++ src/getargs.c 2001/11/28 21:19:21
@@ -34,7 +34,6 @@
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;
@@ -164,10 +163,6 @@
case 'v':
verbose_flag = 1;
- break;
-
- case 'e':
- error_verbose_flag = 1;
break;
case 'S':
Index: src/getargs.h
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.h,v
retrieving revision 1.13
diff -u -r1.13 getargs.h
--- src/getargs.h 2001/11/27 20:30:13 1.13
+++ src/getargs.h 2001/11/28 21:19:21
@@ -34,7 +34,6 @@
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;
Index: src/lex.h
===================================================================
RCS file: /cvsroot/bison/bison/src/lex.h,v
retrieving revision 1.21
diff -u -r1.21 lex.h
--- src/lex.h 2001/11/26 21:06:22 1.21
+++ src/lex.h 2001/11/28 21:19:21
@@ -50,7 +50,6 @@
tok_thong,
tok_define,
tok_skel,
- tok_include,
tok_noop,
tok_intopt,
tok_stropt,
Index: src/options.c
===================================================================
RCS file: /cvsroot/bison/bison/src/options.c,v
retrieving revision 1.9
diff -u -r1.9 options.c
--- src/options.c 2001/11/27 20:30:13 1.9
+++ src/options.c 2001/11/28 21:19:24
@@ -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 @@
/* 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 @@
{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 @@
/* 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 @@
{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}
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.75
diff -u -r1.75 output.c
--- src/output.c 2001/11/28 20:32:53 1.75
+++ src/output.c 2001/11/28 21:19:26
@@ -125,6 +125,8 @@
struct obstack muscle_obstack;
struct obstack output_obstack;
+int error_verbose = 0;
+
/* FIXME. */
static inline void
@@ -1052,7 +1054,7 @@
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);
Index: src/output.h
===================================================================
RCS file: /cvsroot/bison/bison/src/output.h,v
retrieving revision 1.3
diff -u -r1.3 output.h
--- src/output.h 2001/08/31 08:00:56 1.3
+++ src/output.h 2001/11/28 21:19:26
@@ -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));
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.105
diff -u -r1.105 reader.c
--- src/reader.c 2001/11/26 21:06:22 1.105
+++ src/reader.c 2001/11/28 21:19:36
@@ -974,16 +974,6 @@
/* 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 @@
parse_skel_decl ();
break;
- case tok_include:
- parse_include_decl ();
- break;
-
case tok_noop:
break;
--
Marc Autret
- FYI [trunk]: rm-useless-options.patch,
Marc Autret <=