OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpplib.c (cpp_get_token): Don't return a CPP_POP if the buffer has manual_pop set.

Browse Source 
* cpplib.c (cpp_get_token): Don't return a CPP_POP if the buffer
	has manual_pop set.

From-SVN: r28275
This commit is contained in:
Jason Merrill 1999-07-26 22:01:44 +00:00 committed by Jason Merrill
parent e428b1a8c6
commit e7f9deaeff
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jul 26 12:30:09 1999 Jason Merrill <jason@yorick.cygnus.com>
* cpplib.c (cpp_get_token): Don't return a CPP_POP if the buffer
has manual_pop set.
1999-07-26 Nathan Sidwell <nathan@acm.org> 1999-07-26 Nathan Sidwell <nathan@acm.org>
* eh-common.h (__eh_matcher): Prototype correctly. * eh-common.h (__eh_matcher): Prototype correctly.

11
gcc/cpplib.c
View File

@ -2027,12 +2027,13 @@ cpp_get_token (pfile)
if (c == EOF) if (c == EOF)
{ {
handle_eof: handle_eof:
if (CPP_BUFFER (pfile)->seen_eof) if (CPP_BUFFER (pfile)->manual_pop)
/* If we've been reading from redirected input, the
frontend will pop the buffer. */
return CPP_EOF;
else if (CPP_BUFFER (pfile)->seen_eof)
{ {
if (CPP_PREV_BUFFER (CPP_BUFFER (pfile)) == CPP_NULL_BUFFER (pfile) if (CPP_PREV_BUFFER (CPP_BUFFER (pfile)) == CPP_NULL_BUFFER (pfile))
/* If we've been reading from redirected input, the
frontend will pop the buffer. */
|| CPP_BUFFER (pfile)->manual_pop)
return CPP_EOF; return CPP_EOF;
cpp_pop_buffer (pfile); cpp_pop_buffer (pfile);