qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-24 12:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Improve handling of different types in ?:

Browse source
This commit is contained in:
Bill Currie 2023-10-02 09:04:31 +09:00
parent 2134c85a47
commit b89e243c47
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2484,7 +2484,20 @@ conditional_expr (const expr_t *cond, const expr_t *e1, const expr_t *e2)
backpatch (c->boolean.true_list, tlabel);
backpatch (c->boolean.false_list, flabel);
block->block.result = (type1 == type2) ? new_temp_def_expr (type1) : 0;
if (!type_same (type1, type2)) {
if (!type_assignable (type1, type2)
&& !type_assignable (type2, type1)) {
type1 = 0;
}
if (!type_assignable (type1, type2)) {
type1 = type2;
}
if (type_promotes (type2, type1)) {
type1 = type2;
}
}
block->block.result = type1 ? new_temp_def_expr (type1) : 0;
append_expr (block, c);
append_expr ((expr_t *) c->boolean.e, flabel);//FIXME cast
if (block->block.result)