language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-10-03 05:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: method implementation checking bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-12-27 17:50:10 +09:00
parent 365d661c37
commit 3cb4c50a05
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/erg_compiler/lib/pystd/types.d.er
View file

@ -15,6 +15,8 @@
.MethodDescriptorType: ClassType .MethodDescriptorType: ClassType
.ClassMethodDescriptorType: ClassType .ClassMethodDescriptorType: ClassType
.ModuleType: ClassType .ModuleType: ClassType
.ModuleType.
__call__: (name: Str, doc := Str) -> ModuleType
.EllipsisType: ClassType .EllipsisType: ClassType
.GenericAlias: (Type, GenericTuple) -> ClassType # TODO: Tuple Type .GenericAlias: (Type, GenericTuple) -> ClassType # TODO: Tuple Type
.UnionType: (Type, Type) -> Type .UnionType: (Type, Type) -> Type

19
crates/erg_compiler/lower.rs
View file

@ -3225,7 +3225,16 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
let mut errors = CompileErrors::empty(); let mut errors = CompileErrors::empty();
let mut unverified_names = self.module.context.locals.keys().collect::<Set<_>>(); let mut unverified_names = self.module.context.locals.keys().collect::<Set<_>>();
let mut super_impls = set! {}; let mut super_impls = set! {};
let tys_decls = if let Some(sups) = self.module.context.get_super_types(trait_type) { let retained_decls = |ctx: &Context, super_impls: &Set<&VarName>| {
ctx.decls.clone().retained(|k, _| {
let implemented_in_super = super_impls.contains(k);
let class_decl = ctx.kind.is_class();
!implemented_in_super && !class_decl
})
};
let tys_decls = if self.module.context.is_class(trait_type) {
vec![(impl_trait.clone(), retained_decls(trait_ctx, &super_impls))]
} else if let Some(sups) = self.module.context.get_super_types(trait_type) {
sups.map(|sup| { sups.map(|sup| {
if implemented.linear_contains(&sup) { if implemented.linear_contains(&sup) {
return (sup, Dict::new()); return (sup, Dict::new());
@ -3239,17 +3248,13 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
for methods in &ctx.methods_list { for methods in &ctx.methods_list {
super_impls.extend(methods.locals.keys()); super_impls.extend(methods.locals.keys());
} }
ctx.decls.clone().retained(|k, _| { retained_decls(ctx, &super_impls)
let implemented_in_super = super_impls.contains(k);
let class_decl = ctx.kind.is_class();
!implemented_in_super && !class_decl
})
}); });
(sup, decls) (sup, decls)
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>()
} else { } else {
vec![(impl_trait.clone(), trait_ctx.decls.clone())] vec![(impl_trait.clone(), retained_decls(trait_ctx, &super_impls))]
}; };
for (impl_trait, decls) in tys_decls { for (impl_trait, decls) in tys_decls {
for (decl_name, decl_vi) in decls { for (decl_name, decl_vi) in decls {