GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-09-17 07:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

revert to checking fid <= concr->last_fid to identify precomputed CCat

Browse Source
This commit is contained in:
Krasimir Angelov
2026-08-24 19:40:55 +02:00
parent 25ca9dd068
commit 4f4ccccc91
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runtime/c/pgf/parser.cxx
+8 -8
View File
@@ -16,14 +16,14 @@ PgfAbstractParser::PgfAbstractParser(ref<PgfConcr> concr)
void PgfAbstractParser::get_info(CCat *ccat, ref<PgfConcrRule> *prule, size_t **pvalues) void PgfAbstractParser::get_info(CCat *ccat, ref<PgfConcrRule> *prule, size_t **pvalues)
{ {
if (ccat->epsilon == 0) { if (ccat->fid <= concr->last_fid) {
Production *prod = ccat->prods[0];
*prule = prod->rule;
*pvalues = &prod->vars[0];
} else {
ref<PgfItem> pitem = ccat->epsilon->items[0]; ref<PgfItem> pitem = ccat->epsilon->items[0];
*prule = pitem->rule; *prule = pitem->rule;
*pvalues = &pitem->vars[0]; *pvalues = &pitem->vars[0];
} else {
Production *prod = ccat->prods[0];
*prule = prod->rule;
*pvalues = &prod->vars[0];
} }
} }
@@ -179,7 +179,7 @@ void PgfAbstractParser::symbol(Item *item, State *state, PgfSymbol sym)
if (cont == NULL) { if (cont == NULL) {
cont = new Cont; cont = new Cont;
cont->ccat = ccat; cont->ccat = ccat;
if (ccat->epsilon != 0) if (ccat->fid <= concr->last_fid)
cont->lincat = ccat->epsilon->lincat; cont->lincat = ccat->epsilon->lincat;
else else
cont->lincat = ccat->cont->lincat; cont->lincat = ccat->cont->lincat;
@@ -1490,7 +1490,7 @@ void PgfParser::suspend(Cont *cont,Item *item,bool do_predict,ref<PgfSymbolCat>
} }
} else { } else {
if (do_predict && n_suspended == 1) { if (do_predict && n_suspended == 1) {
if (cont->ccat->epsilon != 0) { if (cont->ccat->fid <= concr->last_fid) {
for (size_t i = 0; i < cont->ccat->epsilon->n_items; i++) { for (size_t i = 0; i < cont->ccat->epsilon->n_items; i++) {
ref<PgfItem> pitem = cont->ccat->epsilon->items[i]; ref<PgfItem> pitem = cont->ccat->epsilon->items[i];
td_epsilon(cont->state,cont,pitem,item,symcat); td_epsilon(cont->state,cont,pitem,item,symcat);
@@ -1794,7 +1794,7 @@ void PgfParseTableMaker::suspend(Cont *cont,Item *item,bool do_predict,ref<PgfSy
concr->phrasetable2 = phrasetable2; concr->phrasetable2 = phrasetable2;
} else { } else {
if (do_predict && n_suspended == 1) { if (do_predict && n_suspended == 1) {
if (cont->ccat->epsilon != 0) { if (cont->ccat->fid <= concr->last_fid) {
for (size_t i = 0; i < cont->ccat->epsilon->n_items; i++) { for (size_t i = 0; i < cont->ccat->epsilon->n_items; i++) {
ref<PgfItem> pitem = cont->ccat->epsilon->items[i]; ref<PgfItem> pitem = cont->ccat->epsilon->items[i];
td_epsilon(cont->state,cont,pitem,item,symcat); td_epsilon(cont->state,cont,pitem,item,symcat);