Merge branch 'blub/ast-and-ir-merging' of github.com:graphitemaster/gmqcc into ast...

[xonotic/gmqcc.git] / ast.c

diff --git a/ast.c b/ast.c
index c52a8644556ec58312c8512fc647c153f6c19e31..3639168c5b9ef3105490856404fdd22c33a2e4a7 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -46,6 +46,7 @@ static void ast_node_init(ast_node *self, lex_ctx_t ctx)
 {
     self->node.context = ctx;
     self->node.destroy = &_ast_node_destroy;
+    self->node.keep    = false;
 }
 
 /* General expression initialization */
@@ -55,11 +56,12 @@ static void ast_expression_init(ast_expression *self,
     ast_setfunc(&self->expression, codegen, codegen);
 }
 
-ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int t)
+ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int t, bool keep)
 {
     ast_instantiate(ast_value, ctx, ast_value_delete);
     ast_expression_init((ast_expression*)self,
                         (ast_expression_codegen*)&ast_value_codegen);
+    self->expression.node.keep = keep;
 
     self->name = name ? util_strdup(name) : NULL;
     self->vtype = t;
@@ -80,14 +82,14 @@ void ast_value_delete(ast_value* self)
     if (self->name)
         mem_d((void*)self->name);
     for (i = 0; i < self->params_count; ++i)
-        ast_delete(self->params[i]);
+        ast_unref(self->params[i]);
     MEM_VECTOR_CLEAR(self, params);
-    if (self->next)
+    if (self->next) /* delete, not unref, types are always copied */
         ast_delete(self->next);
     if (self->isconst) {
         switch (self->vtype)
         {
-        case qc_string:
+        case TYPE_STRING:
             mem_d((void*)self->constval.vstring);
             break;
         /* NOTE: delete function? currently collected in
@@ -100,18 +102,19 @@ void ast_value_delete(ast_value* self)
     mem_d(self);
 }
 
-void ast_value_set_name(ast_value *self, const char *name)
+bool ast_value_set_name(ast_value *self, const char *name)
 {
     if (self->name)
         mem_d((void*)self->name);
     self->name = util_strdup(name);
+    return !!self->name;
 }
 
 ast_binary* ast_binary_new(lex_ctx_t ctx, int op,
                            ast_value* left, ast_value* right)
 {
     ast_instantiate(ast_binary, ctx, ast_binary_delete);
-    ast_expression_init((ast_expression*)self, NULL); /* FIXME */
+    ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_binary_codegen);
 
     self->op = op;
     self->left = left;
@@ -122,6 +125,28 @@ ast_binary* ast_binary_new(lex_ctx_t ctx, int op,
 
 void ast_binary_delete(ast_binary *self)
 {
+    ast_unref(self->left);
+    ast_unref(self->right);
+    mem_d(self);
+}
+
+ast_store* ast_store_new(lex_ctx_t ctx, int op,
+                         ast_value *dest, ast_value *source)
+{
+    ast_instantiate(ast_store, ctx, ast_store_delete);
+    ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_store_codegen);
+
+    self->op = op;
+    self->dest = dest;
+    self->source = source;
+
+    return self;
+}
+
+void ast_store_delete(ast_store *self)
+{
+    ast_unref(self->dest);
+    ast_unref(self->source);
     mem_d(self);
 }
 
@@ -146,7 +171,7 @@ void ast_block_delete(ast_block *self)
         ast_delete(self->locals[i]);
     MEM_VECTOR_CLEAR(self, locals);
     for (i = 0; i < self->exprs_count; ++i)
-        ast_delete(self->exprs[i]);
+        ast_unref(self->exprs[i]);
     MEM_VECTOR_CLEAR(self, exprs);
     mem_d(self);
 }
@@ -181,4 +206,23 @@ void ast_function_delete(ast_function *self)
 /* AST codegen aprt
  */
 
-/* TODO */
+/* Some dummies so it compiles... */
+bool ast_value_codegen(ast_value *self, ast_function *func, ir_value **out)
+{
+    return false;
+}
+
+bool ast_block_codegen(ast_block *self, ast_function *func, ir_value **out)
+{
+    return false;
+}
+
+bool ast_store_codegen(ast_store *self, ast_function *func, ir_value **out)
+{
+    return false;
+}
+
+bool ast_binary_codegen(ast_binary *self, ast_function *func, ir_value **out)
+{
+    return false;
+}