compiler.types: print fields of instance types.

whitequark · whitequark · commit d0fd61866fc2 · 2015-08-27T17:25:01.000-05:00
diff --git a/artiq/compiler/types.py b/artiq/compiler/types.py
@@ -512,13 +512,22 @@ class TypePrinter(object):
     def __init__(self):
         self.gen = genalnum()
         self.map = {}
+        self.recurse_guard = set()
 
     def name(self, typ):
         typ = typ.find()
         if isinstance(typ, TVar):
             if typ not in self.map:
                 self.map[typ] = "'%s" % next(self.gen)
             return self.map[typ]
+        elif isinstance(typ, TInstance):
+            if typ.name in self.recurse_guard:
+                return "<instance {}>".format(typ.name)
+            else:
+                self.recurse_guard.add(typ.name)
+                attrs = ", ".join(["{}: {}".format(attr, self.name(typ.attributes[attr]))
+                                   for attr in typ.attributes])
+                return "<instance {} {{{}}}>".format(typ.name, attrs)
         elif isinstance(typ, TMono):
             if typ.params == {}:
                 return typ.name
@@ -545,9 +554,13 @@ def name(self, typ):
         elif isinstance(typ, TBuiltinFunction):
             return "<function {}>".format(typ.name)
         elif isinstance(typ, (TConstructor, TExceptionConstructor)):
-            attrs = ", ".join(["{}: {}".format(attr, self.name(typ.attributes[attr]))
-                               for attr in typ.attributes])
-            return "<constructor {} {{{}}}>".format(typ.name, attrs)
+            if typ.name in self.recurse_guard:
+                return "<constructor {}>".format(typ.name)
+            else:
+                self.recurse_guard.add(typ.name)
+                attrs = ", ".join(["{}: {}".format(attr, self.name(typ.attributes[attr]))
+                                   for attr in typ.attributes])
+                return "<constructor {} {{{}}}>".format(typ.name, attrs)
         elif isinstance(typ, TValue):
             return repr(typ.value)
         else:
