* src/bison.simple: Remove a useless #line directive.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index d86415216c41cedb7741c973f12addd8dbaf5987..726ec9171e9f5781db5fd50232ff2d1530d53b49 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -30,17 +30,16 @@ FILE *finput = NULL;
 
 struct obstack action_obstack;
 struct obstack attrs_obstack;
-struct obstack table_obstack;
-struct obstack defines_obstack;
 struct obstack guard_obstack;
 struct obstack output_obstack;
 
 char *spec_outfile = NULL;     /* for -o. */
 char *spec_file_prefix = NULL; /* for -b. */
-char *spec_name_prefix = NULL; /* for -p. */
+const char *spec_name_prefix = "yy";   /* for -p. */
 char *spec_verbose_file = NULL;   /* for --verbose. */
 char *spec_graph_file = NULL;   /* for -g. */
 char *spec_defines_file = NULL; /* for --defines. */
+char *parser_file_name = NULL;
 
 char *infile = NULL;
 char *attrsfile = NULL;
@@ -94,7 +93,7 @@ stringappend (const char *string1, const char *string2)
 | alphanumerical + underscore).                                    |
 `-----------------------------------------------------------------*/
 
-static char *
+char *
 compute_header_macro (void)
 {
   const char *prefix = "BISON_";
@@ -178,26 +177,6 @@ obstack_save (struct obstack *obs, const char *filename)
   xfclose (out);
 }
 
-/*---------------------------------------------------------------------.
-| Output double inclusion protection macros and saves defines_obstack  |
-`---------------------------------------------------------------------*/
-
-static void
-defines_obstack_save (const char *filename)
-{
-  FILE *out = xfopen (filename, "w");
-  size_t size = obstack_object_size (&defines_obstack);
-  char *macro_name = compute_header_macro ();
-
-  fprintf (out, "#ifndef %s\n", macro_name);
-  fprintf (out, "# define %s\n\n", macro_name);
-  fwrite (obstack_finish (&defines_obstack), 1, size, out);
-  fprintf (out, "\n#endif /* not %s */\n", macro_name);
-
-  free (macro_name);
-  xfclose (out);
-}
-
 /*------------------------------------------------------------------.
 | Return the path to the skeleton which locaction might be given in |
 | ENVVAR, otherwise return SKELETON_NAME.                           |
@@ -433,6 +412,9 @@ compute_output_file_names (void)
 {
   compute_base_names ();
 
+  parser_file_name =
+    spec_outfile ? spec_outfile : stringappend (base_name, src_extension);
+
   /* If not yet done. */
   if (!src_extension)
     src_extension = ".c";
@@ -453,7 +435,6 @@ compute_output_file_names (void)
 #ifndef MSDOS
   attrsfile = stringappend (attrsfile, header_extension);
 #endif /* MSDOS */
-
 }
 
 /*-----------------------------------------------------------------.
@@ -469,8 +450,6 @@ open_files (void)
   /* Initialize the obstacks. */
   obstack_init (&action_obstack);
   obstack_init (&attrs_obstack);
-  obstack_init (&table_obstack);
-  obstack_init (&defines_obstack);
   obstack_init (&guard_obstack);
   obstack_init (&output_obstack);
 }
@@ -494,18 +473,6 @@ close_files (void)
 void
 output_files (void)
 {
-  /* Output the main file.  */
-  if (spec_outfile)
-    obstack_save (&table_obstack, spec_outfile);
-  else
-    obstack_save (&table_obstack, stringappend (base_name, src_extension));
-  obstack_free (&table_obstack, NULL);
-
-  /* Output the header file if wanted. */
-  if (defines_flag)
-    defines_obstack_save (spec_defines_file);
-  obstack_free (&defines_obstack, NULL);
-
 #if 0
   /* Seems to be invalid now --akim. */