qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 02:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix multiple function calls in expressions.

Browse source
This commit is contained in:
Bill Currie 2013-09-27 23:07:38 +09:00
parent 70d18ecfa1
commit db460155e9
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/expr.h
View file

@ -516,6 +516,8 @@ int is_math_op (int op);
*/
int is_logic (int op);
int has_function_call (expr_t *e);
int is_string_val (expr_t *e);
int is_float_val (expr_t *e);
int is_vector_val (expr_t *e);

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

@ -1488,7 +1488,7 @@ is_logic (int op)
return 0;
}
static int
int
has_function_call (expr_t *e)
{
switch (e->type) {

5
tools/qfcc/source/expr_binary.c
View file

@ -726,6 +726,11 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
expr_type_t *expr_type;
convert_name (e1);
if (e1->type == ex_block && e1->e.block.is_call
&& has_function_call (e2) && e1->e.block.result) {
e = new_temp_def_expr (get_type (e1->e.block.result));
e1 = assign_expr (e, e1);
}
if (e1->type == ex_error)
return e1;