Code cleanup

Author: djblue

gdb/pretty_print.py

@@ -100,6 +100,16 @@ def children(self):
         except Exception as e:
             yield str(repr(e))
 
+def jank_opaque_box_type(val):
+    address = jank_address(val)
+    canonical_type = gdb.parse_and_eval(f"((jank::runtime::obj::opaque_box*){address})->canonical_type.c_str()")
+    match = re.search("0x([0-9a-fA-F]{12}) (.*)", str(canonical_type))
+    type_name = match.group(2)[1:-1].replace('\\"', '"').rstrip()
+    if type_name.endswith('*'):
+        return gdb.lookup_type(type_name[:-1].rstrip()).pointer()
+    else:
+        return gdb.lookup_type(type_name).pointer()
+
 class jank_print_opaque_box:
     def __init__(self, val):
         self.val = val
@@ -108,15 +118,8 @@ def to_string(self):
     def children(self):
         try:
             address = jank_address(self.val)
-            canonical_type = gdb.parse_and_eval(f"((jank::runtime::obj::opaque_box*){address})->canonical_type.c_str()")
-            match = re.search("0x([0-9a-fA-F]{12}) (.*)", str(canonical_type))
-            type_name = match.group(2)[1:-1].replace('\\"', '"').rstrip()
-            if type_name.endswith('*'):
-                inner_type = gdb.lookup_type(type_name[:-1].rstrip()).pointer()
-            else:
-                inner_type = gdb.lookup_type(type_name).pointer()
             box = gdb.parse_and_eval(f"((jank::runtime::obj::opaque_box*){address})")
-            yield "data", box["data"].cast(inner_type).dereference()
+            yield "data", box["data"].cast(jank_opaque_box_type(self.val)).dereference()
         except Exception as e:
             yield str(repr(e)), self.val["data"]