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

refactor: 内置八文件续迁内核访问器调用至能力方法

Browse Source
This commit is contained in:
彭俊皓
2026-10-08 07:52:57 +00:00
parent 8a67117497
commit 5970f804d7
10 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_builtins/src/array/common.rs
+2 -2
View File
@@ -4,7 +4,7 @@ use oxide_kernel::shape_forge::EMPTY_SHAPE_ID;
use oxide_types::object::{JsObject, MAX_DENSE_PROPS};
use oxide_types::value::JsValue;
use oxide_runtime_api::{NativeResult, VmHost};
use oxide_runtime_api::{NativeResult, ProtoKind, VmHost};
use super::from::from_engine_error;
@@ -262,7 +262,7 @@ pub(crate) fn require_callback<H: VmHost>(vm: &mut H, callback_val: JsValue) ->
}
pub(crate) fn create_new_array<H: VmHost>(vm: &mut H, n: usize) -> *mut JsObject {
let proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject;
let proto = vm.builtin_proto(ProtoKind::ArrayProto);
vm.alloc_object(JsObject::new_array(
EMPTY_SHAPE_ID,
JsValue::from_js_object(proto),
crates/oxide_builtins/src/data_view.rs
+4 -4
View File
@@ -7,7 +7,7 @@ use num_traits::ToPrimitive;
use crate::array_buffer::{buffer_payload, ArrayBufferPayload};
use oxide_runtime_api::{NativeResult, VmHost};
use oxide_runtime_api::{NativeResult, ProtoKind, VmHost};
/// DataView 视图状态盒。`byte_length` 语义随 `length_is_auto` 分流：
/// 定长视图存静态长；auto 视图（构造时 byteLength 缺省且构造期缓冲可 resize）
@@ -205,7 +205,7 @@ fn has_data_view_proto<H: VmHost>(vm: &mut H, this_val: JsValue) -> bool {
if !this_val.is_object() {
return false;
}
let target = vm.session().builtin_world().data_view_proto.as_ptr() as *mut JsObject;
let target = vm.builtin_proto(ProtoKind::DataViewProto);
let mut cursor = this_val;
for _ in 0..1024 {
if !cursor.is_object() {
@@ -290,11 +290,11 @@ pub fn data_view_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult
// GetPrototypeFromConstructor：普通读触发原型链上的访问器 getter，
// 读期用户异常经原值槽恢复后重抛。NewTarget 非对象（直调/缺省面）时
// 回落默认原型，不抛错。
let default_proto = JsValue::from_js_object(vm.session().builtin_world().data_view_proto.as_ptr() as *mut JsObject);
let default_proto = JsValue::from_js_object(vm.builtin_proto(ProtoKind::DataViewProto));
let proto = if new_target.is_object() {
let nt_ptr = new_target.as_js_object_ptr();
let nt_obj = unsafe { &*nt_ptr };
let proto_si = vm.kernel_core().perm_interner().intern("prototype").0;
let proto_si = vm.perm_intern("prototype");
let proto_val = match vm.ordinary_get(nt_obj, proto_si, new_target) {
Ok(v) => v,
Err(e) => return NativeResult::Err(crate::iterator::engine_error(vm, &e)),
crates/oxide_builtins/src/date.rs
+3 -6
View File
@@ -4,7 +4,7 @@ use oxide_kernel::shape_forge::EMPTY_SHAPE_ID;
use oxide_types::object::JsObject;
use oxide_types::value::JsValue;
use oxide_runtime_api::{NativeResult, VmHost};
use oxide_runtime_api::{NativeResult, ProtoKind, VmHost};
fn get_timestamp(obj: &JsObject) -> f64 {
let v = obj.get_prop_at(0);
@@ -345,7 +345,7 @@ pub fn date_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
if ptr.is_null() {
false
} else {
let date_proto = vm.session().builtin_world().date_proto.as_ptr() as *mut JsObject;
let date_proto = vm.builtin_proto(ProtoKind::DateProto);
if date_proto.is_null() {
false
} else {
@@ -435,10 +435,7 @@ pub fn date_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
}
};
let mut obj = JsObject::new_empty(
EMPTY_SHAPE_ID,
JsValue::from_js_object(vm.session().builtin_world().date_proto.as_ptr() as *mut JsObject),
);
let mut obj = JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(vm.builtin_proto(ProtoKind::DateProto)));
obj.type_tag = JsObject::OBJ_TYPE_DATE;
obj.set_prop_at(0, JsValue::float(timestamp));
crates/oxide_builtins/src/disposable_stack.rs
+6 -10
View File
@@ -16,7 +16,7 @@ use oxide_types::object::JsObject;
use oxide_types::private_key::encode_symbol_key;
use oxide_types::value::JsValue;
use oxide_runtime_api::{NativeResult, VmHost};
use oxide_runtime_api::{NativeResult, ProtoKind, VmHost};
/// 分配空状态盒并存入新资源栈对象（proto 与 type_tag 按栈类型传入）。
fn alloc_disposable_stack<H: VmHost>(vm: &mut H, proto_val: JsValue, type_tag: u8) -> *mut JsObject {
@@ -122,7 +122,7 @@ fn stack_constructor_impl<H: VmHost>(vm: &mut H, args: &[u8], proto_val: JsValue
let nt_ptr = new_target.as_js_object_ptr();
// SAFETY: is_object 保证指针非空且对象本 session 存活。
let nt_obj = unsafe { &*nt_ptr };
let proto_si = vm.kernel_core().perm_interner().intern("prototype").0;
let proto_si = vm.perm_intern("prototype");
let proto = match vm.ordinary_get(nt_obj, proto_si, new_target) {
Ok(v) => v,
Err(err) => return NativeResult::Err(crate::iterator::engine_error(vm, &err)),
@@ -141,15 +141,13 @@ fn stack_constructor_impl<H: VmHost>(vm: &mut H, args: &[u8], proto_val: JsValue
/// `DisposableStack` 构造函数：创建带空状态盒的 DisposableStack 对象。
pub fn disposable_stack_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let proto_val =
JsValue::from_js_object(vm.session().builtin_world().disposable_stack_proto.as_ptr() as *mut JsObject);
let proto_val = JsValue::from_js_object(vm.builtin_proto(ProtoKind::DisposableStackProto));
stack_constructor_impl(vm, args, proto_val, JsObject::OBJ_TYPE_DISPOSABLE_STACK)
}
/// `AsyncDisposableStack` 构造函数：创建带空状态盒的 AsyncDisposableStack 对象。
pub fn async_disposable_stack_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let proto_val =
JsValue::from_js_object(vm.session().builtin_world().async_disposable_stack_proto.as_ptr() as *mut JsObject);
let proto_val = JsValue::from_js_object(vm.builtin_proto(ProtoKind::AsyncDisposableStackProto));
stack_constructor_impl(vm, args, proto_val, JsObject::OBJ_TYPE_ASYNC_DISPOSABLE_STACK)
}
@@ -464,8 +462,7 @@ fn stack_move_impl<H: VmHost>(vm: &mut H, this_val: JsValue, proto_val: JsValue,
/// `DisposableStack.prototype.move()`：把全部 entries 转移到新 DisposableStack。
pub fn disposable_stack_move<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let proto_val =
JsValue::from_js_object(vm.session().builtin_world().disposable_stack_proto.as_ptr() as *mut JsObject);
let proto_val = JsValue::from_js_object(vm.builtin_proto(ProtoKind::DisposableStackProto));
stack_move_impl(vm, this_val, proto_val, JsObject::OBJ_TYPE_DISPOSABLE_STACK)
}
@@ -473,8 +470,7 @@ pub fn disposable_stack_move<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult
/// AsyncDisposableStack（proto 固定为 AsyncDisposableStack.prototype，非子类）。
pub fn async_disposable_stack_move<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let proto_val =
JsValue::from_js_object(vm.session().builtin_world().async_disposable_stack_proto.as_ptr() as *mut JsObject);
let proto_val = JsValue::from_js_object(vm.builtin_proto(ProtoKind::AsyncDisposableStackProto));
stack_move_impl(vm, this_val, proto_val, JsObject::OBJ_TYPE_ASYNC_DISPOSABLE_STACK)
}
crates/oxide_builtins/src/number.rs
+4 -4
View File
@@ -1,6 +1,6 @@
use oxide_types::value::JsValue;
use oxide_runtime_api::{NativeResult, VmHost};
use oxide_runtime_api::{NativeResult, ProtoKind, VmHost};
/// 整值且 i32 域内的有限数转 int 表示；-0 排除
/// （int 表示丢符号，规范要求 `Number(-0)` 得 -0）。
@@ -46,7 +46,7 @@ pub fn number_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
} else {
0.0
};
let number_proto = vm.session().builtin_world().number_proto.as_ptr() as *mut oxide_types::object::JsObject;
let number_proto = vm.builtin_proto(ProtoKind::NumberProto);
let is_ctor = if let Some(this_reg) = args.first().copied() {
let this_val = vm.reg(this_reg);
if this_val.is_object() {
@@ -345,7 +345,7 @@ fn this_number_value<H: VmHost>(vm: &mut H, this_val: JsValue) -> Result<f64, Js
if !ptr.is_null() {
// Number.prototype 本身即 [[NumberData]] = +0 的 Number 对象；
// 与 number_value_of 的 proto 特判同形。
let number_proto = vm.session().builtin_world().number_proto.as_ptr() as *mut oxide_types::object::JsObject;
let number_proto = vm.builtin_proto(ProtoKind::NumberProto);
if std::ptr::eq(ptr, number_proto) {
return Ok(0.0);
}
@@ -942,7 +942,7 @@ pub fn number_value_of<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let ptr = this_val.as_js_object_ptr();
if !ptr.is_null() {
// Number.prototype 本身是 Number 对象，其 [[NumberData]] 为 +0。
let number_proto = vm.session().builtin_world().number_proto.as_ptr() as *mut oxide_types::object::JsObject;
let number_proto = vm.builtin_proto(ProtoKind::NumberProto);
if ptr == number_proto {
return NativeResult::Ok(JsValue::int(0));
}
crates/oxide_builtins/src/reflect.rs
+5 -5
View File
@@ -6,7 +6,7 @@ use oxide_types::value::JsValue;
use crate::array::{arraylike_get, from_engine_error, is_constructor_value};
use crate::object::{delete_own_property, key_si_to_js_value, own_symbol_key_values, walk_own_keys};
use oxide_runtime_api::{to_length, NativeResult, VmHost};
use oxide_runtime_api::{to_length, NativeResult, ProtoKind, VmHost};
/// 原型链深度上限（与引擎原型链深度上限同值）。
const MAX_PROTO_CHAIN_DEPTH: usize = 1024;
@@ -32,7 +32,7 @@ pub fn reflect_apply<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let arg_list_obj = unsafe { &*arg_list_ptr };
// CreateListFromArrayLike：规范读 length（访问器异常原值传播），ToLength 纯函数不抛。
let length_si = vm.kernel_core().perm_interner().intern("length").0;
let length_si = vm.perm_intern("length");
let len_val = match vm.ordinary_get(arg_list_obj, length_si, arg_list) {
Ok(v) => v,
Err(msg) => return NativeResult::Err(from_engine_error(vm, &msg)),
@@ -82,7 +82,7 @@ pub fn reflect_construct<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let arg_list_obj = unsafe { &*arg_list_ptr };
// CreateListFromArrayLike：规范读 length（访问器异常原值传播），ToLength 纯函数不抛。
let length_si = vm.kernel_core().perm_interner().intern("length").0;
let length_si = vm.perm_intern("length");
let len_val = match vm.ordinary_get(arg_list_obj, length_si, arg_list) {
Ok(v) => v,
Err(msg) => return NativeResult::Err(from_engine_error(vm, &msg)),
@@ -248,14 +248,14 @@ pub fn reflect_own_keys<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
// （创建序第一枚字符串键），存储下标哨兵 u32::MAX = 无槽位（消费端只读
// si，不读存储下标）。
if target.is_array() {
let length_si = vm.kernel_core().perm_interner().intern("length").0;
let length_si = vm.perm_intern("length");
let insert_at = keys.iter().position(|(si, _)| !is_int_key(*si)).unwrap_or(keys.len());
keys.insert(insert_at, (length_si, u32::MAX));
}
let symbols = own_symbol_key_values(vm, target);
let n = keys.len() + symbols.len();
let array_proto = vm.session().builtin_world().array_proto.as_ptr() as *mut JsObject;
let array_proto = vm.builtin_proto(ProtoKind::ArrayProto);
let arr = vm.alloc_object(JsObject::new_array(EMPTY_SHAPE_ID, JsValue::from_js_object(array_proto), n));
for (i, (si, _)) in keys.iter().enumerate() {
let key_val = key_si_to_js_value(vm, *si);
crates/oxide_builtins/src/symbol.rs
+3 -5
View File
@@ -1,7 +1,6 @@
use oxide_types::object::JsObject;
use oxide_types::value::JsValue;
use oxide_runtime_api::{NativeResult, VmHost};
use oxide_runtime_api::{NativeResult, ProtoKind, VmHost};
/// JS `Symbol()` 构造逻辑：以可选 description 创建一个新的唯一 Symbol。
/// 当以 new 语义调用（this 原型链指向 Symbol.prototype）时抛 TypeError，与规范一致。
@@ -15,7 +14,7 @@ pub fn symbol_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
if proto.is_object() {
let proto_ptr = proto.as_js_object_ptr();
if !proto_ptr.is_null() {
let sp = vm.session().builtin_world().symbol_proto.as_ptr() as *mut JsObject;
let sp = vm.builtin_proto(ProtoKind::SymbolProto);
if std::ptr::eq(proto_ptr, sp) {
return NativeResult::Err(crate::error::create_type_error(vm, "Symbol is not a constructor"));
}
@@ -64,8 +63,7 @@ fn this_symbol_value<H: VmHost>(vm: &mut H, this_val: JsValue) -> Result<JsValue
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;
let symbol_proto = vm.builtin_proto(ProtoKind::SymbolProto);
if !proto_ptr.is_null() && std::ptr::eq(proto_ptr, symbol_proto) {
let v = obj.boxed_value();
if v.is_symbol() {
crates/oxide_builtins/src/weak_map.rs
+4 -4
View File
@@ -237,11 +237,11 @@ pub fn weak_map_insert(obj: &mut JsObject, key: JsValue, value: JsValue) {
/// `prototype` 槽现值读取（弱族不占 BuiltinWorld 槽，重绑原位更新全局槽，
/// 经全局路径读恒为当前值）。
fn weak_map_proto_ptr<H: VmHost>(vm: &mut H) -> Result<*const JsObject, JsValue> {
let global_ptr = vm.session().global_object().as_ptr();
let global_ptr = vm.global_object().as_ptr();
// SAFETY: 全局对象为 session 级根，本调用内有效。
let global = unsafe { &*global_ptr };
let global_val = JsValue::from_js_object(global_ptr as *mut JsObject);
let si_weakmap = vm.kernel_core().perm_interner().intern("WeakMap").0;
let si_weakmap = vm.perm_intern("WeakMap");
let ctor_val = vm
.ordinary_get(global, si_weakmap, global_val)
.map_err(|e| crate::iterator::engine_error(vm, &e))?;
@@ -249,7 +249,7 @@ fn weak_map_proto_ptr<H: VmHost>(vm: &mut H) -> Result<*const JsObject, JsValue>
if ctor_ptr.is_null() {
return Err(crate::error::create_type_error(vm, "WeakMap constructor unavailable"));
}
let si_prototype = vm.kernel_core().perm_interner().intern("prototype").0;
let si_prototype = vm.perm_intern("prototype");
let proto_val = vm
.ordinary_get(unsafe { &*ctor_ptr }, si_prototype, ctor_val)
.map_err(|e| crate::iterator::engine_error(vm, &e))?;
@@ -327,7 +327,7 @@ pub fn weak_map_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult
let iterable = vm.reg(args[1]);
if !iterable.is_undefined() && !iterable.is_null() {
let map_ref = unsafe { &*map_obj };
let set_si = vm.kernel_core().perm_interner().intern("set").0;
let set_si = vm.perm_intern("set");
let adder = match vm.ordinary_get(map_ref, set_si, map_val) {
Ok(v) => v,
Err(err) => return NativeResult::Err(crate::iterator::engine_error(vm, &err)),