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

fix: __call__ overload bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-08-13 13:02:14 +09:00
parent b87f3da3c6
commit b21d018adf
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1848,6 +1848,11 @@ impl Context {
res
}
}
Type::And(_, _) => {
let instance =
self.resolve_overload(obj, instance.clone(), pos_args, kw_args, &obj)?;
self.substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)
}
Type::Failure => Ok(SubstituteResult::Ok),
_ => {
self.substitute_dunder_call(obj, attr_name, instance, pos_args, kw_args, namespace)
@ -2095,7 +2100,13 @@ impl Context {
)?;
}
let instance = self.instantiate_def_type(&call_vi.t)?;
self.substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)?;
let instance = match self
.substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)?
{
SubstituteResult::__Call__(instance)
| SubstituteResult::Coerced(instance) => instance,
SubstituteResult::Ok => instance,
};
return Ok(SubstituteResult::__Call__(instance));
}
// instance method __call__
@ -2106,7 +2117,14 @@ impl Context {
})
{
let instance = self.instantiate_def_type(&call_vi.t)?;
self.substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)?;
let instance = match self
.substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)?
{
SubstituteResult::__Call__(instance) | SubstituteResult::Coerced(instance) => {
instance
}
SubstituteResult::Ok => instance,
};
return Ok(SubstituteResult::__Call__(instance));
}
}