M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Commit missing parts of 5baf18b.

This commit is contained in:
whitequark 2016-01-05 00:16:58 +08:00
parent dfbf55fed2
commit 2955f9a1e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/compiler/embedding.py
View File

@ -303,8 +303,8 @@ class StitchingInferencer(Inferencer):
# which would be the optimal solution. # which would be the optimal solution.
object_type = value_node.type.find() object_type = value_node.type.find()
attr_value_type = None
for object_value, object_loc in self.value_map[object_type]: for object_value, object_loc in self.value_map[object_type]:
attr_value_type = None
if not hasattr(object_value, attr_name): if not hasattr(object_value, attr_name):
if attr_name.startswith('_'): if attr_name.startswith('_'):
names = set(filter(lambda name: not 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", " different from previously inferred type {typeb} for the same attribute",
{"typea": printer.name(attr_value_type), {"typea": printer.name(attr_value_type),
"typeb": printer.name(attributes[attr_name]), "typeb": printer.name(attributes[attr_name]),
"attr": node.attr}, "attr": attr_name},
object_loc) object_loc)
self.engine.process(diag) self.engine.process(diag)