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

fix the ranges for brackets around pre

Browse Source
This commit is contained in:
krangelov
2021-12-03 13:55:29 +01:00
parent 0132a70b94
commit d10f63c16b
2 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/runtime/c/pgf/linearizer.cxx
View File

@@ -56,6 +56,14 @@ PgfLinearizer::~PgfLinearizer()
while (pre_stack != NULL) {
PreStack *next = pre_stack->next;
while (pre_stack->bracket_stack != NULL) {
BracketStack *next = pre_stack->bracket_stack->next;
delete pre_stack->bracket_stack;
pre_stack->bracket_stack = next;
}
delete pre_stack;
pre_stack = next;
}
@@ -190,6 +198,9 @@ void PgfLinearizer::flush_pre_stack(PgfLinearizationOutputIface *out, PgfText *t
linearize(out, pre->node, pre->sym_kp->default_form);
done:
if (pre->bracket_stack != NULL)
pre->bracket_stack->flush(out);
if (pre->bind)
out->symbol_bind();
@@ -199,6 +210,58 @@ void PgfLinearizer::flush_pre_stack(PgfLinearizationOutputIface *out, PgfText *t
}
}
void PgfLinearizer::BracketStack::flush(PgfLinearizationOutputIface *out)
{
if (next != NULL)
next->flush(out);
if (begin)
out->begin_phrase(&node->lin->absfun->type->name, node->fid, field, &node->lin->name);
else
out->end_phrase(&node->lin->absfun->type->name, node->fid, field, &node->lin->name);
}
void PgfLinearizer::linearize(PgfLinearizationOutputIface *out, TreeNode *node, size_t d, PgfLParam *r)
{
TreeNode *arg = node->args;
while (d > 0) {
arg = arg->next_arg;
if (arg == 0)
throw pgf_error("Found inconsistency in the PMCFG representation");
d--;
}
size_t lindex = node->eval_param(r);
PgfText *cat = &arg->lin->absfun->type->name;
PgfText *field = NULL;
ref<PgfConcrLincat> lincat = namespace_lookup(concr->lincats, cat);
if (lincat != 0) {
field = &(**vector_elem(lincat->fields, lindex));
}
if (pre_stack == NULL)
out->begin_phrase(cat, arg->fid, field, &arg->lin->name);
else {
BracketStack *bracket = new BracketStack();
bracket->next = pre_stack->bracket_stack;
bracket->begin = true;
bracket->node = arg;
bracket->field = field;
pre_stack->bracket_stack = bracket;
}
linearize(out, arg, lindex);
if (pre_stack == NULL)
out->end_phrase(cat, arg->fid, field, &arg->lin->name);
else {
BracketStack *bracket = new BracketStack();
bracket->next = pre_stack->bracket_stack;
bracket->begin = false;
bracket->node = arg;
bracket->field = field;
pre_stack->bracket_stack = bracket;
}
}
void PgfLinearizer::linearize(PgfLinearizationOutputIface *out, TreeNode *node, ref<Vector<PgfSymbol>> syms)
{
ref<Vector<PgfHypo>> hypos = node->lin->absfun->type->hypos;
@@ -209,46 +272,12 @@ void PgfLinearizer::linearize(PgfLinearizationOutputIface *out, TreeNode *node,
switch (ref<PgfSymbol>::get_tag(sym)) {
case PgfSymbolCat::tag: {
auto sym_cat = ref<PgfSymbolCat>::untagged(sym);
size_t d = sym_cat->d;
TreeNode *arg = node->args;
while (d > 0) {
arg = arg->next_arg;
if (arg == 0)
throw pgf_error("Found inconsistency in the PMCFG representation");
d--;
}
size_t lindex = node->eval_param(&sym_cat->r);
PgfText *cat = &vector_elem(hypos, sym_cat->d)->type->name;
PgfText *field = NULL;
ref<PgfConcrLincat> lincat = namespace_lookup(concr->lincats, cat);
if (lincat != 0) {
field = &(**vector_elem(lincat->fields, lindex));
}
out->begin_phrase(cat, arg->fid, field, &arg->lin->name);
linearize(out, arg, lindex);
out->end_phrase(cat, arg->fid, field, &arg->lin->name);
linearize(out, node, sym_cat->d, &sym_cat->r);
break;
}
case PgfSymbolLit::tag: {
auto sym_lit = ref<PgfSymbolLit>::untagged(sym);
size_t d = sym_lit->d;
TreeNode *arg = node->args;
while (d > 0) {
arg = arg->next_arg;
if (arg == 0)
throw pgf_error("Found inconsistency in the PMCFG representation");
d--;
}
size_t lindex = node->eval_param(&sym_lit->r);
PgfText *cat = &vector_elem(hypos, sym_lit->d)->type->name;
out->begin_phrase(cat, 0, NULL, &node->lin->name);
linearize(out, arg, lindex);
out->end_phrase(cat, 0, NULL, &node->lin->name);
linearize(out, node, sym_lit->d, &sym_lit->r);
break;
}
case PgfSymbolVar::tag: {
@@ -316,6 +345,9 @@ void PgfLinearizer::linearize(PgfLinearizationOutputIface *out, TreeNode *node,
pre->next = pre_stack;
pre->node = node;
pre->sym_kp = sym_kp;
pre->bind = false;
pre->capit = CAPIT_NONE;
pre->bracket_stack = NULL;
pre_stack = pre;
break;
}

11
src/runtime/c/pgf/linearizer.h
View File

@@ -50,17 +50,28 @@ class PGF_INTERNAL_DECL PgfLinearizer : public PgfUnmarshaller {
CapitState capit;
struct BracketStack {
BracketStack *next;
bool begin;
TreeNode *node;
PgfText *field;
void flush(PgfLinearizationOutputIface *out);
};
struct PreStack {
PreStack *next;
TreeNode *node;
ref<PgfSymbolKP> sym_kp;
bool bind;
CapitState capit;
BracketStack *bracket_stack;
};
PreStack *pre_stack;
void flush_pre_stack(PgfLinearizationOutputIface *out, PgfText *token);
void linearize(PgfLinearizationOutputIface *out, TreeNode *node, size_t d, PgfLParam *r);
void linearize(PgfLinearizationOutputIface *out, TreeNode *node, ref<Vector<PgfSymbol>> syms);
void linearize(PgfLinearizationOutputIface *out, TreeNode *node, size_t lindex);