From d82fc1085fad2fd7a776bcc88dbac88f081dd10f Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Thu, 2 Aug 2001 23:03:31 +0000 Subject: line-map.c: New. * line-map.c: New. * line-map.h: New. * Makefile.in (line-map.o): New. (LIBCPP_OBJS, LIBCPP_DEPS): Update. * c-lex.c (cb_file_change): Update for new cpp_file_change structure. * cpperror.c (print_containing_files): Similarly. (print_location): Update. Don't output a space before _Pragma. * cppfiles.c (stack_include_file): Set to line 1 immediately. (stack_include_filee, cpp_make_system_header): Update. (_cpp_execute_include): Get logical line number right for calling as-yet-unterminated #include. * cpphash.h (struct cpp_reader): Add line_maps. (_cpp_do_file_change): Update. * cppinit.c (cpp_create_reader): Initialize line maps. (cpp_destroy): Destroy line maps. (cpp_start_read): Get logical line number right. * cpplex.c (parse_string): Only warn once for multi-line strings. Use boolean variable for null warning. * cpplib.c (_cpp_handle_directive): End the directive if it isn't already. (do_include_common): End the directive early. (do_line): Don't warn about out-of-range lines in preprocessed source. Update. Remove unused variables. (_cpp_do_file_change): Update for new line mapping. (pragma_cb): New typedef. (cpp_register_pragma): Stop looking ahead before calling the handler. Clean up. (do_pragma_system_header): End directive early. (cpp_get_line_maps): New. (cpp_pop_buffer): Fudge logical line. Update. * cpplib.h: Include line-map.h (enum cpp_fc_reason): Remove. (struct cpp_file_change): Update. (cpp_get_line_maps): New. * cppmain.c (struct_printer): New member map. (cb_file_change): Update for new mappings. * fix-header.c (cb_file_change): Similarly. testsuite: * gcc.dg/cpp/19951025-1.c: Update. From-SVN: r44584 --- gcc/cppfiles.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/cppfiles.c') diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 2592d4d..b939b40 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -338,7 +338,7 @@ stack_include_file (pfile, inc) /* Generate the call back. */ fp->lineno = 0; - _cpp_do_file_change (pfile, FC_ENTER, 0, 0); + _cpp_do_file_change (pfile, LC_ENTER); fp->lineno = 1; } @@ -579,8 +579,7 @@ cpp_make_system_header (pfile, syshdr, externc) if (syshdr) flags = 1 + (externc != 0); pfile->buffer->sysp = flags; - _cpp_do_file_change (pfile, FC_RENAME, pfile->buffer->nominal_fname, - pfile->buffer->lineno); + _cpp_do_file_change (pfile, LC_RENAME); } /* Report on all files that might benefit from a multiple include guard. @@ -681,6 +680,7 @@ _cpp_execute_include (pfile, header, type) pfile->system_include_depth++; stack_include_file (pfile, inc); + pfile->line++; /* Fake the '\n' at the end of #include. */ if (type == IT_IMPORT) _cpp_never_reread (inc); -- cgit v1.1