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

fix: nested module bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-01-31 12:11:20 +09:00
parent 20b1993714
commit a6e7a39753
8 changed files with 62 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -637,7 +637,7 @@ impl fmt::Display for Context {
impl ContextProvider for Context {
fn dir(&self) -> Dict<&VarName, &VarInfo> {
let mut vars = self.type_dir(self);
if let Some(outer) = self.get_outer() {
if let Some(outer) = self.get_outer_scope() {
vars.guaranteed_extend(outer.dir());
} else if let Some(builtins) = self.get_builtins() {
vars.guaranteed_extend(builtins.locals.iter());
@ -1125,10 +1125,25 @@ impl Context {
String::from(&self.name[..])
}
/// use `get_outer_scope` for getting the outer scope
pub(crate) fn get_outer(&self) -> Option<&Context> {
self.outer.as_ref().map(|x| x.as_ref())
}
/// If both `self` and `outer` are modules, returns `None` because the outer namespace is different from the current context
pub(crate) fn get_outer_scope(&self) -> Option<&Context> {
let outer = self.get_outer()?;
if outer.name != "<builtins>" && outer.kind.is_module() && self.kind.is_module() {
None
} else {
Some(outer)
}
}
pub(crate) fn get_outer_scope_or_builtins(&self) -> Option<&Context> {
self.get_outer_scope().or_else(|| self.get_builtins())
}
pub(crate) fn get_mut_outer(&mut self) -> Option<&mut Context> {
self.outer.as_mut().map(|x| x.as_mut())
}
@ -1423,7 +1438,7 @@ impl Context {
pub fn current_true_function_ctx(&self) -> Option<&Context> {
if self.kind.is_subr() && self.current_control_flow().is_none() {
Some(self)
} else if let Some(outer) = self.get_outer() {
} else if let Some(outer) = self.get_outer_scope() {
outer.current_true_function_ctx()
} else {
None