darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-23 20:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adding a 'keep' bool to nodes: Generally, destroying an AST node should destroy all its child-nodes, global variables get 'keep' to be true to avoid them being deleted together with expressions they're used in.

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-04-26 11:45:22 +02:00
parent 1a917a2659
commit fdc98383d1
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ast.c
View file

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

8
ast.h
View file

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