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

* src/output.c (m4_invoke): Extracted from...

Browse Source 
(output_skeleton): here.
Free tempfile.
This commit is contained in:
Akim Demaille
2002-06-14 17:36:58 +00:00
parent 2c5690250c
commit f958596b44
2 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-06-14 Akim Demaille <akim@epita.fr>
* src/output.c (m4_invoke): Extracted from...
(output_skeleton): here.
Free tempfile.
2002-06-14 Akim Demaille <akim@epita.fr> 2002-06-14 Akim Demaille <akim@epita.fr>
* src/parse-gram.y (directives, directive, gram) * src/parse-gram.y (directives, directive, gram)

79
src/output.c
View File

@@ -941,6 +941,46 @@ output_actions (void)
} }
/*----------------------.
| Run our backend, M4. |
`----------------------*/
static void
m4_invoke (const char *definitions)
{
/* Invoke m4 on the definition of the muscles, and the skeleton. */
const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
const char *m4 = getenv ("M4");
int pkg_data_len;
char *full_skeleton;
if (!m4)
m4 = M4;
if (!bison_pkgdatadir)
bison_pkgdatadir = PKGDATADIR;
pkg_data_len = strlen (bison_pkgdatadir);
full_skeleton = XMALLOC (char, pkg_data_len + strlen (skeleton) + 2);
if (bison_pkgdatadir[pkg_data_len-1] == '/')
sprintf (full_skeleton, "%s%s", bison_pkgdatadir, skeleton);
else
sprintf (full_skeleton, "%s/%s", bison_pkgdatadir, skeleton);
if (trace_flag)
fprintf (stderr,
"running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
m4, bison_pkgdatadir, definitions, full_skeleton);
skel_in = readpipe (m4,
"-I", bison_pkgdatadir,
"m4sugar/m4sugar.m4",
definitions,
full_skeleton,
NULL);
XFREE (full_skeleton);
if (!skel_in)
error (EXIT_FAILURE, errno, "cannot run m4");
skel_lex ();
}
/*---------------------------. /*---------------------------.
| Call the skeleton parser. | | Call the skeleton parser. |
`---------------------------*/ `---------------------------*/
@@ -985,42 +1025,13 @@ output_skeleton (void)
fputs ("m4_divert_push(0)dnl\n", out); fputs ("m4_divert_push(0)dnl\n", out);
xfclose (out); xfclose (out);
/* Invoke m4 on the definition of the muscles, and the skeleton. */ m4_invoke (tempfile);
{
const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
const char *m4 = getenv ("M4");
int pkg_data_len;
char *full_skeleton;
if (!m4) /* If `debugging', keep this file alive. */
m4 = M4; if (!trace_flag)
if (!bison_pkgdatadir) unlink (tempfile);
bison_pkgdatadir = PKGDATADIR;
pkg_data_len = strlen (bison_pkgdatadir);
full_skeleton = XMALLOC (char, pkg_data_len + strlen (skeleton) + 2);
if (bison_pkgdatadir[pkg_data_len-1] == '/')
sprintf (full_skeleton, "%s%s", bison_pkgdatadir, skeleton);
else
sprintf (full_skeleton, "%s/%s", bison_pkgdatadir, skeleton);
if (trace_flag)
fprintf (stderr,
"running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
m4, bison_pkgdatadir, tempfile, full_skeleton);
skel_in = readpipe (m4,
"-I", bison_pkgdatadir,
"m4sugar/m4sugar.m4",
tempfile,
full_skeleton,
NULL);
XFREE (full_skeleton);
if (!skel_in)
error (EXIT_FAILURE, errno, "cannot run m4");
skel_lex ();
/* If `debugging', keep this file alive. */ free (tempfile);
if (!trace_flag)
unlink (tempfile);
}
} }
static void static void