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

fix: type-instantiation bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-09-26 13:03:30 +09:00
parent c024b8f7be
commit 6c57ed6cb5
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/erg_compiler/context/instantiate.rs
View file

@ -181,8 +181,10 @@ impl TyVarCache {
self.update_tyvar(inst, tv, ctx);
} else if let TyParam::FreeVar(_fv) = inst {
inst.destructive_link(&TyParam::t(tv.clone()));
} else {
unreachable!()
} else if let Ok(inst) = ctx.convert_tp_into_type(inst.clone()) {
self.update_tyvar(&inst, tv, ctx);
} else if DEBUG_MODE {
unreachable!("{name} / {inst} / {tv}");
}
} else {
self.tyvar_instances.insert(name.clone(), tv.clone());
@ -201,8 +203,10 @@ impl TyVarCache {
self.update_tyvar(inst, tv, ctx);
} else if let TyParam::FreeVar(_fv) = inst {
inst.destructive_link(&TyParam::t(tv.clone()));
} else {
unreachable!()
} else if let Ok(inst) = ctx.convert_tp_into_type(inst.clone()) {
self.update_tyvar(&inst, tv, ctx);
} else if DEBUG_MODE {
unreachable!("{name} / {inst} / {tv}");
}
} else {
self.tyvar_instances.insert(name.clone(), tv.clone());
@ -286,7 +290,9 @@ impl TyVarCache {
} else if let Some(inst) = self.tyvar_instances.get(name) {
if let Ok(tv) = <&Type>::try_from(tp) {
self.update_tyvar(inst, tv, ctx);
} else {
} else if let Ok(tv) = ctx.convert_tp_into_type(tp.clone()) {
self.update_tyvar(inst, &tv, ctx);
} else if DEBUG_MODE {
unreachable!("{name} / {inst} / {tp}");
}
} else {
@ -321,8 +327,10 @@ impl TyVarCache {
} else if let Some(inst) = self.tyvar_instances.get(name) {
if let Ok(tv) = <&Type>::try_from(tp) {
self.update_tyvar(inst, tv, ctx);
} else {
unreachable!()
} else if let Ok(tv) = ctx.convert_tp_into_type(tp.clone()) {
self.update_tyvar(inst, &tv, ctx);
} else if DEBUG_MODE {
unreachable!("{name} / {inst} / {tp}")
}
} else {
self.typaram_instances.insert(name.clone(), tp.clone());