diff options
| author | echristo <echristo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-15 23:18:04 +0000 |
|---|---|---|
| committer | echristo <echristo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-15 23:18:04 +0000 |
| commit | 9936e07d9194ed249cb7581e2b3b612e98844cde (patch) | |
| tree | 88d1edaa90379d91bcd7b9bad1e228c48a4e8210 /libcpp | |
| parent | a606f1d66ed166d39f547f06331f7e027abfc504 (diff) | |
2005-02-15 Eric Christopher <echristo@redhat.com>
PR preprocessor/19077
* macro.c (cpp_macro_definition): Move handling of whitespace
to PREV_WHITE conditional. Remove overloading of len
variable.
2005-02-15 Eric Christopher <echristo@redhat.com>
* gcc.dg/cpp/20050215-1.c: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95080 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/macro.c | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 26e65045380..5c58eb7ceb8 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2005-02-15 Eric Christopher <echristo@redhat.com> + + PR preprocessor/19077 + * macro.c (cpp_macro_definition): Move handling of whitespace + to PREV_WHITE conditional. Remove overloading of len + variable. + 2005-02-14 Kazu Hirata <kazu@cs.umass.edu> * directives.c, files.c, init.c, internal.h, macro.c, pch.c, diff --git a/libcpp/macro.c b/libcpp/macro.c index 7ad13963537..5e596699e01 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -1666,6 +1666,7 @@ cpp_macro_definition (cpp_reader *pfile, const cpp_hashnode *node) len += NODE_LEN (macro->params[i]) + 1; /* "," */ } + /* This should match below where we fill in the buffer. */ if (CPP_OPTION (pfile, traditional)) len += _cpp_replacement_text_len (macro); else @@ -1677,11 +1678,14 @@ cpp_macro_definition (cpp_reader *pfile, const cpp_hashnode *node) if (token->type == CPP_MACRO_ARG) len += NODE_LEN (macro->params[token->val.arg_no - 1]); else - len += cpp_token_len (token) + 1; /* Includes room for ' '. */ + len += cpp_token_len (token); + if (token->flags & STRINGIFY_ARG) len++; /* "#" */ if (token->flags & PASTE_LEFT) len += 3; /* " ##" */ + if (token->flags & PREV_WHITE) + len++; /* " " */ } } @@ -1741,10 +1745,10 @@ cpp_macro_definition (cpp_reader *pfile, const cpp_hashnode *node) if (token->type == CPP_MACRO_ARG) { - len = NODE_LEN (macro->params[token->val.arg_no - 1]); memcpy (buffer, - NODE_NAME (macro->params[token->val.arg_no - 1]), len); - buffer += len; + NODE_NAME (macro->params[token->val.arg_no - 1]), + NODE_LEN (macro->params[token->val.arg_no - 1])); + buffer += NODE_LEN (macro->params[token->val.arg_no - 1]); } else buffer = cpp_spell_token (pfile, token, buffer); |