m-labs · Aug 28, 2015 · Aug 28, 2015
Showing with 24 additions and 5 deletions.

+5 −0 artiq/compiler/embedding.py

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

+3 −2 artiq/compiler/transforms/llvm_ir_generator.py

+2 −2 artiq/language/core.py
diff --git a/artiq/compiler/embedding.py b/artiq/compiler/embedding.py
@@ -10,6 +10,7 @@
 
 from pythonparser import ast, algorithm, source, diagnostic, parse_buffer
 
+from ..language import core as language_core
 from . import types, builtins, asttyped, prelude
 from .transforms import ASTTypedRewriter, Inferencer, IntMonomorphizer
 
@@ -73,6 +74,10 @@ def quote(self, value):
                 typ = builtins.TFloat()
             return asttyped.NumT(n=value, ctx=None, type=typ,
                                  loc=self._add(repr(value)))
+        elif isinstance(value, language_core.int):
+            typ = builtins.TInt(width=types.TValue(value.width))
+            return asttyped.NumT(n=int(value), ctx=None, type=typ,
+                                 loc=self._add(repr(value)))
         elif isinstance(value, str):
             return asttyped.StrT(s=value, ctx=None, type=builtins.TStr(),
                                  loc=self._add(repr(value)))

diff --git a/artiq/compiler/transforms/inferencer.py b/artiq/compiler/transforms/inferencer.py
@@ -91,9 +91,22 @@ def visit_AttributeT(self, node):
         object_type = node.value.type.find()
         if not types.is_var(object_type):
             if node.attr in object_type.attributes:
+                def makenotes(printer, typea, typeb, loca, locb):
+                    return [
+                        diagnostic.Diagnostic("note",
+                            "expression of type {typea}",
+                            {"typea": printer.name(typea)},
+                            loca),
+                        diagnostic.Diagnostic("note",
+                            "expression of type {typeb}",
+                            {"typeb": printer.name(object_type)},
+                            node.value.loc)
+                    ]
+
                 # Assumes no free type variables in .attributes.
                 self._unify(node.type, object_type.attributes[node.attr],
-                            node.loc, None)
+                            node.loc, None,
+                            makenotes=makenotes, when=" for attribute '{}'".format(node.attr))
             elif types.is_instance(object_type) and \
                     node.attr in object_type.constructor.attributes:
                 # Assumes no free type variables in .attributes.

diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -6,6 +6,7 @@
 import os
 from pythonparser import ast, diagnostic
 from llvmlite_artiq import ir as ll
+from ...language import core as language_core
 from .. import types, builtins, ir
 
 
@@ -1007,8 +1008,8 @@ def _quote(self, value, typ, path):
             assert value in (True, False)
             return ll.Constant(lli1, value)
         elif builtins.is_int(typ):
-            assert isinstance(value, int)
-            return ll.Constant(ll.IntType(builtins.get_int_width(typ)), value)
+            assert isinstance(value, (int, language_core.int))
+            return ll.Constant(ll.IntType(builtins.get_int_width(typ)), int(value))
         elif builtins.is_float(typ):
             assert isinstance(value, float)
             return ll.Constant(lldouble, value)

diff --git a/artiq/language/core.py b/artiq/language/core.py
@@ -72,8 +72,8 @@ def __new__(cls, value, width=32):
             return self
 
     @property
-    def width(width):
-        return width._width
+    def width(self):
+        return self._width
 
     def __int__(self):
         return self._value