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

fix: casting bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-04-27 13:58:15 +09:00
parent 66cac2ccc2
commit 1e72cf20f1
11 changed files with 170 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

53
crates/erg_compiler/context/eval.rs
View file

@ -1424,38 +1424,42 @@ impl Context {
fn substitute_typaram(&self, qtp: TyParam, stp: TyParam) -> EvalResult<()> {
match qtp {
TyParam::FreeVar(ref fv) if fv.is_generalized() => {
if !stp.is_generalized() {
if !stp.is_unbound_var() || !stp.is_generalized() {
fv.undoable_link(&stp);
}
self.sub_unify_tp(&stp, &qtp, None, &(), false)?;
Ok(())
}
TyParam::Type(gt) if gt.is_generalized() => {
let Ok(st) = Type::try_from(stp) else { todo!(); };
if let Ok(qt) = <&FreeTyVar>::try_from(gt.as_ref()) {
if !st.is_generalized() {
qt.undoable_link(&st);
}
}
self.sub_unify(&st, &gt, &(), None)
}
TyParam::Type(qt) => {
let Ok(st) = Type::try_from(stp) else { todo!(); };
let st = if st.typarams_len() != qt.typarams_len() {
let Ok(st) = <&FreeTyVar>::try_from(&st) else { unreachable!() };
st.get_sub().unwrap()
} else {
st
};
if !st.is_generalized() {
self.substitute_typarams(&qt, &st)?;
}
self.sub_unify(&st, &qt, &(), None)
}
TyParam::Type(qt) => self.substitute_type(stp, *qt),
TyParam::Value(ValueObj::Type(qt)) => self.substitute_type(stp, qt.into_typ()),
_ => Ok(()),
}
}
fn substitute_type(&self, stp: TyParam, qt: Type) -> EvalResult<()> {
if qt.is_generalized() {
let Ok(st) = Type::try_from(stp) else { todo!(); };
if let Ok(qt) = <&FreeTyVar>::try_from(&qt) {
if !st.is_unbound_var() || !st.is_generalized() {
qt.undoable_link(&st);
}
}
self.sub_unify(&st, &qt, &(), None)
} else {
let Ok(st) = Type::try_from(stp) else { todo!(); };
let st = if st.typarams_len() != qt.typarams_len() {
let Ok(st) = <&FreeTyVar>::try_from(&st) else { unreachable!() };
st.get_sub().unwrap()
} else {
st
};
if !st.is_unbound_var() || !st.is_generalized() {
self.substitute_typarams(&qt, &st)?;
}
self.sub_unify(&st, &qt, &(), None)
}
}
pub(crate) fn undo_substitute_typarams(substituted_q: &Type) {
for tp in substituted_q.typarams().into_iter() {
match tp {
@ -1469,6 +1473,9 @@ impl Context {
TyParam::Type(t) => {
Self::undo_substitute_typarams(&t);
}
TyParam::Value(ValueObj::Type(t)) => {
Self::undo_substitute_typarams(t.typ());
}
_ => {}
}
}