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

save production rhs in reduce actions for pretty-printing if not compiled NDEBUG

Browse source
This commit is contained in:
Sven M. Hallberg 2013-06-12 15:48:52 +02:00
parent 805dfeb363
commit ce387d81b6
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/backends/lalr.c
View file

@ -35,7 +35,9 @@ typedef struct HLRAction_ {
struct { struct {
HCFChoice *lhs; // symbol carrying semantic actions etc. HCFChoice *lhs; // symbol carrying semantic actions etc.
size_t length; // # of symbols in rhs size_t length; // # of symbols in rhs
// NB: the rhs symbols are not needed for the parse #ifndef NDEBUG
HCFChoice **rhs; // NB: the rhs symbols are not needed for the parse
#endif
} production; // used with REDUCE } production; // used with REDUCE
}; };
} HLRAction; } HLRAction;
@ -378,12 +380,15 @@ static HLRAction *shift_action(HArena *arena, size_t nextstate)
return action; return action;
} }
static HLRAction *reduce_action(HArena *arena, HCFChoice *lhs, size_t rhslen) static HLRAction *reduce_action(HArena *arena, const HLRItem *item)
{ {
HLRAction *action = h_arena_malloc(arena, sizeof(HLRAction)); HLRAction *action = h_arena_malloc(arena, sizeof(HLRAction));
action->type = HLR_REDUCE; action->type = HLR_REDUCE;
action->production.lhs = lhs; action->production.lhs = item->lhs;
action->production.length = rhslen; action->production.length = item->len;
#ifndef NDEBUG
action->production.rhs = item->rhs;
#endif
return action; return action;
} }
@ -424,7 +429,7 @@ HLRTable *h_lr0_table(HCFGrammar *g)
h_slist_push(table->inadeq, (void *)(uintptr_t)i); h_slist_push(table->inadeq, (void *)(uintptr_t)i);
} else { } else {
// set reduce action for the entire row // set reduce action for the entire row
table->forall[i] = reduce_action(arena, item->lhs, item->len); table->forall[i] = reduce_action(arena, item);
} }
} }
H_END_FOREACH H_END_FOREACH
@ -811,8 +816,15 @@ void pprint_lraction(FILE *f, const HCFGrammar *g, const HLRAction *action)
if(action->type == HLR_SHIFT) { if(action->type == HLR_SHIFT) {
fprintf(f, "s%lu", action->nextstate); fprintf(f, "s%lu", action->nextstate);
} else { } else {
fputc('r', f); #ifdef NDEBUG
// XXX reference the production somehow // if we can't print the production, at least print its length
fprintf(f, "r[%lu]", action->production.length);
#else
fputs("r(", f);
HCFSequence seq = {action->production.rhs};
h_pprint_sequence(f, g, &seq);
fputc(')', f);
#endif
} }
} }