darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-27 14:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

handling the ast-destruction in computed goto

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-01-03 13:20:57 +01:00
parent 7d14fdf530
commit cf293bc669
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ast.c
View file

@ -724,9 +724,12 @@ ast_ternary* ast_ternary_new(lex_ctx ctx, ast_expression *cond, ast_expression *
void ast_ternary_delete(ast_ternary *self)
{
ast_unref(self->cond);
ast_unref(self->on_true);
ast_unref(self->on_false);
/* the if()s are only there because computed-gotos can set them
* to NULL
*/
if (self->cond) ast_unref(self->cond);
if (self->on_true) ast_unref(self->on_true);
if (self->on_false) ast_unref(self->on_false);
ast_expression_delete((ast_expression*)self);
mem_d(self);
}

31
parser.c
View file

@ -2999,28 +2999,35 @@ static bool parse_switch_go(parser_t *parser, ast_block *block, ast_expression *
}
/* parse computed goto sides */
static ast_expression *parse_goto_computed(parser_t *parser, ast_expression *side) {
static ast_expression *parse_goto_computed(parser_t *parser, ast_expression **side) {
ast_expression *on_true;
ast_expression *on_false;
ast_expression *cond;
if (!side)
if (!*side)
return NULL;
if (ast_istype(side, ast_ternary)) {
on_true = parse_goto_computed(parser, ((ast_ternary*)side)->on_true);
on_false = parse_goto_computed(parser, ((ast_ternary*)side)->on_false);
if (ast_istype(*side, ast_ternary)) {
ast_ternary *tern = (ast_ternary*)*side;
on_true = parse_goto_computed(parser, &tern->on_true);
on_false = parse_goto_computed(parser, &tern->on_false);
if (!on_true || !on_false) {
parseerror(parser, "expected label or expression in ternary");
if (((ast_ternary*)side)->on_false) ast_unref(((ast_ternary*)side)->on_false);
if (((ast_ternary*)side)->on_true) ast_unref(((ast_ternary*)side)->on_true);
if (on_true) ast_unref(on_true);
if (on_false) ast_unref(on_false);
return NULL;
}
return (ast_expression*)ast_ifthen_new(parser_ctx(parser), ((ast_ternary*)side)->cond, on_true, on_false);
} else if (ast_istype(side, ast_label)) {
ast_goto *gt = ast_goto_new(parser_ctx(parser), ((ast_label*)side)->name);
ast_goto_set_label(gt, ((ast_label*)side));
cond = tern->cond;
tern->cond = NULL;
ast_delete(tern);
*side = NULL;
return (ast_expression*)ast_ifthen_new(parser_ctx(parser), cond, on_true, on_false);
} else if (ast_istype(*side, ast_label)) {
ast_goto *gt = ast_goto_new(parser_ctx(parser), ((ast_label*)*side)->name);
ast_goto_set_label(gt, ((ast_label*)*side));
*side = NULL;
return (ast_expression*)gt;
}
return NULL;
@ -3045,7 +3052,7 @@ static bool parse_goto(parser_t *parser, ast_expression **out)
/* failed to parse expression for goto */
if (!(expression = parse_expression(parser, false, true)) ||
!(*out = parse_goto_computed(parser, expression))) {
!(*out = parse_goto_computed(parser, &expression))) {
parseerror(parser, "invalid goto expression");
ast_unref(expression);
return false;