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

handle charset left-hand-side in LALR compile

Browse source
This commit is contained in:
Sven M. Hallberg 2015-09-16 18:43:52 +02:00
parent 31c460780f
commit 422f88c4aa
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/backends/lalr.c
View file

@ -286,14 +286,28 @@ int h_lalr_compile(HAllocator* mm__, HParser* parser, const void* params)
HHashSet *lhss = h_hashtable_get(eg->corr, item->lhs); HHashSet *lhss = h_hashtable_get(eg->corr, item->lhs);
assert(lhss != NULL); assert(lhss != NULL);
H_FOREACH_KEY(lhss, HCFChoice *lhs) H_FOREACH_KEY(lhss, HCFChoice *lhs)
assert(lhs->type == HCF_CHOICE); // XXX could be CHARSET? assert(lhs->type == HCF_CHOICE || lhs->type == HCF_CHARSET);
bool match = false;
if(lhs->type == HCF_CHOICE) {
for(HCFSequence **p=lhs->seq; *p; p++) { for(HCFSequence **p=lhs->seq; *p; p++) {
HCFChoice **rhs = (*p)->items; HCFChoice **rhs = (*p)->items;
if(!match_production(eg, rhs, item->rhs, state)) { if(match_production(eg, rhs, item->rhs, state)) {
continue; match = true;
break;
}
}
} else { // HCF_CHARSET
assert(item->rhs[0] != NULL);
assert(item->rhs[1] == NULL);
assert(item->rhs[0]->type == HCF_CHAR);
HLRTransition *t = h_hashtable_get(eg->smap, lhs);
assert(t != NULL);
match = (t->to == state
&& charset_isset(lhs->charset, item->rhs[0]->chr));
} }
if(match) {
// the left-hand symbol's follow set is this production's // the left-hand symbol's follow set is this production's
// contribution to the lookahead // contribution to the lookahead
const HStringMap *fs = h_follow(1, eg->grammar, lhs); const HStringMap *fs = h_follow(1, eg->grammar, lhs);
@ -304,7 +318,8 @@ int h_lalr_compile(HAllocator* mm__, HParser* parser, const void* params)
// for each lookahead symbol, put action into table cell // for each lookahead symbol, put action into table cell
if(terminals_put(table->tmap[state], fs, action) < 0) if(terminals_put(table->tmap[state], fs, action) < 0)
inadeq = true; inadeq = true;
} H_END_FOREACH // enhanced production }
H_END_FOREACH // enhanced production
H_END_FOREACH // reducible item H_END_FOREACH // reducible item
if(inadeq) { if(inadeq) {