X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c6f1a33c06db52ed122d0922885602cf37f99941..8a1dd2fe05fc19d9f136d1ddbb42bb0af197240d:/src/scan-skel.l?ds=sidebyside

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 114407fc..0d7114a7 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -23,76 +23,65 @@
 
 %{
 #include "system.h"
+#include "quotearg.h"
 #include "error.h"
 #include "getargs.h"
 #include "files.h"
-int skel_lex PARAMS ((void));
-static int yylineno = 1;
-static char *yyoutname = NULL;
+
+int skel_lex (void);
+
 %}
 %%
-  /* This is an approximation, but we don't need more. */
-^"#output \""[^\"]+\"\n        {
-     yytext[yyleng - 2] = '\0';
-     XFREE (yyoutname);
-     yyoutname = xstrdup (yytext + strlen ("#output \""));
-     yyout = xfopen (yyoutname, "w");
-     yylineno = 1;
-   }
-
-"@<:@"           fputc ('[', yyout);
-"@:>@"           fputc (']', yyout);
-
-"__oline__"      fprintf (yyout, "%d", yylineno+1);
-"__ofile__"      fprintf (yyout, "%s", yyoutname);
-[^@_\n]+         ECHO;
-\n+              yylineno += yyleng; ECHO;
-.                ECHO;
-
-<<EOF>>          xfclose (yyout); free (yyoutname); return EOF;
-%%
 
-/* From lib/readpipe.c.  */
-FILE *readpipe PARAMS ((const char *, ...));
+%{
+  int lineno IF_LINT (= 0);
+  char *outname = NULL;
+%}
+
+"@output ".*\n {
+  char const *filename = yytext + sizeof "@output " - 1;
+  yytext[yyleng - 1] = '\0';
+
+  if (*filename == '@')
+    {
+      if (strcmp (filename, "@output_header_name@") == 0)
+	filename = spec_defines_file;
+      else if (strcmp (filename, "@output_parser_name@") == 0)
+	filename = parser_file_name;
+      else
+	abort ();
+    }
+
+  XFREE (outname);
+  outname = xstrdup (filename);
+  yyout = xfopen (outname, "w");
+  lineno = 1;
+}
+
+"@@"	   fputc ('@', yyout);
+"@{"	   fputc ('[', yyout);
+"@}"	   fputc (']', yyout);
+
+"@oline@"  fprintf (yyout, "%d", lineno);
+"@ofile@"  fputs (quotearg_style (c_quoting_style, outname), yyout);
+
+"@"	   abort ();
+\n	   lineno++; ECHO;
+.	   ECHO;
+
+<<EOF>>	   xfclose (yyout); free (outname); return EOF;
+%%
 
-/*----------------------.
-| Run our backend, M4.  |
-`----------------------*/
+/*------------------------.
+| Scan a Bison skeleton.  |
+`------------------------*/
 
-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.  */