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

fix match_production for the empty-sequence case

Browse source
This commit is contained in:
Sven M. Hallberg 2013-06-15 20:54:53 +02:00
parent 5a57adabab
commit f0cd2de55c
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/backends/lalr.c
View file

@ -579,15 +579,16 @@ int h_lrtable_put(HLRTable *tbl, size_t state, HCFChoice *x, HLRAction *action)
bool match_production(HLREnhGrammar *eg, HCFChoice **p, bool match_production(HLREnhGrammar *eg, HCFChoice **p,
HCFChoice **rhs, size_t endstate) HCFChoice **rhs, size_t endstate)
{ {
HLRTransition *t; size_t state = endstate; // initialized to end in case of empty rhs
for(; *p && *rhs; p++, rhs++) { for(; *p && *rhs; p++, rhs++) {
t = h_hashtable_get(eg->smap, *p); HLRTransition *t = h_hashtable_get(eg->smap, *p);
assert(t != NULL); assert(t != NULL);
if(!eq_symbol(t->symbol, *rhs)) if(!eq_symbol(t->symbol, *rhs))
return false; return false;
state = t->to;
} }
return (*p == *rhs // both NULL return (*p == *rhs // both NULL
&& t->to == endstate); && state == endstate);
} }
int h_lalr_compile(HAllocator* mm__, HParser* parser, const void* params) int h_lalr_compile(HAllocator* mm__, HParser* parser, const void* params)
@ -1022,7 +1023,7 @@ int test_lalr(void)
h_pprint_lrtable(stdout, g, (HLRTable *)p->backend_data, 0); h_pprint_lrtable(stdout, g, (HLRTable *)p->backend_data, 0);
printf("\n==== P A R S E R E S U L T ====\n"); printf("\n==== P A R S E R E S U L T ====\n");
HParseResult *res = h_parse(p, (uint8_t *)"xxn-(n-((n)))-n", 13); HParseResult *res = h_parse(p, (uint8_t *)"xxn-(n-((n)))-n", 2);
if(res) if(res)
h_pprint(stdout, res->ast, 0, 2); h_pprint(stdout, res->ast, 0, 2);
else else