diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-08-20 12:39:36 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2018-08-20 12:39:36 +0000 |
| commit | 3fb558b154f795983ae6a9dd6478e18a2c846584 (patch) | |
| tree | 2c06bad74d6dafddb11979c263020425a716902c /libcpp/traditional.c | |
| parent | b655b8fc7eb4af02231fa0105dddd90a8cfceea1 (diff) | |
| download | gcc-3fb558b154f795983ae6a9dd6478e18a2c846584.zip gcc-3fb558b154f795983ae6a9dd6478e18a2c846584.tar.gz gcc-3fb558b154f795983ae6a9dd6478e18a2c846584.tar.bz2 | |
[PATCH] #assert becomes macro-like
https://gcc.gnu.org/ml/gcc-patches/2018-08/msg01140.html
libcpp/
* include/cpp-id-data.h (struct answer): Delete.
* include/cpplib.h (struct answer): Don't forward-declare.
(enum cpp_macro_kind): Add cmk_assert.
(struct cpp_macro): Union parms and next assert chain.
(union _cpp_hashnode_value): 'answer' field is cpp_macro.
* directives.c (parse_answer): Convert to use cpp_macro. Return
true on success.
(parse_assertion, find_answer, _cpp_test_assertion, cpp_do_assert)
(cpp_do_unassert): Convert to use cpp_macro.
* macro.c (warn_of_redefinition, _cpp_new_macro)
(check_trad_stringification, cpp_macro_definition): Adjust macro
parm access.
* traditional.c (_cpp_replacement_text_len)
(_cpp_copy_replacement_text, _cpp_create_trad_definition): Likewise.
gcc/c-family/
* c-ada-spec.c (macro_length, dump_ada_macros): Adjust macro parm
access.
From-SVN: r263658
Diffstat (limited to 'libcpp/traditional.c')
| -rw-r--r-- | libcpp/traditional.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcpp/traditional.c b/libcpp/traditional.c index 3c3b8ac..0c42b25 100644 --- a/libcpp/traditional.c +++ b/libcpp/traditional.c @@ -918,7 +918,7 @@ _cpp_replacement_text_len (const cpp_macro *macro) len += b->text_len; if (b->arg_index == 0) break; - len += NODE_LEN (macro->params[b->arg_index - 1]); + len += NODE_LEN (macro->parm.params[b->arg_index - 1]); exp += BLOCK_LEN (b->text_len); } } @@ -947,7 +947,7 @@ _cpp_copy_replacement_text (const cpp_macro *macro, uchar *dest) dest += b->text_len; if (b->arg_index == 0) break; - param = macro->params[b->arg_index - 1]; + param = macro->parm.params[b->arg_index - 1]; memcpy (dest, NODE_NAME (param), NODE_LEN (param)); dest += NODE_LEN (param); exp += BLOCK_LEN (b->text_len); @@ -1210,7 +1210,7 @@ _cpp_create_trad_definition (cpp_reader *pfile) { macro = _cpp_new_macro (pfile, cmk_traditional, _cpp_aligned_alloc (pfile, sizeof (cpp_macro))); - macro->params = params; + macro->parm.params = params; macro->paramc = nparms; macro->fun_like = fun_like != 0; } |