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

implement tabularLinearize

Browse Source
This commit is contained in:
krangelov
2021-12-09 09:51:09 +01:00
parent 09de911499
commit b0d364f8e8
6 changed files with 81 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,9 +522,10 @@ bool PgfLinearizer::resolve()
return true;
}
void PgfLinearizer::reverse_and_label()
void PgfLinearizer::reverse_and_label(bool add_linref)
{
new TreeLinrefNode(this, root);
if (add_linref)
new TreeLinrefNode(this, root);
// Reverse the list of nodes and label them with fid;
int fid = 0;
@@ -710,6 +711,7 @@ PgfText *PgfLinearizationOutput::get_text()
free(printer.get_text());
return NULL;
}
bind = true;
return printer.get_text();
}

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

@@ -134,11 +134,14 @@ public:
PgfLinearizer(PgfPrintContext *ctxt, ref<PgfConcr> concr, PgfMarshaller *m);
bool resolve();
void reverse_and_label();
void linearize(PgfLinearizationOutputIface *out) {
root->linearize(out, this, 0);
void reverse_and_label(bool add_linref);
void linearize(PgfLinearizationOutputIface *out, size_t lindex) {
root->linearize(out, this, lindex);
flush_pre_stack(out, NULL);
}
ref<PgfConcrLincat> get_lincat() {
return root->get_lincat(this);
}
~PgfLinearizer();

49
src/runtime/c/pgf/pgf.cxx
View File

@@ -2005,9 +2005,9 @@ PgfText *pgf_linearize(PgfDB *db, PgfConcrRevision revision,
PgfLinearizationOutput out;
PgfLinearizer linearizer(ctxt, concr, m);
m->match_expr(&linearizer, expr);
linearizer.reverse_and_label();
linearizer.reverse_and_label(true);
if (linearizer.resolve()) {
linearizer.linearize(&out);
linearizer.linearize(&out, 0);
return out.get_text();
}
} PGF_API_END
@@ -2015,6 +2015,43 @@ PgfText *pgf_linearize(PgfDB *db, PgfConcrRevision revision,
return NULL;
}
PGF_API
PgfText **pgf_tabular_linearize(PgfDB *db, PgfConcrRevision revision,
PgfExpr expr, PgfPrintContext *ctxt,
PgfMarshaller *m, size_t *n_fields,
PgfExn* err)
{
PGF_API_BEGIN {
DB_scope scope(db, READER_SCOPE);
ref<PgfConcr> concr = PgfDB::revision2concr(revision);
PgfLinearizationOutput out;
PgfLinearizer linearizer(ctxt, concr, m);
m->match_expr(&linearizer, expr);
linearizer.reverse_and_label(false);
if (linearizer.resolve()) {
ref<PgfConcrLincat> lincat = linearizer.get_lincat();
PgfText **res = (PgfText **)
malloc(lincat->fields->len*2*sizeof(PgfText*));
size_t pos = 0;
for (size_t i = 0; i < lincat->fields->len; i++) {
linearizer.linearize(&out, i);
PgfText *text = out.get_text();
if (text != NULL) {
res[pos] = textdup(&(*lincat->fields->data[i]));
res[pos+1] = text;
pos += 2;
}
}
*n_fields = pos/2;
return res;
}
} PGF_API_END
return NULL;
}
PGF_API_DECL
void pgf_bracketed_linearize(PgfDB *db, PgfConcrRevision revision,
PgfExpr expr, PgfPrintContext *ctxt,
@@ -2028,9 +2065,9 @@ void pgf_bracketed_linearize(PgfDB *db, PgfConcrRevision revision,
ref<PgfConcr> concr = PgfDB::revision2concr(revision);
PgfLinearizer linearizer(ctxt, concr, m);
m->match_expr(&linearizer, expr);
linearizer.reverse_and_label();
linearizer.reverse_and_label(true);
if (linearizer.resolve()) {
linearizer.linearize(out);
linearizer.linearize(out, 0);
}
} PGF_API_END
}
@@ -2245,9 +2282,9 @@ pgf_graphviz_parse_tree(PgfDB *db, PgfConcrRevision revision,
PgfLinearizationGraphvizOutput out;
PgfLinearizer linearizer(ctxt, concr, m);
m->match_expr(&linearizer, expr);
linearizer.reverse_and_label();
linearizer.reverse_and_label(true);
if (linearizer.resolve()) {
linearizer.linearize(&out);
linearizer.linearize(&out, 0);
return out.generate_graphviz(opts);
}
} PGF_API_END

6
src/runtime/c/pgf/pgf.h
View File

@@ -632,6 +632,12 @@ PgfText *pgf_linearize(PgfDB *db, PgfConcrRevision revision,
PgfMarshaller *m,
PgfExn* err);
PGF_API
PgfText **pgf_tabular_linearize(PgfDB *db, PgfConcrRevision revision,
PgfExpr expr, PgfPrintContext *ctxt,
PgfMarshaller *m, size_t *n_fields,
PgfExn* err);
PGF_API_DECL
void pgf_bracketed_linearize(PgfDB *db, PgfConcrRevision revision,
PgfExpr expr, PgfPrintContext *ctxt,