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

Update register.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-12-22 23:49:21 +09:00
parent af3ece6a1b
commit b69ef5e093
1 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

50
compiler/erg_compiler/context/register.rs
View file

@ -87,18 +87,19 @@ impl Context {
None None
}; };
if let Some(_decl) = self.decls.remove(&ident.name) { if let Some(_decl) = self.decls.remove(&ident.name) {
Err(TyCheckErrors::from(TyCheckError::duplicate_decl_error( if !self.cfg.python_compatible_mode {
self.cfg.input.clone(), return Err(TyCheckErrors::from(TyCheckError::duplicate_decl_error(
line!() as usize, self.cfg.input.clone(),
sig.loc(), line!() as usize,
self.caused_by(), sig.loc(),
ident.name.inspect(), self.caused_by(),
))) ident.name.inspect(),
} else { )));
let vi = VarInfo::new(sig_t, muty, vis, kind, None, self.impl_of(), py_name); }
self.future_defined_locals.insert(ident.name.clone(), vi);
Ok(())
} }
let vi = VarInfo::new(sig_t, muty, vis, kind, None, self.impl_of(), py_name);
self.future_defined_locals.insert(ident.name.clone(), vi);
Ok(())
} }
pub(crate) fn declare_sub( pub(crate) fn declare_sub(
@ -141,21 +142,22 @@ impl Context {
py_name, py_name,
); );
if let Some(_decl) = self.decls.remove(name) { if let Some(_decl) = self.decls.remove(name) {
Err(TyCheckErrors::from(TyCheckError::duplicate_decl_error( if !self.cfg.python_compatible_mode {
self.cfg.input.clone(), return Err(TyCheckErrors::from(TyCheckError::duplicate_decl_error(
line!() as usize, self.cfg.input.clone(),
sig.loc(), line!() as usize,
self.caused_by(), sig.loc(),
name, self.caused_by(),
))) name,
} else { )));
self.decls.insert(sig.ident.name.clone(), vi);
if errs.is_empty() {
Ok(())
} else {
Err(errs)
} }
} }
self.decls.insert(sig.ident.name.clone(), vi);
if errs.is_empty() {
Ok(())
} else {
Err(errs)
}
} }
pub(crate) fn assign_var_sig( pub(crate) fn assign_var_sig(