From 2955f9a1e0d194af968b0fbd6e07a0ab3eed705c Mon Sep 17 00:00:00 2001 From: whitequark Date: Tue, 5 Jan 2016 00:16:58 +0800 Subject: [PATCH] Commit missing parts of 5baf18b. --- artiq/compiler/embedding.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/compiler/embedding.py b/artiq/compiler/embedding.py index 910c49213..4adb38814 100644 --- a/artiq/compiler/embedding.py +++ b/artiq/compiler/embedding.py @@ -303,8 +303,8 @@ class StitchingInferencer(Inferencer): # which would be the optimal solution. object_type = value_node.type.find() - attr_value_type = None for object_value, object_loc in self.value_map[object_type]: + attr_value_type = None if not hasattr(object_value, attr_name): if attr_name.startswith('_'): names = set(filter(lambda name: not name.startswith('_'), @@ -412,7 +412,7 @@ class StitchingInferencer(Inferencer): " different from previously inferred type {typeb} for the same attribute", {"typea": printer.name(attr_value_type), "typeb": printer.name(attributes[attr_name]), - "attr": node.attr}, + "attr": attr_name}, object_loc) self.engine.process(diag)