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

fix: closure bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-12-28 23:31:09 +09:00
parent a128719cbd
commit b5f5876631
4 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1380,7 +1380,7 @@ impl Context {
&self.shared().promises
}
pub fn current_caller(&self) -> Option<ControlKind> {
pub fn current_control_flow(&self) -> Option<ControlKind> {
self.higher_order_caller
.last()
.and_then(|name| ControlKind::try_from(&name[..]).ok())
@ -1395,11 +1395,13 @@ impl Context {
None
}
pub fn current_function_ctx(&self) -> Option<&Context> {
if self.kind.is_subr() {
/// Context of the function that actually creates the scope.
/// Control flow function blocks do not create actual scopes.
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() {
outer.current_function_ctx()
outer.current_true_function_ctx()
} else {
None
}