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

Fix Expr::Compound codegen

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-11-04 22:53:41 +09:00
parent f15305c287
commit 5519bbb435
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/erg_compiler/codegen.rs
View file

@ -749,7 +749,7 @@ impl CodeGenerator {
self.stack_dec();
}
fn cancel_pop_top(&mut self) {
fn cancel_if_pop_top(&mut self) {
let lasop_t_idx = self.cur_block_codeobj().code.len() - 2;
if self.cur_block_codeobj().code.get(lasop_t_idx) == Some(&(POP_TOP as u8)) {
self.mut_cur_block_codeobj().code.pop();
@ -2219,10 +2219,14 @@ impl CodeGenerator {
}
for expr in chunks.into_iter() {
self.emit_expr(expr);
if self.stack_len() == 1 {
self.emit_pop_top();
}
}
if is_module_loading_chunks {
self.stack_dec_n(2);
}
self.cancel_if_pop_top();
/*if is_module_loading_chunks {
self.stack_dec_n(0);
}*/
}
Expr::TypeAsc(tasc) => {
self.emit_expr(*tasc.expr);
@ -2248,7 +2252,7 @@ impl CodeGenerator {
self.emit_pop_top();
}
}
self.cancel_pop_top();
self.cancel_if_pop_top();
}
fn emit_with_block(&mut self, block: Block, params: Vec<Str>) {
@ -2268,7 +2272,7 @@ impl CodeGenerator {
self.emit_pop_top();
}
}
self.cancel_pop_top();
self.cancel_if_pop_top();
}
fn emit_class_block(&mut self, class: ClassDef) -> CodeObj {
@ -2454,7 +2458,7 @@ impl CodeGenerator {
self.emit_pop_top();
}
}
self.cancel_pop_top(); // 最後の値は戻り値として取っておく
self.cancel_if_pop_top(); // 最後の値は戻り値として取っておく
if self.stack_len() == init_stack_len {
self.emit_load_const(ValueObj::None);
} else if self.stack_len() > init_stack_len + 1 {
@ -2598,7 +2602,7 @@ impl CodeGenerator {
self.emit_pop_top();
}
}
self.cancel_pop_top(); // 最後の値は戻り値として取っておく
self.cancel_if_pop_top(); // 最後の値は戻り値として取っておく
if self.input().is_repl() {
if self.stack_len() == 1 {
self.emit_print_expr();