block and value codegen protos

[xonotic/gmqcc.git] / ast.c

diff --git a/ast.c b/ast.c
index b1d90562e38dc6126b09a1091b81c2084e430be1..5b4b1de228c95244430d9a65570b2f9e6e6553c8 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -1,7 +1,30 @@
+/*
+ * Copyright (C) 2012 
+ *     Wolfgang Bumiller
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "gmqcc.h"
 #include "ast.h"
 
 #define ast_setfunc(me, fn, what) ( *(void**)&((me)->fn) = what )
@@ -32,7 +55,7 @@ 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, qc_type_t t)
+ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int t)
 {
     ast_instantiate(ast_value, ctx, ast_value_delete);
     ast_expression_init((ast_expression*)self,
@@ -42,8 +65,8 @@ ast_value* ast_value_new(lex_ctx_t ctx, const char *name, qc_type_t t)
     self->vtype = t;
     self->next = NULL;
     MEM_VECTOR_INIT(self, params);
-    self->has_constval = false;
-    memset(&self->cvalue, 0, sizeof(self->cvalue));
+    self->isconst = false;
+    memset(&self->constval, 0, sizeof(self->constval));
 
     self->ir_v = NULL;
 
@@ -61,11 +84,11 @@ void ast_value_delete(ast_value* self)
     MEM_VECTOR_CLEAR(self, params);
     if (self->next)
         ast_delete(self->next);
-    if (self->has_constval) {
+    if (self->isconst) {
         switch (self->vtype)
         {
         case qc_string:
-            mem_d((void*)self->cvalue.vstring);
+            mem_d((void*)self->constval.vstring);
             break;
         /* NOTE: delete function? currently collected in
          * the parser structure
@@ -84,11 +107,11 @@ void ast_value_set_name(ast_value *self, const char *name)
     self->name = util_strdup(name);
 }
 
-ast_binary* ast_binary_new(lex_ctx_t ctx, qc_op_t op,
+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, (ast_expression_codegen*)codegen);
+    ast_expression_init((ast_expression*)self, NULL); /* FIXME */
 
     self->op = op;
     self->left = left;
@@ -158,71 +181,13 @@ void ast_function_delete(ast_function *self)
 /* AST codegen aprt
  */
 
-static qbool ast_value_gen_global(ir_builder *ir, ast_value *self, ir_value **out)
-{
-    ir_value *v;
-    *out = NULL;
-
-    /* Generate functions */
-    if (self->vtype == qc_function && self->has_constval)
-    {
-        /* Without has_constval it would be invalid... function pointers actually have
-         * type qc_pointer and next with type qc_function
-         */
-        ast_function *func = self->cvalue.vfunc;
-        if (!ast_function_codegen(func, ir))
-            return false;
-
-        /* Here we do return NULL anyway */
-        return true;
-    }
-    else if (self->vtype == qc_function && !self->has_constval) {
-        fprintf(stderr,
-        "!v->has_constval <- qc_function body missing - FIXME: remove when implementing prototypes\n");
-        fprintf(stderr, "Value: %s\n", self->_name);
-        abort();
-    }
-
-    v = ir_builder_create_global(ir, self->_name, self->vtype);
-    self->ir_v = v;
-
-    *out = v;
-    return true;
-}
-
-qbool ast_value_codegen(ast_value *self, ast_function *func, ir_value **out)
-{
-    if (!func)
-        return ast_value_gen_global(parser.ir, self, out);
-    return false;
-}
-
-qbool ast_function_codegen(ast_function *self, ir_builder *builder)
-{
-    size_t i;
-    for (i = 0; i < self->blocks_count; ++i)
-    {
-        ast_expression *expr;
-        ir_value *out;
-
-        expr = (ast_expression*)self->blocks[i];
-
-        if (!(expr->expression.codegen)(expr, self, &out))
-        {
-            /* there was an error while building this expression... */
-            return false;
-        }
-        (void)out;
-    }
-    return true;
-}
-
-qbool ast_block_codegen(ast_block *self, ir_function *func, ir_value **out)
+/* Some dummies so it compiles... */
+bool ast_value_codegen(ast_value *self, ast_function *func, ir_value **out)
 {
     return false;
 }
 
-qbool ast_bin_store_codegen(ast_binary *self, ir_function *func, ir_value **out)
+bool ast_block_codegen(ast_block *self, ast_function *func, ir_value **out)
 {
     return false;
 }