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

fix: type variable bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-09-16 21:31:10 +09:00
parent 46c349d25d
commit 93305f2081
3 changed files with 123 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1022,6 +1022,16 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
}
let (lsub, lsup) = sub_fv.get_subsup().unwrap();
let (rsub, rsup) = sup_fv.get_subsup().unwrap();
// sub: ?T(:> ?U)
// sup: ?U
// => ?T == ?U
if &lsub == maybe_sup {
maybe_sub.link(maybe_sup, self.undoable);
return Ok(());
} else if &rsup == maybe_sub {
maybe_sup.link(maybe_sub, self.undoable);
return Ok(());
}
// ?T(<: Add(?T))
// ?U(:> {1, 2}, <: Add(?U)) ==> {1, 2}
sup_fv.dummy_link();
@ -1117,6 +1127,40 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
}
}
}
(FreeVar(sub_fv), FreeVar(sup_fv))
if sub_fv.constraint_is_sandwiched() && sup_fv.constraint_is_typeof() =>
{
if !self.change_generalized && (sub_fv.is_generalized() || sup_fv.is_generalized())
{
log!(info "generalized:\nmaybe_sub: {maybe_sub}\nmaybe_sup: {maybe_sup}");
return Ok(());
}
let (lsub, _lsup) = sub_fv.get_subsup().unwrap();
// sub: ?T(:> ?U(: {Str, Int}))
// sup: ?U(: {Str, Int})
// => ?T == ?U
if &lsub == maybe_sup {
maybe_sub.link(maybe_sup, self.undoable);
return Ok(());
}
let rty = sup_fv.get_type().unwrap();
let Some(rtys) = rty.refinement_values() else {
todo!("{rty}");
};
// sub: ?T(:> Nat)
// sup: ?U(: {Str, Int})
// => ?T(:> Nat, <: Int)
for tp in rtys {
let Ok(ty) = self.ctx.convert_tp_into_type(tp.clone()) else {
todo!("{tp}");
};
if self.ctx.subtype_of(&lsub, &ty) {
sub_fv.update_super(|sup| self.ctx.intersection(&sup, &ty));
return Ok(());
}
}
// REVIEW: unreachable?
}
(
Bounded {
sub: lsub,