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

feat: 添加字符串转数字运算分支

Browse Source
This commit is contained in:
彭俊皓
2026-06-06 09:54:53 +08:00
parent fffbd14d42
commit 955596ff2f
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/coercion.rs
+14 -8
View File
@@ -11,7 +11,7 @@ pub fn to_primitive(val: JsValue) -> JsValue {
val val
} }
pub fn to_number(val: JsValue) -> f64 { pub fn to_number(val: JsValue, string_forge: &StringForge) -> f64 {
if val.is_int() { if val.is_int() {
return val.as_int() as f64; return val.as_int() as f64;
} }
@@ -27,6 +27,12 @@ pub fn to_number(val: JsValue) -> f64 {
if val.is_undefined() { if val.is_undefined() {
return f64::NAN; return f64::NAN;
} }
if val.is_string() {
let s = string_forge
.lookup(val.as_string_index())
.unwrap_or_default();
return s.parse::<f64>().unwrap_or(f64::NAN);
}
if val.is_object() { if val.is_object() {
panic_to_object(); panic_to_object();
} }
@@ -98,7 +104,7 @@ pub fn to_boolean(val: JsValue) -> bool {
false false
} }
pub fn abstract_eq(lhs: JsValue, rhs: JsValue) -> bool { pub fn abstract_eq(lhs: JsValue, rhs: JsValue, string_forge: &StringForge) -> bool {
if lhs.is_null() && rhs.is_undefined() { if lhs.is_null() && rhs.is_undefined() {
return true; return true;
} }
@@ -124,16 +130,16 @@ pub fn abstract_eq(lhs: JsValue, rhs: JsValue) -> bool {
return true; return true;
} }
if (lhs.is_int() || lhs.is_double()) && (rhs.is_int() || rhs.is_double()) { if (lhs.is_int() || lhs.is_double()) && (rhs.is_int() || rhs.is_double()) {
return strict_double_eq(to_number(lhs), to_number(rhs)); return strict_double_eq(to_number(lhs, string_forge), to_number(rhs, string_forge));
} }
if (lhs.is_int() || lhs.is_double()) && rhs.is_bool() { if (lhs.is_int() || lhs.is_double()) && rhs.is_bool() {
return to_number(lhs) == to_number(rhs); return to_number(lhs, string_forge) == to_number(rhs, string_forge);
} }
if lhs.is_bool() && (rhs.is_int() || rhs.is_double()) { if lhs.is_bool() && (rhs.is_int() || rhs.is_double()) {
return to_number(lhs) == to_number(rhs); return to_number(lhs, string_forge) == to_number(rhs, string_forge);
} }
if lhs.is_bool() || rhs.is_bool() { if lhs.is_bool() || rhs.is_bool() {
return to_number(lhs) == to_number(rhs); return to_number(lhs, string_forge) == to_number(rhs, string_forge);
} }
if lhs.is_null() || rhs.is_null() { if lhs.is_null() || rhs.is_null() {
return false; return false;
@@ -186,8 +192,8 @@ pub fn relational_compare(string_forge: &StringForge, lhs: JsValue, rhs: JsValue
.unwrap_or_default(); .unwrap_or_default();
return Some(ls < rs); return Some(ls < rs);
} }
let l = to_number(lhs); let l = to_number(lhs, string_forge);
let r = to_number(rhs); let r = to_number(rhs, string_forge);
if l.is_nan() || r.is_nan() { if l.is_nan() || r.is_nan() {
return None; return None;
} }
crates/oxide_vm/src/vm.rs
+21 -13
View File
@@ -164,48 +164,56 @@ impl Vm {
let concat = format!("{ls}{rs}"); let concat = format!("{ls}{rs}");
self.regs[rd] = self.intern(&concat); self.regs[rd] = self.intern(&concat);
} else { } else {
let ln = coercion::to_number(lhs); let ln = coercion::to_number(lhs, self.kernel.string_forge().as_ref());
let rn = coercion::to_number(rhs); let rn = coercion::to_number(rhs, self.kernel.string_forge().as_ref());
self.regs[rd] = JsValue::float(ln + rn); self.regs[rd] = JsValue::float(ln + rn);
} }
} }
OpCode::SUB => { OpCode::SUB => {
let l = coercion::to_number(self.regs[a]); let l = coercion::to_number(self.regs[a], self.kernel.string_forge().as_ref());
let r = coercion::to_number(self.regs[b]); let r = coercion::to_number(self.regs[b], self.kernel.string_forge().as_ref());
self.regs[rd] = JsValue::float(l - r); self.regs[rd] = JsValue::float(l - r);
} }
OpCode::MUL => { OpCode::MUL => {
let l = coercion::to_number(self.regs[a]); let l = coercion::to_number(self.regs[a], self.kernel.string_forge().as_ref());
let r = coercion::to_number(self.regs[b]); let r = coercion::to_number(self.regs[b], self.kernel.string_forge().as_ref());
self.regs[rd] = JsValue::float(l * r); self.regs[rd] = JsValue::float(l * r);
} }
OpCode::DIV => { OpCode::DIV => {
let l = coercion::to_number(self.regs[a]); let l = coercion::to_number(self.regs[a], self.kernel.string_forge().as_ref());
let r = coercion::to_number(self.regs[b]); let r = coercion::to_number(self.regs[b], self.kernel.string_forge().as_ref());
self.regs[rd] = JsValue::float(l / r); self.regs[rd] = JsValue::float(l / r);
} }
OpCode::MOD => { OpCode::MOD => {
let l = coercion::to_number(self.regs[a]); let l = coercion::to_number(self.regs[a], self.kernel.string_forge().as_ref());
let r = coercion::to_number(self.regs[b]); let r = coercion::to_number(self.regs[b], self.kernel.string_forge().as_ref());
self.regs[rd] = JsValue::float(l % r); self.regs[rd] = JsValue::float(l % r);
} }
OpCode::NEG => { OpCode::NEG => {
let v = coercion::to_number(self.regs[a]); let v = coercion::to_number(self.regs[a], self.kernel.string_forge().as_ref());
self.regs[rd] = JsValue::float(-v); self.regs[rd] = JsValue::float(-v);
} }
OpCode::EQ => { OpCode::EQ => {
let eq = coercion::abstract_eq(self.regs[a], self.regs[b]); let eq = coercion::abstract_eq(
self.regs[a],
self.regs[b],
self.kernel.string_forge().as_ref(),
);
self.regs[rd] = JsValue::bool(eq); self.regs[rd] = JsValue::bool(eq);
} }
OpCode::NEQ => { OpCode::NEQ => {
let ne = !coercion::abstract_eq(self.regs[a], self.regs[b]); let ne = !coercion::abstract_eq(
self.regs[a],
self.regs[b],
self.kernel.string_forge().as_ref(),
);
self.regs[rd] = JsValue::bool(ne); self.regs[rd] = JsValue::bool(ne);
} }