aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpplib.c
diff options
context:
space:
mode:
authorZack Weinberg <zack@wolery.cumb.org>2000-07-18 23:25:06 +0000
committerZack Weinberg <zack@gcc.gnu.org>2000-07-18 23:25:06 +0000
commit96be6998336d305447f3963eb2c9d902eae516a7 (patch)
treebe6672085587ff8d9d75f630009b64878dc2aec5 /gcc/cpplib.c
parentd0089985e7e6ec8fd020e40eb59667a88d0282de (diff)
downloadgcc-96be6998336d305447f3963eb2c9d902eae516a7.zip
gcc-96be6998336d305447f3963eb2c9d902eae516a7.tar.gz
gcc-96be6998336d305447f3963eb2c9d902eae516a7.tar.bz2
cpplib.h (TTYPE_TABLE): Rearrange to use only two per-entry macros, not five.
* cpplib.h (TTYPE_TABLE): Rearrange to use only two per-entry macros, not five. * cpphash.h (TOKEN_NAME): New macro. (_cpp_spell_operator): Deleted. (token_spellings): Now _cpp_token_spellings. * cppexp.c: Use TOKEN_NAME or TYPE_NAME, not _cpp_spell_operator. * cpplex.c: Use OP and TK macros when expanding the TTYPE_TABLE. Eliminate token_names. For non-OPERATOR tokens, store the stringification of the enumeration name (CPP_CHAR, etc.) in the name slot of token_spellings. Use TOKEN_NAME and/or TOKEN_SPELL, do not reference token_spellings directly. * cpplib.c: Use TOKEN_SPELL. * cpplex.c (_cpp_push_token): If the token being pushed back is the previous token in this context, just subtract one from context->posn. * cppmacro.c (save_expansion): Clear aux field when storing a placemarker. * gcc.dg/cpp/paste5.c: New test. * gcc.dg/cpp/vararg1.c: New test. From-SVN: r35124
Diffstat (limited to 'gcc/cpplib.c')
-rw-r--r--gcc/cpplib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index adbd8d1..520821a 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -1252,7 +1252,7 @@ _cpp_parse_assertion (pfile, answerp)
dest = &list->tokens[list->tokens_used++];
*dest = *token;
- if (token_spellings[token->type].type == SPELL_STRING)
+ if (TOKEN_SPELL (token) == SPELL_STRING)
{
_cpp_expand_name_space (list, token->val.str.len);
dest->val.str.text = list->namebuf + list->name_used;