started implementing #pythontutor_inline_type: option

pgbovine · pgbovine · commit de36c0577f17 · 2018-06-17T15:14:03.000-07:00
diff --git a/v5-unity/pg_encoder.py b/v5-unity/pg_encoder.py
@@ -199,6 +199,42 @@ def __init__(self, parent):
   def should_hide_var(self, var):
     return self.parent.should_hide_var(var)
 
+  # searches through self.parents.types_to_inline and tries
+  # to match the type returned by type(obj) and also 'class'/'instance'
+  # for classes and instances, respectively
+  def should_inline_object_by_type(self, obj):
+    # fast-pass optimization -- common case
+    if not self.parent.types_to_inline:
+      return False
+
+    # copy-pasted from the end of self.encode()
+    typ = type(obj)
+    typeStr = str(typ)
+    m = typeRE.match(typeStr)
+    if not m:
+      m = classRE.match(typeStr)
+    if not m:
+      return False
+
+    assert m
+    typename = m.group(1)
+    if not typename:
+        return False
+
+    alt_typename = None
+    if is_class(obj):
+        alt_typename = 'class'
+    elif is_instance(obj):
+        alt_typename = 'instance'
+
+    for re_match in self.parent.types_to_inline:
+        if re_match(typename):
+            return True
+        if alt_typename and re_match(alt_typename):
+            return True
+    return False
+
+
   def get_heap(self):
     return self.encoded_heap_objects
 
diff --git a/v5-unity/pg_logger.py b/v5-unity/pg_logger.py
@@ -69,6 +69,11 @@
 #   like '#pythontutor_hide: _*' to hide all private instance variables
 # - also now filters class and instance fields in addition to top-level vars
 PYTUTOR_HIDE_STR = '#pythontutor_hide:'
+# 2018-06-17: a comma-separated list of types that should be displayed *inline*
+# like primitives. for details of what types are legal to specify, see:
+# pg_encoder.py:should_inline_object_by_type()
+# - also accepts shell globs, just like PYTUTOR_HIDE_STR
+PYTUTOR_INLINE_TYPE_STR = '#pythontutor_inline_type:'
 
 CLASS_RE = re.compile('class\s+')
 
@@ -605,6 +610,8 @@ def __init__(self, cumulative_mode, heap_primitives, show_only_outputs, finalize
                                   # created by compileGlobMatch() from
                                   # the contents of PYTUTOR_HIDE_STR
 
+        self.types_to_inline = set() # a set of regex match objects derived from PYTUTOR_INLINE_TYPE_STR
+
         self.prev_lineno = -1 # keep track of previous line just executed
 
 
