emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid duplicate conflict branches

Browse source
This commit is contained in:
Sven M. Hallberg 2013-06-19 18:51:16 +02:00
parent 572f1c8f9e
commit 4f36fcd2c1
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/backends/lr.c
View file

@ -170,11 +170,19 @@ HLRAction *h_lr_conflict(HArena *arena, HLRAction *action, HLRAction *new)
action->type = HLR_CONFLICT; action->type = HLR_CONFLICT;
action->branches = h_slist_new(arena); action->branches = h_slist_new(arena);
h_slist_push(action->branches, old); h_slist_push(action->branches, old);
h_slist_push(action->branches, new);
} else {
// check if 'new' is already among branches
HSlistNode *x;
for(x=action->branches->head; x; x=x->next) {
if(x->elem == new)
break;
}
// add 'new' if it is not already in list
if(x == NULL)
h_slist_push(action->branches, new);
} }
assert(action->type == HLR_CONFLICT);
h_slist_push(action->branches, new);
return action; return action;
} }