X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/55b9634155b80271df2b90a95d5f529e2371be28..18569462dba3a1ce0dbcdefdcfe04cfea33e8826:/src/files.c

diff --git a/src/files.c b/src/files.c
index ccb47182..eefa188d 100644
--- a/src/files.c
+++ b/src/files.c
@@ -27,56 +27,54 @@
 #include "complain.h"
 
 FILE *finput = NULL;
-FILE *foutput = NULL;
-FILE *fguard = NULL;
-FILE *fparser = NULL;
 
 struct obstack action_obstack;
 struct obstack attrs_obstack;
 struct obstack table_obstack;
 struct obstack defines_obstack;
+struct obstack guard_obstack;
+struct obstack output_obstack;
 
-/* File name specified with -o for the output file, or 0 if no -o.  */
-char *spec_outfile;
+char *spec_outfile;	/* for -o. */
+char *spec_file_prefix; /* for -b. */
+char *spec_name_prefix; /* for -p. */
 
 char *infile;
 char *attrsfile;
 
-static char *outfile;
-static char *defsfile;
-static char *tabfile;
-static char *guardfile;
-static char *actfile;
+static char *base_name;
+static char *short_base_name;
+
 
+/*--------------------------.
+| Is SUFFIX ending STRING?  |
+`--------------------------*/
+
+static int
+strsuffix (const char *string, const char *suffix)
+{
+  size_t string_len = strlen (string);
+  size_t suffix_len = strlen (suffix);
+  if (suffix_len <= string_len)
+    return !strcmp (string + string_len - suffix_len, suffix);
+  else
+    return 0;
+}
+
+
 /*-----------------------------------------------------------------.
 | Return a newly allocated string composed of the concatenation of |
-| the END1 first chars of STRING1, and STRING2.                    |
+| STRING1, and STRING2.                                            |
 `-----------------------------------------------------------------*/
 
 static char *
-stringappend (const char *string1, int end1, const char *string2)
+stringappend (const char *string1, const char *string2)
 {
-  char *res;
+  size_t len = strlen (string1) + strlen (string2);
+  char *res = XMALLOC (char, len + 1);
   char *cp;
-  const char *cp1;
-  int i;
-
-  cp1 = string2;
-  i = 0;
-  while (*cp1++)
-    i++;
-
-  res = XCALLOC (char, i + end1 + 1);
-
-  cp = res;
-  cp1 = string1;
-  for (i = 0; i < end1; i++)
-    *cp++ = *cp1++;
-
-  cp1 = string2;
-  while ((*cp++ = *cp1++))
-    ;
-
+  cp = stpcpy (res, string1);
+  cp = stpcpy (cp, string2);
   return res;
 }
 
@@ -85,7 +83,7 @@ stringappend (const char *string1, int end1, const char *string2)
 | if fails.                                                        |
 `-----------------------------------------------------------------*/
 
-static FILE *
+FILE *
 xfopen (const char *name, const char *mode)
 {
   FILE *ptr;
@@ -101,7 +99,7 @@ xfopen (const char *name, const char *mode)
 | Try to close file PTR, and print an error message if fails.  |
 `-------------------------------------------------------------*/
 
-static int
+int
 xfclose (FILE *ptr)
 {
   int result;
@@ -130,7 +128,12 @@ obstack_save (struct obstack *obs, const char *filename)
 }
 
 
-static const char *
+/*------------------------------------------------------------------.
+| Return the path to the skeleton which locaction might be given in |
+| ENVVAR, otherwise return SKELETON.                                |
+`------------------------------------------------------------------*/
+
+const char *
 skeleton_find (const char *envvar, const char *skeleton)
 {
   const char *res = getenv (envvar);
@@ -153,130 +156,108 @@ skeleton_find (const char *envvar, const char *skeleton)
 }
 
 
-/*-----------------------------------------------------------------.
-| Open the input file.  Look for the skeletons.  Find the names of |
-| the output files.  Prepare the obstacks.                         |
-`-----------------------------------------------------------------*/
+/*----------------------------------------.
+| Compute BASE_NAME and SHORT_BASE_NAME.  |
+`----------------------------------------*/
 
-void
-open_files (void)
+/* FIXME: Should use xstrndup. */
+
+static void
+compute_base_names (void)
 {
-  char *name_base;
-  int base_length;
-  int short_base_length;
+  size_t base_length;
+  size_t short_base_length;
 
+  /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),
+     BASE_NAME and SHORT_BASE_NAME are `foo'.
+
+     If --output=foo.tab.c was specified, BASE_NAME is `foo.tab' and
+     SHORT_BASE_NAME is `foo'.
+
+     The precise -o name will be used for FTABLE.  For other output
+     files, remove the ".c" or ".tab.c" suffix.  */
   if (spec_outfile)
     {
-      /* -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
-      strlwr (name_base);
+      strlwr (spec_outfile);
 #endif /* MSDOS */
       /* BASE_LENGTH includes ".tab" but not ".c".  */
-      base_length = strlen (name_base);
-      if (!strcmp (name_base + base_length - 2, ".c"))
+      base_length = strlen (spec_outfile);
+      if (strsuffix (spec_outfile, ".c"))
 	base_length -= 2;
+      base_name = strndup (spec_outfile, base_length);
       /* SHORT_BASE_LENGTH includes neither ".tab" nor ".c".  */
       short_base_length = base_length;
-      if (!strncmp (name_base + short_base_length - 4, ".tab", 4))
-	short_base_length -= 4;
-      else if (!strncmp (name_base + short_base_length - 4, "_tab", 4))
+      if (strsuffix (base_name, ".tab") || strsuffix (base_name, "_tab"))
 	short_base_length -= 4;
+      short_base_name = strndup (spec_outfile, short_base_length);
+
+      return;
     }
-  else if (spec_file_prefix)
+
+  /* If --file-prefix=foo was specified, BASE_NAME and SHORT_BASE_NAME
+     are `foo'.
+
+     Construct names from it.  */
+  if (spec_file_prefix)
     {
-      /* -b was specified.  Construct names from it.  */
-      /* SHORT_BASE_LENGTH includes neither ".tab" nor ".c".  */
-      short_base_length = strlen (spec_file_prefix);
-      /* Count room for `.tab'.  */
-      base_length = short_base_length + 4;
-      name_base = XMALLOC (char, base_length + 1);
-      /* Append `.tab'.  */
-      strcpy (name_base, spec_file_prefix);
-      strcat (name_base, EXT_TAB);
 #ifdef MSDOS
-      strlwr (name_base);
+      strlwr (spec_file_prefix);
 #endif /* MSDOS */
-    }
-  else
-    {
-      /* -o was not specified; compute output file name from input
-         or use y.tab.c, etc., if -y was specified.  */
+      short_base_name = xstrdup (spec_file_prefix);
 
-      static char FIXED_NAME_BASE[] = "y.y";
+      base_name = XMALLOC (char,
+			   strlen (short_base_name) + strlen (EXT_TAB) + 1);
+      stpcpy (stpcpy (base_name, short_base_name), EXT_TAB);
 
-      name_base = yacc_flag ? FIXED_NAME_BASE : infile;
-
-      /* BASE_LENGTH gets length of NAME_BASE, sans ".y" suffix if any.  */
-
-      base_length = strlen (name_base);
-      if (!strcmp (name_base + base_length - 2, ".y"))
-	base_length -= 2;
-      short_base_length = base_length;
-
-      name_base = stringappend (name_base, short_base_length, EXT_TAB);
-      base_length = short_base_length + 4;
+      return;
     }
 
-  finput = xfopen (infile, "r");
+  /* If neither -o nor --file-prefix were specified, and the input
+     file is foo.y, BASE_NAME is `foo.tab', and SHORT_BASE_NAME is
+     `foo'.
 
-  if (!no_parser_flag)
-    fparser = xfopen (skeleton_find ("BISON_SIMPLE", BISON_SIMPLE), "r");
+     If --yacc is used, do as if the input file was `y.y'.  */
+  {
+    const char *name_base = yacc_flag ? "y.y" : infile;
 
-  if (verbose_flag)
-    {
-      /* We used to use just .out if spec_name_prefix (-p) was used,
-         but that conflicts with Posix.  */
-      outfile = stringappend (name_base, short_base_length, EXT_OUTPUT);
-      foutput = xfopen (outfile, "w");
-    }
+    /* BASE_LENGTH gets length of BASE_NAME, sans ".y" suffix if any.  */
 
-  if (no_parser_flag)
-    {
-      /* use permanent name for actions file */
-      actfile = stringappend (name_base, short_base_length, ".act");
-    }
+    base_length = strlen (name_base);
+    if (strsuffix (name_base, ".y"))
+      base_length -= 2;
+    short_base_length = base_length;
+    short_base_name = strndup (name_base, short_base_length);
 
-  if (defines_flag)
-    {
-      defsfile = stringappend (name_base, base_length, ".h");
-    }
+    base_name = XMALLOC (char,
+			 strlen (short_base_name) + strlen (EXT_TAB) + 1);
+    stpcpy (stpcpy (base_name, short_base_name), EXT_TAB);
 
-  /* These are opened by `done' or `open_extra_files', if at all */
-  if (spec_outfile)
-    tabfile = spec_outfile;
-  else
-    tabfile = stringappend (name_base, base_length, ".c");
+    return;
+  }
+}
 
-  attrsfile = stringappend (name_base, short_base_length, EXT_STYPE_H);
-  guardfile = stringappend (name_base, short_base_length, EXT_GUARD_C);
+/*-----------------------------------------------------------------.
+| Open the input file.  Look for the skeletons.  Find the names of |
+| the output files.  Prepare the obstacks.                         |
+`-----------------------------------------------------------------*/
+
+void
+open_files (void)
+{
+  finput = xfopen (infile, "r");
 
   /* Initialize the obstacks. */
   obstack_init (&action_obstack);
   obstack_init (&attrs_obstack);
   obstack_init (&table_obstack);
   obstack_init (&defines_obstack);
+  obstack_init (&guard_obstack);
+  obstack_init (&output_obstack);
 }
 
 
 
-/*--------------------------------------------------------------------.
-| Open the output files needed only for the semantic parser.  This    |
-| is done when %semantic_parser is seen in the declarations section.  |
-`--------------------------------------------------------------------*/
-
-void
-open_extra_files (void)
-{
-  xfclose (fparser);
-
-  if (!no_parser_flag)
-    fparser = xfopen (skeleton_find ("BISON_HAIRY", BISON_HAIRY), "r");
-  fguard = xfopen (guardfile, "w");
-}
-
-
 /*-----------------------------------------------------.
 | Close the open files, produce all the output files.  |
 `-----------------------------------------------------*/
@@ -284,25 +265,36 @@ open_extra_files (void)
 void
 output_files (void)
 {
-  xfclose (fguard);
   xfclose (finput);
-  xfclose (fparser);
-  xfclose (foutput);
+
+  compute_base_names ();
+  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
 
   /* Output the main file.  */
-  obstack_save (&table_obstack, tabfile);
+  if (spec_outfile)
+    obstack_save (&table_obstack, spec_outfile);
+  else
+    obstack_save (&table_obstack,  stringappend (base_name, ".c"));
 
   /* Output the header file if wanted. */
   if (defines_flag)
-    obstack_save (&defines_obstack, defsfile);
+    obstack_save (&defines_obstack, stringappend (base_name, ".h"));
 
-  /* If we output only the table, dump the actions in ACTFILE.
-     */
+  /* If we output only the table, dump the actions in ACTFILE. */
   if (no_parser_flag)
-    obstack_save (&action_obstack, actfile);
+    obstack_save (&action_obstack, stringappend (short_base_name, ".act"));
 
   /* If we produced a semantic parser ATTRS_OBSTACK must be dumped
      into its own file, ATTTRSFILE.  */
   if (semantic_parser)
-    obstack_save (&attrs_obstack, attrsfile);
+    {
+      obstack_save (&attrs_obstack, attrsfile);
+      obstack_save (&guard_obstack,
+		    stringappend (short_base_name, EXT_GUARD_C));
+    }
+
+  if (verbose_flag)
+    /* We used to use just .out if spec_name_prefix (-p) was used, but
+       that conflicts with Posix.  */
+    obstack_save (&output_obstack, stringappend (short_base_name, EXT_OUTPUT));
 }