language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-29 12:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update eval.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-08-26 22:28:52 +09:00
parent 653993f637
commit b5ee614c53
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/erg_compiler/context/eval.rs
View file

@ -20,8 +20,8 @@ use erg_parser::desugar::Desugarer;
use erg_parser::token::{Token, TokenKind}; use erg_parser::token::{Token, TokenKind};
use crate::ty::constructors::{ use crate::ty::constructors::{
array_t, dict_t, mono, named_free_var, poly, proj, proj_call, ref_, ref_mut, refinement, set_t, array_t, dict_t, mono, mono_q, named_free_var, poly, proj, proj_call, ref_, ref_mut,
subr_t, tp_enum, tuple_t, v_enum, refinement, set_t, subr_t, subtypeof, tp_enum, tuple_t, v_enum,
}; };
use crate::ty::free::{Constraint, HasLevel}; use crate::ty::free::{Constraint, HasLevel};
use crate::ty::typaram::{OpKind, TyParam}; use crate::ty::typaram::{OpKind, TyParam};
@ -807,7 +807,15 @@ impl Context {
} }
}; };
let name = VarName::from_str(ident.symbol.clone()); let name = VarName::from_str(ident.symbol.clone());
record_ctx.consts.insert(name.clone(), elem.clone()); // T = Trait { .Output = Type; ... }
// -> .Output = Self(<: T).Output
if self.kind.is_trait() && self.convert_value_into_type(elem.clone()).is_ok() {
let slf = mono_q("Self", subtypeof(mono(self.name.clone())));
let t = ValueObj::builtin_type(slf.proj(ident.symbol.clone()));
record_ctx.consts.insert(name.clone(), t);
} else {
record_ctx.consts.insert(name.clone(), elem.clone());
}
let t = v_enum(set! { elem.clone() }); let t = v_enum(set! { elem.clone() });
let vis = record_ctx.instantiate_vis_modifier(attr.sig.vis())?; let vis = record_ctx.instantiate_vis_modifier(attr.sig.vis())?;
let vis = Visibility::new(vis, record_ctx.name.clone()); let vis = Visibility::new(vis, record_ctx.name.clone());