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: eliminate panics

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-03-25 23:17:30 +09:00
parent bf8cf61c7e
commit caa171342f
5 changed files with 66 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/erg_compiler/context/instantiate_spec.rs
View file

@ -714,7 +714,19 @@ impl Context {
) -> TyCheckResult<TyParam> {
if &name[..] == "_" {
let t = if let Some((ctx, i)) = erased_idx {
ctx.params[i].1.t.clone()
let param = ctx.params.get(i).ok_or_else(|| {
TyCheckErrors::from(TyCheckError::too_many_args_error(
self.cfg.input.clone(),
line!() as usize,
loc.loc(),
&ctx.name,
self.caused_by(),
ctx.params.len(),
i,
0,
))
})?;
param.1.t.clone()
} else {
Type::Uninited
};

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

@ -383,16 +383,28 @@ impl Context {
}
}
(l, TyParam::Type(r)) => {
let l = self
.convert_tp_into_ty(l.clone())
.unwrap_or_else(|_| todo!("{l} cannot be a type"));
let l = self.convert_tp_into_ty(l.clone()).map_err(|_| {
TyCheckError::tp_to_type_error(
self.cfg.input.clone(),
line!() as usize,
l,
loc.loc(),
self.caused_by(),
)
})?;
self.sub_unify(&l, r, loc, None)?;
Ok(())
}
(TyParam::Type(l), r) => {
let r = self
.convert_tp_into_ty(r.clone())
.unwrap_or_else(|_| todo!("{r} cannot be a type"));
let r = self.convert_tp_into_ty(r.clone()).map_err(|_| {
TyCheckError::tp_to_type_error(
self.cfg.input.clone(),
line!() as usize,
r,
loc.loc(),
self.caused_by(),
)
})?;
self.sub_unify(l, &r, loc, None)?;
Ok(())
}
@ -417,7 +429,7 @@ impl Context {
}
Ok(())
}
(l, r) => panic!("type-parameter unification failed:\nl:{l}\nr: {r}"),
(l, r) => type_feature_error!(self, loc.loc(), &format!("unifying {l} and {r}")),
}
}
@ -457,7 +469,9 @@ impl Context {
todo!("{_l}/{_r}")
}
(l, r) if self.eq_tp(l, r) => Ok(()),
(l, r) => panic!("type-parameter re-unification failed:\nl: {l}\nr: {r}"),
(l, r) => {
type_feature_error!(error self, loc.loc(), &format!("re-unifying {l} and {r}"))
}
}
}