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

another fix for 'pre'

Browse Source
This commit is contained in:
kr.angelov
2013-10-28 13:54:06 +00:00
parent 2355e32db8
commit c60a019b70
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/runtime/c/pgf/parser.c
View File

@@ -1419,6 +1419,22 @@ pgf_parsing_meta_predict(GuMapItor* fn, const void* key, void* value, GuExn* err
} }
} }
static void
pgf_parsing_symbol(PgfParsing* ps, PgfItem* item, PgfSymbol sym);
static void
pgf_parsing_pre(PgfParsing* ps, PgfItem* item, PgfSymbols* syms)
{
if (item->alt_idx < gu_seq_length(syms)) {
PgfSymbol sym = gu_seq_get(syms, PgfSymbol, item->alt_idx);
pgf_parsing_symbol(ps, item, sym);
} else {
item->alt = 0;
pgf_item_advance(item, ps->pool);
gu_buf_heap_push(ps->before->agenda, pgf_item_prob_order, &item);
}
}
static void static void
pgf_parsing_symbol(PgfParsing* ps, PgfItem* item, PgfSymbol sym) pgf_parsing_symbol(PgfParsing* ps, PgfItem* item, PgfSymbol sym)
{ {
@@ -1453,8 +1469,7 @@ pgf_parsing_symbol(PgfParsing* ps, PgfItem* item, PgfSymbol sym)
new_item = pgf_item_copy(item, ps); new_item = pgf_item_copy(item, ps);
new_item->alt = 1; new_item->alt = 1;
new_item->alt_idx = 0; new_item->alt_idx = 0;
sym = gu_seq_get(skp->default_form, PgfSymbol, new_item->alt_idx); pgf_parsing_pre(ps, new_item, skp->default_form);
pgf_parsing_symbol(ps, new_item, sym);
for (size_t i = 0; i < skp->n_forms; i++) { for (size_t i = 0; i < skp->n_forms; i++) {
PgfSymbols* syms = skp->forms[i].form; PgfSymbols* syms = skp->forms[i].form;
@@ -1468,23 +1483,14 @@ pgf_parsing_symbol(PgfParsing* ps, PgfItem* item, PgfSymbol sym)
new_item = pgf_item_copy(item, ps); new_item = pgf_item_copy(item, ps);
new_item->alt = i+2; new_item->alt = i+2;
new_item->alt_idx = 0; new_item->alt_idx = 0;
sym = gu_seq_get(syms, PgfSymbol, new_item->alt_idx); pgf_parsing_pre(ps, new_item, syms);
pgf_parsing_symbol(ps, new_item, sym);
} }
} }
} else { } else {
PgfSymbols* syms = PgfSymbols* syms =
(item->alt == 1) ? skp->default_form : (item->alt == 1) ? skp->default_form :
skp->forms[item->alt-2].form; skp->forms[item->alt-2].form;
pgf_parsing_pre(ps, item, syms);
if (item->alt_idx < gu_seq_length(syms)) {
sym = gu_seq_get(syms, PgfSymbol, item->alt_idx);
pgf_parsing_symbol(ps, item, sym);
} else {
item->alt = 0;
pgf_item_advance(item, ps->pool);
gu_buf_heap_push(ps->before->agenda, pgf_item_prob_order, &item);
}
} }
} }
break; break;