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

Update unify.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-03-17 00:12:09 +09:00
parent 2afd47a24a
commit a7ff798c6d
1 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,31 @@ impl Context {
self.occur(maybe_sub, &subr.return_t, loc)?; self.occur(maybe_sub, &subr.return_t, loc)?;
Ok(()) Ok(())
} }
(Type::Subr(lhs), Type::Subr(rhs)) => {
for (lhs, rhs) in lhs
.default_params
.iter()
.map(|pt| pt.typ())
.zip(rhs.default_params.iter().map(|pt| pt.typ()))
{
self.occur(lhs, rhs, loc)?;
}
if let Some(lhs) = lhs.var_params.as_ref() {
if let Some(rhs) = rhs.var_params.as_ref() {
self.occur(lhs.typ(), rhs.typ(), loc)?;
}
}
for (lhs, rhs) in lhs
.non_default_params
.iter()
.map(|pt| pt.typ())
.zip(rhs.non_default_params.iter().map(|pt| pt.typ()))
{
self.occur(lhs, rhs, loc)?;
}
self.occur(&lhs.return_t, &rhs.return_t, loc)?;
Ok(())
}
(Type::Poly { params, .. }, Type::FreeVar(fv)) if fv.is_unbound() => { (Type::Poly { params, .. }, Type::FreeVar(fv)) if fv.is_unbound() => {
for param in params.iter().filter_map(|tp| { for param in params.iter().filter_map(|tp| {
if let TyParam::Type(t) = tp { if let TyParam::Type(t) = tp {
@ -125,6 +150,14 @@ impl Context {
} }
Ok(()) Ok(())
} }
(lhs, Type::Or(l, r)) | (lhs, Type::And(l, r)) => {
self.occur(lhs, l, loc)?;
self.occur(lhs, r, loc)
}
(Type::Or(l, r), rhs) | (Type::And(l, r), rhs) => {
self.occur(l, rhs, loc)?;
self.occur(r, rhs, loc)
}
_ => Ok(()), _ => Ok(()),
} }
} }