ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-24 02:31:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 关系比较处理器补 Symbol 守卫，替换 BigInt 混合检查

Browse Source
This commit is contained in:
彭俊皓
2026-09-27 00:31:38 +00:00
parent 1c13815762
commit 7dbb8aa2bf
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/dispatch/comparison.rs
+8 -8
View File
@@ -29,8 +29,8 @@ impl Vm {
vm_trace!("LT rd={} r{}={:?} r{}={:?}", rd, a, self.regs[a], b, self.regs[b]);
let va = self.coerce_primitive_bounded(self.regs[a], false)?;
let vb = self.coerce_primitive_bounded(self.regs[b], false)?;
if (va.is_bigint() || vb.is_bigint()) && (va.is_symbol() || vb.is_symbol()) {
return self.raise_type_error("Cannot mix BigInt and other types, use explicit conversions");
if va.is_symbol() || vb.is_symbol() {
return self.raise_type_error("Cannot convert a Symbol value to a number");
}
match coercion::relational_compare(va, vb) {
Some(r) => self.regs[rd] = JsValue::bool(r),
@@ -47,8 +47,8 @@ impl Vm {
vm_trace!("GT rd={} r{}={:?} r{}={:?}", rd, a, self.regs[a], b, self.regs[b]);
let va = self.coerce_primitive_bounded(self.regs[a], false)?;
let vb = self.coerce_primitive_bounded(self.regs[b], false)?;
if (va.is_bigint() || vb.is_bigint()) && (va.is_symbol() || vb.is_symbol()) {
return self.raise_type_error("Cannot mix BigInt and other types, use explicit conversions");
if va.is_symbol() || vb.is_symbol() {
return self.raise_type_error("Cannot convert a Symbol value to a number");
}
match coercion::relational_compare(vb, va) {
Some(r) => self.regs[rd] = JsValue::bool(r),
@@ -65,8 +65,8 @@ impl Vm {
vm_trace!("LTE rd={} r{}={:?} r{}={:?}", rd, a, self.regs[a], b, self.regs[b]);
let va = self.coerce_primitive_bounded(self.regs[a], false)?;
let vb = self.coerce_primitive_bounded(self.regs[b], false)?;
if (va.is_bigint() || vb.is_bigint()) && (va.is_symbol() || vb.is_symbol()) {
return self.raise_type_error("Cannot mix BigInt and other types, use explicit conversions");
if va.is_symbol() || vb.is_symbol() {
return self.raise_type_error("Cannot convert a Symbol value to a number");
}
match coercion::relational_compare(vb, va) {
Some(r) => self.regs[rd] = JsValue::bool(!r),
@@ -83,8 +83,8 @@ impl Vm {
vm_trace!("GTE rd={} r{}={:?} r{}={:?}", rd, a, self.regs[a], b, self.regs[b]);
let va = self.coerce_primitive_bounded(self.regs[a], false)?;
let vb = self.coerce_primitive_bounded(self.regs[b], false)?;
if (va.is_bigint() || vb.is_bigint()) && (va.is_symbol() || vb.is_symbol()) {
return self.raise_type_error("Cannot mix BigInt and other types, use explicit conversions");
if va.is_symbol() || vb.is_symbol() {
return self.raise_type_error("Cannot convert a Symbol value to a number");
}
match coercion::relational_compare(va, vb) {
Some(r) => self.regs[rd] = JsValue::bool(!r),
crates/oxide_vm/tests/comparison_tests.rs
+24
View File
@@ -157,3 +157,27 @@ fn eval_string_relational_utf16_code_unit_order() {
assert_eq!(eval(source), expected, "source: {source}");
}
}
#[test]
fn eval_relational_symbol_throws() {
// 关系比较任一侧为 Symbol 时按 ToNumber 抛 TypeError（规范 13.7.5 步骤 4/5）。
assert_eq!(
eval("Object(Symbol()) <= ''"),
"vm error: uncaught TypeError: Cannot convert a Symbol value to a number"
);
// symbol 与 bigint 混合时 symbol 消息优先（ToNumber 先于混合判定）。
assert_eq!(
eval("Object(Symbol()) < 1n"),
"vm error: uncaught TypeError: Cannot convert a Symbol value to a number"
);
assert_eq!(
eval("Object(Symbol()) > 1n"),
"vm error: uncaught TypeError: Cannot convert a Symbol value to a number"
);
assert_eq!(
eval("1n >= Object(Symbol())"),
"vm error: uncaught TypeError: Cannot convert a Symbol value to a number"
);
// 松散等值对 symbol 不抛，返回 false（回归钉）。
assert_eq!(eval("Object(Symbol()) == 'Symbol()'"), "false");
}