Major fixes in Tree, to allow threads treatment

Author: mapio

CHANGELOG.txt

@@ -1,11 +1,18 @@
 Changelog
 =========
 
+v1.13.1 (2025-05-22)
+--------------------
+
+- Improved Tree.to_lol so it avoids _thread_ attributes.
+- Fixed Tree.__hash__ and Tree.__eq__ for annotated trees.
+- Fixed Tree.with_threads.
+
 v1.13.0 (2025-04-10)
 --------------------
 
-- AnnotatedTreeWalker vist accepts an Itrable, now
-  visit(trees) returns tuple(vist(tree) for tree in trees)
+- AnnotatedTreeWalker visit accepts an Iterable: now
+  visit(trees) returns tuple(visit(tree) for tree in trees).
 
 v1.12.2 (2025-04-09)
 --------------------

src/liblet/antlr.py

@@ -1,3 +1,4 @@
+from collections.abc import Iterable
 from contextlib import redirect_stderr
 from importlib import util as imputil
 from io import StringIO
@@ -20,7 +21,6 @@
 
 from liblet.display import Tree
 from liblet.utils import warn
-from collections.abc import Iterable
 
 if 'READTHEDOCS' not in environ:  # pragma: nocover
   if 'ANTLR4_JAR' not in environ:
@@ -387,8 +387,7 @@ def __call__(self, tree_or_trees):
       tree = tree_or_trees
       visitor = self.dispatch_table.get(tree.root[self.key], self.catchall_func)
       return visitor(self.__call__, tree)
-    elif isinstance(tree_or_trees, Iterable):
+    if isinstance(tree_or_trees, Iterable):
       trees = list(tree_or_trees)
       return tuple(self.__call__(t) for t in trees)
-    else:
-      raise TypeError(f'Expected Tree or Iterable, got {type(tree_or_trees)}')
+    raise TypeError(f'Expected Tree or Iterable, got {type(tree_or_trees)}')

src/liblet/display.py

@@ -318,9 +318,23 @@ def child(self):
       raise ValueError('No children available')
     raise ValueError('More than one child present')
 
-  def to_lol(self):
+  def to_lol(self, undict=False):
+    """
+    Converts the tree to a *list of lists*.
+
+    Args:
+      undict (bool): if True and the root is a Mapping, it will be converted to a sorted tuple of key-value pairs.
+
+    Returns:
+      A list of lists representing the tree.
+    """
+
     def walk(T):
-      return (T.root, *tuple(walk(child) for child in T.children))
+      if undict and isinstance(T.root, Mapping):
+        root = tuple((k, v) for k, v in sorted(T.root.items()) if not k.startswith('_thread_'))
+      else:
+        root = T.root
+      return (root, *tuple(walk(child) for child in T.children))
 
     return walk(self)
 
@@ -334,7 +348,7 @@ def __eq__(self, other):
     return isinstance(other, Tree) and self.to_lol() == other.to_lol()
 
   def __hash__(self):
-    return hash(self.to_lol())
+    return hash(self.to_lol(True))
 
   def _gv_graph_(self):
     G = GVWrapper(
@@ -392,19 +406,23 @@ def with_threads(self, threads):
 
     for node in threads:
       if 'type' in node.root and node.root['type'] in ('<BEGIN>', '<JOIN>', '<END>'):
-        G.node((node.root, node), gv_args=node_args)
+        G.node((node.root, node.__instance_count), gv_args=node_args)
 
     for node, info in threads.items():
       for nxt in info:
         if nxt == 'next':
-          G.edge((node.root, node), (info[nxt].root, info[nxt]), gv_args=edge_args)
+          G.edge((node.root, node.__instance_count), (info[nxt].root, info[nxt].__instance_count), gv_args=edge_args)
         else:
           G.node(
-            (nxt, (1, node)),
+            (nxt, (1, node.__instance_count)),
             gv_args={'color': 'red', 'fontcolor': 'red', 'fontsize': '10', 'width': '.04', 'height': '.04'},
           )
-          G.edge((node.root, node), (nxt, (1, node)), gv_args=edge_args | {'arrowhead': 'none'})
-          G.edge((nxt, (1, node)), (info[nxt].root, info[nxt]), gv_args=edge_args)
+          G.edge(
+            (node.root, node.__instance_count),
+            (nxt, (1, node.__instance_count)),
+            gv_args=edge_args | {'arrowhead': 'none'},
+          )
+          G.edge((nxt, (1, node.__instance_count)), (info[nxt].root, info[nxt].__instance_count), gv_args=edge_args)
 
     return G