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

* tests/testsuite.at (AT_CHECK): When checking if $1 starts with

Browse Source 
`bison ', use m4_index instead of m4_substr since chopping up a string
containing M4-special characters causes problems here.

Fix a couple of bugs related to special characters in user-specified
file names, and make it easier for skeletons to compute output file
names with the same file name prefix as Bison-computed output file
names.
* data/glr.cc, data/push.c, data/yacc.c: In @output, use
b4_parser_file_name and b4_spec_defines_file instead of
@output_parser_name@ and @output_header_name@, which are now redundant.
* data/glr.c, data/lalr1.cc: Likewise.  Also, in header #include's, use
b4_parser_file_name, b4_spec_defines_file, and the new
@basename(FILENAME@) instead of @output_parser_name@ and
@output_header_name@, which inappropriately escaped the file names as
C string literals.
* src/files.c (all_but_ext): Remove static qualifier.
(compute_output_file_names): Move `free (all_but_ext)' to...
(output_file_names_free): ... here since all_but_ext is needed later.
* src/files.h (all_but_ext): Extern.
* src/muscle_tab.h (MUSCLE_INSERT_STRING_RAW): New macro that does
exactly what MUSCLE_INSERT_STRING used to do.
(MUSCLE_INSERT_STRING): Use MUSCLE_OBSTACK_SGROW so that M4-special
characters are escaped properly.
* src/output.c (prepare): Define muscle file_name_all_but_ext as
all_but_ext.
For pkgdatadir muscle, maintain previous functionality by using
MUSCLE_INSERT_STRING_RAW instead of MUSCLE_INSERT_STRING.  The problem
is that b4_pkgdatadir is used inside m4_include in the skeletons, so
digraphs would never be expanded.  Hopefully no one has M4-special
characters in his Bison installation path.
* src/scan-skel.l: Don't parse @output_header_name@ and
@output_parser_name@ anymore since they're now redundant.
In @output, use decode_at_digraphs.
Parse a new @basename command that invokes last_component.
(decode_at_digraphs): New.
(BASE_QPUTS): Remove unused.
* tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): New macro.
(Output file name): New tests.
This commit is contained in:
Joel E. Denny
2006-12-12 06:47:39 +00:00
parent 3f7ca62853
commit bd9d212b13
13 changed files with 165 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/scan-skel.l
View File

@@ -47,9 +47,7 @@ int skel_lex (void);
#define QPUTS(String) \
fputs (quotearg_style (c_quoting_style, String), yyout)
#define BASE_QPUTS(File) \
QPUTS (last_component (File))
static char *decode_at_digraphs (char *in);
%}
%%
@@ -59,29 +57,15 @@ int skel_lex (void);
%}
"@output ".*\n {
char const *file_name = yytext + sizeof "@output " - 1;
char *file_name = yytext + sizeof "@output " - 1;
yytext[yyleng - 1] = '\0';
/* Decode special file names. They include the directory part,
contrary to their "free" occurrences, used for issuing #includes,
which must not include the directory part. */
if (*file_name == '@')
{
if (strcmp (file_name, "@output_header_name@") == 0)
file_name = spec_defines_file;
else if (strcmp (file_name, "@output_parser_name@") == 0)
file_name = parser_file_name;
else
fatal ("invalid token in skeleton: %s", yytext);
}
if (outname)
{
free (outname);
xfclose (yyout);
}
outname = xstrdup (file_name);
output_file_name_check (file_name);
outname = decode_at_digraphs (file_name);
output_file_name_check (outname);
yyout = xfopen (outname, "w");
lineno = 1;
}
@@ -93,8 +77,14 @@ int skel_lex (void);
"@oline@" fprintf (yyout, "%d", lineno + 1);
"@ofile@" QPUTS (outname);
"@dir_prefix@" QPUTS (dir_prefix);
"@output_parser_name@" BASE_QPUTS (parser_file_name);
"@output_header_name@" BASE_QPUTS (spec_defines_file);
"@basename(".*"@)" {
char *file_name = yytext + sizeof "@basename " - 1;
yytext[yyleng - 2] = '\0';
file_name = decode_at_digraphs (file_name);
fputs (last_component (file_name), yyout);
free (file_name);
}
/* This pattern must not match more than the previous @ patterns. */
@[^{}@\n]* fatal ("invalid @ in skeleton: %s", yytext);
@@ -124,3 +114,31 @@ scan_skel (FILE *in)
/* Reclaim Flex's buffers. */
yylex_destroy ();
}
static char *
decode_at_digraphs (char *in)
{
char *out_start = xnmalloc (strlen (in)+1, sizeof *out_start);
char *out;
for (out = out_start; *in != '\0'; ++in, ++out)
{
if (*in == '@')
{
switch (*++in)
{
case '@': *out = '@'; break;
case '{': *out = '['; break;
case '}': *out = ']'; break;
default:
if (*in != '\0')
in[1] = '\0';
fatal ("invalid @ in skeleton: %s", in-1);
break;
}
}
else
*out = *in;
}
*out = '\0';
return out_start;
}