diff options
author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-02-01 19:13:53 +0000 |
---|---|---|
committer | Neil Booth <neil@gcc.gnu.org> | 2001-02-01 19:13:53 +0000 |
commit | bd9697727ba8f11b7015a5e7e4ab20cd172ddc81 (patch) | |
tree | cb3461c1cc22fa95ff3bb51b1b2b2dbad2132830 /gcc/cppmain.c | |
parent | 8c0abc88e8dc5593bebe1f4e10b9a545cc183dad (diff) | |
download | gcc-bd9697727ba8f11b7015a5e7e4ab20cd172ddc81.tar.gz |
cpphash.h (struct cpp_buffer): Move saved_flags from cpp_reader.
* cpphash.h (struct cpp_buffer): Move saved_flags from cpp_reader.
* cpplex.c (_cpp_lex_token): New token picks up the saved flags,
and AVOID_LPASTE is cleared on meeting an unescaped newline.
* cppmacro.c (builtin_macro): Set builtin flags here.
(paste_all_tokens): Preserve AVOID_LPASTE on pasted token.
(replace_args): Clarify intent.
(cpp_get_token): Macro expansion tokens get the saved flags.
Update.
* cppmain.c (scan_buffer): Remove now-redundant print.printed
check.
From-SVN: r39393
Diffstat (limited to 'gcc/cppmain.c')
-rw-r--r-- | gcc/cppmain.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cppmain.c b/gcc/cppmain.c index 13bbbdd3c4f..a68d19cf9db 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -234,8 +234,7 @@ scan_buffer (pfile) putc (' ', print.outf); } } - else if (print.printed - && (token->flags & (PREV_WHITE | AVOID_LPASTE)) + else if ((token->flags & (PREV_WHITE | AVOID_LPASTE)) == AVOID_LPASTE && cpp_avoid_paste (pfile, &tokens[1 - index], token)) token->flags |= PREV_WHITE; |