diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-05 13:22:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-07 21:02:01 -0700 |
| commit | 1694b992f1834bed9cbceafa795b511ee52efaca (patch) | |
| tree | b144a4906130b7df87a847472e82bc04d242223d /expression.c | |
| parent | 930f205a62cd53ecf19d68297895bb4025db28e8 (diff) | |
| download | sparse-dev-1694b992f1834bed9cbceafa795b511ee52efaca.tar.gz | |
Remove TOKEN_FP vs TOKEN_INTEGER distinction, and make numbers be
just TOKEN_NUMBER.
This matches how tokenization is supposed to be done, and simplifies
the code.
Expression evaluation changed to cope with the new rules.
Diffstat (limited to 'expression.c')
| -rw-r--r-- | expression.c | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/expression.c b/expression.c index a8ca454b..a8f39d30 100644 --- a/expression.c +++ b/expression.c @@ -88,21 +88,35 @@ static struct token *string_expression(struct token *token, struct expression *e return next; } -static void get_int_value(struct expression *expr, struct token *token) +static void get_fp_value(struct expression *expr, struct token *token) { - const char *str = token->integer; + static int fp_warned; + + expr->ctype = &double_ctype; + expr->value = 0; + if (!fp_warned) { + warn(token->pos, "FP values not yet implemented"); + fp_warned = 1; + } +} + +static void get_number_value(struct expression *expr, struct token *token) +{ + const char *str = token->number; unsigned long long value = 0; unsigned int base = 10, digit, bits; unsigned long modifiers, extramod; - switch (str[0]) { - case 'x': - base = 18; // the -= 2 for the octal case will - str++; // skip the 'x' - /* fallthrough */ - case 'o': - str++; // skip the 'o' or 'x/X' - base -= 2; // the fall-through will make this 8 + if (str[0] == '0') { + switch (str[1]) { + case 'x': case 'X': + base = 18; // the -= 2 for the octal case will + str++; // skip the '0' + /* fallthrough */ + case '0'...'7': + str++; // skip the '0' or 'x/X' + base -= 2; // the fall-through will make this 8 + } } while ((digit = hexval(*str)) < base) { value = value * base + digit; @@ -121,6 +135,10 @@ static void get_int_value(struct expression *expr, struct token *token) modifiers |= MOD_LONG; continue; } + if (c) { + get_fp_value(expr, token); + return; + } break; } @@ -175,18 +193,6 @@ struct token *primary_expression(struct token *token, struct expression **tree) struct expression *expr = NULL; switch (token_type(token)) { - static int fp_warned; - case TOKEN_FP: - expr = alloc_expression(token->pos, EXPR_VALUE); - expr->ctype = &double_ctype; - expr->value = 0; - if (!fp_warned) { - warn(token->pos, "FP values not yet implemented"); - fp_warned = 1; - } - token = token->next; - break; - case TOKEN_CHAR: expr = alloc_expression(token->pos, EXPR_VALUE); expr->ctype = &int_ctype; @@ -194,9 +200,9 @@ struct token *primary_expression(struct token *token, struct expression **tree) token = token->next; break; - case TOKEN_INTEGER: + case TOKEN_NUMBER: expr = alloc_expression(token->pos, EXPR_VALUE); - get_int_value(expr, token); + get_number_value(expr, token); token = token->next; break; |