Fix the previous test.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 5f94bd00ca5c6ffb2893bd15de683946e92ba73f..22f29c1ed06c3f11a38a532900157a00b0e011ca 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,5 +1,6 @@
 /* Open and close files for bison,
-   Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -54,15 +55,18 @@ char *infile = NULL;
 char *attrsfile = NULL;
 
 static char *full_base_name = NULL;
+
+/* Prefix used to generate output file names.  */
 char *short_base_name = NULL;
 
+/* 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;
-
-/* Should we insert '.tab' in yacc-compatible parsers?  */
-int tab_extension = 0;
 \f
 
 /*--------------------------.
@@ -188,6 +192,7 @@ skeleton_find (const char *envvar, const char *skeleton_name)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)
+  const char *cp = getenv ("INIT");
   if (!res)
     {
       /* Skeleton file name without path */
@@ -200,7 +205,6 @@ skeleton_find (const char *envvar, const char *skeleton_name)
         ++skel_name;
 
       /* File doesn't exist in current directory; try in INIT directory.  */
-      const char *cp = getenv ("INIT");
       if (cp)
        {
          res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);
@@ -253,27 +257,6 @@ tr (const char *in, char from, char to)
   return (temp);
 }
 
-/* Gets the extension index in FILENAME. Returns 0 if fails to
-   find an extension.  */
-static int
-get_extension_index (const char *filename)
-{
-  int len;
-
-  len = strlen (filename);
-
-  if (filename[len-- - 1] == '.')
-    return (0);
-
-  while ((len > 0) && (filename[len - 1] != '.'))
-    if (filename[len - 1] == '/')
-      return (0);
-    else
-      len--;
-
-  return (len - 1);
-}
-
 /* Computes extensions from the grammar file extension. */
 static void
 compute_exts_from_gf (const char *ext)
@@ -338,7 +321,7 @@ filename_split (const char *filename,
   /* If there is an exentension, check if there is a `.tab' part right
      before.  */
   if (*ext
-      && (*ext - *base) > strlen (".tab")
+      && (*ext - *base) > (int) strlen (".tab")
       && (!strncmp (*ext - strlen (".tab"), ".tab", strlen (".tab"))
          || !strncmp (*ext - strlen ("_tab"), "_tab", strlen ("_tab"))))
     *tab = *ext - strlen (".tab");
@@ -351,9 +334,6 @@ static void
 compute_base_names (void)
 {
   const char *base, *tab, *ext;
-  size_t base_length;
-  size_t short_base_length;
-  size_t ext_index;
 
   /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),
      BASE_NAME and SHORT_BASE_NAME are `foo'.
@@ -365,21 +345,22 @@ compute_base_names (void)
      files, remove the ".c" or ".tab.c" suffix.  */
   if (spec_outfile)
     {
-      const char *cp;
       filename_split (spec_outfile, &base, &tab, &ext);
 
       /* The full base name goes up the EXT, excluding it. */
       full_base_name =
        xstrndup (spec_outfile,
                  (strlen (spec_outfile) - (ext ? strlen (ext) : 0)));
+
       /* 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))));
 
-      /* Do we have a tab part? */
-      tab_extension = !!tab;
+      if (tab)
+       output_infix = xstrndup (tab,
+                                (strlen (tab) - (ext ? strlen (ext) : 0)));
 
       if (ext)
        compute_exts_from_src (ext);
@@ -413,7 +394,8 @@ compute_base_names (void)
        }
 
       /* In these cases, always append `.tab'. */
-      tab_extension = 1;
+      output_infix = xstrdup (EXT_TAB);
+
       full_base_name = XMALLOC (char,
                                strlen (short_base_name)
                                + strlen (EXT_TAB) + 1);
@@ -421,7 +403,7 @@ compute_base_names (void)
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);
-      if (ext)
+      if (ext && !yacc_flag)
        compute_exts_from_gf (ext);
     }
 }
@@ -435,15 +417,15 @@ compute_output_file_names (void)
 {
   compute_base_names ();
 
-  parser_file_name =
-    spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension);
-
   /* If not yet done. */
   if (!src_extension)
     src_extension = ".c";
   if (!header_extension)
     header_extension = ".h";
-
+  
+  parser_file_name =
+    spec_outfile ? spec_outfile : stringappend (full_base_name, src_extension);
+  
   /* It the defines filename if not given, we create it.  */
   if (!spec_defines_file)
     spec_defines_file = stringappend (full_base_name, header_extension);