darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-17 09:02:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

get rid of some code duplication, and fix some wrong type adoptions in the ast

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-12-05 16:22:32 +01:00
parent 37fbe7176f
commit 2eea7b03c0
1 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
ast.c
View file

@ -429,16 +429,10 @@ ast_binstore* ast_binstore_new(lex_ctx ctx, int storop, int op,
self->keep_dest = false;
self->expression.vtype = left->expression.vtype;
if (left->expression.next) {
self->expression.next = ast_type_copy(ctx, left);
if (!self->expression.next) {
ast_delete(self);
return NULL;
}
if (!ast_type_adopt(self, left)) {
ast_delete(self);
return NULL;
}
else
self->expression.next = NULL;
return self;
}
@ -855,11 +849,6 @@ ast_call* ast_call_new(lex_ctx ctx,
self->params = NULL;
self->func = funcexpr;
/*
self->expression.vtype = funcexpr->expression.next->expression.vtype;
if (funcexpr->expression.next->expression.next)
self->expression.next = ast_type_copy(ctx, funcexpr->expression.next->expression.next);
*/
ast_type_adopt(self, funcexpr->expression.next);
return self;
@ -915,16 +904,10 @@ ast_store* ast_store_new(lex_ctx ctx, int op,
self->dest = dest;
self->source = source;
self->expression.vtype = dest->expression.vtype;
if (dest->expression.next) {
self->expression.next = ast_type_copy(ctx, dest);
if (!self->expression.next) {
ast_delete(self);
return NULL;
}
if (!ast_type_adopt(self, dest)) {
ast_delete(self);
return NULL;
}
else
self->expression.next = NULL;
return self;
}
@ -991,14 +974,8 @@ bool ast_block_set_type(ast_block *self, ast_expression *from)
{
if (self->expression.next)
ast_delete(self->expression.next);
self->expression.vtype = from->expression.vtype;
if (from->expression.next) {
self->expression.next = ast_type_copy(self->expression.node.context, from->expression.next);
if (!self->expression.next)
return false;
}
else
self->expression.next = NULL;
if (!ast_type_adopt(self, from))
return false;
return true;
}