]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
ast_binary now keeps track of types
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 12 Aug 2012 09:36:28 +0000 (11:36 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 12 Aug 2012 09:36:28 +0000 (11:36 +0200)
ast.c

diff --git a/ast.c b/ast.c
index e6d28a61d19a4dcc32672c794a52f62657a4e49c..117f845ae0bc816b40a99f5a3ab0a9741ace5ac6 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -211,6 +211,18 @@ ast_binary* ast_binary_new(lex_ctx ctx, int op,
     self->left = left;
     self->right = right;
 
+    if (op >= INSTR_EQ_F && op <= INSTR_GT)
+        self->expression.vtype = TYPE_FLOAT;
+    else if (op == INSTR_AND || op == INSTR_OR ||
+             op == INSTR_BITAND || op == INSTR_BITOR)
+        self->expression.vtype = TYPE_FLOAT;
+    else if (op == INSTR_MUL_VF || op == INSTR_MUL_FV)
+        self->expression.vtype = TYPE_VECTOR;
+    else if (op == INSTR_MUL_V)
+        self->expression.vtype = TYPE_FLOAT;
+    else
+        self->expression.vtype = left->expression.vtype;
+
     return self;
 }
 
@@ -650,8 +662,10 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir)
     }
 
     v = ir_builder_create_global(ir, self->name, self->expression.vtype);
-    if (!v)
+    if (!v) {
+        printf("ir_builder_create_global failed\n");
         return false;
+    }
 
     if (self->isconst) {
         switch (self->expression.vtype)