diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2009-02-02 07:31:51 +0000 |
|---|---|---|
| committer | Christopher Li <sparse@chrisli.org> | 2009-07-17 23:06:22 +0000 |
| commit | f7d10fe6c183448a48e2c4dc8d805c3524ccab45 (patch) | |
| tree | 1226f0881cf275a95783d942a356b03be0319421 /expression.c | |
| parent | bbba9f8a25b5b8b72735fa41c4509965b1ccb126 (diff) | |
| download | sparse-dev-f7d10fe6c183448a48e2c4dc8d805c3524ccab45.tar.gz | |
Fix type_info_expression()
sizeof (typename){initializers}.foo is nice and valid C99 - it's parsed
as sizeof primary.foo <- sizeof postfix.foo <- sizeof postfix <- sizeof unary
<- unary. Current type_info_expression() stops too early.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Christopher Li <sparse@chrisli.org>
Diffstat (limited to 'expression.c')
| -rw-r--r-- | expression.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/expression.c b/expression.c index f634b079..124a8ec0 100644 --- a/expression.c +++ b/expression.c @@ -594,12 +594,14 @@ static struct token *type_info_expression(struct token *token, struct expression **tree, int type) { struct expression *expr = alloc_expression(token->pos, type); + struct token *p; *tree = expr; expr->flags = Int_const_expr; /* XXX: VLA support will need that changed */ token = token->next; if (!match_op(token, '(') || !lookup_type(token->next)) return unary_expression(token, &expr->cast_expression); + p = token; token = typename(token->next, &expr->cast_type, 0); if (!match_op(token, ')')) { @@ -616,8 +618,14 @@ static struct token *type_info_expression(struct token *token, * C99 ambiguity: the typename might have been the beginning * of a typed initializer expression.. */ - if (match_op(token, '{')) - token = initializer(&expr->cast_expression, token); + if (match_op(token, '{')) { + struct expression *cast = alloc_expression(p->pos, EXPR_CAST); + cast->cast_type = expr->cast_type; + expr->cast_type = NULL; + expr->cast_expression = cast; + token = initializer(&cast->cast_expression, token); + token = postfix_expression(token, &expr->cast_expression, cast); + } return token; } |