* src/scan-gram.l (<SC_ESCAPED_CHARACTER>): Convert to unsigned

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 11de06e7510a4b64aac10b6886ad375a5115f345..1252aab0dc1e574636ceea5bf38b51f862b82027 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,5 +1,5 @@
 /* Open and close files for bison,
 /* 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.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -32,9 +32,8 @@ const char *base_name PARAMS ((char const *name));
 
 FILE *finput = NULL;
 
 
 FILE *finput = NULL;
 

-struct obstack action_obstack;
-struct obstack attrs_obstack;
-struct obstack output_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
 
 /* 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


@@ -52,7 +51,6 @@ char *spec_defines_file = NULL; /* for --defines. */
 char *parser_file_name = NULL;
 
 char *infile = NULL;
 char *parser_file_name = NULL;
 
 char *infile = NULL;

-char *attrsfile = NULL;

 
 static char *full_base_name = NULL;
 
 
 static char *full_base_name = NULL;
 


@@ -192,6 +190,7 @@ skeleton_find (const char *envvar, const char *skeleton_name)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)
   const char *res = getenv (envvar);
 
 #if defined (MSDOS) || defined (_WIN32)

+  const char *cp = getenv ("INIT");

   if (!res)
     {
       /* Skeleton file name without path */
   if (!res)
     {
       /* Skeleton file name without path */


@@ -204,7 +203,6 @@ skeleton_find (const char *envvar, const char *skeleton_name)
         ++skel_name;
 
       /* File doesn't exist in current directory; try in INIT directory.  */
         ++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);
       if (cp)
        {
          res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);


@@ -386,11 +384,11 @@ compute_base_names (void)
       else
        {
          /* Otherwise, the short base name is computed from the input
       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 =
          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'. */
        }
 
       /* In these cases, always append `.tab'. */


@@ -403,7 +401,7 @@ compute_base_names (void)
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);
 
       /* 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);
     }
 }
        compute_exts_from_gf (ext);
     }
 }


@@ -417,15 +415,15 @@ compute_output_file_names (void)
 {
   compute_base_names ();
 
 {
   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";
 
   /* 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);
   /* It the defines filename if not given, we create it.  */
   if (!spec_defines_file)
     spec_defines_file = stringappend (full_base_name, header_extension);


@@ -435,6 +433,4 @@ compute_output_file_names (void)
     spec_graph_file = stringappend (short_base_name, ".vcg");
 
   spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
     spec_graph_file = stringappend (short_base_name, ".vcg");
 
   spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);

-
-  attrsfile = stringappend (short_base_name, EXT_STYPE_H);

 }
 }