diff options
| author | Per Bothner <per@bothner.com> | 2004-04-22 19:22:27 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-04-22 19:22:27 -0700 |
| commit | 500bee0adc06da520a9b8b3afde33afee6f314f3 (patch) | |
| tree | 04a13ceb8485dc1405388eb42a55f0a9c7a8ebbc /gcc/cppfiles.c | |
| parent | 9344fdb9407d69218d02c2e509a358e80cf64eb6 (diff) | |
| download | gcc-500bee0adc06da520a9b8b3afde33afee6f314f3.zip gcc-500bee0adc06da520a9b8b3afde33afee6f314f3.tar.gz gcc-500bee0adc06da520a9b8b3afde33afee6f314f3.tar.bz2 | |
line-map.h (struct line_maps): New field highest_line.
* line-map.h (struct line_maps): New field highest_line.
(linemap_position_for_column): Make non-inline function.
(LINEMAP_POSITION_FOR_COLUMN): New macro.
* line-map.c (linemap_init): Clear highest_line field.
(linemap_add): Set highest_line field.
(linemap_line_start): Minor optimization - use highest_line field.
Reduce maximum column hint to 10000. Update highest_line field.
(linemap_position_for_column): Moved from line-map.h. Optimize a bit.
* cpphash.h (struct cpp_reader): Remove line field - instead use
line_table->highest_line.
(saved_line): Remove unused field.
(CPP_INCREMENT_FILE): Don't do linemap_lookup - just use newest map.
Use line_table's highest_line field instead of cpp_reader's line.
* cpplib.c (start_directive): Likewise use highest_line field.
(do_line, do_linemarker): Likewise just use newest map.
(_cpp_do_file_change): Don't need to set cpp_reader's line field.
* cpperror.c (cpp_error): Likewise use highest_line field.
* cppfiles.c (open_file_failed: Likewise.
(cpp_make_system_header): Likewise use newest map and highest_line.
* cppinit.c (cpp_create_reader): Don't initialize removed field.
* cpplex.c (_cpp_process_line_notes, _cpp_skip_block_comment,
skip_line_comment, skip_whitespace, _cpp_get_fresh_line,
_cpp_lex_direct): Likewise use highest_line.
(_cpp_lex_direct): Use new LINEMAP_POSITION_FOR_COLUMN macro.
* cppmacro.c (_cpp_builtin_macro_text): Likewise use highest_line,
and use newest map.
* cpppch.c (cpp_read_state): Don't save+restore cpp_reader's line.
* cpptrad.c (_cpp_overlay_buffer): Don't save cpp_reader's line.
(copy_comment, _cpp_scan_out_logical_line): Likewise use highest_line.
From-SVN: r81074
Diffstat (limited to 'gcc/cppfiles.c')
| -rw-r--r-- | gcc/cppfiles.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index d31f61b..bdfaa3f 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -806,7 +806,7 @@ _cpp_stack_include (cpp_reader *pfile, const char *fname, int angle_brackets, static void open_file_failed (cpp_reader *pfile, _cpp_file *file) { - int sysp = pfile->line > 1 && pfile->buffer ? pfile->buffer->sysp : 0; + int sysp = pfile->line_table->highest_line > 1 && pfile->buffer ? pfile->buffer->sysp : 0; bool print_dep = CPP_OPTION (pfile, deps.style) > !!sysp; errno = file->err_no; @@ -987,14 +987,15 @@ void cpp_make_system_header (cpp_reader *pfile, int syshdr, int externc) { int flags = 0; - const struct line_map *map = linemap_lookup (pfile->line_table, pfile->line); + const struct line_maps *line_table = pfile->line_table; + const struct line_map *map = &line_table->maps[line_table->used-1]; /* 1 = system header, 2 = system header to be treated as C. */ if (syshdr) flags = 1 + (externc != 0); pfile->buffer->sysp = flags; _cpp_do_file_change (pfile, LC_RENAME, map->to_file, - SOURCE_LINE (map, pfile->line), flags); + SOURCE_LINE (map, pfile->line_table->highest_line), flags); } /* Allow the client to change the current file. Used by the front end |