language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 10:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update unify.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-09-17 02:38:07 +09:00
parent b84fee183d
commit a876b34145
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/erg_compiler/context/unify.rs
View file

@ -70,6 +70,7 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
/// occur(?T(<: Str) or ?U(<: Int), ?T(<: Str)) ==> Error
/// occur(?T(<: ?U or Y), ?U) ==> OK
/// occur(?T, ?T.Output) ==> OK
/// occur(?T, ?T or Int) ==> Error
/// ```
fn occur(&self, maybe_sub: &Type, maybe_sup: &Type) -> TyCheckResult<()> {
if maybe_sub == maybe_sup {
@ -160,7 +161,7 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
for _ in 0..r.len() {
if l.iter()
.zip(r.iter())
.all(|(l, r)| self.occur(l, r).is_ok())
.all(|(l, r)| self.occur_inner(l, r).is_ok())
{
return Ok(());
}
@ -181,7 +182,7 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
for _ in 0..r.len() {
if l.iter()
.zip(r.iter())
.all(|(l, r)| self.occur(l, r).is_ok())
.all(|(l, r)| self.occur_inner(l, r).is_ok())
{
return Ok(());
}
@ -198,25 +199,25 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
}
(lhs, And(tys)) => {
for ty in tys.iter() {
self.occur(lhs, ty)?;
self.occur_inner(lhs, ty)?;
}
Ok(())
}
(lhs, Or(tys)) => {
for ty in tys.iter() {
self.occur(lhs, ty)?;
self.occur_inner(lhs, ty)?;
}
Ok(())
}
(And(tys), rhs) => {
for ty in tys.iter() {
self.occur(ty, rhs)?;
self.occur_inner(ty, rhs)?;
}
Ok(())
}
(Or(tys), rhs) => {
for ty in tys.iter() {
self.occur(ty, rhs)?;
self.occur_inner(ty, rhs)?;
}
Ok(())
}