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

fix a bug with closures

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-11-04 21:42:37 +09:00
parent a28ca96d80
commit f15305c287
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/erg_compiler/codegen.rs
View file

@ -480,9 +480,14 @@ impl CodeGenerator {
}
Some(StoreLoadKind::Deref) => {
self.mut_cur_block_codeobj().freevars.push(name.clone());
// TODO: in 3.11 freevars are unified with varnames
// cellvarsのpushはrec_search()で行われる
Name::deref(self.cur_block_codeobj().freevars.len() - 1)
if self.py_version.minor >= Some(11) {
// in 3.11 freevars are unified with varnames
self.mut_cur_block_codeobj().varnames.push(name);
Name::deref(self.cur_block_codeobj().varnames.len() - 1)
} else {
// cellvarsのpushはrec_search()で行われる
Name::deref(self.cur_block_codeobj().freevars.len() - 1)
}
}
None => {
// new variable
@ -2473,6 +2478,7 @@ impl CodeGenerator {
}
let freevars_len = self.cur_block_codeobj().freevars.len();
if freevars_len > 0 {
self.mut_cur_block_codeobj().flags += CodeObjFlags::Nested as u32;
self.edit_code(idx_copy_free_vars + 1, freevars_len);
} else if self.py_version.minor >= Some(11) {
self.edit_code(idx_copy_free_vars, CommonOpcode::NOP as usize);