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

fix: codegen bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-08-29 03:18:48 +09:00
parent 8d8a1b5d53
commit d42411bb05
1 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/erg_compiler/codegen.rs
View file

@ -1173,7 +1173,7 @@ impl PyCodeGenerator {
let ld = unit.prev_lineno - self.cur_block().prev_lineno; let ld = unit.prev_lineno - self.cur_block().prev_lineno;
if ld != 0 { if ld != 0 {
if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() { if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() {
*l += ld as u8; *l += u8::try_from(ld).unwrap();
} }
self.mut_cur_block().prev_lineno += ld; self.mut_cur_block().prev_lineno += ld;
} }
@ -1214,7 +1214,7 @@ impl PyCodeGenerator {
.saturating_sub(self.cur_block().prev_lineno); .saturating_sub(self.cur_block().prev_lineno);
if ld != 0 { if ld != 0 {
if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() { if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() {
*l += ld as u8; *l += u8::try_from(ld).unwrap();
} }
self.mut_cur_block().prev_lineno += ld; self.mut_cur_block().prev_lineno += ld;
} }
@ -1986,7 +1986,6 @@ impl PyCodeGenerator {
self.stack_dec(); self.stack_dec();
let idx_end = match self.py_version.minor { let idx_end = match self.py_version.minor {
Some(11) => self.lasti() - idx_while - 1, Some(11) => self.lasti() - idx_while - 1,
Some(10) => self.lasti(),
_ => self.lasti() + 2, _ => self.lasti() + 2,
}; };
self.fill_jump(idx_while + 1, idx_end - 2); self.fill_jump(idx_while + 1, idx_end - 2);
@ -2906,23 +2905,46 @@ impl PyCodeGenerator {
self.cancel_if_pop_top(); self.cancel_if_pop_top();
} }
/// See `cpython/Object/lnotab_notes.txt` in details
fn push_lnotab(&mut self, expr: &Expr) { fn push_lnotab(&mut self, expr: &Expr) {
let ln_begin = expr.ln_begin().unwrap_or(0); let ln_begin = expr.ln_begin().unwrap_or(0);
if ln_begin > self.cur_block().prev_lineno { if ln_begin > self.cur_block().prev_lineno {
let sd = self.lasti() - self.cur_block().prev_lasti; let mut sd = self.lasti() - self.cur_block().prev_lasti;
let ld = ln_begin - self.cur_block().prev_lineno; let mut ld = ln_begin - self.cur_block().prev_lineno;
if ld != 0 { if ld != 0 {
if sd != 0 { if sd != 0 {
while sd > 254 {
self.mut_cur_block_codeobj().lnotab.push(255);
self.mut_cur_block_codeobj().lnotab.push(0);
sd -= 254;
}
while ld > 127 {
self.mut_cur_block_codeobj().lnotab.push(0);
self.mut_cur_block_codeobj().lnotab.push(127);
ld -= 127;
}
self.mut_cur_block_codeobj().lnotab.push(sd as u8); self.mut_cur_block_codeobj().lnotab.push(sd as u8);
self.mut_cur_block_codeobj().lnotab.push(ld as u8); self.mut_cur_block_codeobj().lnotab.push(ld as u8);
} else { } else {
// empty lines // empty lines
if let Some(last_ld) = self.mut_cur_block_codeobj().lnotab.last_mut() { if let Some(&last_ld) = self.cur_block_codeobj().lnotab.last() {
*last_ld += ld as u8; if last_ld as u32 + ld > 127 {
*self.mut_cur_block_codeobj().lnotab.last_mut().unwrap() = 127;
self.mut_cur_block_codeobj().lnotab.push(0);
ld -= 127;
}
while last_ld as u32 + ld > 127 {
self.mut_cur_block_codeobj().lnotab.push(127);
self.mut_cur_block_codeobj().lnotab.push(0);
ld -= 127;
}
self.mut_cur_block_codeobj().lnotab.push(ld as u8);
} else { } else {
// a block starts with an empty line // a block starts with an empty line
self.mut_cur_block_codeobj().lnotab.push(0); self.mut_cur_block_codeobj().lnotab.push(0);
self.mut_cur_block_codeobj().lnotab.push(ld as u8); self.mut_cur_block_codeobj()
.lnotab
.push(u8::try_from(ld).unwrap());
} }
} }
self.mut_cur_block().prev_lineno += ld; self.mut_cur_block().prev_lineno += ld;
@ -3140,7 +3162,7 @@ impl PyCodeGenerator {
let ld = unit.prev_lineno - self.cur_block().prev_lineno; let ld = unit.prev_lineno - self.cur_block().prev_lineno;
if ld != 0 { if ld != 0 {
if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() { if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() {
*l += ld as u8; *l += u8::try_from(ld).unwrap();
} }
self.mut_cur_block().prev_lineno += ld; self.mut_cur_block().prev_lineno += ld;
} }
@ -3372,7 +3394,7 @@ impl PyCodeGenerator {
.saturating_sub(self.cur_block().prev_lineno); .saturating_sub(self.cur_block().prev_lineno);
if ld != 0 { if ld != 0 {
if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() { if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() {
*l += ld as u8; *l += u8::try_from(ld).unwrap();
} }
self.mut_cur_block().prev_lineno += ld; self.mut_cur_block().prev_lineno += ld;
} }
@ -3550,7 +3572,7 @@ impl PyCodeGenerator {
let ld = unit.prev_lineno - self.cur_block().prev_lineno; let ld = unit.prev_lineno - self.cur_block().prev_lineno;
if ld != 0 { if ld != 0 {
if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() { if let Some(l) = self.mut_cur_block_codeobj().lnotab.last_mut() {
*l += ld as u8; *l += u8::try_from(ld).unwrap();
} }
self.mut_cur_block().prev_lineno += ld; self.mut_cur_block().prev_lineno += ld;
} }