diff options
| author | Neil Booth <neil@gcc.gnu.org> | 2001-08-02 23:03:31 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-08-02 23:03:31 +0000 |
| commit | d82fc1085fad2fd7a776bcc88dbac88f081dd10f (patch) | |
| tree | aedb0e3e4381261de71d4d7cee777f2ccde7880d /gcc/cpphash.h | |
| parent | 6ff02a9579cfb21fd184f3e634c4c837732d7cb5 (diff) | |
| download | gcc-d82fc1085fad2fd7a776bcc88dbac88f081dd10f.zip gcc-d82fc1085fad2fd7a776bcc88dbac88f081dd10f.tar.gz gcc-d82fc1085fad2fd7a776bcc88dbac88f081dd10f.tar.bz2 | |
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
Diffstat (limited to 'gcc/cpphash.h')
| -rw-r--r-- | gcc/cpphash.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 12b64a8..0c1695c 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -249,6 +249,7 @@ struct cpp_reader /* Source line tracking. Subtract pseudo_newlines from the actual line number to get the line number of preprocessed output. Used for escaped newlines and macro args that cross multiple lines. */ + struct line_maps line_maps; unsigned int line; unsigned int pseudo_newlines; @@ -439,8 +440,7 @@ extern void _cpp_define_builtin PARAMS ((cpp_reader *, const char *)); extern void _cpp_do__Pragma PARAMS ((cpp_reader *)); extern void _cpp_init_directives PARAMS ((cpp_reader *)); extern void _cpp_init_internal_pragmas PARAMS ((cpp_reader *)); -extern void _cpp_do_file_change PARAMS ((cpp_reader *, enum cpp_fc_reason, - const char *, unsigned int)); +extern void _cpp_do_file_change PARAMS ((cpp_reader *, enum lc_reason)); /* Utility routines and macros. */ #define DSC(str) (const U_CHAR *)str, sizeof str - 1 |