language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 18:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: const record member definition

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-08-26 16:44:00 +09:00
parent e51e7a2003
commit 653993f637
10 changed files with 66 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/erg_compiler/context/instantiate_spec.rs
View file

@ -550,8 +550,14 @@ impl Context {
return Ok(t);
}
}
if let Some((typ, _)) = self.get_type(ident.inspect()) {
if let Some((typ, _)) = self.get_type_and_ctx(ident.inspect()) {
Ok(typ.clone())
} else if let Some(typ) = self
.consts
.get(ident.inspect())
.and_then(|v| self.convert_value_into_type(v.clone()).ok())
{
Ok(typ)
} else if not_found_is_qvar {
let tyvar = named_free_var(Str::rc(other), self.level, Constraint::Uninited);
tmp_tv_cache.push_or_init_tyvar(&ident.name, &tyvar, self);
@ -715,7 +721,7 @@ impl Context {
Ok(Type::NamedTuple(ts))
}
other => {
let Some((typ, ctx)) = self.get_type(&Str::rc(other)) else {
let Some((typ, ctx)) = self.get_type_and_ctx(&Str::rc(other)) else {
return Err(TyCheckErrors::from(TyCheckError::no_type_error(
self.cfg.input.clone(),
line!() as usize,