ast_binary takes 2 expressions, not 2 values, ast_store takes a value and and express...

diff --git a/ast.c b/ast.c
index 773c498ce205be21df24c684f7ae9eb3c3379744..ae58b9d2ca5d91c7adf2fb1baa48d67a9401cdac 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -54,12 +54,12 @@ static void ast_expression_init(ast_expression *self,
     self->expression.codegen = codegen;
 }
 
-ast_value* ast_value_new(lex_ctx ctx, const char *name, int t, bool keep)
+ast_value* ast_value_new(lex_ctx ctx, const char *name, int t)
 {
     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->expression.node.keep = true; /* keep */
 
     self->name = name ? util_strdup(name) : NULL;
     self->vtype = t;
@@ -113,7 +113,7 @@ bool ast_value_set_name(ast_value *self, const char *name)
 }
 
 ast_binary* ast_binary_new(lex_ctx ctx, int op,
-                           ast_value* left, ast_value* right)
+                           ast_expression* left, ast_expression* right)
 {
     ast_instantiate(ast_binary, ctx, ast_binary_delete);
     ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_binary_codegen);
@@ -133,7 +133,7 @@ void ast_binary_delete(ast_binary *self)
 }
 
 ast_store* ast_store_new(lex_ctx ctx, int op,
-                         ast_value *dest, ast_value *source)
+                         ast_value *dest, ast_expression *source)
 {
     ast_instantiate(ast_store, ctx, ast_store_delete);
     ast_expression_init((ast_expression*)self, (ast_expression_codegen*)&ast_store_codegen);

diff --git a/ast.h b/ast.h
index eb456b1e8e7ce64915eeaddaf16a799000aa37a2..b79ea967f071ed7195f90ef73d0789e260f11bcd 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -106,7 +106,7 @@ struct ast_value_s
      */
     MEM_VECTOR_MAKE(ast_value*, params);
 };
-ast_value* ast_value_new(lex_ctx ctx, const char *name, int qctype, bool keep);
+ast_value* ast_value_new(lex_ctx ctx, const char *name, int qctype);
 /* This will NOT delete an underlying ast_function */
 void ast_value_delete(ast_value*);
 
@@ -122,14 +122,14 @@ struct ast_binary_s
 {
     ast_expression_common expression;
 
-    int       op;
-    ast_value *left;
-    ast_value *right;
+    int             op;
+    ast_expression *left;
+    ast_expression *right;
 };
 ast_binary* ast_binary_new(lex_ctx    ctx,
                            int        op,
-                           ast_value *left,
-                           ast_value *right);
+                           ast_expression *left,
+                           ast_expression *right);
 void ast_binary_delete(ast_binary*);
 
 /* hmm, seperate functions?
@@ -145,12 +145,12 @@ bool ast_binary_codegen(ast_binary*, ast_function*, ir_value**);
 struct ast_store_s
 {
     ast_expression_common expression;
-    int       op;
-    ast_value *dest;
-    ast_value *source;
+    int             op;
+    ast_value      *dest; /* When we add pointers this might have to change to expression */
+    ast_expression *source;
 };
 ast_store* ast_store_new(lex_ctx ctx, int op,
-                         ast_value *d, ast_value *s);
+                         ast_value *d, ast_expression *s);
 void ast_store_delete(ast_store*);
 
 bool ast_store_codegen(ast_store*, ast_function*, ir_value**);