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

Revert "Update inquire.rs"

Browse source 
This reverts commit 10f6b362da.
This commit is contained in:
Shunsuke Shibayama 2022-12-23 01:31:49 +09:00
parent 10f6b362da
commit 41592e0821
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/erg_compiler/context/inquire.rs
View file

@ -66,6 +66,7 @@ impl Context {
pub(crate) fn get_current_scope_var(&self, name: &VarName) -> Option<&VarInfo> { pub(crate) fn get_current_scope_var(&self, name: &VarName) -> Option<&VarInfo> {
self.locals self.locals
.get(name) .get(name)
.or_else(|| self.decls.get(name))
.or_else(|| { .or_else(|| {
if self.cfg.python_compatible_mode { if self.cfg.python_compatible_mode {
let mangled_name = let mangled_name =
@ -75,7 +76,6 @@ impl Context {
None None
} }
}) })
.or_else(|| self.decls.get(name))
.or_else(|| { .or_else(|| {
self.params self.params
.iter() .iter()
@ -97,12 +97,12 @@ impl Context {
.get_mut(name) .get_mut(name)
.or_else(|| { .or_else(|| {
if self.cfg.python_compatible_mode { if self.cfg.python_compatible_mode {
let mangled_name = if self.decls.contains_key(name) {
format!("{}${}", name.inspect(), name.ln_begin().unwrap_or(0));
if self.decls.contains_key(&mangled_name[..]) {
self.decls.get_mut(&mangled_name[..])
} else {
self.decls.get_mut(name) self.decls.get_mut(name)
} else {
let mangled_name =
format!("{}${}", name.inspect(), name.ln_begin().unwrap_or(0));
self.decls.get_mut(&mangled_name[..])
} }
} else { } else {
self.decls.get_mut(name) self.decls.get_mut(name)