2007-02-07 Paolo Bonzini <bonzini@gnu.org>

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 05985d8e22b1743f90b5c85a23f42fa4628ae1f7..06334f8b118e013092b80b1d3ade10c8ce39912b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,7 +1,7 @@
 /* Open and close files for Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
 /* Open and close files for Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007 Free Software Foundation, Inc.

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


@@ -35,9 +35,6 @@
 #include "getargs.h"
 #include "gram.h"
 
 #include "getargs.h"
 #include "gram.h"
 

-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
 /* 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


@@ -76,7 +73,7 @@ uniqstr current_file = NULL;
    empty string (meaning the current directory); otherwise it is
    `dir/'.  */
 
    empty string (meaning the current directory); otherwise it is
    `dir/'.  */
 

-static char *all_but_ext;
+char *all_but_ext;

 static char *all_but_tab_ext;
 char *dir_prefix;
 
 static char *all_but_tab_ext;
 char *dir_prefix;
 


@@ -153,12 +150,20 @@ tr (char *s, char from, char to)
 static void
 compute_exts_from_gf (const char *ext)
 {
 static void
 compute_exts_from_gf (const char *ext)
 {

-  src_extension = xstrdup (ext);
-  header_extension = xstrdup (ext);
-  tr (src_extension, 'y', 'c');
-  tr (src_extension, 'Y', 'C');
-  tr (header_extension, 'y', 'h');
-  tr (header_extension, 'Y', 'H');
+  if (strcmp (ext, ".y") == 0)
+    {
+      src_extension = xstrdup (language->src_extension);
+      header_extension = xstrdup (language->header_extension);
+    }
+  else
+    {
+      src_extension = xstrdup (ext);
+      header_extension = xstrdup (ext);
+      tr (src_extension, 'y', 'c');
+      tr (src_extension, 'Y', 'C');
+      tr (header_extension, 'y', 'h');
+      tr (header_extension, 'Y', 'H');
+    }

 }
 
 /* Compute extensions from the given c source file extension.  */
 }
 
 /* Compute extensions from the given c source file extension.  */


@@ -281,7 +286,10 @@ compute_file_name_parts (void)
            xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0)));
        }
 
            xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0)));
        }
 

-      all_but_ext = concat2 (all_but_tab_ext, TAB_EXT);
+      if (language->add_tab)
+        all_but_ext = concat2 (all_but_tab_ext, TAB_EXT);
+      else
+        all_but_ext = xstrdup (all_but_tab_ext);

 
       /* Compute the extensions from the grammar file name.  */
       if (ext && !yacc_flag)
 
       /* Compute the extensions from the grammar file name.  */
       if (ext && !yacc_flag)


@@ -328,7 +336,6 @@ compute_output_file_names (void)
       output_file_name_check (spec_verbose_file);
     }
 
       output_file_name_check (spec_verbose_file);
     }
 

-  free (all_but_ext);

   free (all_but_tab_ext);
   free (src_extension);
   free (header_extension);
   free (all_but_tab_ext);
   free (src_extension);
   free (header_extension);


@@ -350,6 +357,7 @@ output_file_name_check (char const *file_name)
 void
 output_file_names_free (void)
 {
 void
 output_file_names_free (void)
 {

+  free (all_but_ext);

   free (spec_verbose_file);
   free (spec_graph_file);
   free (spec_defines_file);
   free (spec_verbose_file);
   free (spec_graph_file);
   free (spec_defines_file);