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

fix: aliasing bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-03-13 07:03:31 +09:00
parent 359a030347
commit fd0f56579a
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/erg_compiler/context/initialize/funcs.rs
View file

@ -417,14 +417,14 @@ impl Context {
dict! { T => U }.into(),
)
.quantify();
self.register_builtin_py_impl(FUNC_DICT, t_dict, Immutable, vis, Some(FUNC_DICT));
self.register_builtin_py_impl(
FUNC_DICT,
t_dict,
PYIMPORT,
t_pyimport,
Immutable,
vis.clone(),
Some(FUNC_DICT),
Visibility::BUILTIN_PRIVATE,
None,
);
self.register_builtin_py_impl(PYIMPORT, t_pyimport, Immutable, vis, None);
}
}

8
crates/erg_compiler/context/inquire.rs
View file

@ -2343,6 +2343,8 @@ impl Context {
/// you should use `get_mono_type` instead of this
pub(crate) fn rec_local_get_mono_type(&self, name: &str) -> Option<(&Type, &Context)> {
#[cfg(feature = "py_compatible")]
let name = self.erg_to_py_names.get(name).map_or(name, |s| &s[..]);
if let Some((t, ctx)) = self.mono_types.get(name) {
Some((t, ctx))
} else if let Some(outer) = self.get_outer().or_else(|| self.get_builtins()) {
@ -2353,6 +2355,8 @@ impl Context {
}
pub(crate) fn _rec_local_get_poly_type(&self, name: &str) -> Option<(&Type, &Context)> {
#[cfg(feature = "py_compatible")]
let name = self.erg_to_py_names.get(name).map_or(name, |s| &s[..]);
if let Some((t, ctx)) = self.poly_types.get(name) {
Some((t, ctx))
} else if let Some(outer) = self.get_outer().or_else(|| self.get_builtins()) {
@ -2363,6 +2367,8 @@ impl Context {
}
fn rec_get_mut_mono_type(&mut self, name: &str) -> Option<(&mut Type, &mut Context)> {
#[cfg(feature = "py_compatible")]
let name = self.erg_to_py_names.get(name).map_or(name, |s| &s[..]);
if let Some((t, ctx)) = self.mono_types.get_mut(name) {
Some((t, ctx))
} else if let Some(outer) = self.outer.as_mut() {
@ -2374,6 +2380,8 @@ impl Context {
}
fn rec_get_mut_poly_type(&mut self, name: &str) -> Option<(&mut Type, &mut Context)> {
#[cfg(feature = "py_compatible")]
let name = self.erg_to_py_names.get(name).map_or(name, |s| &s[..]);
if let Some((t, ctx)) = self.poly_types.get_mut(name) {
Some((t, ctx))
} else if let Some(outer) = self.outer.as_mut() {