ast_member will not unref/delete the owner: first of all the owner is always an ast_v...

[xonotic/gmqcc.git] / ast.c

diff --git a/ast.c b/ast.c
index c99a051b36fefb48a613f56d8348f6b6ed81874c..317f0efe59c14d256db2aa812f70fae2ee8647a0 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -405,7 +405,7 @@ ast_member* ast_member_new(lex_ctx ctx, ast_expression *owner, unsigned int fiel
 
 void ast_member_delete(ast_member *self)
 {
-    ast_unref(self->owner);
+    // ast_unref(self->owner);
     ast_expression_delete((ast_expression*)self);
     mem_d(self);
 }
@@ -557,11 +557,21 @@ ast_block* ast_block_new(lex_ctx ctx)
 
     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)
 {
@@ -572,6 +582,9 @@ 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);
 }
@@ -846,6 +859,11 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
         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;
@@ -867,6 +885,7 @@ bool ast_function_codegen(ast_function *self, ir_builder *ir)
         else
         {
             /* error("missing return"); */
+            asterror(ast_ctx(self), "function `%s` missing return value", self->name);
             return false;
         }
     }
@@ -1013,7 +1032,7 @@ bool ast_binstore_codegen(ast_binstore *self, ast_function *func, bool lvalue, i
     /* 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 */
@@ -1139,8 +1158,12 @@ bool ast_entfield_codegen(ast_entfield *self, ast_function *func, bool lvalue, i
         *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;