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

Merge branch 'LL' of github.com:pesco/hammer into LL

Browse source 
Conflicts:
	src/cfgrammar.c
This commit is contained in:
Sven M. Hallberg 2013-06-04 22:02:04 +02:00
commit ef52f66a8c
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cfgrammar.c
View file

@ -18,6 +18,7 @@ HCFGrammar *h_cfgrammar_new(HAllocator *mm__)
g->mm__ = mm__; g->mm__ = mm__;
g->arena = h_new_arena(mm__, 0); // default blocksize g->arena = h_new_arena(mm__, 0); // default blocksize
g->nts = h_hashset_new(g->arena, h_eq_ptr, h_hash_ptr); g->nts = h_hashset_new(g->arena, h_eq_ptr, h_hash_ptr);
g->start = NULL;
g->geneps = NULL; g->geneps = NULL;
g->first = NULL; g->first = NULL;
g->follow = NULL; g->follow = NULL;
@ -222,6 +223,8 @@ static void collect_geneps(HCFGrammar *g)
HStringMap *h_stringmap_new(HArena *a) HStringMap *h_stringmap_new(HArena *a)
{ {
HStringMap *m = h_arena_malloc(a, sizeof(HStringMap)); HStringMap *m = h_arena_malloc(a, sizeof(HStringMap));
m->epsilon_branch = NULL;
m->end_branch = NULL;
m->char_branches = h_hashtable_new(a, h_eq_ptr, h_hash_ptr); m->char_branches = h_hashtable_new(a, h_eq_ptr, h_hash_ptr);
m->arena = a; m->arena = a;
return m; return m;