+2000-07-02 Jakub Jelinek <jakub@redhat.com>
+
+ * 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.
+
2000-07-01 Benjamin Chelf <chelf@codesourcery.com>
* Makefile.in (C_AND_OBJC_OBJS): Added c-semantics.o.
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)
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
/* Current depth of buffer stack. */
unsigned int buffer_stack_depth;
+ /* Current depth in #include directives. */
+ unsigned int include_depth;
+
/* Hash table of macros and assertions. See cpphash.c */
struct htab *hashtab;
{
FILE *outf; /* stream to write to */
const char *last_fname; /* previous file name */
- unsigned int last_bsd; /* did we just push? */
+ unsigned int last_id; /* did we just push? */
unsigned int lineno; /* line currently being written */
unsigned int written; /* low water mark in token buffer */
};