msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

bugfix in the linearizer for the C runtime

Browse Source
This commit is contained in:
kr.angelov
2013-02-13 15:39:01 +00:00
parent 0f7ebcc10d
commit ffb17bd26a
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/runtime/c/pgf/linearizer.c
View File

@@ -188,7 +188,13 @@ redo:;
ccat = parg->ccat; ccat = parg->ccat;
} else { } else {
int index = gu_choice_next(lzn->ch, gu_buf_length(coercions)); int index = gu_choice_next(lzn->ch, gu_buf_length(coercions));
gu_choice_advance(lzn->ch); if (index < 0) {
gu_choice_reset(lzn->ch, mark);
if (!gu_choice_advance(lzn->ch))
return gu_null_variant;
goto redo;
}
PgfProductionCoerce* pcoerce = PgfProductionCoerce* pcoerce =
gu_buf_get(coercions, PgfProductionCoerce*, index); gu_buf_get(coercions, PgfProductionCoerce*, index);
ccat = pcoerce->coerce; ccat = pcoerce->coerce;
@@ -360,7 +366,10 @@ pgf_cnc_tree_enum_next(GuEnum* self, void* to, GuPool* pool)
{ {
PgfLzn* lzn = gu_container(self, PgfLzn, en); PgfLzn* lzn = gu_container(self, PgfLzn, en);
PgfCncTree* toc = to; PgfCncTree* toc = to;
GuChoiceMark mark = gu_choice_mark(lzn->ch);
*toc = pgf_lzn_resolve(lzn, lzn->expr, NULL, pool); *toc = pgf_lzn_resolve(lzn, lzn->expr, NULL, pool);
gu_choice_reset(lzn->ch, mark);
#ifdef PGF_LINEARIZER_DEBUG #ifdef PGF_LINEARIZER_DEBUG
GuPool* tmp_pool = gu_new_pool(); GuPool* tmp_pool = gu_new_pool();
@@ -375,6 +384,8 @@ pgf_cnc_tree_enum_next(GuEnum* self, void* to, GuPool* pool)
} }
gu_pool_free(tmp_pool); gu_pool_free(tmp_pool);
#endif #endif
gu_choice_advance(lzn->ch);
} }
PgfCncTreeEnum* PgfCncTreeEnum*