From 2cdb2a7b057fbcb3278427f2d623ea9dcf8a5312 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 20 Oct 2002 06:32:04 +0000 Subject: [PATCH] (readpipe): Remove decl. (scan_skel): New function, to be used in place of m4_invoke. Read from stream rather than file. --- src/scan-skel.l | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/src/scan-skel.l b/src/scan-skel.l index 114407f..3f98cf7 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -52,47 +52,16 @@ static char *yyoutname = NULL; <> xfclose (yyout); free (yyoutname); return EOF; %% -/* From lib/readpipe.c. */ -FILE *readpipe PARAMS ((const char *, ...)); +/*------------------------. +| Scan a Bison skeleton. | +`------------------------*/ -/*----------------------. -| Run our backend, M4. | -`----------------------*/ - -void m4_invoke PARAMS ((const char *definitions)); +void scan_skel (FILE *); void -m4_invoke (const char *definitions) +scan_skel (FILE *in) { - /* 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 & trace_tools) - 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_in = in; skel_lex (); /* Reclaim Flex's buffers. */ -- 2.7.4