GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-08-19 18:56:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

avoid looping with recursive epsilon categories

Browse Source
This commit is contained in:
Krasimir Angelov
2026-08-05 12:14:15 +02:00
parent 696c3705a2
commit edd9fcf904
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runtime/c/pgf/parser.cxx
+18 -3
View File
@@ -140,6 +140,24 @@ void PgfAbstractParser::symbol(Item *item, State *state, PgfSymbol sym)
suspend(cont,item,n_suspended1,suspended.size()); suspend(cont,item,n_suspended1,suspended.size());
} }
} else { } else {
interval_t value_i = item->interval(item->rule->args[symcat->d]);
interval_t lin_idx_i = item->interval(ref<PgfLParam>::from_ptr(&symcat->r));
bool found = false;
CCat *prev_ccat = ccat;
while (prev_ccat != NULL && prev_ccat->fid > initial_fid && prev_ccat->cont->state == state) {
if (prev_ccat->value == value_i && prev_ccat->lin_idx == lin_idx_i) {
found = true;
break;
}
prev_ccat = prev_ccat->cont->ccat;
}
if (found) {
item->dot++;
state->push_item(item);
break;
}
Cont *&cont = state->conts2[ccat]; Cont *&cont = state->conts2[ccat];
if (cont == NULL) { if (cont == NULL) {
cont = new Cont; cont = new Cont;
@@ -151,9 +169,6 @@ void PgfAbstractParser::symbol(Item *item, State *state, PgfSymbol sym)
cont->state = state; cont->state = state;
} }
interval_t value_i = item->interval(item->rule->args[symcat->d]);
interval_t lin_idx_i = item->interval(ref<PgfLParam>::from_ptr(&symcat->r));
bool subsumed = false; bool subsumed = false;
for (auto it1 : cont->suspended.overlaps(value_i)) { for (auto it1 : cont->suspended.overlaps(value_i)) {
if (it1.first.first <= value_i.first && it1.first.second >= value_i.second) { if (it1.first.first <= value_i.first && it1.first.second >= value_i.second) {