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

cosmetic changes

Browse source
This commit is contained in:
Sven M. Hallberg 2015-09-24 16:33:13 +02:00
parent 65dbcf56fc
commit 520884739c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backends/lr.c
View file

@ -163,7 +163,7 @@ HLRAction *h_reduce_action(HArena *arena, const HLRItem *item)
} }
// adds 'new' to the branches of 'action' // adds 'new' to the branches of 'action'
// returns a 'action' if it is already of type HLR_CONFLICT // returns 'action' if it is already of type HLR_CONFLICT
// allocates a new HLRAction otherwise // allocates a new HLRAction otherwise
HLRAction *h_lr_conflict(HArena *arena, HLRAction *action, HLRAction *new) HLRAction *h_lr_conflict(HArena *arena, HLRAction *action, HLRAction *new)
{ {

8
src/backends/lr0.c
View file

@ -30,9 +30,9 @@ static void expand_to_closure(HCFGrammar *g, HHashSet *items)
HCFChoice *sym = item->rhs[item->mark]; // symbol after mark HCFChoice *sym = item->rhs[item->mark]; // symbol after mark
// if there is a non-terminal after the mark, follow it // if there is a non-terminal after the mark, follow it
// and add items corresponding to the productions of sym
// NB: unlike LLk, we do consider HCF_CHARSET a non-terminal here // NB: unlike LLk, we do consider HCF_CHARSET a non-terminal here
if(sym != NULL && (sym->type==HCF_CHOICE || sym->type==HCF_CHARSET)) { if(sym != NULL) {
// add items corresponding to the productions of sym
if(sym->type == HCF_CHOICE) { if(sym->type == HCF_CHOICE) {
for(HCFSequence **p=sym->seq; *p; p++) { for(HCFSequence **p=sym->seq; *p; p++) {
HLRItem *it = h_lritem_new(arena, sym, (*p)->items, 0); HLRItem *it = h_lritem_new(arena, sym, (*p)->items, 0);
@ -41,7 +41,7 @@ static void expand_to_closure(HCFGrammar *g, HHashSet *items)
h_slist_push(work, it); h_slist_push(work, it);
} }
} }
} else { // HCF_CHARSET } else if(sym->type == 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)) {
// XXX allocate these single-character symbols statically somewhere // XXX allocate these single-character symbols statically somewhere
@ -93,8 +93,8 @@ HLRDFA *h_lr0_dfa(HCFGrammar *g)
// compute closure // compute closure
// if destination is a new state: // if destination is a new state:
// add it to state set // add it to state set
// add transition to it
// add it to the work list // add it to the work list
// add transition to it
while(!h_slist_empty(work)) { while(!h_slist_empty(work)) {
size_t state_idx = (uintptr_t)h_slist_pop(work); size_t state_idx = (uintptr_t)h_slist_pop(work);