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: cyclic reference modules bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-12-28 14:59:14 +09:00
parent 26c758e67f
commit a2d1809cee
21 changed files with 266 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -809,15 +809,9 @@ impl Context {
let Some(ctx) = self.get_nominal_type_ctx(other) else {
return Dict::new();
};
let mod_fields = if other.is_module() {
if let Ok(ValueObj::Str(mod_name)) =
ValueObj::try_from(other.typarams()[0].clone())
{
self.get_mod(&mod_name)
.map_or(Dict::new(), |ctx| ctx.local_dir())
} else {
Dict::new()
}
let mod_fields = if let Some(path) = other.module_path() {
self.get_mod_with_path(&path)
.map_or(Dict::new(), |ctx| ctx.local_dir())
} else {
Dict::new()
};
@ -847,9 +841,13 @@ impl Context {
erg_common::fmt_vec(lparams),
erg_common::fmt_vec(rparams)
);
let ctx = self
.get_nominal_type_ctx(typ)
.unwrap_or_else(|| panic!("{typ} is not found"));
let Some(ctx) = self.get_nominal_type_ctx(typ) else {
if DEBUG_MODE {
panic!("{typ} is not found");
} else {
return false;
}
};
let variances = ctx.type_params_variance();
debug_assert_eq!(
lparams.len(),