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

make it possible to merge PGF files in the compiler

Browse Source
This commit is contained in:
krangelov
2021-12-22 10:47:22 +01:00
parent c4bd898dc0
commit 12b4958b99
10 changed files with 165 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/runtime/c/pgf/reader.cxx
View File

@@ -169,6 +169,16 @@ Namespace<V> PgfReader::read_namespace(ref<V> (PgfReader::*read_value)())
return read_namespace(read_value, len);
}
template<class V>
void PgfReader::merge_namespace(ref<V> (PgfReader::*read_value)())
{
size_t len = read_len();
for (size_t i = 0; i < len; i++) {
ref<V> value = (this->*read_value)();
V::release(value);
}
}
template <class C, class V>
ref<C> PgfReader::read_vector(Vector<V> C::* field, void (PgfReader::*read_value)(ref<V> val))
{
@@ -371,6 +381,16 @@ void PgfReader::read_abstract(ref<PgfAbstr> abstract)
abstract->cats = read_namespace<PgfAbsCat>(&PgfReader::read_abscat);
}
void PgfReader::merge_abstract(ref<PgfAbstr> abstract)
{
this->abstract = abstract;
read_name(); // ?
merge_namespace<PgfFlag>(&PgfReader::read_flag); // ?
merge_namespace<PgfAbsFun>(&PgfReader::read_absfun); // ?
merge_namespace<PgfAbsCat>(&PgfReader::read_abscat); // ?
}
ref<PgfLParam> PgfReader::read_lparam()
{
size_t i0 = read_int();
@@ -597,3 +617,27 @@ ref<PgfPGF> PgfReader::read_pgf()
return pgf;
}
void PgfReader::merge_pgf(ref<PgfPGF> pgf)
{
uint16_t major_version = read_u16be();
uint16_t minor_version = read_u16be();
if (pgf->major_version != PGF_MAJOR_VERSION ||
pgf->minor_version != PGF_MINOR_VERSION) {
throw pgf_error("Unsupported format version");
}
merge_namespace<PgfFlag>(&PgfReader::read_flag); // ??
merge_abstract(ref<PgfAbstr>::from_ptr(&pgf->abstract));
size_t len = read_len();
for (size_t i = 0; i < len; i++) {
ref<PgfConcr> concr = PgfReader::read_concrete();
Namespace<PgfConcr> concrs =
namespace_insert(pgf->concretes, concr);
namespace_release(pgf->concretes);
pgf->concretes = concrs;
}
}