From c4e3dae3ace44790c838ff39808756a81464bb8f Mon Sep 17 00:00:00 2001 From: Marc Autret Date: Mon, 17 Sep 2001 22:20:08 +0000 Subject: [PATCH] Turn off %{source,header}_extension feature. * src/files.c (compute_exts_from_gf): Update. (compute_exts_from_src): Update. (output_files): CPP-out useless code. * src/files.h: Remove {header,source}_extension extern declarations. * src/reader.c (parse_dquoted_param): CPP-out. (parse_header_extension_decl): Remove. (parse_source_extension_decl): Remove. (read_declarations): Remove cases tok_{hdrext,srcext}. * src/lex.c (percent_table): Remove {header,source}_extension entries. * src/lex.h (token_t): Remove tok_hdrext and tok_srcext. --- ChangeLog | 15 +++++++++++++++ src/files.c | 20 ++++++-------------- src/files.h | 3 --- src/lex.c | 2 -- src/reader.c | 37 ++++++++----------------------------- 5 files changed, 29 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3465cc6d..13b1dd61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2001-09-18 Marc Autret + + Turn off %{source,header}_extension feature. + + * src/files.c (compute_exts_from_gf): Update. + (compute_exts_from_src): Update. + (output_files): CPP-out useless code. + * src/files.h: Remove {header,source}_extension extern declarations. + * src/reader.c (parse_dquoted_param): CPP-out. + (parse_header_extension_decl): Remove. + (parse_source_extension_decl): Remove. + (read_declarations): Remove cases tok_{hdrext,srcext}. + * src/lex.c (percent_table): Remove {header,source}_extension entries. + * src/lex.h (token_t): Remove tok_hdrext and tok_srcext. + 2001-09-10 Akim Demaille * tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT): diff --git a/src/files.c b/src/files.c index 6bf301f9..35cd872d 100644 --- a/src/files.c +++ b/src/files.c @@ -260,20 +260,10 @@ get_extension_index (const char *filename) static void compute_exts_from_gf (const char *ext) { - /* Checks if SRC_EXTENSION is NULL. In the other case, %source_extension - was specified in the grammar file. */ - if (src_extension == NULL) - { - src_extension = tr (ext, 'y', 'c'); - src_extension = tr (src_extension, 'Y', 'C'); - } - /* Checks if HEADER_EXTENSION is NULL. In the other case, - %header_extension was specified in the grammar file. */ - if (header_extension == NULL) - { - header_extension = tr (ext, 'y', 'h'); - header_extension = tr (header_extension, 'Y', 'H'); - } + src_extension = tr (ext, 'y', 'c'); + src_extension = tr (src_extension, 'Y', 'C'); + header_extension = tr (ext, 'y', 'h'); + header_extension = tr (header_extension, 'Y', 'H'); } /* Computes extensions from the given c source file extension. */ @@ -428,11 +418,13 @@ output_files (void) compute_base_names (); +#if 0 /* Set default extensions */ if (!src_extension) src_extension = ".c"; if (!header_extension) header_extension = ".h"; +#endif attrsfile = stringappend (short_base_name, EXT_STYPE_H); #ifndef MSDOS diff --git a/src/files.h b/src/files.h index 3c1b2f06..7ffaf958 100644 --- a/src/files.h +++ b/src/files.h @@ -62,9 +62,6 @@ extern struct obstack graph_obstack; extern char *infile; extern char *attrsfile; -extern const char *src_extension; -extern const char *header_extension; - void open_files PARAMS((void)); void output_files PARAMS((void)); diff --git a/src/lex.c b/src/lex.c index b8846ba9..cbb7f278 100644 --- a/src/lex.c +++ b/src/lex.c @@ -555,8 +555,6 @@ struct percent_table_struct percent_table[] = { "file_prefix", &spec_file_prefix, tok_setopt }, /* -b */ { "name_prefix", &spec_name_prefix, tok_setopt }, /* -p */ #endif - { "header_extension", NULL, tok_hdrext }, - { "source_extension", NULL, tok_srcext }, { "verbose", &verbose_flag, tok_noop }, /* -v */ { "debug", &debug_flag, tok_noop }, /* -t */ { "semantic_parser", &semantic_parser, tok_noop }, diff --git a/src/reader.c b/src/reader.c index b4dcea07..52ed6145 100644 --- a/src/reader.c +++ b/src/reader.c @@ -874,9 +874,13 @@ parse_thong_decl (void) nsyms--; } -/*--------------------------------------------------------------. -| Parse what comes after %header_extension and %source_etension | -`--------------------------------------------------------------*/ + +/*-----------------------------------------------------------------------------. +| Parse a double quoted parameter. It was used for %{source,header}_extension. | +| For the moment, It is not used since extension features have been removed. | +`-----------------------------------------------------------------------------*/ + +#if 0 static const char * parse_dquoted_param (const char *from) @@ -922,25 +926,8 @@ parse_dquoted_param (const char *from) return xstrdup (buff); } -/* %header_extension case. */ -static void -parse_header_extension_decl (void) -{ - if (header_extension) - complain (_("multiple %%header_extension declarations")); - - header_extension = parse_dquoted_param ("%header_extension"); -} - -/* %source_extension case. */ -static void -parse_source_extension_decl (void) -{ - if (src_extension) - complain (_("multiple %%source_extension declarations")); +#endif - src_extension = parse_dquoted_param ("%source_extension"); -} /*----------------------------------------------------------------. | Read from finput until `%%' is seen. Discard the `%%'. Handle | @@ -1011,14 +998,6 @@ read_declarations (void) parse_assoc_decl (non_assoc); break; - case tok_hdrext: - parse_header_extension_decl (); - break; - - case tok_srcext: - parse_source_extension_decl (); - break; - case tok_noop: break; -- 2.50.0