GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-03 08:12:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

restore the priority after each pattern matching

Browse Source
This commit is contained in:
Krasimir Angelov
2023-05-09 09:45:33 +02:00
parent a8630ddcd2
commit aa090607d8
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime/c/pgf/printer.cxx
View File

@@ -162,8 +162,9 @@ PgfExpr PgfPrinter::eabs(PgfBindType btype, PgfText *name, PgfExpr body)
this->btype = btype; this->btype = btype;
puts(&ctxt->name); puts(&ctxt->name);
prio = 1; int save_prio = prio; prio = 1;
m->match_expr(this, body); m->match_expr(this, body);
prio = save_prio;
pop_variable(); pop_variable();
@@ -179,13 +180,14 @@ PgfExpr PgfPrinter::eapp(PgfExpr fun, PgfExpr arg)
bool p = (prio > 3); bool p = (prio > 3);
if (p) puts("("); if (p) puts("(");
prio = 3; int save_prio = prio; prio = 3;
m->match_expr(this, fun); m->match_expr(this, fun);
puts(" "); puts(" ");
prio = 4; prio = 4;
m->match_expr(this, arg); m->match_expr(this, arg);
prio = save_prio;
if (p) puts(")"); if (p) puts(")");
@@ -300,11 +302,12 @@ PgfExpr PgfPrinter::etyped(PgfExpr expr, PgfType ty)
flush_lambdas(); flush_lambdas();
puts("<"); puts("<");
prio = 0; int save_prio = prio; prio = 0;
m->match_expr(this, expr); m->match_expr(this, expr);
puts(" : "); puts(" : ");
prio = 0; prio = 0;
m->match_type(this, ty); m->match_type(this, ty);
prio = save_prio;
puts(">"); puts(">");
return 0; return 0;
} }
@@ -314,8 +317,9 @@ PgfExpr PgfPrinter::eimplarg(PgfExpr expr)
flush_lambdas(); flush_lambdas();
puts("{"); puts("{");
prio = 0; int save_prio = prio; prio = 0;
m->match_expr(this, expr); m->match_expr(this, expr);
prio = save_prio;
puts("}"); puts("}");
return 0; return 0;
} }
@@ -389,8 +393,9 @@ PgfLiteral PgfPrinter::lstr(PgfText *v)
void PgfPrinter::hypo(PgfTypeHypo *hypo, int prio) void PgfPrinter::hypo(PgfTypeHypo *hypo, int prio)
{ {
if (hypo->cid->size == 1 && strcmp(hypo->cid->text, "_") == 0) { if (hypo->cid->size == 1 && strcmp(hypo->cid->text, "_") == 0) {
this->prio = prio; int save_prio = this->prio; this->prio = prio;
m->match_type(this, hypo->type); m->match_type(this, hypo->type);
this->prio = save_prio;
} else { } else {
puts("("); puts("(");
if (hypo->bind_type == PGF_BIND_TYPE_IMPLICIT) if (hypo->bind_type == PGF_BIND_TYPE_IMPLICIT)
@@ -399,8 +404,9 @@ void PgfPrinter::hypo(PgfTypeHypo *hypo, int prio)
if (hypo->bind_type == PGF_BIND_TYPE_IMPLICIT) if (hypo->bind_type == PGF_BIND_TYPE_IMPLICIT)
puts("}"); puts("}");
puts(" : "); puts(" : ");
this->prio = 0; int save_prio = this->prio; this->prio = 0;
m->match_type(this, hypo->type); m->match_type(this, hypo->type);
this->prio = save_prio;
puts(")"); puts(")");
push_variable(hypo->cid); push_variable(hypo->cid);
@@ -424,11 +430,13 @@ PgfType PgfPrinter::dtyp(size_t n_hypos, PgfTypeHypo *hypos,
efun(cat); efun(cat);
int save_prio = prio;
for (size_t i = 0; i < n_exprs; i++) { for (size_t i = 0; i < n_exprs; i++) {
puts(" "); puts(" ");
prio = 4; prio = 4;
m->match_expr(this, exprs[i]); m->match_expr(this, exprs[i]);
} }
prio = save_prio;
while (ctxt != save_ctxt) { while (ctxt != save_ctxt) {
pop_variable(); pop_variable();