diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-21 15:57:51 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-21 15:57:51 +0000 |
| commit | 108ed0fbfc597f8548880f11ed8c0d5c46ed7557 (patch) | |
| tree | 7c7e63abe1ff8a2d9797fc58544a1e41ad0c12f2 | |
| parent | df731bb1601a1b1aaf9eae3ca375abbe6a086665 (diff) | |
| download | gcc-108ed0fbfc597f8548880f11ed8c0d5c46ed7557.tar.gz | |
* cppfiles.c (stack_file): Correctly pass return_at_eof parameter
to cpp_push_buffer.
* cpplex.c (_cpp_get_fresh_line): Don't buffer->prev - handled
by return_at_eof check. Always call _cpp_pop_buffer at end.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70646 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cppfiles.c | 3 | ||||
| -rw-r--r-- | gcc/cpplex.c | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d8de7de8d7..d572aa4efaf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2003-08-21 Per Bothner <bothner@pbothner.com> + + * cppfiles.c (stack_file): Correctly pass return_at_eof parameter + to cpp_push_buffer. + * cpplex.c (_cpp_get_fresh_line): Don't buffer->prev - handled + by return_at_eof check. Always call _cpp_pop_buffer at end. + 2003-08-21 Kazu Hirata <kazu@cs.umass.edu> PR target/11805 diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 04f067da9d1..a4edd5da33b 100644 --- a/gcc/cppfiles.c +++ b/gcc/cppfiles.c @@ -615,7 +615,8 @@ stack_file (cpp_reader *pfile, _cpp_file *file, bool import) /* Stack the buffer. */ buffer = cpp_push_buffer (pfile, file->buffer, file->st.st_size, - CPP_OPTION (pfile, preprocessed), 0); + CPP_OPTION (pfile, preprocessed), + ! pfile->buffer); buffer->file = file; /* Initialize controlling macro state. */ diff --git a/gcc/cpplex.c b/gcc/cpplex.c index c3ef88dc060..1c00bdd0c8e 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -719,9 +719,6 @@ _cpp_get_fresh_line (cpp_reader *pfile) "no newline at end of file"); } - if (!buffer->prev) - return false; - if (buffer->return_at_eof) { _cpp_pop_buffer (pfile); |