From b4838649f527a039da8a52616b7f612ce151ec9b Mon Sep 17 00:00:00 2001
From: krangelov <kr.angelov@gmail.com>
Date: Fri, 3 Sep 2021 21:10:26 +0200
Subject: [PATCH] linear time loading of namespaces

---
 src/runtime/c/pgf/reader.cxx | 23 +++++++++++++++--------
 src/runtime/c/pgf/reader.h   |  3 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/runtime/c/pgf/reader.cxx b/src/runtime/c/pgf/reader.cxx
index b9b8b3e2c..525bee5f0 100644
--- a/src/runtime/c/pgf/reader.cxx
+++ b/src/runtime/c/pgf/reader.cxx
@@ -147,18 +147,25 @@ object PgfReader::read_text_internal(size_t struct_size)
 	return offs;
 }
 
+template<class V>
+Namespace<V> PgfReader::read_namespace(ref<V> (PgfReader::*read_value)(), size_t len)
+{
+    if (len == 0)
+        return 0;
+
+    size_t half = len/2;
+    Namespace<V> left  = read_namespace(read_value, half);
+    ref<V> value = (this->*read_value)();
+    Namespace<V> right = read_namespace(read_value, len-half-1);
+
+    return Node<V>::new_node(value, left, right);
+}
+
 template<class V>
 Namespace<V> PgfReader::read_namespace(ref<V> (PgfReader::*read_value)())
 {
     size_t len = read_len();
-    Namespace<V> nmsp = 0;
-    for (size_t i = 0; i < len; i++) {
-        ref<V> value = (this->*read_value)();
-        Namespace<V> new_nmsp = namespace_insert(nmsp, value);
-        namespace_release(nmsp);
-        nmsp = new_nmsp;
-    }
-    return nmsp;
+    return read_namespace(read_value, len);
 }
 
 template <class C, class V>
diff --git a/src/runtime/c/pgf/reader.h b/src/runtime/c/pgf/reader.h
index d6136cd94..84d763dac 100644
--- a/src/runtime/c/pgf/reader.h
+++ b/src/runtime/c/pgf/reader.h
@@ -40,6 +40,9 @@ public:
         return read_text_internal(0);
     };
 
+    template<class V>
+    Namespace<V> read_namespace(ref<V> (PgfReader::*read_value)(), size_t len);
+
     template<class V>
     Namespace<V> read_namespace(ref<V> (PgfReader::*read_value)());