diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-06 18:43:32 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-06 18:43:32 +0000 |
| commit | 33344a1ca6e19d836b7295b368aa3aeb8c31bdb1 (patch) | |
| tree | 7c3e54eeed36fe96129f61bda5ccc8088000d6e9 /gcc/cpplex.c | |
| parent | ba8480002dae05bdcb5158f21ace8ac5fff51c32 (diff) | |
| download | gcc-33344a1ca6e19d836b7295b368aa3aeb8c31bdb1.tar.gz | |
* c-lex.c (c_lex): Replace tok.val.aux with tok.val.c or
tok.val.arg_no as appropriate.
* cppexp.c (lex): Similarly.
* cpplex.c (_cpp_lex_token, cpp_spell_token, cpp_output_token,
cpp_equiv_tokens, cpp_can_paste, cpp_avoid_paste): Similarly.
* cppmacro.c (stringify_arg, replace_args, lex_expansion_token,
cpp_macro_definition): Similarly.
* cpplib.h (struct cpp_token): Replace aux with c and arg_no.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37276 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cpplex.c')
| -rw-r--r-- | gcc/cpplex.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 86dbf5a692d..c77ed910f9c 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -1241,7 +1241,7 @@ _cpp_lex_token (pfile, result) random_char: default: result->type = CPP_OTHER; - result->val.aux = c; + result->val.c = c; break; } } @@ -1321,7 +1321,7 @@ cpp_spell_token (pfile, token, buffer) break; case SPELL_CHAR: - *buffer++ = token->val.aux; + *buffer++ = token->val.c; break; case SPELL_NONE: @@ -1410,7 +1410,7 @@ cpp_output_token (token, fp) break; case SPELL_CHAR: - putc (token->val.aux, fp); + putc (token->val.c, fp); break; case SPELL_NONE: @@ -1431,9 +1431,9 @@ _cpp_equiv_tokens (a, b) case SPELL_OPERATOR: return 1; case SPELL_CHAR: - return a->val.aux == b->val.aux; /* Character. */ + return a->val.c == b->val.c; /* Character. */ case SPELL_NONE: - return (a->type != CPP_MACRO_ARG || a->val.aux == b->val.aux); + return (a->type != CPP_MACRO_ARG || a->val.c == b->val.c); case SPELL_IDENT: return a->val.node == b->val.node; case SPELL_STRING: @@ -1565,7 +1565,7 @@ cpp_can_paste (pfile, token1, token2, digraph) break; case CPP_OTHER: - if (CPP_OPTION (pfile, objc) && token1->val.aux == '@') + if (CPP_OPTION (pfile, objc) && token1->val.c == '@') { if (b == CPP_NAME) return CPP_NAME; if (b == CPP_STRING) return CPP_OSTRING; @@ -1627,7 +1627,7 @@ cpp_avoid_paste (pfile, token1, token2) case CPP_NUMBER: return (b == CPP_NUMBER || b == CPP_NAME || c == '.' || c == '+' || c == '-'); case CPP_OTHER: return (CPP_OPTION (pfile, objc) - && token1->val.aux == '@' + && token1->val.c == '@' && (b == CPP_NAME || b == CPP_STRING)); default: break; } |