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

fix incorrect usage of h_stringset_put_char in stringset_extend

Browse source
This commit is contained in:
Sven M. Hallberg 2013-05-23 14:19:37 +02:00
parent 859f7e3990
commit 9112452709
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/cfgrammar.c
View file

@ -235,11 +235,16 @@ void h_stringmap_put_epsilon(HCFStringMap *m, void *v)
m->epsilon_branch = v; m->epsilon_branch = v;
} }
void h_stringmap_put_after(HCFStringMap *m, uint8_t c, HCFStringMap *ends)
{
h_hashtable_put(m->char_branches, (void *)char_key(c), ends);
}
void h_stringmap_put_char(HCFStringMap *m, uint8_t c, void *v) void h_stringmap_put_char(HCFStringMap *m, uint8_t c, void *v)
{ {
HCFStringMap *node = h_stringmap_new(m->arena); HCFStringMap *node = h_stringmap_new(m->arena);
h_stringmap_put_epsilon(node, v); h_stringmap_put_epsilon(node, v);
h_hashtable_put(m->char_branches, (void *)char_key(c), node); h_stringmap_put_after(m, c, node);
} }
// helper for h_stringmap_update // helper for h_stringmap_update
@ -505,7 +510,7 @@ static void stringset_extend(HCFGrammar *g, HCFStringMap *ret,
// t { a b | a <- as_, b <- f_l(tail), l=k-|a|-1 } // t { a b | a <- as_, b <- f_l(tail), l=k-|a|-1 }
// so we can use recursion over k // so we can use recursion over k
HCFStringMap *ret_ = h_stringmap_new(g->arena); HCFStringMap *ret_ = h_stringmap_new(g->arena);
h_stringmap_put_char(ret, c, ret_); h_stringmap_put_after(ret, c, ret_);
stringset_extend(g, ret_, k-1, as_, f, tail); stringset_extend(g, ret_, k-1, as_, f, tail);
} }

1
src/cfgrammar.h
View file

@ -42,6 +42,7 @@ typedef struct HCFStringMap_ {
HCFStringMap *h_stringmap_new(HArena *a); HCFStringMap *h_stringmap_new(HArena *a);
void h_stringmap_put_end(HCFStringMap *m, void *v); void h_stringmap_put_end(HCFStringMap *m, void *v);
void h_stringmap_put_epsilon(HCFStringMap *m, void *v); void h_stringmap_put_epsilon(HCFStringMap *m, void *v);
void h_stringmap_put_after(HCFStringMap *m, uint8_t c, HCFStringMap *ends);
void h_stringmap_put_char(HCFStringMap *m, uint8_t c, void *v); void h_stringmap_put_char(HCFStringMap *m, uint8_t c, void *v);
void h_stringmap_update(HCFStringMap *m, const HCFStringMap *n); void h_stringmap_update(HCFStringMap *m, const HCFStringMap *n);
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);