qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid testing block expressions in truth assignments.

Browse source 
This fixes the infinite loop in if ((x = self.heat && x))

Really, I think I need to revisit the whole expression tree code. It's
proving to be rather fragile.
This commit is contained in:
Bill Currie 2012-12-24 20:01:16 +09:00
parent 60af059b6e
commit 79519bc357
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/qfcc/source/expr.c
View file

@ -1188,10 +1188,16 @@ convert_bool (expr_t *e, int block)
expr_t *b; expr_t *b;
if (e->type == ex_expr && (e->e.expr.op == '=' || e->e.expr.op == PAS)) { if (e->type == ex_expr && (e->e.expr.op == '=' || e->e.expr.op == PAS)) {
expr_t *src;
if (!e->paren && options.warnings.precedence) if (!e->paren && options.warnings.precedence)
warning (e, "suggest parentheses around assignment " warning (e, "suggest parentheses around assignment "
"used as truth value"); "used as truth value");
b = convert_bool (e->e.expr.e2, 1); src = e->e.expr.e2;
if (src->type == ex_block) {
src = new_temp_def_expr (get_type (src));
e = assign_expr (e->e.expr.e1, assign_expr (src, e->e.expr.e2));
}
b = convert_bool (src, 1);
if (b->type == ex_error) if (b->type == ex_error)
return b; return b;
// insert the assignment into the bool's block // insert the assignment into the bool's block