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

Fix inferring bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-09-25 21:32:49 +09:00
parent 93388ddf80
commit d11b05ecff
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/erg_compiler/context/compare.rs
View file

@ -606,10 +606,10 @@ impl Context {
self.poly_supertype_of(lhs, lparams, rparams)
}
(MonoQVar(name), r) | (PolyQVar { name, .. }, r) => {
panic!("Not instantiated type variable: {name}, r: {r}")
panic!("internal error: not instantiated type variable: '{name}, r: {r}")
}
(l, MonoQVar(name)) | (l, PolyQVar { name, .. }) => {
panic!("Not instantiated type variable: {name}, l: {l}")
panic!("internal error: not instantiated type variable: '{name}, l: {l}")
}
(MonoProj { .. }, _) => todo!(),
(_, MonoProj { .. }) => todo!(),

10
compiler/erg_compiler/context/instantiate.rs
View file

@ -133,6 +133,7 @@ impl TyVarContext {
params
.into_iter()
.map(|p| {
erg_common::log!(err "p: {p}, {:?}", p.tvar_name());
if let Some(name) = p.tvar_name() {
let tp = self.instantiate_qtp(p);
self.push_or_init_typaram(&name, &tp);
@ -243,7 +244,7 @@ impl TyVarContext {
}
}
TyParam::Type(t) => {
if let Type::MonoQVar(n) = *t {
if let Some(n) = t.as_ref().tvar_name() {
if let Some(t) = self.get_typaram(&n) {
t.clone()
} else if let Some(t) = self.get_tyvar(&n) {
@ -254,7 +255,7 @@ impl TyVarContext {
TyParam::t(tv)
}
} else {
todo!("{t}")
unreachable!("{t}")
}
}
TyParam::UnaryOp { op, val } => {
@ -336,6 +337,7 @@ impl TyVarContext {
}
}
/// TODO: this struct will be removed when const functions are implemented.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum ConstTemplate {
Obj(ValueObj),
@ -766,6 +768,9 @@ impl Context {
let t = Self::instantiate_t(*t, tv_ctx, loc)?;
Ok(TyParam::t(t))
}
TyParam::FreeVar(fv) if fv.is_linked() => {
Self::instantiate_tp(fv.crack().clone(), tv_ctx, loc)
}
p @ (TyParam::Value(_) | TyParam::Mono(_) | TyParam::FreeVar(_)) => Ok(p),
other => todo!("{other}"),
}
@ -867,6 +872,7 @@ impl Context {
Quantified(_) => {
panic!("a quantified type should not be instantiated, instantiate the inner type")
}
FreeVar(fv) if fv.is_linked() => Self::instantiate_t(fv.crack().clone(), tv_ctx, loc),
other if other.is_monomorphic() => Ok(other),
other => todo!("{other}"),
}