(xfopen, xfclose): Use EXIT_FAILURE rathern than 2.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 32a4a8d54b5db9959891bcb12d026a80aa32cc96..92573585a491e6d5f92c84ac2159ca86214bffff 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,5 +1,6 @@
 /* Open and close files for bison,
 /* Open and close files for bison,

-   Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
+   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,36 +23,55 @@
 #include "system.h"
 #include "getargs.h"
 #include "files.h"
 #include "system.h"
 #include "getargs.h"
 #include "files.h"

-#include "xalloc.h"

 #include "gram.h"
 #include "gram.h"

+#include "error.h"

 #include "complain.h"
 
 #include "complain.h"
 

+/* From basename.c.  Almost a lie, as it returns a char *. */
+const char *base_name (char const *name);
+

 FILE *finput = NULL;
 FILE *finput = NULL;

-FILE *foutput = NULL;
-FILE *fguard = NULL;

 
 

-struct obstack action_obstack;
-struct obstack attrs_obstack;
-struct obstack table_obstack;
-struct obstack defines_obstack;
+struct obstack pre_prologue_obstack;
+struct obstack post_prologue_obstack;
+
+/* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
+   tempting, but don't do that: for the time being our handling of the
+   %directive vs --option leaves precedence to the options by deciding
+   that if a %directive sets a variable which is really set (i.e., not
+   NULL), then the %directive is ignored.  As a result, %name-prefix,
+   for instance, will not be honored.  */
+
+char *spec_outfile = NULL;     /* for -o. */
+char *spec_file_prefix = NULL; /* for -b. */
+const char *spec_name_prefix = NULL;   /* for -p. */
+char *spec_verbose_file = NULL;   /* for --verbose. */
+char *spec_graph_file = NULL;   /* for -g. */
+char *spec_defines_file = NULL; /* for --defines. */
+char *parser_file_name = NULL;
+
+char *infile = NULL;

 
 

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

 
 

-char *infile;
-char *attrsfile;
-char *guardfile;
+/* Prefix used to generate output file names.  */
+char *short_base_name = NULL;

 
 

-static char *outfile;
-static char *defsfile;
-static char *tabfile;
-static char *actfile;
+/* Infix used to generate output file names (i.e., `.tab', or `_tab',
+   or `').  */
+char *output_infix = NULL;
+
+/* C source file extension (the parser source).  */
+const char *src_extension = NULL;
+/* Header file extension (if option ``-d'' is specified).  */
+const char *header_extension = NULL;

 \f
 \f

+

 /*--------------------------.
 | Is SUFFIX ending STRING?  |
 `--------------------------*/
 
 /*--------------------------.
 | Is SUFFIX ending STRING?  |
 `--------------------------*/
 

-static int
+int

 strsuffix (const char *string, const char *suffix)
 {
   size_t string_len = strlen (string);
 strsuffix (const char *string, const char *suffix)
 {
   size_t string_len = strlen (string);


@@ -68,7 +88,7 @@ strsuffix (const char *string, const char *suffix)
 | STRING1, and STRING2.                                            |
 `-----------------------------------------------------------------*/
 
 | STRING1, and STRING2.                                            |
 `-----------------------------------------------------------------*/
 

-static char *
+char*

 stringappend (const char *string1, const char *string2)
 {
   size_t len = strlen (string1) + strlen (string2);
 stringappend (const char *string1, const char *string2)
 {
   size_t len = strlen (string1) + strlen (string2);


@@ -91,7 +111,7 @@ xfopen (const char *name, const char *mode)
 
   ptr = fopen (name, mode);
   if (!ptr)
 
   ptr = fopen (name, mode);
   if (!ptr)

-    error (2, errno, _("cannot open file `%s'"), name);
+    error (EXIT_FAILURE, errno, _("cannot open file `%s'"), name);

 
   return ptr;
 }
 
   return ptr;
 }


@@ -110,64 +130,112 @@ xfclose (FILE *ptr)
 
   result = fclose (ptr);
   if (result == EOF)
 
   result = fclose (ptr);
   if (result == EOF)

-    error (2, errno, _("cannot close file"));
+    error (EXIT_FAILURE, errno, _("cannot close file"));

 
   return result;
 }
 
   return result;
 }

+\f
+
+/*----------------------------------------------------------------.
+| Compute BASE_NAME, SHORT_BASE_NAME and output files extensions. |
+`----------------------------------------------------------------*/

 
 

-/*--------------------------------------------------.
-| Save the content of the obstack OBS in FILENAME.  |
-`--------------------------------------------------*/
+/* Replace all characters FROM by TO in the string IN.
+   and returns a new allocated string.  */
+static char *
+tr (const char *in, char from, char to)
+{
+  char *temp;
+  char *out;
+
+  out = XMALLOC (char, strlen (in) + 1);
+
+  for (temp = out; *in; in++, out++)
+    if (*in == from)
+      *out = to;
+    else
+      *out = *in;
+  *out = 0;
+  return (temp);
+}

 
 

+/* Computes extensions from the grammar file extension. */

 static void
 static void

-obstack_save (struct obstack *obs, const char *filename)
+compute_exts_from_gf (const char *ext)

 {
 {

-  FILE *out = xfopen (filename, "w");
-  size_t size = obstack_object_size (obs);
-  fwrite (obstack_finish (obs), 1, size, out);
-  xfclose (out);
+  src_extension = tr (ext, 'y', 'c');
+  src_extension = tr (src_extension, 'Y', 'C');
+  header_extension = tr (ext, 'y', 'h');
+  header_extension = tr (header_extension, 'Y', 'H');

 }
 
 }
 

+/* Computes extensions from the given c source file extension. */
+static void
+compute_exts_from_src (const char *ext)
+{
+  /* We use this function when the user specifies `-o' or `--output',
+     so the extenions must be computed unconditionally from the file name
+     given by this option.  */
+  src_extension = xstrdup (ext);
+  header_extension = tr (ext, 'c', 'h');
+  header_extension = tr (header_extension, 'C', 'H');
+}

 
 

-/*------------------------------------------------------------------.
-| 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);
+/* Decompose FILENAME in four parts: *BASE, *TAB, and *EXT, the fourth
+   part, (the directory) is ranging from FILENAME to the char before
+   *BASE, so we don't need an additional parameter.

 
 

-#ifdef MSDOS
-  const char *cp;
+   *EXT points to the last period in the basename, or NULL if none.

 
 

-  /* 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 there is no *EXT, *TAB is NULL.  Otherwise, *TAB points to
+   `.tab' or `_tab' if present right before *EXT, or is NULL. *TAB
+   cannot be equal to *BASE.

 
 

-  if (!res)
-    res = skeleton;
+   None are allocated, they are simply pointers to parts of FILENAME.
+   Examples:

 
 

-  return res;
+   '/tmp/foo.tab.c' -> *BASE = 'foo.tab.c', *TAB = '.tab.c', *EXT =
+   '.c'
+
+   'foo.c' -> *BASE = 'foo.c', *TAB = NULL, *EXT = '.c'
+
+   'tab.c' -> *BASE = 'tab.c', *TAB = NULL, *EXT = '.c'
+
+   '.tab.c' -> *BASE = '.tab.c', *TAB = NULL, *EXT = '.c'
+
+   'foo.tab' -> *BASE = 'foo.tab', *TAB = NULL, *EXT = '.tab'
+
+   'foo_tab' -> *BASE = 'foo_tab', *TAB = NULL, *EXT = NULL
+
+   'foo' -> *BASE = 'foo', *TAB = NULL, *EXT = NULL.  */
+
+static void
+filename_split (const char *filename,
+               const char **base, const char **tab, const char **ext)
+{
+  *base = base_name (filename);
+
+  /* Look for the extension, i.e., look for the last dot. */
+  *ext = strrchr (*base, '.');
+  *tab = NULL;
+
+  /* If there is an exentension, check if there is a `.tab' part right
+     before.  */
+  if (*ext
+      && (*ext - *base) > (int) strlen (".tab")
+      && (!strncmp (*ext - strlen (".tab"), ".tab", strlen (".tab"))
+         || !strncmp (*ext - strlen ("_tab"), "_tab", strlen ("_tab"))))
+    *tab = *ext - strlen (".tab");

 }
 
 }
 

-\f
-/*----------------------------------------.
-| Compute BASE_NAME and SHORT_BASE_NAME.  |
-`----------------------------------------*/

 
 /* FIXME: Should use xstrndup. */
 
 static void
 
 /* FIXME: Should use xstrndup. */
 
 static void

-base_names (char **base_name, char **short_base_name)
+compute_base_names (void)

 {
 {

-  size_t base_length;
-  size_t short_base_length;
+  const char *base, *tab, *ext;

 
   /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),
      BASE_NAME and SHORT_BASE_NAME are `foo'.
 
   /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),
      BASE_NAME and SHORT_BASE_NAME are `foo'.


@@ -179,142 +247,94 @@ base_names (char **base_name, char **short_base_name)
      files, remove the ".c" or ".tab.c" suffix.  */
   if (spec_outfile)
     {
      files, remove the ".c" or ".tab.c" suffix.  */
   if (spec_outfile)
     {

-#ifdef MSDOS
-      strlwr (spec_outfile);
-#endif /* MSDOS */
-      /* BASE_LENGTH includes ".tab" but not ".c".  */
-      base_length = strlen (spec_outfile);
-      if (strsuffix (spec_outfile, ".c"))
-       base_length -= 2;
-      /* SHORT_BASE_LENGTH includes neither ".tab" nor ".c".  */
-      short_base_length = base_length;
-      if (strsuffix (spec_outfile, ".tab") || strsuffix (spec_outfile, "_tab"))
-       short_base_length -= 4;
-      *base_name = strndup (spec_outfile, base_length);
-      *short_base_name = strndup (spec_outfile, short_base_length);
-
-      return;
-    }
+      filename_split (spec_outfile, &base, &tab, &ext);

 
 

-  /* If --file-prefix=foo was specified, BASE_NAME and SHORT_BASE_NAME
-     are `foo'.
+      /* The full base name goes up the EXT, excluding it. */
+      full_base_name =
+       xstrndup (spec_outfile,
+                 (strlen (spec_outfile) - (ext ? strlen (ext) : 0)));

 
 

-     Construct names from it.  */
-  if (spec_file_prefix)
-    {
-#ifdef MSDOS
-      strlwr (spec_file_prefix);
-#endif /* MSDOS */
-      *short_base_name = xstrdup (spec_file_prefix);
+      /* The short base name goes up to TAB, excluding it.  */
+      short_base_name =
+       xstrndup (spec_outfile,
+                 (strlen (spec_outfile)
+                  - (tab ? strlen (tab) : (ext ? strlen (ext) : 0))));

 
 

-      *base_name = XMALLOC (char,
-                           strlen (*short_base_name) + strlen (EXT_TAB) + 1);
-      stpcpy (stpcpy (*base_name, *short_base_name), EXT_TAB);
+      if (tab)
+       output_infix = xstrndup (tab,
+                                (strlen (tab) - (ext ? strlen (ext) : 0)));

 
 

-      return;
+      if (ext)
+       compute_exts_from_src (ext);

     }
 
     }
 

-  /* 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 --yacc is used, do as if the input file was `y.y'.  */
-  {
-    const char *name_base = yacc_flag ? "y.y" : infile;
-
-    /* BASE_LENGTH gets length of BASE_NAME, sans ".y" suffix if any.  */
+  /* If --file-prefix=foo was specified, FULL_BASE_NAME = `foo.tab'
+     and SHORT_BASE_NAME = `foo'.

 
 

-    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);
-
-    *base_name = XMALLOC (char,
-                         strlen (*short_base_name) + strlen (EXT_TAB) + 1);
-    stpcpy (stpcpy (*base_name, *short_base_name), EXT_TAB);
-
-    return;
-  }
+     Construct names from it.  */
+  else
+    {
+      if (spec_file_prefix)
+       {
+         /* If --file-prefix=foo was specified, SHORT_BASE_NAME =
+            `foo'.  */
+         short_base_name = xstrdup (spec_file_prefix);
+       }
+      else if (yacc_flag)
+       {
+         /* If --yacc, then the output is `y.tab.c'. */
+         short_base_name = xstrdup ("y");
+       }
+      else
+       {
+         /* Otherwise, the short base name is computed from the input
+            grammar: `foo/bar.yy' => `bar'.  */
+         filename_split (infile, &base, &tab, &ext);
+         short_base_name =
+           xstrndup (base,
+                     (strlen (base) - (ext ? strlen (ext) : 0)));
+       }
+
+      /* In these cases, always append `.tab'. */
+      output_infix = xstrdup (EXT_TAB);
+
+      full_base_name = XMALLOC (char,
+                               strlen (short_base_name)
+                               + strlen (EXT_TAB) + 1);
+      stpcpy (stpcpy (full_base_name, short_base_name), EXT_TAB);
+
+      /* Computes the extensions from the grammar file name.  */
+      filename_split (infile, &base, &tab, &ext);
+      if (ext && !yacc_flag)
+       compute_exts_from_gf (ext);
+    }

 }
 
 }
 

-/*-----------------------------------------------------------------.
-| Open the input file.  Look for the skeletons.  Find the names of |
-| the output files.  Prepare the obstacks.                         |
-`-----------------------------------------------------------------*/
+/*-------------------------------------------------------.
+| Close the open files, compute the output files names.  |
+`-------------------------------------------------------*/

 
 void
 
 void

-open_files (void)
+compute_output_file_names (void)

 {
 {

-  char *base_name;
-  char *short_base_name;
-
-  base_names (&base_name, &short_base_name);
-
-  finput = xfopen (infile, "r");
-
-  if (verbose_flag)
-    {
-      /* We used to use just .out if spec_name_prefix (-p) was used,
-         but that conflicts with Posix.  */
-      outfile = stringappend (base_name, EXT_OUTPUT);
-      foutput = xfopen (outfile, "w");
-    }
+  compute_base_names ();

 
 

-  if (no_parser_flag)
-    {
-      /* use permanent name for actions file */
-      actfile = stringappend (short_base_name, ".act");
-    }
+  /* If not yet done. */
+  if (!src_extension)
+    src_extension = ".c";
+  if (!header_extension)
+    header_extension = ".h";

 
 

-  if (defines_flag)
-    {
-      defsfile = stringappend (base_name, ".h");
-    }
+  parser_file_name =
+    spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension);

 
 

-  /* These are opened by `done' or `open_extra_files', if at all */
-  if (spec_outfile)
-    tabfile = spec_outfile;
-  else
-    tabfile = stringappend (base_name, ".c");
+  /* It the defines filename if not given, we create it.  */
+  if (!spec_defines_file)
+    spec_defines_file = stringappend (full_base_name, header_extension);

 
 

-  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
-  guardfile = stringappend (short_base_name, EXT_GUARD_C);
+  /* It the graph filename if not given, we create it.  */
+  if (!spec_graph_file)
+    spec_graph_file = stringappend (short_base_name, ".vcg");

 
 

-  /* Initialize the obstacks. */
-  obstack_init (&action_obstack);
-  obstack_init (&attrs_obstack);
-  obstack_init (&table_obstack);
-  obstack_init (&defines_obstack);
-}
-
-
-
-/*-----------------------------------------------------.
-| Close the open files, produce all the output files.  |
-`-----------------------------------------------------*/
-
-void
-output_files (void)
-{
-  xfclose (fguard);
-  xfclose (finput);
-  xfclose (foutput);
-
-  /* Output the main file.  */
-  obstack_save (&table_obstack, tabfile);
-
-  /* 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);
+  spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);

 }
 }