diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2000-07-02 10:56:57 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2000-07-02 10:56:57 +0200 |
| commit | fb753f88e9ae5a80d1499596821d3b09fd09cc7c (patch) | |
| tree | e1e29855a5797315304e8491a4cfdf4286a2a7d9 /gcc/cpplex.c | |
| parent | 970d6386ebf7ea8f38b5f07623851e2f05ae5b2c (diff) | |
| download | gcc-fb753f88e9ae5a80d1499596821d3b09fd09cc7c.zip gcc-fb753f88e9ae5a80d1499596821d3b09fd09cc7c.tar.gz gcc-fb753f88e9ae5a80d1499596821d3b09fd09cc7c.tar.bz2 | |
cpplib.h (struct cpp_reader): New field include_depth.
* cpplib.h (struct cpp_reader): New field include_depth.
(struct cpp_printer): Rename last_bsd to last_id.
* cppfiles.c (read_include_file): Bump include_depth.
* cpplex.c (cpp_pop_buffer): Decrement include_depth.
(output_line_command): Output correct #line if a header
is including itself and is not protected against multiple inclusion.
Use include_depth instead of buffer_stack_depth, last_id instead of
last_bsd.
* cppinit.c (cpp_start_read): Initialize last_id instead of
last_bsd.
From-SVN: r34831
Diffstat (limited to 'gcc/cpplex.c')
| -rw-r--r-- | gcc/cpplex.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c index b7f6da5..109e97e 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -218,6 +218,8 @@ cpp_pop_buffer (pfile) free ((PTR) buf->buf); if (pfile->system_include_depth) pfile->system_include_depth--; + if (pfile->include_depth) + pfile->include_depth--; if (pfile->potential_control_macro) { if (buf->inc->cmacro != NEVER_REREAD) @@ -289,25 +291,26 @@ output_line_command (pfile, print, line) if (CPP_OPTION (pfile, no_line_commands)) return; - /* Determine whether the current filename has changed, and if so, - how. 'nominal_fname' values are unique, so they can be compared - by comparing pointers. */ - if (ip->nominal_fname == print->last_fname) - change = same; - else + if (pfile->include_depth == print->last_id) { - if (pfile->buffer_stack_depth == print->last_bsd) + /* Determine whether the current filename has changed, and if so, + how. 'nominal_fname' values are unique, so they can be compared + by comparing pointers. */ + if (ip->nominal_fname == print->last_fname) + change = same; + else change = rname; + } + else + { + if (pfile->include_depth > print->last_id) + change = enter; else - { - if (pfile->buffer_stack_depth > print->last_bsd) - change = enter; - else - change = leave; - print->last_bsd = pfile->buffer_stack_depth; - } - print->last_fname = ip->nominal_fname; + change = leave; + print->last_id = pfile->include_depth; } + print->last_fname = ip->nominal_fname; + /* If the current file has not changed, we can output a few newlines instead if we want to increase the line number by a small amount. We cannot do this if print->lineno is zero, because that means we |