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

minor bugfixies

Browse source
This commit is contained in:
Sven M. Hallberg 2013-06-14 19:07:26 +02:00
parent d51e13173a
commit a7fe3824cd
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/backends/lalr.c
View file

@ -215,6 +215,7 @@ static HLRItem *advance_mark(HArena *arena, const HLRItem *item)
static HHashSet *closure(HCFGrammar *g, const HHashSet *items) static HHashSet *closure(HCFGrammar *g, const HHashSet *items)
{ {
HAllocator *mm__ = g->mm__;
HArena *arena = g->arena; HArena *arena = g->arena;
HHashSet *ret = h_lrstate_new(arena); HHashSet *ret = h_lrstate_new(arena);
HSlist *work = h_slist_new(arena); HSlist *work = h_slist_new(arena);
@ -251,8 +252,9 @@ static HHashSet *closure(HCFGrammar *g, const HHashSet *items)
} else { // HCF_CHARSET } else { // HCF_CHARSET
for(unsigned int i=0; i<256; i++) { for(unsigned int i=0; i<256; i++) {
if(charset_isset(sym->charset, i)) { if(charset_isset(sym->charset, i)) {
HCFChoice **rhs = h_arena_malloc(arena, 2 * sizeof(HCFChoice *)); // XXX allocatethese single-character symbols statically somewhere
rhs[0] = h_arena_malloc(arena, sizeof(HCFChoice)); HCFChoice **rhs = h_new(HCFChoice *, 2);
rhs[0] = h_new(HCFChoice, 1);
rhs[0]->type = HCF_CHAR; rhs[0]->type = HCF_CHAR;
rhs[0]->chr = i; rhs[0]->chr = i;
rhs[1] = NULL; rhs[1] = NULL;
@ -558,7 +560,7 @@ static HLREnhGrammar *enhance_grammar(const HCFGrammar *g, const HLRDFA *dfa,
const HLRTable *table) const HLRTable *table)
{ {
HAllocator *mm__ = g->mm__; HAllocator *mm__ = g->mm__;
HArena *arena = g->arena; // XXX ? HArena *arena = g->arena;
HLREnhGrammar *eg = h_arena_malloc(arena, sizeof(HLREnhGrammar)); HLREnhGrammar *eg = h_arena_malloc(arena, sizeof(HLREnhGrammar));
eg->tmap = h_hashtable_new(arena, eq_transition, hash_transition); eg->tmap = h_hashtable_new(arena, eq_transition, hash_transition);
@ -851,8 +853,8 @@ HParseResult *h_lr_parse(HAllocator* mm__, const HParser* parser, HInputStream*
HParseResult *result = NULL; HParseResult *result = NULL;
if(h_slist_pop(right) == table->start) { if(h_slist_pop(right) == table->start) {
// next on the right stack is the start symbol's semantic value // next on the right stack is the start symbol's semantic value
assert(!h_slist_empty(right));
HParsedToken *tok = h_slist_pop(right); HParsedToken *tok = h_slist_pop(right);
assert(tok != NULL);
result = make_result(arena, tok); result = make_result(arena, tok);
} else { } else {
h_delete_arena(arena); h_delete_arena(arena);