diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2009-05-10 15:27:32 +0100 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2009-05-10 15:27:32 +0100 |
| commit | 9a0c61875533558e047cb5ef140d9836ed475ab9 (patch) | |
| tree | c5f8e2e7ce183b106614d41e5e99dcd5c47f5581 /gcc/c-lex.c | |
| parent | fb0be16980027e055bfc6094868090382a0a4086 (diff) | |
| download | gcc-9a0c61875533558e047cb5ef140d9836ed475ab9.zip gcc-9a0c61875533558e047cb5ef140d9836ed475ab9.tar.gz gcc-9a0c61875533558e047cb5ef140d9836ed475ab9.tar.bz2 | |
c-lex.c (c_lex_with_flags): Expect cpp_hashnode in tok->val.node.node.
gcc:
* c-lex.c (c_lex_with_flags): Expect cpp_hashnode in
tok->val.node.node.
libcpp:
* include/cpplib.h (enum cpp_token_fld_kind): Add
CPP_TOKEN_FLD_TOKEN_NO.
(struct cpp_macro_arg, struct cpp_identifier): Define.
(union cpp_token_u): Use struct cpp_identifier for identifiers.
Use struct cpp_macro_arg for macro arguments. Add token_no for
CPP_PASTE token numbers.
* directives.c (_cpp_handle_directive, lex_macro_node, do_pragma,
do_pragma_poison, parse_assertion): Use val.node.node in place of
val.node.
* expr.c (parse_defined, eval_token): Use val.node.node in place
of val.node.
* lex.c (cpp_ideq, _cpp_lex_direct, cpp_token_len,
cpp_spell_token, cpp_output_token, _cpp_equiv_tokens,
cpp_token_val_index): Use val.macro_arg.arg_no or val.token_no in
place of val.arg_no. Use val.node.node in place of val.node.
* macro.c (replace_args, cpp_get_token, parse_params,
lex_expansion_token, create_iso_definition, cpp_macro_definition):
Use val.macro_arg.arg_no or val.token_no in place of val.arg_no.
Use val.node.node in place of val.node.
From-SVN: r147341
Diffstat (limited to 'gcc/c-lex.c')
| -rw-r--r-- | gcc/c-lex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/c-lex.c b/gcc/c-lex.c index fc89279..66df4c4 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -313,7 +313,7 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags, goto retry; case CPP_NAME: - *value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node)); + *value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node.node)); break; case CPP_NUMBER: @@ -369,7 +369,7 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags, break; case CPP_NAME: - *value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node)); + *value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node.node)); if (objc_is_reserved_word (*value)) { type = CPP_AT_NAME; |