Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn off %{source,header}_extension feature.

Browse Source 
* 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.
This commit is contained in:
Marc Autret
2001-09-17 22:20:08 +00:00
parent 8cedc168fa
commit c4e3dae3ac
5 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@@ -1,3 +1,18 @@
2001-09-18 Marc Autret <autret_m@epita.fr>
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 <akim@epita.fr>
* tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):

20
src/files.c
View File

@@ -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

3
src/files.h
View File

@@ -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));

2
src/lex.c
View File

@@ -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 },

37
src/reader.c
View File

@@ -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"));
#endif
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"));
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;