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

Make unification reflective.

This commit is contained in:
whitequark 2015-06-04 14:50:16 +03:00
parent 1a08b50f0a
commit 4b01e604db
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/py2llvm/types.py
View File

@ -80,6 +80,8 @@ class TMono(Type):
assert self.params.keys() == other.params.keys() assert self.params.keys() == other.params.keys()
for param in self.params: for param in self.params:
self.params[param].unify(other.params[param]) self.params[param].unify(other.params[param])
elif isinstance(other, TVar):
other.unify(self)
else: else:
raise UnificationError(self, other) raise UnificationError(self, other)
@ -110,6 +112,8 @@ class TTuple(Type):
if isinstance(other, TTuple) and len(self.elts) == len(other.elts): if isinstance(other, TTuple) and len(self.elts) == len(other.elts):
for selfelt, otherelt in zip(self.elts, other.elts): for selfelt, otherelt in zip(self.elts, other.elts):
selfelt.unify(otherelt) selfelt.unify(otherelt)
elif isinstance(other, TVar):
other.unify(self)
else: else:
raise UnificationError(self, other) raise UnificationError(self, other)
@ -136,7 +140,9 @@ class TValue(Type):
return self return self
def unify(self, other): def unify(self, other):
if self != other: if isinstance(other, TVar):
other.unify(self)
elif self != other:
raise UnificationError(self, other) raise UnificationError(self, other)
def __repr__(self): def __repr__(self):