* tests/Makefile.am (suite.m4, regression.m4, calc.m4): Rename

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 6baa13bf9074ea2d5c4520b96c318e4cccb37218..5282ac0d199271ea0edd214773de077b7afdb5d0 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,5 +1,5 @@
 /* Open and close files for bison,
 /* Open and close files for bison,

-   Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -22,22 +22,20 @@
 #include "system.h"
 
 #if defined (VMS) & !defined (__VMS_POSIX)
 #include "system.h"
 
 #if defined (VMS) & !defined (__VMS_POSIX)

-# include <ssdef.h>
-# define unlink delete
-# ifndef XPFILE
-#  define XPFILE "GNU_BISON:[000000]BISON.SIMPLE"
+# ifndef BISON_SIMPLE
+#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"

 # endif
 # endif

-# ifndef XPFILE1
-#  define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY"
+# ifndef BISON_HAIRY
+#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"

 # endif
 #endif
 
 #if defined (_MSC_VER)
 # endif
 #endif
 
 #if defined (_MSC_VER)

-# ifndef XPFILE
-#  define XPFILE "c:/usr/local/lib/bison.simple"
+# ifndef BISON_SIMPLE
+#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"

 # endif
 # endif

-# ifndef XPFILE1
-#  define XPFILE1 "c:/usr/local/lib/bison.hairy"
+# ifndef BISON_HAIRY
+#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"

 # endif
 #endif
 
 # endif
 #endif
 


@@ -49,13 +47,14 @@
 
 FILE *finput = NULL;
 FILE *foutput = NULL;
 
 FILE *finput = NULL;
 FILE *foutput = NULL;

-FILE *fdefines = NULL;
-FILE *ftable = NULL;
-FILE *fattrs = NULL;

 FILE *fguard = NULL;
 FILE *fguard = NULL;

-FILE *faction = NULL;

 FILE *fparser = NULL;
 
 FILE *fparser = NULL;
 

+struct obstack action_obstack;
+struct obstack attrs_obstack;
+struct obstack table_obstack;
+struct obstack defines_obstack;
+

 /* File name specified with -o for the output file, or 0 if no -o.  */
 char *spec_outfile;
 
 /* File name specified with -o for the output file, or 0 if no -o.  */
 char *spec_outfile;
 


@@ -67,11 +66,7 @@ static char *defsfile;
 static char *tabfile;
 static char *guardfile;
 static char *actfile;
 static char *tabfile;
 static char *guardfile;
 static char *actfile;

-static char *tmpattrsfile;
-static char *tmptabfile;
-static char *tmpdefsfile;

 
 

-extern char *mktemp ();                /* So the compiler won't complain */

 extern char *getenv ();
 
 extern char *program_name;
 extern char *getenv ();
 
 extern char *program_name;


@@ -139,9 +134,49 @@ xfclose (FILE *ptr)
 
   return result;
 }
 
   return result;
 }

+
+/*--------------------------------------------------.
+| Save the content of the obstack OBS in FILENAME.  |
+`--------------------------------------------------*/
+
+static void
+obstack_save (struct obstack *obs, const char *filename)
+{
+  FILE *out = xfopen (filename, "w");
+  size_t size = obstack_object_size (obs);
+  fwrite (obstack_finish (obs), 1, size, out);
+  xfclose (out);
+}
+
+
+static const char *
+skeleton_find (const char *envvar, const char *skeleton)
+{
+  const char *res = getenv (envvar);
+
+#ifdef MSDOS
+  const char *cp;
+
+  /* File doesn't exist in current directory; try in INIT directory.  */
+  if (!res && (cp = getenv ("INIT")))
+    {
+      res = XMALLOC (char, strlen (cp) + strlen (skeleton) + 2);
+      sprintf (res, "%s%c%s", cp, '/', skeleton);
+    }
+#endif /* !MSDOS */
+
+  if (!res)
+    res = skeleton;
+
+  return res;
+}
+

 \f
 \f

-/* JF this has been hacked to death.  Nowaday it sets up the file names for
-   the output files, and opens the tmp files and the parser */
+/*-----------------------------------------------------------------.
+| Open the input file.  Look for the skeletons.  Find the names of |
+| the output files.  Prepare the obstacks.                         |
+`-----------------------------------------------------------------*/
+

 void
 open_files (void)
 {
 void
 open_files (void)
 {


@@ -149,7 +184,6 @@ open_files (void)
 #ifdef MSDOS
   register char *cp;
 #endif
 #ifdef MSDOS
   register char *cp;
 #endif

-  char *filename;

   int base_length;
   int short_base_length;
 
   int base_length;
   int short_base_length;
 


@@ -189,7 +223,7 @@ open_files (void)
 
   if (spec_outfile)
     {
 
   if (spec_outfile)
     {

-      /* -o was specified.  The precise -o name will be used for ftable.
+      /* -o was specified.  The precise -o name will be used for FTABLE.

          For other output files, remove the ".c" or ".tab.c" suffix.  */
       name_base = spec_outfile;
 #ifdef MSDOS
          For other output files, remove the ".c" or ".tab.c" suffix.  */
       name_base = spec_outfile;
 #ifdef MSDOS


@@ -232,7 +266,7 @@ open_files (void)
 
       static char FIXED_NAME_BASE[] = "y.y";
 
 
       static char FIXED_NAME_BASE[] = "y.y";
 

-      name_base = fixed_outfiles ? FIXED_NAME_BASE : infile;
+      name_base = yacc_flag ? FIXED_NAME_BASE : infile;

 
       /* BASE_LENGTH gets length of NAME_BASE, sans ".y" suffix if any.  */
 
 
       /* BASE_LENGTH gets length of NAME_BASE, sans ".y" suffix if any.  */
 


@@ -255,25 +289,10 @@ open_files (void)
 
   finput = xfopen (infile, "r");
 
 
   finput = xfopen (infile, "r");
 

-  if (!noparserflag)
-    {
-      filename = getenv ("BISON_SIMPLE");
-#ifdef MSDOS
-      /* File doesn't exist in current directory; try in INIT directory.  */
-      cp = getenv ("INIT");
-      if (filename == 0 && cp != NULL)
-       {
-         filename = XMALLOC (char, strlen (cp) + strlen (PFILE) + 2);
-         strcpy (filename, cp);
-         cp = filename + strlen (filename);
-         *cp++ = '/';
-         strcpy (cp, PFILE);
-       }
-#endif /* MSDOS */
-      fparser = xfopen (filename ? filename : PFILE, "r");
-    }
+  if (!no_parser_flag)
+    fparser = xfopen (skeleton_find ("BISON_SIMPLE", BISON_SIMPLE), "r");

 
 

-  if (verboseflag)
+  if (verbose_flag)

     {
 #ifdef MSDOS
       outfile = stringappend (name_base, short_base_length, ".out");
     {
 #ifdef MSDOS
       outfile = stringappend (name_base, short_base_length, ".out");


@@ -285,46 +304,17 @@ open_files (void)
       foutput = xfopen (outfile, "w");
     }
 
       foutput = xfopen (outfile, "w");
     }
 

-  if (noparserflag)
+  if (no_parser_flag)

     {
       /* use permanent name for actions file */
       actfile = stringappend (name_base, short_base_length, ".act");
     {
       /* use permanent name for actions file */
       actfile = stringappend (name_base, short_base_length, ".act");

-      faction = xfopen (actfile, "w");

     }
 
     }
 

-#ifdef MSDOS
-  if (!noparserflag)
-    actfile = mktemp (stringappend (tmp_base, tmp_len, "acXXXXXX"));
-  tmpattrsfile = mktemp (stringappend (tmp_base, tmp_len, "atXXXXXX"));
-  tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "taXXXXXX"));
-  tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "deXXXXXX"));
-#else
-  if (!noparserflag)
-    actfile = mktemp (stringappend (tmp_base, tmp_len, "act.XXXXXX"));
-  tmpattrsfile = mktemp (stringappend (tmp_base, tmp_len, "attrs.XXXXXX"));
-  tmptabfile = mktemp (stringappend (tmp_base, tmp_len, "tab.XXXXXX"));
-  tmpdefsfile = mktemp (stringappend (tmp_base, tmp_len, "defs.XXXXXX"));
-#endif /* not MSDOS */
-
-  if (!noparserflag)
-    faction = xfopen (actfile, "w+");
-  fattrs = xfopen (tmpattrsfile, "w+");
-  ftable = xfopen (tmptabfile, "w+");
-
-  if (definesflag)
+  if (defines_flag)

     {
       defsfile = stringappend (name_base, base_length, ".h");
     {
       defsfile = stringappend (name_base, base_length, ".h");

-      fdefines = xfopen (tmpdefsfile, "w+");

     }
 
     }
 

-#if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
-  if (!noparserflag)
-    unlink (actfile);
-  unlink (tmpattrsfile);
-  unlink (tmptabfile);
-  unlink (tmpdefsfile);
-#endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
-

   /* These are opened by `done' or `open_extra_files', if at all */
   if (spec_outfile)
     tabfile = spec_outfile;
   /* These are opened by `done' or `open_extra_files', if at all */
   if (spec_outfile)
     tabfile = spec_outfile;


@@ -343,6 +333,12 @@ open_files (void)
   guardfile = stringappend (name_base, short_base_length, ".guard.c");
 #endif /* not MSDOS */
 #endif /* not VMS */
   guardfile = stringappend (name_base, short_base_length, ".guard.c");
 #endif /* not MSDOS */
 #endif /* not VMS */

+
+  /* Initialize the obstacks. */
+  obstack_init (&action_obstack);
+  obstack_init (&attrs_obstack);
+  obstack_init (&table_obstack);
+  obstack_init (&defines_obstack);

 }
 
 
 }
 
 


@@ -355,103 +351,40 @@ open_files (void)
 void
 open_extra_files (void)
 {
 void
 open_extra_files (void)
 {

-  FILE *ftmp;
-  int c;
-  char *filename;
-#ifdef MSDOS
-  char *cp;
-#endif
-

   xfclose (fparser);
 
   xfclose (fparser);
 

-  if (!noparserflag)
-    {
-      filename = (char *) getenv ("BISON_HAIRY");
-#ifdef MSDOS
-      /* File doesn't exist in current directory; try in INIT directory.  */
-      cp = getenv ("INIT");
-      if (filename == 0 && cp != NULL)
-       {
-         filename = XMALLOC (char, strlen (cp) + strlen (PFILE1) + 2);
-         strcpy (filename, cp);
-         cp = filename + strlen (filename);
-         *cp++ = '/';
-         strcpy (cp, PFILE1);
-       }
-#endif
-      fparser = xfopen (filename ? filename : PFILE1, "r");
-    }
-
-  /* JF change from inline attrs file to separate one */
-  ftmp = xfopen (attrsfile, "w");
-  rewind (fattrs);
-  while ((c = getc (fattrs)) != EOF)   /* Thank god for buffering */
-    putc (c, ftmp);
-  xfclose (fattrs);
-  fattrs = ftmp;
-
+  if (!no_parser_flag)
+    fparser = xfopen (skeleton_find ("BISON_HAIRY", BISON_HAIRY), "r");

   fguard = xfopen (guardfile, "w");
   fguard = xfopen (guardfile, "w");

-

 }
 
 }
 

+
+/*-----------------------------------------------------.
+| Close the open files, produce all the output files.  |
+`-----------------------------------------------------*/
+

 void
 void

-done (void)
+output_files (void)

 {
 {

-  xfclose (faction);
-  xfclose (fattrs);

   xfclose (fguard);
   xfclose (finput);
   xfclose (fparser);
   xfclose (foutput);
 
   xfclose (fguard);
   xfclose (finput);
   xfclose (fparser);
   xfclose (foutput);
 

-  /* JF write out the output file */
-  if (!complain_message_count && ftable)
-    {
-      FILE *ftmp;
-      register int c;
-
-      ftmp = xfopen (tabfile, "w");
-      rewind (ftable);
-      while ((c = getc (ftable)) != EOF)
-       putc (c, ftmp);
-      xfclose (ftmp);
-      xfclose (ftable);
-
-      if (definesflag)
-       {
-         ftmp = xfopen (defsfile, "w");
-         fflush (fdefines);
-         rewind (fdefines);
-         while ((c = getc (fdefines)) != EOF)
-           putc (c, ftmp);
-         xfclose (ftmp);
-         xfclose (fdefines);
-       }
-    }
+  /* Output the main file.  */
+  obstack_save (&table_obstack, tabfile);

 
 

-#if defined (VMS) & !defined (__VMS_POSIX)
-  if (faction && !noparserflag)
-    delete (actfile);
-  if (fattrs)
-    delete (tmpattrsfile);
-  if (ftable)
-    delete (tmptabfile);
-/* Don't call exit again, we're in atexit ().
-  if (!complain_message_count)
-    sys$exit(SS$_NORMAL);
-  sys$exit(SS$_ABORT); */
-#else
-#if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
-  if (actfile && !noparserflag)
-    unlink (actfile);
-  if (tmpattrsfile)
-    unlink (tmpattrsfile);
-  if (tmptabfile)
-    unlink (tmptabfile);
-  if (tmpdefsfile)
-    unlink (tmpdefsfile);
-#endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
-/* Don't call exit again, we're in atexit ().
-  exit (complain_message_count ? 1 : 0); */
-#endif /* not VMS, or __VMS_POSIX */
+  /* Output the header file if wanted. */
+  if (defines_flag)
+    obstack_save (&defines_obstack, defsfile);
+
+  /* If we output only the table, dump the actions in ACTFILE.
+     */
+  if (no_parser_flag)
+    obstack_save (&action_obstack, actfile);
+
+  /* If we produced a semantic parser ATTRS_OBSTACK must be dumped
+     into its own file, ATTTRSFILE.  */
+  if (semantic_parser)
+    obstack_save (&attrs_obstack, attrsfile);

 }
 }