- Fixed some missing and erroneous testing logic for containers

- Lots of bug-fixing for containers
 - Performance optimization for containers

gdb/fennec/containers.py

@@ -389,18 +389,19 @@ class RDTreePrinter:
         return self.Iterator(self.tree, 0, self.capacity)
 
 
-# BINTREE ==============================================================================================================
+# PRIORITY QUEUE =======================================================================================================
 
-class BinTreePrinter:
-    """Print a fennec::bintree"""
+class PriorityQueuePrinter:
+    """Print a fennec::rdtree"""
 
     class Iterator:
         def __init__(self, tree, node, capacity):
             self.tree = tree
             self.capacity = capacity
             self.visit = deque()
+            self.skip = True
 
-            self.visit.append((node, 0, 0))
+            self.visit.append((node, 0, 0, node))
 
         def __iter__(self):
             return self
@@ -412,6 +413,80 @@ class BinTreePrinter:
             node  = self.visit[0][0]
             i     = self.visit[0][1]
             depth = self.visit[0][2]
+            start = self.visit[0][3]
+            self.visit.popleft()
+
+            if node == start and not self.skip:
+                return self.__next__()
+
+            self.skip = False
+
+            value = self.tree[node]['_val']['key']
+
+            nnext  = self.tree[node]['_val']['next']
+            child  = self.tree[node]['_val']['child']
+
+            index = '⠀' * depth * 2 # Uses Braille Space, otherwise it would get eaten as whitespace by parsers
+
+            if nnext < self.capacity:
+                self.visit.appendleft((nnext, i + 1, depth, start))
+
+            if child < self.capacity:
+                self.visit.appendleft((child, 0, depth + 1, child))
+                self.skip = True
+
+            # ┌ ─ ├ └
+
+            if nnext != 18446744073709551615:
+                index += '├'
+            else:
+                index += '└'
+
+            index += '─'
+            index += '[{}]'.format(node)
+            return index, value
+
+
+    def __init__(self, val):
+        self.tree     = val['_table']['_table']['_alloc']['_data']
+        self.size     = val['_table']['_size']
+        self.capacity = val['_table']['_table']['_alloc']['_capacity']
+        self.min      = val['_min']
+
+    def to_string(self):
+        if self.size == 0:
+            return "{ empty }"
+        return "{ size = " + str(self.size) + " }"
+
+    def children(self):
+        return self.Iterator(self.tree, self.min, self.capacity)
+
+
+# BINTREE ==============================================================================================================
+
+class BinTreePrinter:
+    """Print a fennec::bintree"""
+
+    class Iterator:
+        def __init__(self, tree, node, capacity):
+            self.tree = tree
+            self.capacity = capacity
+            self.visit = deque()
+
+            if capacity > 0:
+                self.visit.append((node, 0, 0))
+
+        def __iter__(self):
+            return self
+
+        def __next__(self):
+            if len(self.visit) == 0:
+                raise StopIteration
+
+            node   = self.visit[0][0]
+            i      = self.visit[0][1]
+            depth  = self.visit[0][2]
+            parent = self.tree[node]['parent']
             self.visit.popleft()
 
             value = self.tree[node]['value']
@@ -424,7 +499,7 @@ class BinTreePrinter:
                 self.visit.appendleft((left,  0, depth + 1))
 
             index = '⠀' * depth * 2 # Uses Braille Space, otherwise it would get eaten as whitespace by parsers
-            if i == 0:
+            if i == 0 and parent != 18446744073709551615 and self.tree[parent]['right'] != 18446744073709551615:
                 index += '├'
             else:
                 index += '└'
@@ -524,20 +599,21 @@ class GraphPrinter:
 def register_printers():
     print("registering containers")
     pp = gdb.printing.RegexpCollectionPrettyPrinter("fennec::containers")
-    pp.add_printer('fennec::array',       '^fennec::array<.*>$',       ArrayPrinter)
-    pp.add_printer('fennec::deque',       '^fennec::deque<.*>$',       DequePrinter)
-    pp.add_printer('fennec::dynarray',    '^fennec::dynarray<.*>$',    DynArrayPrinter)
-    pp.add_printer('fennec::graph',       '^fennec::graph<.*>$',       GraphPrinter)
-    pp.add_printer('fennec::list',        '^fennec::list<.*>$',        ListPrinter)
-    pp.add_printer('fennec::map',         '^fennec::map<.*>$',         MapPrinter)
-    pp.add_printer('fennec::object_pool', '^fennec::object_pool<.*>$', ObjectPoolPrinter)
-    pp.add_printer('fennec::optional',    '^fennec::optional<.*>$',    OptionalPrinter)
-    pp.add_printer('fennec::pair',        '^fennec::pair<.*>$',        PairPrinter)
-    pp.add_printer('fennec::set',         '^fennec::set<.*>$',         SetPrinter)
-    pp.add_printer('fennec::rdtree',      '^fennec::rdtree<.*>$',      RDTreePrinter)
-    pp.add_printer('fennec::bintree',     '^fennec::bintree<.*>$',     BinTreePrinter)
-    pp.add_printer('fennec::sequence',    '^fennec::sequence<.*>$',    BinTreePrinter)
-    pp.add_printer('fennec::tuple',       '^fennec::tuple<.*>$',       TuplePrinter)
+    pp.add_printer('fennec::array',          '^fennec::array<.*>$',          ArrayPrinter)
+    pp.add_printer('fennec::deque',          '^fennec::deque<.*>$',          DequePrinter)
+    pp.add_printer('fennec::dynarray',       '^fennec::dynarray<.*>$',       DynArrayPrinter)
+    pp.add_printer('fennec::graph',          '^fennec::graph<.*>$',          GraphPrinter)
+    pp.add_printer('fennec::list',           '^fennec::list<.*>$',           ListPrinter)
+    pp.add_printer('fennec::map',            '^fennec::map<.*>$',            MapPrinter)
+    pp.add_printer('fennec::object_pool',    '^fennec::object_pool<.*>$',    ObjectPoolPrinter)
+    pp.add_printer('fennec::optional',       '^fennec::optional<.*>$',       OptionalPrinter)
+    pp.add_printer('fennec::pair',           '^fennec::pair<.*>$',           PairPrinter)
+    pp.add_printer('fennec::set',            '^fennec::set<.*>$',            SetPrinter)
+    pp.add_printer('fennec::rdtree',         '^fennec::rdtree<.*>$',         RDTreePrinter)
+    pp.add_printer('fennec::bintree',        '^fennec::bintree<.*>$',        BinTreePrinter)
+    pp.add_printer('fennec::sequence',       '^fennec::sequence<.*>$',       BinTreePrinter)
+    pp.add_printer('fennec::priority_queue', '^fennec::priority_queue<.*>$', PriorityQueuePrinter)
+    pp.add_printer('fennec::tuple',          '^fennec::tuple<.*>$',          TuplePrinter)
     return pp
 
 printer = register_printers()