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

Update codeobj.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-10-18 00:40:04 +09:00
parent 46b87e1ca3
commit af65a48355
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/erg_compiler/ty/codeobj.rs
View file

@ -354,9 +354,9 @@ impl CodeObj {
fn instr_info(&self) -> String { fn instr_info(&self) -> String {
let mut lnotab_iter = self.lnotab.iter(); let mut lnotab_iter = self.lnotab.iter();
let mut code_iter = self.code.iter(); let mut code_iter = self.code.iter();
let mut idx = 0; let mut idx = 0usize;
let mut line_offset = 0; let mut line_offset = 0usize;
let mut lineno = self.firstlineno as u8; let mut lineno = self.firstlineno;
let mut sdelta = lnotab_iter.next().unwrap_or(&0); let mut sdelta = lnotab_iter.next().unwrap_or(&0);
let mut ldelta = lnotab_iter.next().unwrap_or(&0); let mut ldelta = lnotab_iter.next().unwrap_or(&0);
let mut instrs = "".to_string(); let mut instrs = "".to_string();
@ -365,9 +365,9 @@ impl CodeObj {
writeln!(instrs, "{}:", lineno).unwrap(); writeln!(instrs, "{}:", lineno).unwrap();
} }
loop { loop {
if *sdelta == line_offset { if *sdelta as usize == line_offset {
line_offset = 0; line_offset = 0;
lineno += ldelta; lineno += *ldelta as u32;
writeln!(instrs, "{}:", lineno).unwrap(); writeln!(instrs, "{}:", lineno).unwrap();
sdelta = lnotab_iter.next().unwrap_or(&0); sdelta = lnotab_iter.next().unwrap_or(&0);
ldelta = lnotab_iter.next().unwrap_or(&0); ldelta = lnotab_iter.next().unwrap_or(&0);
@ -443,19 +443,19 @@ impl CodeObj {
.unwrap(); .unwrap();
} }
Opcode::FOR_ITER => { Opcode::FOR_ITER => {
write!(instrs, "{} (to {})", arg, idx + arg * 2 + 2).unwrap(); write!(instrs, "{} (to {})", arg, idx + *arg as usize * 2 + 2).unwrap();
} }
Opcode::JUMP_FORWARD => { Opcode::JUMP_FORWARD => {
write!(instrs, "{} (to {})", arg, idx + arg * 2 + 2).unwrap(); write!(instrs, "{} (to {})", arg, idx + *arg as usize * 2 + 2).unwrap();
} }
Opcode::SETUP_WITH => { Opcode::SETUP_WITH => {
write!(instrs, "{} (to {})", arg, idx + arg * 2 + 2).unwrap(); write!(instrs, "{} (to {})", arg, idx + *arg as usize * 2 + 2).unwrap();
} }
Opcode::JUMP_ABSOLUTE => { Opcode::JUMP_ABSOLUTE => {
write!(instrs, "{} (to {})", arg, arg * 2).unwrap(); write!(instrs, "{} (to {})", arg, *arg as usize * 2).unwrap();
} }
Opcode::POP_JUMP_IF_FALSE | Opcode::POP_JUMP_IF_TRUE => { Opcode::POP_JUMP_IF_FALSE | Opcode::POP_JUMP_IF_TRUE => {
write!(instrs, "{} (to {})", arg, arg * 2).unwrap(); write!(instrs, "{} (to {})", arg, *arg as usize * 2).unwrap();
} }
Opcode::MAKE_FUNCTION => { Opcode::MAKE_FUNCTION => {
let flag = match arg { let flag = match arg {