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

h_stringmap_update wasn't merging results correctly

Browse source
This commit is contained in:
Sven M. Hallberg 2013-05-22 21:58:34 +02:00
parent e4d0b636dd
commit 289c57aef5
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/cfgrammar.c
View file

@ -239,6 +239,13 @@ void h_stringmap_put_char(HCFStringMap *m, uint8_t c, void *v)
h_hashtable_put(m->char_branches, (void *)char_key(c), node); h_hashtable_put(m->char_branches, (void *)char_key(c), node);
} }
// helper for h_stringmap_update
void *combine_stringmap(void *v1, void *v2)
{
h_stringmap_update((HCFStringMap *)v1, (HCFStringMap *)v2);
return v1;
}
void h_stringmap_update(HCFStringMap *m, const HCFStringMap *n) void h_stringmap_update(HCFStringMap *m, const HCFStringMap *n)
{ {
if(n->epsilon_branch) if(n->epsilon_branch)
@ -247,7 +254,7 @@ void h_stringmap_update(HCFStringMap *m, const HCFStringMap *n)
if(n->end_branch) if(n->end_branch)
m->end_branch = n->end_branch; m->end_branch = n->end_branch;
h_hashtable_update(m->char_branches, n->char_branches); h_hashtable_merge(combine_stringmap, m->char_branches, n->char_branches);
} }
void *h_stringmap_get(const HCFStringMap *m, const uint8_t *str, size_t n, bool end) void *h_stringmap_get(const HCFStringMap *m, const uint8_t *str, size_t n, bool end)