X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ea52d7066d461da102602b25d371dd09e82eb371..d945f5cd8e85c0343da52dc720d23624e1c28661:/src/files.c diff --git a/src/files.c b/src/files.c index dc6eb1e6..b3064b5a 100644 --- a/src/files.c +++ b/src/files.c @@ -30,7 +30,6 @@ FILE *finput = NULL; struct obstack action_obstack; struct obstack attrs_obstack; -struct obstack defines_obstack; struct obstack guard_obstack; struct obstack output_obstack; @@ -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. | @@ -458,35 +437,6 @@ compute_output_file_names (void) #endif /* MSDOS */ } -/*-----------------------------------------------------------------. -| Open the input file. Look for the skeletons. Find the names of | -| the output files. Prepare the obstacks. | -`-----------------------------------------------------------------*/ - -void -open_files (void) -{ - finput = xfopen (infile, "r"); - - /* Initialize the obstacks. */ - obstack_init (&action_obstack); - obstack_init (&attrs_obstack); - obstack_init (&defines_obstack); - obstack_init (&guard_obstack); - obstack_init (&output_obstack); -} - - - -/*-----------------------. -| Close the open file.. | -`-----------------------*/ - -void -close_files (void) -{ - xfclose (finput); -} /*---------------------------. | Produce the output files. | @@ -495,11 +445,6 @@ close_files (void) void output_files (void) { - /* 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. */ @@ -516,12 +461,13 @@ output_files (void) char *temp_name; obstack_save (&attrs_obstack, attrsfile); - obstack_free (&attrs_obstack, NULL); temp_name = stringappend (short_base_name, EXT_GUARD_C); #ifndef MSDOS temp_name = stringappend (temp_name, src_extension); #endif /* MSDOS */ obstack_save (&guard_obstack, temp_name); - obstack_free (&guard_obstack, NULL); } + + obstack_free (&guard_obstack, NULL); + obstack_free (&attrs_obstack, NULL); }