X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fdbcd8e28930c6a1e6d4f80636c7b4e21a575489..c97011bfc1cabd3f7aa8e263f83d9e8a18a262bf:/src/files.c

diff --git a/src/files.c b/src/files.c
index 1e084f6e..5073f04f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,5 +1,5 @@
 /* Open and close files for bison,
-   Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -32,8 +32,6 @@ const char *base_name PARAMS ((char const *name));
 
 FILE *finput = NULL;
 
-struct obstack action_obstack;
-struct obstack output_obstack;
 struct obstack pre_prologue_obstack;
 struct obstack post_prologue_obstack;
 
@@ -101,49 +99,6 @@ stringappend (const char *string1, const char *string2)
   return res;
 }
 
-
-/*-----------------------------------------------------------------.
-| Computes the macro name used to avoid double inclusion in the    |
-| header of the parser and store it in header_macro_name.  Be sure |
-| to produce valid CPP names (don't start with digit, remain       |
-| alphanumerical + underscore).                                    |
-`-----------------------------------------------------------------*/
-
-char *
-compute_header_macro (void)
-{
-  const char *prefix = "BISON_";
-  char *macro_name, *cp;
-
-  if (spec_defines_file)
-    {
-      macro_name = XMALLOC (char,
-			    strlen (prefix) +
-			    strlen (spec_defines_file) + 1);
-      cp = stpcpy (macro_name, prefix);
-      cp = stpcpy (cp, spec_defines_file);
-    }
-  else
-    {
-      macro_name = XMALLOC (char,
-			    strlen (prefix) +
-			    strlen (full_base_name) +
-			    strlen (header_extension) + 1);
-      cp = stpcpy (macro_name, prefix);
-      cp = stpcpy (cp, full_base_name);
-      cp = stpcpy (cp, header_extension);
-    }
-
-  for (cp = macro_name; *cp; ++cp)
-    if (islower (*cp))
-      *cp = toupper (*cp);
-    else if (!isalnum (*cp))
-      *cp = '_';
-
-  return macro_name;
-}
-
-
 /*-----------------------------------------------------------------.
 | Try to open file NAME with mode MODE, and print an error message |
 | if fails.                                                        |
@@ -386,11 +341,11 @@ compute_base_names (void)
       else
 	{
 	  /* Otherwise, the short base name is computed from the input
-	     grammar: `foo.yy' => `foo'.  */
+	     grammar: `foo/bar.yy' => `bar'.  */
 	  filename_split (infile, &base, &tab, &ext);
 	  short_base_name =
-	    xstrndup (infile,
-		      (strlen (infile) - (ext ? strlen (ext) : 0)));
+	    xstrndup (base,
+		      (strlen (base) - (ext ? strlen (ext) : 0)));
 	}
 
       /* In these cases, always append `.tab'. */