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

feat: ToPropertyKey 改走 ToPrimitive，Symbol 键与描述符，转换错误可捕获

Browse Source
This commit is contained in:
彭俊皓
2026-08-12 09:59:56 +08:00
parent c287708ddc
commit af61dcf6fc
16 changed files with 265 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_builtins/src/date.rs
+10 -1
View File
@@ -190,7 +190,16 @@ pub fn date_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let obj = unsafe { &*val.as_js_object_ptr() };
get_timestamp(obj)
} else {
f64::NAN
match oxide_runtime_api::to_number_full(val, vm) {
Ok(n) => n,
Err(_) => {
// ToNumber on an object may throw via toString/valueOf; propagate the original exception.
if let Some(exc) = vm.take_uncaught_value() {
return NativeResult::Err(exc);
}
return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a number"));
}
}
}
};
crates/oxide_builtins/src/number.rs
+10 -1
View File
@@ -6,7 +6,16 @@ use oxide_runtime_api::{NativeResult, VmHost};
/// 普通调用返回原始 number（整数走 int 表示）；new 语义返回 `[[NumberData]]` 包装对象。
pub fn number_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let n = if args.len() > 1 {
vm.coerce_number_bounded(vm.reg(args[1])).unwrap_or(f64::NAN)
match vm.coerce_number_bounded(vm.reg(args[1])) {
Ok(n) => n,
Err(_) => {
// ToNumber on an object may throw via toString/valueOf; propagate the original exception.
if let Some(exc) = vm.take_uncaught_value() {
return NativeResult::Err(exc);
}
return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a number"));
}
}
} else {
0.0
};
crates/oxide_builtins/src/object.rs
+15 -2
View File
@@ -204,8 +204,13 @@ pub fn delete_own_property<H: VmHost>(vm: &mut H, obj: &mut JsObject, key_si: u3
}
}
// walk_own_keys 只返回字符串键；Symbol 键（well-known/用户）需另行定位。
let keys = walk_own_keys(vm, obj);
let Some((_, delete_pos)) = keys.iter().find(|(si, _)| *si == key_si).copied() else {
let mut all_keys = keys;
if is_symbol_key(key_si) {
all_keys.extend(walk_own_symbol_keys(vm, obj));
}
let Some(delete_pos) = all_keys.iter().find(|(si, _)| *si == key_si).map(|(_, pos)| *pos) else {
return true;
};
// delete_pos 是 shape 槽位；数组对象存储索引 = 元素数 + 槽位。
@@ -230,7 +235,7 @@ pub fn delete_own_property<H: VmHost>(vm: &mut H, obj: &mut JsObject, key_si: u3
None
};
let retained: Vec<(u32, JsValue, Option<PropMetaEntry>)> = keys
let retained: Vec<(u32, JsValue, Option<PropMetaEntry>)> = all_keys
.into_iter()
.filter(|(_, pos)| *pos != delete_pos)
.map(|(si, pos)| {
@@ -312,6 +317,14 @@ pub fn object_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
obj_ref.set_prop_at(0, val);
return NativeResult::Ok(JsValue::from_js_object(obj));
}
if val.is_symbol() {
let proto = vm.session().builtin_world().symbol_proto.as_ptr() as *mut JsObject;
let obj = vm.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto)));
let obj_ref = unsafe { &mut *obj };
obj_ref.type_tag = JsObject::OBJ_TYPE_SYMBOL_OBJ;
obj_ref.set_prop_at(0, val);
return NativeResult::Ok(JsValue::from_js_object(obj));
}
if val.is_bigint() {
let proto = vm.session().builtin_world().bigint_proto.as_ptr() as *mut JsObject;
let obj = vm.alloc_object(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto)));
crates/oxide_builtins/src/string.rs
+18 -3
View File
@@ -114,9 +114,15 @@ pub fn string_value_of<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn string_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let s = if args.len() > 1 {
// 对象参数须经 ToPrimitive/ToString 完整转换（数组 → join，对象 → toString）。
match oxide_runtime_api::to_string_full(vm.reg(args[1]), vm) {
match oxide_runtime_api::to_string_for_string_constructor(vm.reg(args[1]), vm) {
Ok(s) => s,
Err(e) => return NativeResult::Err(crate::error::create_error(vm, &e)),
Err(_) => {
// ToString on an object may throw via toString/valueOf; propagate the original exception.
if let Some(exc) = vm.take_uncaught_value() {
return NativeResult::Err(exc);
}
return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string"));
}
}
} else {
String::new()
@@ -490,7 +496,16 @@ pub fn string_concat<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
builtins_debug!("String.prototype.concat called with {} args", args.len());
let mut result = try_string!(this_string(vm, args));
for &arg_reg in args.iter().skip(1) {
result.push_str(&oxide_runtime_api::to_string(vm.reg(arg_reg)));
match oxide_runtime_api::to_string_full(vm.reg(arg_reg), vm) {
Ok(s) => result.push_str(&s),
Err(_) => {
// ToString on an object may throw via toString/valueOf; propagate the original exception.
if let Some(exc) = vm.take_uncaught_value() {
return NativeResult::Err(exc);
}
return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string"));
}
}
}
NativeResult::Ok(vm.new_string(&result))
}
crates/oxide_builtins/src/symbol.rs
+66 -9
View File
@@ -24,35 +24,92 @@ pub fn symbol_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
}
}
// 描述符按规范 ToString(description)：对象经 ToPrimitive(string hint) 强制转换，
// Symbol 抛 TypeError，对象方法抛出的原始异常原样传播。
let description = if args.len() > 1 {
oxide_runtime_api::to_string(vm.reg(args[1]))
match oxide_runtime_api::to_string_full(vm.reg(args[1]), vm) {
Ok(s) => s,
Err(_) => {
if let Some(exc) = vm.take_uncaught_value() {
return NativeResult::Err(exc);
}
return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string"));
}
}
} else {
String::new()
};
let idx = vm.symbol_intern(description);
let idx = vm.symbol_intern(Some(description));
NativeResult::Ok(JsValue::symbol(idx))
}
/// `Symbol.prototype.toString`：返回 `Symbol(description)` 形式字符串。
/// this 必须是 Symbol，否则抛 TypeError。
/// thisSymbolValue：Symbol 原样返回；包装对象解盒（prop 0 存原始 Symbol）；其它类型 TypeError。
fn this_symbol_value<H: VmHost>(vm: &mut H, this_val: JsValue) -> Result<JsValue, JsValue> {
if this_val.is_symbol() {
return Ok(this_val);
}
if this_val.is_object() {
let ptr = this_val.as_js_object_ptr();
if !ptr.is_null() {
let obj = unsafe { &*ptr };
if obj.proto().is_object() {
let proto_ptr = obj.proto().as_js_object_ptr();
let symbol_proto =
vm.session().builtin_world().symbol_proto.as_ptr() as *mut oxide_types::object::JsObject;
if !proto_ptr.is_null() && std::ptr::eq(proto_ptr, symbol_proto) {
let v = obj.get_prop_at(0);
if v.is_symbol() {
return Ok(v);
}
}
}
}
}
Err(crate::error::create_type_error(
vm,
"Symbol.prototype method called on incompatible receiver",
))
}
/// `Symbol.prototype.toString`：返回 `Symbol(description)` 形式字符串。
/// this 必须是 Symbol 或 Symbol 包装对象，否则抛 TypeError。
pub fn symbol_to_string<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(args[0]);
if !this_val.is_symbol() {
return NativeResult::Err(crate::error::create_type_error(vm, "Symbol.prototype.toString requires a Symbol"));
}
let idx = this_val.as_symbol_index();
let sym = match this_symbol_value(vm, this_val) {
Ok(v) => v,
Err(e) => return NativeResult::Err(e),
};
let idx = sym.as_symbol_index();
let desc = vm.symbol_description(idx).unwrap_or("").to_string();
let result = format!("Symbol({})", desc);
NativeResult::Ok(vm.new_string(&result))
}
/// `Symbol.prototype.valueOf`：Symbol 原样返回；包装对象解盒返回其原始 Symbol。
pub fn symbol_value_of<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
match this_symbol_value(vm, vm.reg(args[0])) {
Ok(v) => NativeResult::Ok(v),
Err(e) => NativeResult::Err(e),
}
}
/// `Symbol.for(key)`：在全局 symbol 注册表中查找并返回同 key 的 Symbol；
/// 不存在则新建并登记。同 key 的 Symbol 在全局唯一。
pub fn symbol_for<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
// Symbol.for(key) 按规范 ToString(key)：对象经完整强制转换，异常原样传播。
let key = if args.len() > 1 {
oxide_runtime_api::to_string(vm.reg(args[1]))
match oxide_runtime_api::to_string_full(vm.reg(args[1]), vm) {
Ok(s) => s,
Err(_) => {
if let Some(exc) = vm.take_uncaught_value() {
return NativeResult::Err(exc);
}
return NativeResult::Err(crate::error::create_type_error(vm, "Cannot convert value to a string"));
}
}
} else {
"undefined".to_string()
};
@@ -61,7 +118,7 @@ pub fn symbol_for<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
return NativeResult::Ok(JsValue::symbol(idx));
}
let idx = vm.symbol_intern(key.clone());
let idx = vm.symbol_intern(Some(key.clone()));
vm.symbol_register_global(key, idx);
NativeResult::Ok(JsValue::symbol(idx))
}