m-labs · Aug 28, 2015 · Aug 28, 2015 · Aug 28, 2015
Showing with 22 additions and 11 deletions.

+8 −6 artiq/compiler/transforms/artiq_ir_generator.py

+4 −4 artiq/coredevice/ttl.py

+7 −1 artiq/frontend/artiq_run.py

+3 −0 lit-test/test/integration/class.py
diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -1424,40 +1424,42 @@ def visit_CallT(self, node):
                 func     = self.visit(node.func)
                 self_arg = None
                 fn_typ   = typ
+                offset   = 0
             elif types.is_method(typ):
                 method   = self.visit(node.func)
                 func     = self.append(ir.GetAttr(method, "__func__"))
                 self_arg = self.append(ir.GetAttr(method, "__self__"))
                 fn_typ   = types.get_method_function(typ)
+                offset   = 1
 
             args = [None] * (len(fn_typ.args) + len(fn_typ.optargs))
 
             for index, arg_node in enumerate(node.args):
                 arg = self.visit(arg_node)
                 if index < len(fn_typ.args):
-                    args[index] = arg
+                    args[index + offset] = arg
                 else:
-                    args[index] = self.append(ir.Alloc([arg], ir.TOption(arg.type)))
+                    args[index + offset] = self.append(ir.Alloc([arg], ir.TOption(arg.type)))
 
             for keyword in node.keywords:
                 arg = self.visit(keyword.value)
                 if keyword.arg in fn_typ.args:
                     for index, arg_name in enumerate(fn_typ.args):
                         if keyword.arg == arg_name:
                             assert args[index] is None
-                            args[index] = arg
+                            args[index + offset] = arg
                             break
                 elif keyword.arg in fn_typ.optargs:
                     for index, optarg_name in enumerate(fn_typ.optargs):
                         if keyword.arg == optarg_name:
                             assert args[len(fn_typ.args) + index] is None
-                            args[len(fn_typ.args) + index] = \
+                            args[len(fn_typ.args) + index + offset] = \
                                     self.append(ir.Alloc([arg], ir.TOption(arg.type)))
                             break
 
             for index, optarg_name in enumerate(fn_typ.optargs):
-                if args[len(fn_typ.args) + index] is None:
-                    args[len(fn_typ.args) + index] = \
+                if args[len(fn_typ.args) + index + offset] is None:
+                    args[len(fn_typ.args) + index + offset] = \
                             self.append(ir.Alloc([], ir.TOption(fn_typ.optargs[optarg_name])))
 
             if self_arg is not None:

diff --git a/artiq/coredevice/ttl.py b/artiq/coredevice/ttl.py
@@ -36,7 +36,7 @@ def __init__(self, dmgr, channel):
         self.channel = channel
 
         # in RTIO cycles
-        self.o_previous_timestamp = int64(0)
+        self.o_previous_timestamp = int(0, width=64)
 
     @kernel
     def set_o(self, o):
@@ -100,8 +100,8 @@ def __init__(self, dmgr, channel):
         self.channel = channel
 
         # in RTIO cycles
-        self.o_previous_timestamp = int64(0)
-        self.i_previous_timestamp = int64(0)
+        self.o_previous_timestamp = int(0, width=64)
+        self.i_previous_timestamp = int(0, width=64)
 
     @kernel
     def set_oe(self, oe):
@@ -240,7 +240,7 @@ def __init__(self, dmgr, channel):
 
     def build(self):
         # in RTIO cycles
-        self.previous_timestamp = int64(0)
+        self.previous_timestamp = int(0, width=64)
         self.acc_width = 24
 
     @portable

diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py
@@ -12,9 +12,10 @@
 from artiq.language.environment import EnvExperiment
 from artiq.protocols.file_db import FlatFileDB
 from artiq.master.worker_db import DeviceManager, ResultDB
-from artiq.tools import *
+from artiq.coredevice.core import CompileError
 from artiq.compiler.embedding import ObjectMap
 from artiq.compiler.targets import OR1KTarget
+from artiq.tools import *
 
 logger = logging.getLogger(__name__)
 
@@ -122,6 +123,11 @@ def run(with_file=False):
         exp_inst.prepare()
         exp_inst.run()
         exp_inst.analyze()
+    except CompileError as error:
+        message = "\n".join(error.__cause__.diagnostic.render(colored=True))
+        message = message.replace(os.path.normpath(os.path.join(os.path.dirname(__file__), "..")),
+                                  "<artiq>")
+        print(message, file=sys.stderr)
     finally:
         dmgr.close_devices()
 

diff --git a/lit-test/test/integration/class.py b/lit-test/test/integration/class.py
@@ -7,7 +7,10 @@ def f():
         return 2
     def g(self):
         return self.a + 5
+    def h(self, x):
+        return self.a + x
 
 assert c.a == 1
 assert c.f() == 2
 assert c().g() == 6
+assert c().h(9) == 10