fix: 变量声明完成值归空记录,脚本保留末非空完成值

This commit is contained in:
2026-09-14 20:15:08 +00:00
parent 53da6ef817
commit fa67988ab4
3 changed files with 8 additions and 8 deletions
+4 -3
View File
@@ -1874,9 +1874,10 @@ impl Emitter {
if matches!(stmt, Statement::FunctionDeclaration(_)) { if matches!(stmt, Statement::FunctionDeclaration(_)) {
continue; // Already emitted above continue; // Already emitted above
} }
match self.emit_statement(stmt, &mut ctx)? { // 空完成值语句(变量/函数等声明)不覆写此前结果:保留最后一个非空
Some(r) => last_result = Some(r), // 完成值,与函数体 emit_body_stmts 的收敛口径一致。
None => last_result = None, if let Some(r) = self.emit_statement(stmt, &mut ctx)? {
last_result = Some(r);
} }
} }
if let Some(r) = last_result { if let Some(r) = last_result {
@@ -18,10 +18,10 @@ impl Emitter {
} }
/// 变量声明本体:供 export 声明复用(导出声明需先按普通声明 emit,再就地注册导出值)。 /// 变量声明本体:供 export 声明复用(导出声明需先按普通声明 emit,再就地注册导出值)。
/// 变量声明语句完成值按规范为空记录(对外 undefined),不回填结果寄存器。
pub(crate) fn emit_variable_declaration( pub(crate) fn emit_variable_declaration(
&self, decl: &VariableDeclaration, ctx: &mut CompileCtx, &self, decl: &VariableDeclaration, ctx: &mut CompileCtx,
) -> Result<Option<u32>, String> { ) -> Result<Option<u32>, String> {
let mut r = None;
for d in &decl.declarations { for d in &decl.declarations {
let is_const = matches!(decl.kind, VariableDeclarationKind::Const); let is_const = matches!(decl.kind, VariableDeclarationKind::Const);
if is_const && d.init.is_none() { if is_const && d.init.is_none() {
@@ -39,7 +39,6 @@ impl Emitter {
} }
} }
} }
r = Some(val_reg);
} else { } else {
let BindingPattern::BindingIdentifier(bi) = &d.id else { let BindingPattern::BindingIdentifier(bi) = &d.id else {
return Err("destructuring declaration requires an initializer".into()); return Err("destructuring declaration requires an initializer".into());
@@ -82,9 +81,8 @@ impl Emitter {
ctx.inst(Inst::new(OpCode::STORE_VAR, Operand::Reg(target_reg), Operand::Reg(tmp), Operand::None)); ctx.inst(Inst::new(OpCode::STORE_VAR, Operand::Reg(target_reg), Operand::Reg(tmp), Operand::None));
} }
ctx.init_var(bi.name.as_str()); ctx.init_var(bi.name.as_str());
r = Some(var_reg);
} }
} }
Ok(r) Ok(None)
} }
} }
+2 -1
View File
@@ -23,7 +23,8 @@ fn eval(source: &str) -> String {
#[test] #[test]
fn eval_var_declaration() { fn eval_var_declaration() {
assert_eq!(eval("var x = 42"), "42"); // 变量声明语句完成值按规范为空记录(对外 undefined),不回填初始化器值。
assert_eq!(eval("var x = 42"), "undefined");
} }
#[test] #[test]