m-labs · Nov 16, 2015 · Nov 16, 2015
Showing with 20 additions and 2 deletions.

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

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

+6 −0 lit-test/test/inferencer/error_class.py

+12 −0 lit-test/test/iodelay/class.py
diff --git a/artiq/compiler/transforms/asttyped_rewriter.py b/artiq/compiler/transforms/asttyped_rewriter.py
@@ -263,7 +263,7 @@ def visit_ClassDef(self, node):
 
         if node.name in self.env_stack[-1]:
             diag = diagnostic.Diagnostic("fatal",
-                "variable '{name}' is already defined", {"name":name}, loc)
+                "variable '{name}' is already defined", {"name":node.name}, node.name_loc)
             self.engine.process(diag)
 
         extractor = LocalExtractor(env_stack=self.env_stack, engine=self.engine)

diff --git a/artiq/compiler/transforms/iodelay_estimator.py b/artiq/compiler/transforms/iodelay_estimator.py
@@ -258,7 +258,7 @@ def abort(notes):
                 args = {}
                 for kw_node in node.keywords:
                     args[kw_node.arg] = kw_node.value
-                for arg_name, arg_node in zip(typ.args, node.args[offset:]):
+                for arg_name, arg_node in zip(list(typ.args)[offset:], node.args):
                     args[arg_name] = arg_node
 
                 free_vars = delay.duration.free_vars()

diff --git a/lit-test/test/inferencer/error_class.py b/lit-test/test/inferencer/error_class.py
@@ -8,3 +8,9 @@ class a(1):
 class b:
     # CHECK-L: ${LINE:+1}: fatal: class body must contain only assignments and function definitions
     x += 1
+
+class c:
+    pass
+# CHECK-L: ${LINE:+1}: fatal: variable 'c' is already defined
+class c:
+    pass
diff --git a/lit-test/test/iodelay/class.py b/lit-test/test/iodelay/class.py
@@ -0,0 +1,12 @@
+# RUN: %python -m artiq.compiler.testbench.signature %s >%t
+# RUN: OutputCheck %s --file-to-check=%t
+
+# CHECK-L: g: ()->NoneType delay(s->mu(1.0) mu)
+def g(i):
+    i.f(1.0)
+
+class c:
+    def f(self, x):
+        delay(x)
+
+g(c())