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

fix: const call bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-12-30 21:53:38 +09:00
parent 477778c9fe
commit 2ddff1512f
6 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/erg_compiler/declare.rs
View file

@ -623,7 +623,7 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
let arg_ts = ctx.params.iter().map(|(_, vi)| &vi.t);
for ((tp, arg), arg_t) in ctx.typ.typarams().iter().zip(args.pos_args()).zip(arg_ts) {
if let ast::Expr::Accessor(ast::Accessor::Ident(ident)) = &arg.expr {
if arg_t.is_type() {
if self.module.context.subtype_of(arg_t, &Type::Type) {
if let Ok(tv) = self.module.context.convert_tp_into_type(tp.clone()) {
tv_ctx.push_or_init_tyvar(&ident.name, &tv, &self.module.context);
continue;
@ -861,7 +861,10 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
.module
.context
.registered_info(ident.inspect(), ident.is_const())
.is_some_and(|(_, vi)| t.is_type() || vi.t.is_type())
.is_some_and(|(_, vi)| {
self.module.context.subtype_of(t, &Type::Type)
|| self.module.context.subtype_of(&vi.t, &Type::Type)
})
{
let typ = self.module.context.get_type_ctx(ident.inspect());
if typ.is_some_and(|ctx| ctx.has("__call__")) {