[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI [trunk]: I-option-bis.patch
From: |
Marc Autret |
Subject: |
FYI [trunk]: I-option-bis.patch |
Date: |
26 Nov 2001 16:05:27 -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.302
diff -u -r1.302 ChangeLog
--- ChangeLog 2001/11/26 19:13:40 1.302
+++ ChangeLog 2001/11/26 20:50:14
@@ -1,3 +1,14 @@
+2001-11-26 Marc Autret <address@hidden>
+
+ * src/reader.c (parse_include_decl): New, Not yet implemented.
+ (read_declarations): Add case tok_include.
+ * src/getargs.h (include): Add its extern definition.
+ * src/getargs.c (include): New const char *.
+ (getargs): Add case '-I'.
+ * src/options.c (option_table): Add include as command line and
+ percent option.
+ * src/lex.h (token_t): Add tok_include.
+
2001-11-26 Akim Demaille <address@hidden>
* src/reader.c (readgram): Make sure rules for mid-rule actions
Index: src/getargs.c
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.c,v
retrieving revision 1.28
diff -u -r1.28 getargs.c
--- src/getargs.c 2001/11/19 10:37:58 1.28
+++ src/getargs.c 2001/11/26 20:50:15
@@ -39,6 +39,7 @@
int trace_flag = 0;
const char *skeleton = NULL;
+const char *include = NULL;
extern char *program_name;
@@ -166,6 +167,10 @@
case 'S':
skeleton = optarg;
+ break;
+
+ case 'I':
+ include = optarg;
break;
case 'd':
Index: src/getargs.h
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.h,v
retrieving revision 1.11
diff -u -r1.11 getargs.h
--- src/getargs.h 2001/11/19 10:37:58 1.11
+++ src/getargs.h 2001/11/26 20:50:15
@@ -22,9 +22,10 @@
# define GETARGS_H_
/* flags set by % directives */
-extern char *spec_file_prefix; /* for -b */
-extern char *spec_name_prefix; /* for -p */
-extern const char *skeleton;
+extern char *spec_file_prefix; /* for -b */
+extern char *spec_name_prefix; /* for -p */
+extern const char *skeleton; /* for -S */
+extern const char *include; /* for -I */
extern int debug_flag; /* for -t */
extern int defines_flag; /* for -d */
Index: src/lex.h
===================================================================
RCS file: /cvsroot/bison/bison/src/lex.h,v
retrieving revision 1.20
diff -u -r1.20 lex.h
--- src/lex.h 2001/11/14 14:43:58 1.20
+++ src/lex.h 2001/11/26 20:50:15
@@ -50,6 +50,7 @@
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.7
diff -u -r1.7 options.c
--- src/options.c 2001/11/19 10:37:58 1.7
+++ src/options.c 2001/11/26 20:50:16
@@ -116,6 +116,7 @@
{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/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.104
diff -u -r1.104 reader.c
--- src/reader.c 2001/11/26 15:27:58 1.104
+++ src/reader.c 2001/11/26 20:50:23
@@ -974,6 +974,16 @@
/* 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 `%{ ... %}' |
@@ -1048,6 +1058,10 @@
parse_skel_decl ();
break;
+ case tok_include:
+ parse_include_decl ();
+ break;
+
case tok_noop:
break;
--
Marc Autret
- FYI [trunk]: I-option-bis.patch,
Marc Autret <=