ast_binary takes 2 expressions, not 2 values, ast_store takes a value and and expression for now until we support pointers, also: dropped the 'keep' param from ast_value_new, values are always to be stored somewhere to be deleted independently from their uses

This commit is contained in:
Wolfgang Bumiller 2012-04-28 17:27:06 +02:00
parent 0f38a560b6
commit 6145ecf7e0
2 changed files with 14 additions and 14 deletions

8
ast.c
View file

@ -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);

20
ast.h
View file

@ -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**);