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

feat: support Structural types for methods

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-02-23 18:12:05 +09:00
parent 2c3a27ed4b
commit aaa6b40b24
22 changed files with 477 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/erg_compiler/context/mod.rs
View file

@ -391,21 +391,7 @@ impl fmt::Display for Context {
impl ContextProvider for Context {
fn dir(&self) -> Vec<(&VarName, &VarInfo)> {
let mut vars: Vec<_> = self
.locals
.iter()
.chain(
self.params
.iter()
.filter_map(|(k, v)| k.as_ref().map(|k| (k, v))),
)
.chain(self.methods_list.iter().flat_map(|(_, ctx)| ctx.dir()))
.collect();
for sup in self.super_classes.iter() {
if let Some((_, sup_ctx)) = self.get_nominal_type_ctx(sup) {
vars.extend(sup_ctx.type_dir());
}
}
let mut vars = self.type_dir();
if let Some(outer) = self.get_outer() {
vars.extend(outer.dir());
} else if let Some(builtins) = self.get_builtins() {
@ -992,10 +978,23 @@ impl Context {
}
fn type_dir(&self) -> Vec<(&VarName, &VarInfo)> {
self.locals
let mut vars: Vec<_> = self
.locals
.iter()
.chain(self.methods_list.iter().flat_map(|(_, ctx)| ctx.dir()))
.collect()
.chain(self.decls.iter())
.chain(
self.params
.iter()
.filter_map(|(k, v)| k.as_ref().map(|k| (k, v))),
)
.chain(self.methods_list.iter().flat_map(|(_, ctx)| ctx.type_dir()))
.collect();
for sup in self.super_classes.iter() {
if let Some((_, sup_ctx)) = self.get_nominal_type_ctx(sup) {
vars.extend(sup_ctx.type_dir());
}
}
vars
}
pub(crate) fn mod_cache(&self) -> &SharedModuleCache {