* data/lalr1.cc: Reinstall the former ctor, for sake of

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index d081f3e0d1af8baa82f6e8b27c60365fef29a489..32a3e729c931dfc0029941b1677bbb7962233397 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,5 +1,6 @@
-/* Open and close files for bison,
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
+/* Open and close files for Bison.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -24,6 +25,8 @@
 
 #include <error.h>
 #include <get-errno.h>
 
 #include <error.h>
 #include <get-errno.h>

+#include <quote.h>
+#include <xstrndup.h>

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


@@ -75,7 +78,7 @@ static char *
 concat2 (char const *str1, char const *str2)
 {
   size_t len = strlen (str1) + strlen (str2);
 concat2 (char const *str1, char const *str2)
 {
   size_t len = strlen (str1) + strlen (str2);

-  char *res = XMALLOC (char, len + 1);
+  char *res = xmalloc (len + 1);

   char *cp;
   cp = stpcpy (res, str1);
   cp = stpcpy (cp, str2);
   char *cp;
   cp = stpcpy (res, str1);
   cp = stpcpy (cp, str2);


@@ -117,9 +120,9 @@ xfclose (FILE *ptr)
 }
 \f
 
 }
 \f
 

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

 
 /* Replace all characters FROM by TO in the string IN.
    and returns a new allocated string.  */
 
 /* Replace all characters FROM by TO in the string IN.
    and returns a new allocated string.  */


@@ -127,9 +130,7 @@ static char *
 tr (const char *in, char from, char to)
 {
   char *temp;
 tr (const char *in, char from, char to)
 {
   char *temp;

-  char *out;
-
-  out = XMALLOC (char, strlen (in) + 1);
+  char *out = xmalloc (strlen (in) + 1);

 
   for (temp = out; *in; in++, out++)
     if (*in == from)
 
   for (temp = out; *in; in++, out++)
     if (*in == from)


@@ -140,7 +141,7 @@ tr (const char *in, char from, char to)
   return (temp);
 }
 
   return (temp);
 }
 

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

 static void
 compute_exts_from_gf (const char *ext)
 {
 static void
 compute_exts_from_gf (const char *ext)
 {


@@ -150,7 +151,7 @@ compute_exts_from_gf (const char *ext)
   header_extension = tr (header_extension, 'Y', 'H');
 }
 
   header_extension = tr (header_extension, 'Y', 'H');
 }
 

-/* Computes extensions from the given c source file extension. */
+/* Compute extensions from the given c source file extension.  */

 static void
 compute_exts_from_src (const char *ext)
 {
 static void
 compute_exts_from_src (const char *ext)
 {


@@ -201,13 +202,17 @@ filename_split (const char *filename,
   *ext = strrchr (*base, '.');
   *tab = NULL;
 
   *ext = strrchr (*base, '.');
   *tab = NULL;
 

-  /* If there is an exentension, check if there is a `.tab' part right
+  /* If there is an extension, check if there is a `.tab' part right

      before.  */
      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");
+  if (*ext)
+    {
+      size_t baselen = *ext - *base;
+      size_t dottablen = 4;
+      if (dottablen < baselen
+         && (strncmp (*ext - dottablen, ".tab", dottablen) == 0
+             || strncmp (*ext - dottablen, "_tab", dottablen) == 0))
+       *tab = *ext - dottablen;
+    }

 }
 
 
 }
 
 


@@ -219,10 +224,10 @@ compute_base_names (void)
   const char *base, *tab, *ext;
 
   /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),
   const char *base, *tab, *ext;
 
   /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),

-     BASE_NAME and SHORT_BASE_NAME are `foo'.
+     FULL_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'.
+     If --output=foo.tab.c was specified, FULL_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.  */
 
      The precise -o name will be used for FTABLE.  For other output
      files, remove the ".c" or ".tab.c" suffix.  */


@@ -272,25 +277,29 @@ compute_base_names (void)
                      (strlen (base) - (ext ? strlen (ext) : 0)));
        }
 
                      (strlen (base) - (ext ? strlen (ext) : 0)));
        }
 

-      full_base_name = XMALLOC (char,
-                               strlen (short_base_name)
+      full_base_name = xmalloc (strlen (short_base_name)

                                + strlen (TAB_EXT) + 1);
       stpcpy (stpcpy (full_base_name, short_base_name), TAB_EXT);
 
                                + strlen (TAB_EXT) + 1);
       stpcpy (stpcpy (full_base_name, short_base_name), TAB_EXT);
 

-      /* Computes the extensions from the grammar file name.  */
+      /* Compute the extensions from the grammar file name.  */

       filename_split (grammar_file, &base, &tab, &ext);
       if (ext && !yacc_flag)
        compute_exts_from_gf (ext);
     }
 }
 
       filename_split (grammar_file, &base, &tab, &ext);
       if (ext && !yacc_flag)
        compute_exts_from_gf (ext);
     }
 }
 

-/*-------------------------------------------------------.
-| Close the open files, compute the output files names.  |
-`-------------------------------------------------------*/
+
+/* Compute the output file names.  Warn if we detect conflicting
+   outputs to the same file.  */

 
 void
 compute_output_file_names (void)
 {
 
 void
 compute_output_file_names (void)
 {

+  char const *name[4];
+  int i;
+  int j;
+  int names = 0;
+

   compute_base_names ();
 
   /* If not yet done. */
   compute_base_names ();
 
   /* If not yet done. */


@@ -299,16 +308,31 @@ compute_output_file_names (void)
   if (!header_extension)
     header_extension = ".h";
 
   if (!header_extension)
     header_extension = ".h";
 

-  parser_file_name =
+  name[names++] = parser_file_name =

     spec_outfile ? spec_outfile : concat2 (full_base_name, src_extension);
 
     spec_outfile ? spec_outfile : concat2 (full_base_name, src_extension);
 

-  /* It the defines filename if not given, we create it.  */
-  if (!spec_defines_file)
-    spec_defines_file = concat2 (full_base_name, header_extension);
+  if (defines_flag)
+    {
+      if (! spec_defines_file)
+       spec_defines_file = concat2 (full_base_name, header_extension);
+      name[names++] = spec_defines_file;
+    }
+
+  if (graph_flag)
+    {
+      if (! spec_graph_file)
+       spec_graph_file = concat2 (short_base_name, ".vcg");
+      name[names++] = spec_graph_file;
+    }

 
 

-  /* It the graph filename if not given, we create it.  */
-  if (!spec_graph_file)
-    spec_graph_file = concat2 (short_base_name, ".vcg");
+  if (report_flag)
+    {
+      spec_verbose_file = concat2 (short_base_name, OUTPUT_EXT);
+      name[names++] = spec_verbose_file;
+    }

 
 

-  spec_verbose_file = concat2 (short_base_name, OUTPUT_EXT);
+  for (j = 0; j < names; j++)
+    for (i = 0; i < j; i++)
+      if (strcmp (name[i], name[j]) == 0)
+       warn (_("conflicting outputs to file %s"), quote (name[i]));

 }
 }