ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-25 19:21:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复无 else 块时冗余指令跳转问题

Browse Source
This commit is contained in:
彭俊皓
2026-06-06 13:30:41 +08:00
parent 527f57b520
commit 8d4620e1da
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_compiler/src/counter.rs
+4 -2
View File
@@ -33,7 +33,9 @@ impl Compiler {
self.count_statement(&ifs.consequent, ctx); self.count_statement(&ifs.consequent, ctx);
ctx.alloc_reg(); // result register ctx.alloc_reg(); // result register
ctx.projected_pc += 1; // LOAD_VAR result <- consequent ctx.projected_pc += 1; // LOAD_VAR result <- consequent
ctx.projected_pc += 1; // JMP (skip else) if ifs.alternate.is_some() {
ctx.projected_pc += 1; // JMP (skip else)
}
ctx.label_map.insert(else_label, ctx.projected_pc); ctx.label_map.insert(else_label, ctx.projected_pc);
if let Some(alt_stmt) = &ifs.alternate { if let Some(alt_stmt) = &ifs.alternate {
self.count_statement(alt_stmt, ctx); self.count_statement(alt_stmt, ctx);
@@ -173,7 +175,7 @@ impl Compiler {
LogicalOperator::And => Label::TernaryEnd(id), LogicalOperator::And => Label::TernaryEnd(id),
LogicalOperator::Or => Label::TernaryElse(id), LogicalOperator::Or => Label::TernaryElse(id),
LogicalOperator::Coalesce => { LogicalOperator::Coalesce => {
return; unreachable!()
} }
}; };
ctx.label_map.insert(skip_label, ctx.projected_pc); ctx.label_map.insert(skip_label, ctx.projected_pc);
crates/oxide_compiler/src/emitter.rs
+6 -3
View File
@@ -93,9 +93,12 @@ impl Compiler {
)); ));
} }
let end_pos = ctx.label_map[&end_label]; let has_alt = ifs.alternate.is_some();
let offset = (end_pos as isize) - (ctx.bytecode.len() as isize); if has_alt {
ctx.emit(opcode::encode_jmp(offset as i16)); let end_pos = ctx.label_map[&end_label];
let offset = (end_pos as isize) - (ctx.bytecode.len() as isize);
ctx.emit(opcode::encode_jmp(offset as i16));
}
if let Some(alt) = &ifs.alternate { if let Some(alt) = &ifs.alternate {
let alt_reg = self.emit_statement(alt, ctx)?; let alt_reg = self.emit_statement(alt, ctx)?;