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

fix: while codegen bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-07-09 21:34:12 +09:00
parent 7be1d42c03
commit 98c4b480b7
2 changed files with 74 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/erg_compiler/codegen.rs
View file

@ -1883,6 +1883,8 @@ impl PyCodeGenerator {
// Evaluate again at the end of the loop
self.emit_expr(cond.clone());
let idx_while = self.lasti();
self.write_instr(EXTENDED_ARG);
self.write_arg(0);
self.write_instr(Opcode310::POP_JUMP_IF_FALSE);
self.write_arg(0);
self.stack_dec();
@ -1906,14 +1908,20 @@ impl PyCodeGenerator {
idx_while + 2
}
};
self.write_arg(arg);
let shift_bytes = match arg {
0..=255 => 1,
256..=65535 => 2,
65536..=4294967295 => 3,
n => todo!("too large: {n}"),
};
self.write_arg(arg - shift_bytes);
self.stack_dec();
let idx_end = if self.py_version.minor >= Some(11) {
self.lasti() - idx_while - 1
} else {
self.lasti()
};
self.calc_edit_jump(idx_while + 1, idx_end);
self.fill_jump(idx_while + 1, idx_end - 2);
self.emit_load_const(ValueObj::None);
debug_assert_eq!(self.stack_len(), _init_stack_len + 1);
}