darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-18 14:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add some more output and field types so you can now properly call 'get_a_function_which_gives_a_function()()()' without return values getting lost

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-12-01 16:11:04 +01:00
parent b7ce7370e8
commit de837f2380
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ast.c
View file

@ -855,9 +855,12 @@ ast_call* ast_call_new(lex_ctx ctx,
self->params = NULL;
self->func = funcexpr;
/*
self->expression.vtype = funcexpr->expression.next->expression.vtype;
if (funcexpr->expression.next->expression.next)
self->expression.next = ast_type_copy(ctx, funcexpr->expression.next->expression.next);
*/
ast_type_adopt(self, funcexpr->expression.next);
return self;
}
@ -1987,6 +1990,10 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i
} else {
*out = ir_block_create_load_from_ent(func->curblock, ast_ctx(self), ast_function_label(func, "efv"),
ent, field, self->expression.vtype);
if ((*out)->vtype == TYPE_FIELD)
(*out)->fieldtype = self->expression.next->expression.vtype;
if ((*out)->vtype == TYPE_FUNCTION)
(*out)->outtype = self->expression.next->expression.vtype;
}
if (!*out) {
compile_error(ast_ctx(self), "failed to create %s instruction (output type %s)",
@ -2870,6 +2877,11 @@ bool ast_call_codegen(ast_call *self, ast_function *func, bool lvalue, ir_value
*out = ir_call_value(callinstr);
self->expression.outr = *out;
if ((*out)->vtype == TYPE_FIELD)
(*out)->fieldtype = self->expression.next->expression.vtype;
if ((*out)->vtype == TYPE_FUNCTION)
(*out)->outtype = self->expression.next->expression.vtype;
vec_free(params);
return true;
error: