darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-31 12:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

ast_block_collect: add to ast_block->collect and set the node's .keep=true, those will now always be deleted by the ast_block dtor

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-18 16:27:40 +02:00
parent 5a78270ada
commit b6ab0207b1
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ast.c
View file

@ -565,18 +565,26 @@ MEM_VEC_FUNCTIONS(ast_block, ast_value*, locals)
MEM_VEC_FUNCTIONS(ast_block, ast_expression*, exprs)
MEM_VEC_FUNCTIONS(ast_block, ast_expression*, collect)
bool ast_block_collect(ast_block *self, ast_expression *expr)
{
if (!ast_block_collect_add(self, expr))
return false;
expr->expression.node.keep = true;
return true;
}
void ast_block_delete(ast_block *self)
{
size_t i;
for (i = 0; i < self->collect_count; ++i)
ast_unref(self->collect[i]);
MEM_VECTOR_CLEAR(self, collect);
for (i = 0; i < self->exprs_count; ++i)
ast_unref(self->exprs[i]);
MEM_VECTOR_CLEAR(self, exprs);
for (i = 0; i < self->locals_count; ++i)
ast_delete(self->locals[i]);
MEM_VECTOR_CLEAR(self, locals);
for (i = 0; i < self->collect_count; ++i)
ast_delete(self->collect[i]);
MEM_VECTOR_CLEAR(self, collect);
ast_expression_delete((ast_expression*)self);
mem_d(self);
}

1
ast.h
View file

@ -438,6 +438,7 @@ MEM_VECTOR_PROTO(ast_block, ast_expression*, exprs);
MEM_VECTOR_PROTO(ast_block, ast_expression*, collect);
bool ast_block_codegen(ast_block*, ast_function*, bool lvalue, ir_value**);
bool ast_block_collect(ast_block*, ast_expression*);
/* Function
*

6
parser.c
View file

@ -1889,9 +1889,9 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
(void)!parser_t_locals_add(parser, vy);
(void)!parser_t_locals_add(parser, vz);
if (!ast_block_locals_add(localblock, var) ||
!ast_block_collect_add(localblock, vx.var) ||
!ast_block_collect_add(localblock, vy.var) ||
!ast_block_collect_add(localblock, vz.var))
!ast_block_collect(localblock, vx.var) ||
!ast_block_collect(localblock, vy.var) ||
!ast_block_collect(localblock, vz.var))
{
parser_pop_local(parser);
parser_pop_local(parser);