qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix structure copy into and out of entities.

This commit is contained in:
Bill Currie 2011-03-06 13:19:20 +09:00
parent dc7a78b2ff
commit 417d1b4442
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/qfcc/source/expr.c
View File

@ -2449,7 +2449,7 @@ assign_expr (expr_t *e1, expr_t *e2)
if (is_struct (get_type (e2))) {
e1 = address_expr (e1, 0, 0);
e2 = address_expr (e2, 0, 0);
e = new_move_expr (e1, e2, get_type (e2));
e = new_move_expr (e1, e2, t2);
} else {
expr_t *temp = new_temp_def_expr (t1);
@ -2462,6 +2462,7 @@ assign_expr (expr_t *e1, expr_t *e2)
} else if (is_indirect (e1)) {
if (is_struct (get_type (e1))) {
e1 = address_expr (e1, 0, 0);
e2 = address_expr (e2, 0, 0);
return new_move_expr (e1, e2, get_type (e2));
}
if (e1->type == ex_expr) {
@ -2482,9 +2483,10 @@ assign_expr (expr_t *e1, expr_t *e2)
}
} else if (is_indirect (e2)) {
if (is_struct (get_type (e1))) {
e1 = address_expr (e1, 0, 0);
e2 = address_expr (e2, 0, 0);
e2->rvalue = 1;
return new_move_expr (e1, e2, get_type (e2));
return new_move_expr (e1, e2, t2);
}
if (e2->type == ex_uexpr) {
e = e2->e.expr.e1;