6502/SixtyPical
1
0
Fork 0
mirror of https://github.com/catseye/SixtyPical.git synced 2024-11-25 23:49:17 +00:00
Code Issues Projects Releases Wiki Activity

When backpatching constraints, don't strip ones we've already done.

Browse Source
This commit is contained in:
Chris Pressey 2018-02-06 10:28:41 +00:00
parent 612ae588f7
commit 44ee8efbef
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sixtypical/model.py
View File

@ -18,14 +18,18 @@ class Type(object):
return hash(self.name) return hash(self.name)
def backpatch_constraint_labels(self, resolver): def backpatch_constraint_labels(self, resolver):
def resolve(w):
if not isinstance(w, basestring):
return w
return resolver(w)
if isinstance(self, TableType): if isinstance(self, TableType):
self.of_type.backpatch_constraint_labels(resolver) self.of_type.backpatch_constraint_labels(resolver)
elif isinstance(self, VectorType): elif isinstance(self, VectorType):
self.of_type.backpatch_constraint_labels(resolver) self.of_type.backpatch_constraint_labels(resolver)
elif isinstance(self, RoutineType): elif isinstance(self, RoutineType):
self.inputs = set([resolver(w) for w in self.inputs if isinstance(w, basestring)]) self.inputs = set([resolve(w) for w in self.inputs])
self.outputs = set([resolver(w) for w in self.outputs if isinstance(w, basestring)]) self.outputs = set([resolve(w) for w in self.outputs])
self.trashes = set([resolver(w) for w in self.trashes if isinstance(w, basestring)]) self.trashes = set([resolve(w) for w in self.trashes])
TYPE_BIT = Type('bit') TYPE_BIT = Type('bit')