Adding a 'keep' bool to nodes: Generally, destroying an AST node should destroy all...

diff --git a/ast.c b/ast.c
index 595dea16f2d4327f7f0ae8397a6d2c13937fded8..f42a2fa74807e0fddc8cefd528be99889895684b 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,9 +82,9 @@ 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)
@@ -122,6 +124,8 @@ 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);
 }
 
@@ -140,6 +144,8 @@ ast_store* ast_store_new(lex_ctx_t ctx, int op,
 
 void ast_store_delete(ast_store *self)
 {
+    ast_unref(self->dest);
+    ast_unref(self->source);
     mem_d(self);
 }
 
@@ -164,7 +170,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);
 }

diff --git a/ast.h b/ast.h
index 2eab19183352eb7f15bf064a6a3aa9f4211cfc93..ec46c9f8b710ab6c20044f273d31a6f0de147e8b 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -54,6 +54,12 @@ typedef struct
 } ast_node_common;
 
 #define ast_delete(x) ( ( (ast_node*)(x) ) -> node.destroy )((ast_node*)(x))
+#define ast_unref(x) do                     \
+{                                           \
+    if (! (((ast_node*)(x))->node.keep) ) { \
+        ast_delete(x);                      \
+    }                                       \
+} while(0)
 
 /* Expression interface
  *
@@ -102,7 +108,7 @@ struct ast_value_s
      */
     MEM_VECTOR_MAKE(ast_value*, params);
 };
-ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int qctype);
+ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int qctype, bool keep);
 void ast_value_delete(ast_value*);
 
 void ast_value_set_name(ast_value*, const char *name);