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

fix: Structural types bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-02-24 13:08:18 +09:00
parent 73a91dcbbb
commit 59f07f6d1d
8 changed files with 117 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/erg_compiler/context/compare.rs
View file

@ -129,6 +129,7 @@ impl Context {
self.supertype_of(lhs, rhs, allow_cast) || self.subtype_of(lhs, rhs, allow_cast)
}
/// lhs :> rhs ?
pub(crate) fn supertype_of(&self, lhs: &Type, rhs: &Type, allow_cast: bool) -> bool {
let res = match Self::cheap_supertype_of(lhs, rhs, allow_cast) {
(Absolutely, judge) => judge,
@ -142,12 +143,16 @@ impl Context {
res
}
/// lhs <: rhs ?
///
/// e.g.
/// ```erg
/// Named :> Module
/// => Module.super_types == [Named]
///
/// Seq(T) :> Range(T)
/// => Range(T).super_types == [Eq, Mutate, Seq('T), Output('T)]
/// => Range(T).super_types == [Eq, Mutate, Seq(T), Output(T)]
/// ```
pub(crate) fn subtype_of(&self, lhs: &Type, rhs: &Type, allow_cast: bool) -> bool {
match Self::cheap_subtype_of(lhs, rhs, allow_cast) {
(Absolutely, judge) => judge,
@ -614,17 +619,25 @@ impl Context {
self.supertype_of(&l.t, r, allow_cast)
}
(Quantified(_), Quantified(_)) => {
let l = self.instantiate_dummy(lhs.clone());
let r = self.instantiate_dummy(rhs.clone());
let Ok(l) = self.instantiate_dummy(lhs.clone()) else {
return false;
};
let Ok(r) = self.instantiate_dummy(rhs.clone()) else {
return false;
};
self.sub_unify(&r, &l, &(), None).is_ok()
}
// (|T: Type| T -> T) !<: Obj -> Never
(Quantified(_), r) if allow_cast => {
let inst = self.instantiate_dummy(lhs.clone());
let Ok(inst) = self.instantiate_dummy(lhs.clone()) else {
return false;
};
self.sub_unify(r, &inst, &(), None).is_ok()
}
(l, Quantified(_)) if allow_cast => {
let inst = self.instantiate_dummy(rhs.clone());
let Ok(inst) = self.instantiate_dummy(rhs.clone()) else {
return false;
};
self.sub_unify(&inst, l, &(), None).is_ok()
}
// Int or Str :> Str or Int == (Int :> Str && Str :> Int) || (Int :> Int && Str :> Str) == true