diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-24 00:03:28 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2007-06-25 15:49:15 -0400 |
| commit | da26e7d8090812e6788980471c0d32eba180f676 (patch) | |
| tree | 3b8d8254b6fe18a90d4bc04bca89a2ed968ed91d | |
| parent | 9f1abfd7c44b2553d40ab8904971e657f67dd568 (diff) | |
| download | sparse-dev-da26e7d8090812e6788980471c0d32eba180f676.tar.gz | |
[PATCH] take cast_to() out of usual_conversions(), do it in callers
At the same time we get to pass expressions by value...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | evaluate.c | 30 |
1 files changed, 16 insertions, 14 deletions
@@ -491,15 +491,15 @@ static struct symbol *restricted_binop_type(int op, } static struct symbol *usual_conversions(int op, - struct expression **left, - struct expression **right, + struct expression *left, + struct expression *right, int lclass, int rclass, struct symbol *ltype, struct symbol *rtype) { struct symbol *ctype; - warn_for_different_enum_types((*right)->pos, (*left)->ctype, (*right)->ctype); + warn_for_different_enum_types(right->pos, left->ctype, right->ctype); if ((lclass | rclass) & TYPE_RESTRICT) goto Restr; @@ -521,27 +521,25 @@ Normal: ctype = ltype; Convert: - *left = cast_to(*left, ctype); - *right = cast_to(*right, ctype); return ctype; Restr: - ctype = restricted_binop_type(op, *left, *right, + ctype = restricted_binop_type(op, left, right, lclass, rclass, ltype, rtype); if (ctype) goto Convert; if (lclass & TYPE_RESTRICT) { - warning((*left)->pos, "restricted degrades to integer"); - ltype = ltype->ctype.base_type; - if (is_restricted_type(ltype)) /* was fouled */ + warning(left->pos, "restricted degrades to integer"); + if (lclass & TYPE_FOULED) ltype = ltype->ctype.base_type; + ltype = ltype->ctype.base_type; } if (rclass & TYPE_RESTRICT) { - warning((*right)->pos, "restricted degrades to integer"); - rtype = rtype->ctype.base_type; - if (is_restricted_type(rtype)) /* was fouled */ + warning(right->pos, "restricted degrades to integer"); + if (rclass & TYPE_FOULED) rtype = rtype->ctype.base_type; + rtype = rtype->ctype.base_type; } goto Normal; } @@ -559,8 +557,10 @@ static struct symbol *evaluate_arith(struct expression *expr, int float_ok) if (!float_ok && (lclass | rclass) & TYPE_FLOAT) goto Bad; - ctype = usual_conversions(expr->op, &expr->left, &expr->right, + ctype = usual_conversions(expr->op, expr->left, expr->right, lclass, rclass, ltype, rtype); + expr->left = cast_to(expr->left, ctype); + expr->right = cast_to(expr->right, ctype); expr->ctype = ctype; return ctype; @@ -1106,8 +1106,10 @@ static struct symbol *evaluate_conditional_expression(struct expression *expr) lclass = classify_type(ltype, <ype); rclass = classify_type(rtype, &rtype); if (lclass & rclass & TYPE_NUM) { - ctype = usual_conversions('?', true, &expr->cond_false, + ctype = usual_conversions('?', *true, expr->cond_false, lclass, rclass, ltype, rtype); + *true = cast_to(*true, ctype); + expr->cond_false = cast_to(expr->cond_false, ctype); goto out; } ctype = compatible_ptr_type(*true, expr->cond_false); |