diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2000-12-17 00:13:54 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-12-17 00:13:54 +0000 |
| commit | ad2a084dbd3fbcacde8a5034ef381b1ee41d09e5 (patch) | |
| tree | dc9788c071208bc6125b57c49a68337f6a09eb53 /gcc/cppfiles.c | |
| parent | 3b67042af8f91e658c6467d3dad4464c89c069ab (diff) | |
| download | gcc-ad2a084dbd3fbcacde8a5034ef381b1ee41d09e5.zip gcc-ad2a084dbd3fbcacde8a5034ef381b1ee41d09e5.tar.gz gcc-ad2a084dbd3fbcacde8a5034ef381b1ee41d09e5.tar.bz2 | |
c-lex.c: Move main_input_filename handling to FC_ENTER.
* c-lex.c: Move main_input_filename handling to FC_ENTER. Clean up.
* cpperror.c (print_containing_files): Get right line number.
(print_location): Output column of 1 if 0.
* cppfiles.c (stack_include_file): cpp_push_buffer handles
the callback.
* cpphash.h (_cpp_do_file_change): No longer external.
* cpplib.c (do_file_change): Now local to cpplib.c.
(do_line): Fake a buffer stack for preprocessed files.
(cpp_push_buffer): Create a file_change callback. Handle faked
buffers.
(cpp_pop_buffer): Similarly.
* cpplib.h: BUF_FAKE: New buffer type.
* cppmain.c: Update to handle correct file renaming where a
#line is the first line of the main file, and produce only
the renamed file, not the original file, as output.
From-SVN: r38319
Diffstat (limited to 'gcc/cppfiles.c')
| -rw-r--r-- | gcc/cppfiles.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 28bdfd0..96ce7e4 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -245,16 +245,8 @@ stack_include_file (pfile, inc) cpp_reader *pfile; struct include_file *inc; { - const char *filename = 0; - unsigned int lineno = 0; cpp_buffer *fp; - if (pfile->buffer) - { - filename = pfile->buffer->nominal_fname; - lineno = pfile->buffer->lineno; - } - /* Not in cache? */ if (! inc->buffer) read_include_file (pfile, inc); @@ -268,7 +260,6 @@ stack_include_file (pfile, inc) fp->rlimit += inc->st.st_size; fp->cur = fp->buf; fp->line_base = fp->buf; - fp->lineno = 0; /* For _cpp_do_file_change. */ fp->inc->refcnt++; if (inc->foundhere) fp->sysp = inc->foundhere->sysp; @@ -282,10 +273,6 @@ stack_include_file (pfile, inc) pfile->mi_state = MI_OUTSIDE; pfile->mi_cmacro = 0; pfile->include_depth++; - - _cpp_do_file_change (pfile, FC_ENTER, filename, lineno); - - fp->lineno = 1; } /* Read the file referenced by INC into the file cache. |