darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-31 12:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix array-index codegen conditions

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-11 19:02:50 +01:00
parent 22d6ff2309
commit feec2d74ee
1 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
ast.c
View file

@ -1537,47 +1537,42 @@ bool ast_array_index_codegen(ast_array_index *self, ast_function *func, bool lva
return false;
}
if (!ast_istype(self->index, ast_value)) {
if (lvalue) {
asterror(ast_ctx(self), "array indexing here needs a compile-time constant");
return false;
} else {
/* Time to use accessor functions */
ast_expression_codegen *cgen;
ir_value *iridx, *funval;
ir_instr *call;
if (!arr->getter) {
asterror(ast_ctx(self), "value has no getter, don't know how to index it");
return false;
}
cgen = self->index->expression.codegen;
if (!(*cgen)((ast_expression*)(self->index), func, true, &iridx))
return false;
cgen = arr->getter->expression.codegen;
if (!(*cgen)((ast_expression*)(arr->getter), func, true, &funval))
return false;
call = ir_block_create_call(func->curblock, ast_function_label(func, "fetch"), funval);
if (!call)
return false;
if (!ir_call_param(call, iridx))
return false;
*out = ir_call_value(call);
self->expression.outr = *out;
return true;
}
}
arr = (ast_value*)self->array;
idx = (ast_value*)self->index;
if (!idx->isconst) {
asterror(ast_ctx(self), "(.2) array indexing here needs a compile-time constant");
return false;
if (!ast_istype(self->index, ast_value) || !idx->isconst) {
/* Time to use accessor functions */
ast_expression_codegen *cgen;
ir_value *iridx, *funval;
ir_instr *call;
if (lvalue) {
asterror(ast_ctx(self), "(.2) array indexing here needs a compile-time constant");
return false;
}
if (!arr->getter) {
asterror(ast_ctx(self), "value has no getter, don't know how to index it");
return false;
}
cgen = self->index->expression.codegen;
if (!(*cgen)((ast_expression*)(self->index), func, true, &iridx))
return false;
cgen = arr->getter->expression.codegen;
if (!(*cgen)((ast_expression*)(arr->getter), func, true, &funval))
return false;
call = ir_block_create_call(func->curblock, ast_function_label(func, "fetch"), funval);
if (!call)
return false;
if (!ir_call_param(call, iridx))
return false;
*out = ir_call_value(call);
self->expression.outr = *out;
return true;
}
if (idx->expression.vtype == TYPE_FLOAT)