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

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/files.c
View File

@@ -165,8 +165,8 @@ compute_exts_from_src (const char *ext)
}
/* Decompose FILENAME in four parts: *BASE, *TAB, and *EXT, the fourth
part, (the directory) is ranging from FILENAME to the char before
/* Decompose FILE_NAME in four parts: *BASE, *TAB, and *EXT, the fourth
part, (the directory) is ranging from FILE_NAME to the char before
*BASE, so we don't need an additional parameter.
*EXT points to the last period in the basename, or NULL if none.
@@ -175,7 +175,7 @@ compute_exts_from_src (const char *ext)
`.tab' or `_tab' if present right before *EXT, or is NULL. *TAB
cannot be equal to *BASE.
None are allocated, they are simply pointers to parts of FILENAME.
None are allocated, they are simply pointers to parts of FILE_NAME.
Examples:
'/tmp/foo.tab.c' -> *BASE = 'foo.tab.c', *TAB = '.tab.c', *EXT =
@@ -194,10 +194,10 @@ compute_exts_from_src (const char *ext)
'foo' -> *BASE = 'foo', *TAB = NULL, *EXT = NULL. */
static void
filename_split (const char *filename,
const char **base, const char **tab, const char **ext)
file_name_split (const char *file_name,
const char **base, const char **tab, const char **ext)
{
*base = base_name (filename);
*base = base_name (file_name);
/* Look for the extension, i.e., look for the last dot. */
*ext = strrchr (*base, '.');
@@ -232,7 +232,7 @@ compute_base_names (void)
files, remove the ".c" or ".tab.c" suffix. */
if (spec_outfile)
{
filename_split (spec_outfile, &base, &tab, &ext);
file_name_split (spec_outfile, &base, &tab, &ext);
/* The full base name goes up the EXT, excluding it. */
full_base_name =
@@ -270,7 +270,7 @@ compute_base_names (void)
{
/* Otherwise, the short base name is computed from the input
grammar: `foo/bar.yy' => `bar'. */
filename_split (grammar_file, &base, &tab, &ext);
file_name_split (grammar_file, &base, &tab, &ext);
short_base_name =
xstrndup (base,
(strlen (base) - (ext ? strlen (ext) : 0)));
@@ -281,7 +281,7 @@ compute_base_names (void)
stpcpy (stpcpy (full_base_name, short_base_name), TAB_EXT);
/* Compute the extensions from the grammar file name. */
filename_split (grammar_file, &base, &tab, &ext);
file_name_split (grammar_file, &base, &tab, &ext);
if (ext && !yacc_flag)
compute_exts_from_gf (ext);
}

2
src/muscle_tab.c
View File

@@ -74,7 +74,7 @@ muscle_init (void)
/* Version and input file. */
MUSCLE_INSERT_STRING ("version", VERSION);
MUSCLE_INSERT_C_STRING ("filename", grammar_file);
MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
}

14
src/scan-skel.l
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;
}