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 codegen bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-08-29 00:34:35 +09:00
parent 4acace41de
commit 8d8a1b5d53
3 changed files with 74 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/erg_compiler/ty/codeobj.rs
View file

@ -625,7 +625,8 @@ impl CodeObj {
}
Opcode308::CALL_FUNCTION
| Opcode308::CALL_FUNCTION_EX
| Opcode308::CALL_FUNCTION_KW => {
| Opcode308::CALL_FUNCTION_KW
| Opcode308::CALL_METHOD => {
write!(instrs, "{arg}").unwrap();
}
_ => {}
@ -665,7 +666,8 @@ impl CodeObj {
}
Opcode309::CALL_FUNCTION
| Opcode309::CALL_FUNCTION_EX
| Opcode309::CALL_FUNCTION_KW => {
| Opcode309::CALL_FUNCTION_KW
| Opcode309::CALL_METHOD => {
write!(instrs, "{arg}").unwrap();
}
_ => {}
@ -682,7 +684,15 @@ impl CodeObj {
}
match op310 {
Opcode310::STORE_DEREF | Opcode310::LOAD_DEREF => {
write!(instrs, "{arg} ({})", self.freevars.get(arg).unwrap()).unwrap();
write!(
instrs,
"{arg} ({})",
self.freevars
.get(arg)
.or_else(|| self.varnames.get(arg))
.unwrap()
)
.unwrap();
}
Opcode310::LOAD_CLOSURE => {
write!(instrs, "{arg} ({})", self.cellvars.get(arg).unwrap()).unwrap();
@ -704,7 +714,8 @@ impl CodeObj {
}
Opcode310::CALL_FUNCTION
| Opcode310::CALL_FUNCTION_EX
| Opcode310::CALL_FUNCTION_KW => {
| Opcode310::CALL_FUNCTION_KW
| Opcode310::CALL_METHOD => {
write!(instrs, "{arg}").unwrap();
}
Opcode310::SETUP_WITH => {