m-labs · Aug 10, 2015 · Aug 10, 2015
Showing with 33 additions and 8 deletions.

+2 −1 artiq/compiler/embedding.py

+7 −2 artiq/compiler/ir.py

+4 −2 artiq/compiler/transforms/artiq_ir_generator.py

+20 −3 artiq/compiler/types.py
diff --git a/artiq/compiler/embedding.py b/artiq/compiler/embedding.py
@@ -184,9 +184,10 @@ def _iterate(self):
             inferencer.visit(self.typedtree)
 
         # After we have found all functions, synthesize a module to hold them.
+        source_buffer = source.Buffer("", "<synthesized>")
         self.typedtree = asttyped.ModuleT(
             typing_env=self.globals, globals_in_scope=set(),
-            body=self.typedtree, loc=None)
+            body=self.typedtree, loc=source.Range(source_buffer, 0, 0))
 
     def _quote_embedded_function(self, function):
         if not hasattr(function, "artiq_embedded"):

diff --git a/artiq/compiler/ir.py b/artiq/compiler/ir.py
@@ -138,6 +138,9 @@ def replace_uses_of(self, value, replacement):
 class Instruction(User):
     """
     An SSA instruction.
+
+    :ivar loc: (:class:`pythonparser.source.Range` or None)
+        source location
     """
 
     def __init__(self, operands, typ, name=""):
@@ -388,13 +391,15 @@ class Function:
     """
     A function containing SSA IR.
 
+    :ivar loc: (:class:`pythonparser.source.Range` or None)
+        source location of function definition
     :ivar is_internal:
         (bool) if True, the function should not be accessible from outside
         the module it is contained in
     """
 
-    def __init__(self, typ, name, arguments):
-        self.type, self.name = typ, name
+    def __init__(self, typ, name, arguments, loc=None):
+        self.type, self.name, self.loc = typ, name, loc
         self.names, self.arguments, self.basic_blocks = set(), [], []
         self.next_name = 1
         self.set_arguments(arguments)

diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -129,7 +129,8 @@ def visit_ModuleT(self, node):
 
         try:
             typ = types.TFunction(OrderedDict(), OrderedDict(), builtins.TNone())
-            func = ir.Function(typ, ".".join(self.name + ['__modinit__']), [])
+            func = ir.Function(typ, ".".join(self.name + ['__modinit__']), [],
+                               loc=node.loc.begin())
             self.functions.append(func)
             old_func, self.current_function = self.current_function, func
 
@@ -184,7 +185,8 @@ def visit_function(self, node, is_lambda, is_internal):
             for arg_name in typ.optargs:
                 optargs.append(ir.Argument(ir.TOption(typ.optargs[arg_name]), "arg." + arg_name))
 
-            func = ir.Function(typ, ".".join(self.name), [env_arg] + args + optargs)
+            func = ir.Function(typ, ".".join(self.name), [env_arg] + args + optargs,
+                               loc=node.keyword_loc)
             func.is_internal = is_internal
             self.functions.append(func)
             old_func, self.current_function = self.current_function, func

diff --git a/artiq/compiler/types.py b/artiq/compiler/types.py
@@ -6,6 +6,12 @@
 import string
 from collections import OrderedDict
 
+
+class UnificationError(Exception):
+    def __init__(self, typea, typeb):
+        self.typea, self.typeb = typea, typeb
+
+
 def genalnum():
     ident = ["a"]
     while True:
@@ -22,9 +28,8 @@ def genalnum():
         if pos < 0:
             ident = ["a"] + ident
 
-class UnificationError(Exception):
-    def __init__(self, typea, typeb):
-        self.typea, self.typeb = typea, typeb
+def _freeze(dict_):
+    return tuple((key, dict_[key]) for key in dict_)
 
 def _map_find(elts):
     if isinstance(elts, list):
@@ -34,6 +39,7 @@ def _map_find(elts):
     else:
         assert False
 
+
 class Type(object):
     pass
 
@@ -93,6 +99,7 @@ class TMono(Type):
     attributes = OrderedDict()
 
     def __init__(self, name, params={}):
+        assert isinstance(params, dict)
         self.name, self.params = name, params
 
     def find(self):
@@ -127,6 +134,9 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not (self == other)
 
+    def __hash__(self):
+        return hash((self.name, _freeze(self.params)))
+
 class TTuple(Type):
     """
     A tuple type.
@@ -181,6 +191,9 @@ class TFunction(Type):
     attributes = OrderedDict()
 
     def __init__(self, args, optargs, ret):
+        assert isinstance(args, OrderedDict)
+        assert isinstance(optargs, OrderedDict)
+        assert isinstance(ret, Type)
         self.args, self.optargs, self.ret = args, optargs, ret
 
     def arity(self):
@@ -222,6 +235,9 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not (self == other)
 
+    def __hash__(self):
+        return hash((_freeze(self.args), _freeze(self.optargs), self.ret))
+
 class TRPCFunction(TFunction):
     """
     A function type of a remote function.
@@ -249,6 +265,7 @@ class TBuiltin(Type):
     """
 
     def __init__(self, name):
+        assert isinstance(name, str)
         self.name = name
         self.attributes = OrderedDict()