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: path resolution bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-01-26 19:30:41 +09:00
parent efea5ae52f
commit ca04076f77
3 changed files with 60 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/erg_compiler/lower.rs
View file

@ -2279,7 +2279,9 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
return unreachable_error!(LowerErrors, LowerError, self);
};
if let Some(sup_type) = call.args.get_left_or_key("Super") {
Self::check_inheritable(&self.cfg, &mut self.errs, type_obj, sup_type, &hir_def.sig);
if let Err(err) = self.check_inheritable(type_obj, sup_type, &hir_def.sig) {
self.errs.extend(err);
}
}
let Some(__new__) = class_ctx
.get_current_scope_var(&VarName::from_static("__new__"))
@ -2416,35 +2418,39 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
Ok(hir::ReDef::new(attr, hir::Block::new(vec![expr])))
}
/// HACK: Cannot be methodized this because `&self` has been taken immediately before.
fn check_inheritable(
cfg: &ErgConfig,
errs: &mut LowerErrors,
&self,
type_obj: &GenTypeObj,
sup_class: &hir::Expr,
sub_sig: &hir::Signature,
) {
) -> LowerResult<()> {
if let Some(TypeObj::Generated(gen)) = type_obj.base_or_sup() {
if let Some(impls) = gen.impls() {
if !impls.contains_intersec(&mono("InheritableType")) {
errs.push(LowerError::inheritance_error(
cfg.input.clone(),
line!() as usize,
sup_class.to_string(),
sup_class.loc(),
sub_sig.ident().inspect().into(),
));
if let Some(ctx) = self.module.context.get_nominal_type_ctx(gen.typ()) {
for super_trait in ctx.super_traits.iter() {
if self
.module
.context
.subtype_of(super_trait, &mono("InheritableType"))
{
return Ok(());
}
}
} else {
errs.push(LowerError::inheritance_error(
cfg.input.clone(),
line!() as usize,
sup_class.to_string(),
sup_class.loc(),
sub_sig.ident().inspect().into(),
));
}
if let Some(impls) = gen.impls() {
if impls.contains_intersec(&mono("InheritableType")) {
return Ok(());
}
}
return Err(LowerError::inheritance_error(
self.cfg.input.clone(),
line!() as usize,
sup_class.to_string(),
sup_class.loc(),
sub_sig.ident().inspect().into(),
)
.into());
}
Ok(())
}
fn check_override(&mut self, class: &Type, impl_trait: Option<&Type>) {