* doc/bison.texinfo: Correct typos in previous fix.

* data/glr.c: b4_filename -> b4_file_name.
* data/lalr1.cc: Likewise.  Also, b4_filename_type -> b4_file_name_type.
All uses changed.
(class position): filename -> file_name.  All uses changed.
* data/yacc.c: b4_filename -> b4_file_name.
* lib/bitset.h: filename -> file_name in local vars.
* lib/bitset_stats.c: Likewise.
* src/files.c: Likewise.
* src/scan-skel.l ("@output ".*\n): Likewise.
* src/files.c (file_name_split): Renamed from filename_split.
* src/muscle_tab.c (muscle_init): Output b4_file_name, not b4_filename.
This commit is contained in:
Paul Eggert
2005-09-09 22:42:15 +00:00
parent a420f9620e
commit 48b16bbc04
10 changed files with 57 additions and 45 deletions

View File

@@ -45,15 +45,15 @@
%}
"@output ".*\n {
char const *filename = yytext + sizeof "@output " - 1;
char const *file_name = yytext + sizeof "@output " - 1;
yytext[yyleng - 1] = '\0';
if (*filename == '@')
if (*file_name == '@')
{
if (strcmp (filename, "@output_header_name@") == 0)
filename = spec_defines_file;
else if (strcmp (filename, "@output_parser_name@") == 0)
filename = parser_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);
}
@@ -63,7 +63,7 @@
free (outname);
xfclose (yyout);
}
outname = xstrdup (filename);
outname = xstrdup (file_name);
yyout = xfopen (outname, "w");
lineno = 1;
}