From 2124ff9e91a0b1629b032186f868f8fba6a5dea7 Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 28 Aug 2015 05:28:58 -0500 Subject: [PATCH] Fix tests. --- artiq/compiler/testbench/embedding.py | 2 +- artiq/compiler/transforms/asttyped_rewriter.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/compiler/testbench/embedding.py b/artiq/compiler/testbench/embedding.py index 432638f19..7df21af21 100644 --- a/artiq/compiler/testbench/embedding.py +++ b/artiq/compiler/testbench/embedding.py @@ -8,7 +8,7 @@ from artiq.coredevice.core import Core, CompileError def main(): with open(sys.argv[1]) as f: testcase_code = compile(f.read(), f.name, "exec") - testcase_vars = {} + testcase_vars = {'__name__': 'testbench'} exec(testcase_code, testcase_vars) ddb_path = os.path.join(os.path.dirname(sys.argv[1]), "ddb.pyon") diff --git a/artiq/compiler/transforms/asttyped_rewriter.py b/artiq/compiler/transforms/asttyped_rewriter.py index 15f74f8ca..ee93e0834 100644 --- a/artiq/compiler/transforms/asttyped_rewriter.py +++ b/artiq/compiler/transforms/asttyped_rewriter.py @@ -277,7 +277,7 @@ class ASTTypedRewriter(algorithm.Transformer): # Its attributes are those of the class environment, but wrapped # appropriately so that they are linked to the class from which they # originate. - instance_type = types.TInstance(node.name) + instance_type = types.TInstance(node.name, OrderedDict()) # The second type is the type of the constructor itself (in other words, # the class object): it is simply a singleton type that has the class