From f2d5f0cca244fc70acb45fbe557bd22411175f1b Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Fri, 14 Apr 2000 23:29:45 +0000 Subject: cpplex.c (cpp_output_tokens, [...]): New public interfaces. * cpplex.c (cpp_output_tokens, cpp_scan_buffer_nooutput): New public interfaces. (safe_fwrite, output_line_command): New static functions. (cpp_expand_to_buffer): Now private to cpplib. (cpp_scan_buffer): Take a printer. * cpphash.h: Update prototypes. * cpplib.h: Update prototypes. (cpp_printer): New. (cpp_buffer): Remove last_nominal_fname. (cpp_reader): Remove lineno. * cppmain.c: Use a cpp_printer. * fix-header.c: No need to inhibit line commands. Call cpp_start_read with no printer. * cpperror.c (cpp_notice_from_errno): Provide default name. * cppfiles.c (make_IHASH, _cpp_fake_ihash): New functions. (find_include_file, cpp_read_file): Use make_IHASH. (file_cleanup): Set control_macro and clear input_stack_listing_current here. (_cpp_execute_include): Don't output entering-file marker. * cpphash.c (special_symbol): Look for the line number in the buffer, not the reader. (_cpp_macroexpand): No need to disable line commands. (_cpp_dump_definition): No need to generate line commands. (dump_hash_helper): Remove excess newline from output. * cppinit.c (dump_special_to_buffer): No need to generate line commands. (cpp_printer_init): New. (cpp_start_read): Take a printer, and start it up if it's not NULL. No need to generate line commands. (cpp_finish): Expect no buffers stacked at all. Take a printer argument, and flush the output buffer if it's not NULL. * cpplex.c (_cpp_lex_token): Return EOF if there's no buffer. Don't put two hashes at the beginning of an assertion. (cpp_get_token): Don't increment pfile->lineno or emit line commands here. Return EOF if there's no buffer when we get EOF. * cpplib.c (do_define, skip_if_group): No need to disable line commands. (_cpp_output_line_command): Delete function. (do_line): Don't emit line commands here, but set things up so they will be emitted if necessary. Use _cpp_fake_ihash to make unique nominal_fnames if necessary. (do_elif, do_else, _cpp_handle_eof): Call cpp_error_with_line with 0 for column, not -1. (_cpp_handle_eof): Don't set the control macro here. Don't clear input_stack_listing_current here. Don't emit line commands. From-SVN: r33159 --- gcc/cppmain.c | 73 +++++++++++++---------------------------------------------- 1 file changed, 16 insertions(+), 57 deletions(-) (limited to 'gcc/cppmain.c') diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 2e85ebf..ef636cb 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -28,6 +28,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const char *progname; cpp_reader parse_in; +cpp_printer parse_out; extern int main PARAMS ((int, char **)); @@ -38,10 +39,8 @@ main (argc, argv) { char *p; cpp_reader *pfile = &parse_in; + cpp_printer *print; int argi = 1; /* Next argument to handle. */ - enum cpp_ttype kind; - FILE *out; - const char *out_fname; p = argv[0] + strlen (argv[0]); while (p != argv[0] && p[-1] != '/') --p; @@ -63,64 +62,24 @@ main (argc, argv) if (CPP_FATAL_ERRORS (pfile)) return (FATAL_EXIT_CODE); - if (! cpp_start_read (pfile, CPP_OPTION (pfile, in_fname))) + /* Open the output now. We must do so even if no_output is on, + because there may be other output than from the actual + preprocessing (e.g. from -dM). */ + print = cpp_printer_init (pfile, &parse_out); + if (! print) return (FATAL_EXIT_CODE); - /* Now that we know the input file is valid, open the output. */ - out_fname = CPP_OPTION (pfile, out_fname); - if (*out_fname == '\0') - { - out_fname = "stdout"; - out = stdout; - } - else - { - out = fopen (out_fname, "w"); - if (!out) - { - cpp_notice_from_errno (pfile, CPP_OPTION (pfile, out_fname)); - return (FATAL_EXIT_CODE); - } - } - - if (! CPP_OPTION (pfile, no_output)) - { - do - { - kind = cpp_get_token (pfile); - if (CPP_WRITTEN (pfile) >= BUFSIZ || kind == CPP_EOF) - { - size_t rem, count = CPP_WRITTEN (pfile); - - rem = fwrite (parse_in.token_buffer, 1, count, out); - if (rem < count) - /* Write error. */ - cpp_notice_from_errno (pfile, CPP_OPTION (pfile, out_fname)); - - CPP_SET_WRITTEN (pfile, 0); - } - } - while (kind != CPP_EOF); - } + if (! cpp_start_read (pfile, print, CPP_OPTION (pfile, in_fname))) + return (FATAL_EXIT_CODE); + + if (CPP_OPTION (pfile, no_output)) + while (CPP_BUFFER (pfile) != NULL) + cpp_scan_buffer_nooutput (pfile); else - { - do - { - cpp_scan_buffer (pfile); - kind = cpp_get_token (pfile); - } - while (kind != CPP_EOF); - CPP_SET_WRITTEN (pfile, 0); - } - - cpp_finish (pfile); - if (fwrite (parse_in.token_buffer, 1, CPP_WRITTEN (pfile), out) - < CPP_WRITTEN (pfile)) - cpp_notice_from_errno (pfile, CPP_OPTION (pfile, out_fname)); - - if (ferror (out) || fclose (out)) - cpp_notice_from_errno (pfile, CPP_OPTION (pfile, out_fname)); + while (CPP_BUFFER (pfile) != NULL) + cpp_scan_buffer (pfile, print); + cpp_finish (pfile, print); cpp_cleanup (pfile); if (parse_in.errors) -- cgit v1.1