MEM_VEC_FUNCTIONS(ast_expression_common, ast_value*, params)
-static ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex);
-static ast_value* ast_value_copy(const ast_value *self)
+ast_value* ast_value_copy(const ast_value *self)
{
+ size_t i;
+ const ast_expression_common *fromex;
+ ast_expression_common *selfex;
ast_value *cp = ast_value_new(self->expression.node.context, self->name, self->expression.vtype);
if (self->expression.next) {
cp->expression.next = ast_type_copy(self->expression.node.context, self->expression.next);
return NULL;
}
}
+ fromex = &self->expression;
+ selfex = &cp->expression;
+ for (i = 0; i < fromex->params_count; ++i) {
+ ast_value *v = ast_value_copy(fromex->params[i]);
+ if (!v || !ast_expression_common_params_add(selfex, v)) {
+ ast_value_delete(cp);
+ return NULL;
+ }
+ }
return cp;
}
+bool ast_type_adopt_impl(ast_expression *self, const ast_expression *other)
+{
+ size_t i;
+ const ast_expression_common *fromex;
+ ast_expression_common *selfex;
+ self->expression.vtype = other->expression.vtype;
+ if (other->expression.next) {
+ self->expression.next = (ast_expression*)ast_type_copy(ast_ctx(self), other->expression.next);
+ if (!self->expression.next)
+ return false;
+ }
+ fromex = &other->expression;
+ selfex = &self->expression;
+ for (i = 0; i < fromex->params_count; ++i) {
+ ast_value *v = ast_value_copy(fromex->params[i]);
+ if (!v || !ast_expression_common_params_add(selfex, v))
+ return false;
+ }
+ return true;
+}
+
static ast_expression* ast_shallow_type(lex_ctx ctx, int vtype)
{
ast_instantiate(ast_expression, ctx, ast_expression_delete_full);
+ ast_expression_init(self, NULL);
self->expression.codegen = NULL;
self->expression.next = NULL;
self->expression.vtype = vtype;
return self;
}
-static ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex)
+ast_expression* ast_type_copy(lex_ctx ctx, const ast_expression *ex)
{
size_t i;
const ast_expression_common *fromex;
else
{
ast_instantiate(ast_expression, ctx, ast_expression_delete_full);
+ ast_expression_init(self, NULL);
fromex = &ex->expression;
selfex = &self->expression;
}
}
+bool ast_compare_type(ast_expression *a, ast_expression *b)
+{
+ if (a->expression.vtype != b->expression.vtype)
+ return false;
+ if (!a->expression.next != !b->expression.next)
+ return false;
+ if (a->expression.params_count != b->expression.params_count)
+ return false;
+ if (a->expression.params_count) {
+ size_t i;
+ for (i = 0; i < a->expression.params_count; ++i) {
+ if (!ast_compare_type((ast_expression*)a->expression.params[i],
+ (ast_expression*)b->expression.params[i]))
+ return false;
+ }
+ }
+ if (a->expression.next)
+ return ast_compare_type(a->expression.next, b->expression.next);
+ return true;
+}
+
ast_value* ast_value_new(lex_ctx ctx, const char *name, int t)
{
ast_instantiate(ast_value, ctx, ast_value_delete);
self->op = op;
self->operand = expr;
+ if (op >= INSTR_NOT_F && op <= INSTR_NOT_FNC) {
+ self->expression.vtype = TYPE_FLOAT;
+ } else
+ asterror(ctx, "cannot determine type of unary operation %s", asm_instr[op].m);
+
return self;
}
void ast_return_delete(ast_return *self)
{
- ast_unref(self->operand);
+ if (self->operand)
+ ast_unref(self->operand);
ast_expression_delete((ast_expression*)self);
mem_d(self);
}
ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_entfield_codegen);
- self->expression.vtype = outtype->expression.vtype;
- self->expression.next = ast_type_copy(ctx, outtype->expression.next);
-
self->entity = entity;
self->field = field;
+ if (!ast_type_adopt(self, outtype)) {
+ ast_entfield_delete(self);
+ return NULL;
+ }
+
return self;
}
}
ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_member_codegen);
+ self->expression.node.keep = true; /* keep */
if (owner->expression.vtype == TYPE_VECTOR) {
self->expression.vtype = TYPE_FLOAT;
void ast_member_delete(ast_member *self)
{
+ /* The owner is always an ast_value, which has .keep=true,
+ * also: ast_members are usually deleted after the owner, thus
+ * this will cause invalid access
ast_unref(self->owner);
+ * once we allow (expression).x to access a vector-member, we need
+ * to change this: preferably by creating an alternate ast node for this
+ * purpose that is not garbage-collected.
+ */
ast_expression_delete((ast_expression*)self);
mem_d(self);
}
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);
+
return self;
}
MEM_VEC_FUNCTIONS(ast_call, ast_expression*, params)
MEM_VECTOR_INIT(self, locals);
MEM_VECTOR_INIT(self, exprs);
+ MEM_VECTOR_INIT(self, collect);
return self;
}
MEM_VEC_FUNCTIONS(ast_block, ast_value*, locals)
MEM_VEC_FUNCTIONS(ast_block, ast_expression*, exprs)
+MEM_VEC_FUNCTIONS(ast_block, ast_expression*, collect)
+
+bool ast_block_collect(ast_block *self, ast_expression *expr)
+{
+ if (!ast_block_collect_add(self, expr))
+ return false;
+ expr->expression.node.keep = true;
+ return true;
+}
void ast_block_delete(ast_block *self)
{
for (i = 0; i < self->locals_count; ++i)
ast_delete(self->locals[i]);
MEM_VECTOR_CLEAR(self, locals);
+ for (i = 0; i < self->collect_count; ++i)
+ ast_delete(self->collect[i]);
+ MEM_VECTOR_CLEAR(self, collect);
ast_expression_delete((ast_expression*)self);
mem_d(self);
}
if (!self->expression.next)
return false;
}
+ else
+ self->expression.next = NULL;
return true;
}
ir_function *func = ir_builder_create_function(ir, self->name, self->expression.next->expression.vtype);
if (!func)
return false;
+ func->context = ast_ctx(self);
self->constval.vfunc->ir_func = func;
self->ir_v = func->value;
v = ir_builder_create_field(ir, self->name, self->expression.next->expression.vtype);
if (!v)
return false;
+ v->context = ast_ctx(self);
if (self->isconst) {
asterror(ast_ctx(self), "TODO: constant field pointers with value\n");
goto error;
asterror(ast_ctx(self), "ir_builder_create_global failed\n");
return false;
}
+ v->context = ast_ctx(self);
if (self->isconst) {
switch (self->expression.vtype)
v = ir_function_create_local(func, self->name, self->expression.vtype, param);
if (!v)
return false;
+ v->context = ast_ctx(self);
/* A constant local... hmmm...
* I suppose the IR will have to deal with this
return true;
}
+ if (!self->blocks_count) {
+ asterror(ast_ctx(self), "function `%s` has no body", self->name);
+ return false;
+ }
+
self->curblock = ir_function_create_block(irf, "entry");
if (!self->curblock)
return false;
/* TODO: check return types */
if (!self->curblock->is_return)
{
+ return ir_block_create_return(self->curblock, NULL);
+ /* From now on the parser has to handle this situation */
+#if 0
if (!self->vtype->expression.next ||
self->vtype->expression.next->expression.vtype == TYPE_VOID)
{
else
{
/* error("missing return"); */
+ asterror(ast_ctx(self), "function `%s` missing return value", self->name);
return false;
}
+#endif
}
return true;
}
/* for a binstore we need both an lvalue and an rvalue for the left side */
/* rvalue of destination! */
cgen = self->dest->expression.codegen;
- if (!(*cgen)((ast_expression*)(self->dest), func, true, &leftr))
+ if (!(*cgen)((ast_expression*)(self->dest), func, false, &leftr))
return false;
/* source as rvalue only */
}
self->expression.outr = (ir_value*)1;
- cgen = self->operand->expression.codegen;
- /* lvalue! */
- if (!(*cgen)((ast_expression*)(self->operand), func, false, &operand))
- return false;
+ if (self->operand) {
+ cgen = self->operand->expression.codegen;
+ /* lvalue! */
+ if (!(*cgen)((ast_expression*)(self->operand), func, false, &operand))
+ return false;
- if (!ir_block_create_return(func->curblock, operand))
- return false;
+ if (!ir_block_create_return(func->curblock, operand))
+ return false;
+ } else {
+ if (!ir_block_create_return(func->curblock, NULL))
+ return false;
+ }
return true;
}
*out = ir_block_create_load_from_ent(func->curblock, ast_function_label(func, "efv"),
ent, field, self->expression.vtype);
}
- if (!*out)
+ if (!*out) {
+ asterror(ast_ctx(self), "failed to create %s instruction (output type %s)",
+ (lvalue ? "ADDRESS" : "FIELD"),
+ type_name[self->expression.vtype]);
return false;
+ }
if (lvalue)
self->expression.outl = *out;
return false;
/* add jumps ot the merge block */
- if (ontrue && !ir_block_create_jump(ontrue, merge))
+ if (ontrue && !ontrue->final && !ir_block_create_jump(ontrue, merge))
return false;
- if (onfalse && !ir_block_create_jump(onfalse, merge))
+ if (onfalse && !onfalse->final && !ir_block_create_jump(onfalse, merge))
return false;
/* we create the if here, that way all blocks are ordered :)
else if (bpostcond) tmpblock = bpostcond;
else if (bprecond) tmpblock = bprecond;
else tmpblock = bout;
- if (!ir_block_create_jump(end_bbody, tmpblock))
+ if (!end_bbody->final && !ir_block_create_jump(end_bbody, tmpblock))
return false;
}
projects / xonotic / gmqcc.git / blobdiff