m-labs · Jul 17, 2015 · Jul 17, 2015
Showing with 15 additions and 9 deletions.

+6 −3 artiq/compiler/builtins.py

+8 −2 artiq/compiler/transforms/asttyped_rewriter.py

+1 −1 artiq/compiler/transforms/inferencer.py

+0 −3 artiq/compiler/types.py
diff --git a/artiq/compiler/builtins.py b/artiq/compiler/builtins.py
@@ -71,11 +71,11 @@ class TException(types.TMono):
     def __init__(self, name="Exception"):
         super().__init__(name)
 
-class TIndexError(types.TMono):
+class TIndexError(TException):
     def __init__(self):
         super().__init__("IndexError")
 
-class TValueError(types.TMono):
+class TValueError(TException):
     def __init__(self):
         super().__init__("ValueError")
 
@@ -150,14 +150,17 @@ def is_range(typ, elt=None):
     else:
         return types.is_mono(typ, "range")
 
+def is_exception(typ):
+    return isinstance(typ.find(), TException)
+
 def is_iterable(typ):
     typ = typ.find()
     return isinstance(typ, types.TMono) and \
         typ.name in ('list', 'range')
 
 def get_iterable_elt(typ):
     if is_iterable(typ):
-        return typ.find()["elt"]
+        return typ.find()["elt"].find()
 
 def is_collection(typ):
     typ = typ.find()

diff --git a/artiq/compiler/transforms/asttyped_rewriter.py b/artiq/compiler/transforms/asttyped_rewriter.py
@@ -92,6 +92,7 @@ def visit_FunctionDef(self, node):
         self.visit_root(node)
 
     def _assignable(self, name):
+        assert name is not None
         if name not in self.typing_env and name not in self.nonlocal_:
             self.typing_env[name] = types.TVar()
 
@@ -177,7 +178,8 @@ def visit_Nonlocal(self, node):
 
     def visit_ExceptHandler(self, node):
         self.visit(node.type)
-        self._assignable(node.name)
+        if node.name is not None:
+            self._assignable(node.name)
         for stmt in node.body:
             self.visit(stmt)
 
@@ -383,8 +385,12 @@ def visit_Lambda(self, node):
 
     def visit_ExceptHandler(self, node):
         node = self.generic_visit(node)
+        if node.name is not None:
+            name_type = self._find_name(node.name, node.name_loc)
+        else:
+            name_type = types.TVar()
         node = asttyped.ExceptHandlerT(
-            name_type=self._find_name(node.name, node.name_loc),
+            name_type=name_type,
             filter=node.type, name=node.name, body=node.body,
             except_loc=node.except_loc, as_loc=node.as_loc, name_loc=node.name_loc,
             colon_loc=node.colon_loc, loc=node.loc)

diff --git a/artiq/compiler/transforms/inferencer.py b/artiq/compiler/transforms/inferencer.py
@@ -827,7 +827,7 @@ def makenotes(printer, typea, typeb, loca, locb):
                         {"typeb": printer.name(typeb)},
                         locb)
                 ]
-            self._unify(node.name_type, node.filter.type.to_exception_type(),
+            self._unify(node.name_type, builtins.TException(node.filter.type.name),
                         node.name_loc, node.filter.loc, makenotes)
 
     def _type_from_arguments(self, node, ret):

diff --git a/artiq/compiler/types.py b/artiq/compiler/types.py
@@ -268,9 +268,6 @@ class TExceptionConstructor(TBuiltin):
     Note that this is not the same as the type of an instance of
     the class, which is ``TMono("Exception", ...)``.
     """
-    def to_exception_type(self):
-        # Exceptions currently can't have type parameters
-        return TMono(self.name, {})
 
 class TValue(Type):
     """