This commit is contained in:
Sven M. Hallberg 2014-03-24 17:30:23 +01:00
parent 797bdb7224
commit 6875dc3e53

View file

@ -86,7 +86,7 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
if(src->epsilon_branch) { if(src->epsilon_branch) {
if(dst->epsilon_branch) if(dst->epsilon_branch)
dst->epsilon_branch = dst->epsilon_branch =
combine_entries(workset, dst->epsilon_branch, src->epsilon_branch); combine_entries(workset, dst->epsilon_branch, src->epsilon_branch);
else else
dst->epsilon_branch = src->epsilon_branch; dst->epsilon_branch = src->epsilon_branch;
} else { } else {
@ -100,7 +100,7 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
if(src->end_branch) { if(src->end_branch) {
if(dst->end_branch) if(dst->end_branch)
dst->end_branch = dst->end_branch =
combine_entries(workset, dst->end_branch, src->end_branch); combine_entries(workset, dst->end_branch, src->end_branch);
else else
dst->end_branch = src->end_branch; dst->end_branch = src->end_branch;
} }
@ -120,10 +120,10 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
if(dst_) { if(dst_) {
stringmap_merge(workset, dst_, src_); stringmap_merge(workset, dst_, src_);
} else { } else {
if(src_->arena != dst->arena) if(src_->arena != dst->arena)
src_ = h_stringmap_copy(dst->arena, src_); src_ = h_stringmap_copy(dst->arena, src_);
h_hashtable_put(dst->char_branches, (void *)c, src_); h_hashtable_put(dst->char_branches, (void *)c, src_);
} }
} }
} }
} }