diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-01-28 11:22:23 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-01-28 11:22:23 +0000 |
| commit | 26ec42ee4d266cf25be73a29888abf906b2d10ef (patch) | |
| tree | 1d89d6c0190e47c079ba3aba7080beb23ee2e05a /gcc/cppmain.c | |
| parent | 6001735ea0da3d5d89a8f249a79fc8198ff28513 (diff) | |
| download | gcc-26ec42ee4d266cf25be73a29888abf906b2d10ef.zip gcc-26ec42ee4d266cf25be73a29888abf906b2d10ef.tar.gz gcc-26ec42ee4d266cf25be73a29888abf906b2d10ef.tar.bz2 | |
cpphash.c (_cpp_cleanup_hashtable, [...]): Don't set fe_value.
* cpphash.c (_cpp_cleanup_hashtable, _cpp_lookup_with_hash)
: Don't set fe_value.
* cpplib.h (AVOID_LPASTE): New flag.
(struct cpp_hashnode): Remove fe_value.
* cpplex.c (cpp_avoid_paste): Don't paste '.' with a number.
* cppmacro.c (builtin_macro): Don't set flags here.
(replace_args): Set AVOID_LPASTE flag on first token of an
argument, and the token following it.
(cpp_get_token): Set AVOID_LPASTE flag on first token of a
macro expansion, and on the token following it. Do it for
builtins too.
* cppmain.c (scan_buffer): Avoid pasting only flagged tokens.
From-SVN: r39318
Diffstat (limited to 'gcc/cppmain.c')
| -rw-r--r-- | gcc/cppmain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cppmain.c b/gcc/cppmain.c index ecc27e4..13bbbdd 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -235,8 +235,8 @@ scan_buffer (pfile) } } else if (print.printed - && ! (token->flags & PREV_WHITE) - && options->lang != CLK_ASM + && (token->flags & (PREV_WHITE | AVOID_LPASTE)) + == AVOID_LPASTE && cpp_avoid_paste (pfile, &tokens[1 - index], token)) token->flags |= PREV_WHITE; |