refactor: array 共享层拆出 common 模块

This commit is contained in:
2026-09-17 11:26:34 +00:00
parent 4f940d9f00
commit 24f15d3a7c
2 changed files with 253 additions and 238 deletions
+251
View File
@@ -0,0 +1,251 @@
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 super::from_engine_error;
macro_rules! array_ptr {
($vm:expr, $args:expr) => {{
match get_this_array_ref($vm, $vm.reg($args[0])) {
Ok(ptr) => ptr,
Err(err) => {
builtins_error!("Array method: invalid receiver");
return NativeResult::Err(err);
}
}
}};
}
pub(crate) use array_ptr;
#[allow(unused_macros)]
macro_rules! array_ptr_len {
($vm:expr, $args:expr) => {{
let this_val = $vm.reg($args[0]);
let (arr_ptr, len, _is_arr) = match get_this_arraylike($vm, this_val) {
Ok(v) => v,
Err(err) => {
builtins_error!("Array method: invalid receiver");
return NativeResult::Err(err);
}
};
(arr_ptr, len)
}};
}
#[expect(unused_imports)] // 无调用点的预留宏,保留与其余助手宏一致的导出
pub(crate) use array_ptr_len;
macro_rules! array_ptr_len3 {
($vm:expr, $args:expr) => {{
let this_val = $vm.reg($args[0]);
let (arr_ptr, len, is_arr) = match get_this_arraylike($vm, this_val) {
Ok(v) => v,
Err(err) => {
builtins_error!("Array method: invalid receiver");
return NativeResult::Err(err);
}
};
(arr_ptr, len, is_arr)
}};
}
pub(crate) use array_ptr_len3;
pub(crate) fn array_type_error<H: VmHost>(vm: &mut H, msg: &str) -> JsValue {
crate::error::create_type_error(vm, msg)
}
pub(crate) fn get_this_array_ref<H: VmHost>(vm: &mut H, val: JsValue) -> Result<*mut JsObject, JsValue> {
if !val.is_object() {
return Err(array_type_error(vm, "Array method called on incompatible receiver"));
}
let ptr = val.as_js_object_ptr();
if ptr.is_null() {
return Err(array_type_error(vm, "Array method called on incompatible receiver"));
}
let obj = unsafe { &*ptr };
if !obj.is_array() {
return Err(array_type_error(vm, "Array method called on incompatible receiver"));
}
Ok(ptr)
}
/// 接受 array 或 ArrayLike (object with length property) — for read-only methods.
/// 返回 (object_ptr, length, is_real_array)
#[inline(always)]
pub(crate) fn get_this_arraylike<H: VmHost>(vm: &mut H, val: JsValue) -> Result<(*mut JsObject, usize, bool), JsValue> {
if !val.is_object() {
return Err(array_type_error(vm, "Array.prototype method called on null or undefined"));
}
let ptr = val.as_js_object_ptr();
if ptr.is_null() {
return Err(array_type_error(vm, "Array.prototype method called on null or undefined"));
}
let obj = unsafe { &*ptr };
let is_array = obj.is_array();
// 读取 length 属性(按规范 Get 语义,getter 抛错需向上传播)。
// 真数组也走 Get:`arr.length = N` 已由 ordinary_set 的数组分支同步元素区,
// 直接 prop_count() 会漏掉 length 赋值。
let length_key = vm.new_string("length");
let length_si = vm.property_key_si(length_key);
let len_val = match vm.ordinary_get(unsafe { &*ptr }, length_si, val) {
Ok(v) => v,
Err(msg) => return Err(from_engine_error(vm, &msg)),
};
if len_val.is_symbol() {
return Err(array_type_error(vm, "Cannot convert a Symbol value to a number"));
}
let len_num = match vm.coerce_number_bounded(len_val) {
Ok(v) => v,
Err(msg) => return Err(from_engine_error(vm, &msg)),
};
// ToLength:min(max(0, ToIntegerOrInfinity(len)), 2**53-1)
let len = if len_num.is_nan() || len_num <= 0.0 {
0
} else {
len_num.min(9_007_199_254_740_991.0) as usize
};
Ok((ptr, len, is_array))
}
/// 从 arraylike 读取 index 位置元素(按规范 Get:访问器/原型链/异常完整传播)。
#[inline(always)]
pub(crate) fn arraylike_get<H: VmHost>(vm: &mut H, ptr: *mut JsObject, i: usize) -> Result<JsValue, JsValue> {
// 真数组密集直读快路径:无元素 meta(无 hole / accessor,O(1) 空指针判定)且
// 索引在元素区内时,直接读数据槽,免每元素构造数字串 + 属性键转换。
// 语义与 ordinary_get 一致:`array_elements_meta_vec().is_none()` 保证该索引
// 恒为数据属性(见 vm_props.rs ordinary_get_inner 数组分支)。
let obj = unsafe { &*ptr };
if obj.is_array() && obj.array_elements_meta_vec().is_none() && i < obj.array_prop_count as usize {
return Ok(obj.get_prop_at(i));
}
let key_str = vm.new_string(&i.to_string());
let key_si = vm.property_key_si(key_str);
let recv = JsValue::from_js_object(ptr);
match vm.ordinary_get(obj, key_si, recv) {
Ok(v) => Ok(v),
Err(msg) => Err(from_engine_error(vm, &msg)),
}
}
/// 元素读取失败时直接把异常作为 NativeResult::Err 返回。
macro_rules! arraylike_get_or_err {
($vm:expr, $ptr:expr, $i:expr) => {
match arraylike_get($vm, $ptr, $i) {
Ok(v) => v,
Err(err) => return NativeResult::Err(err),
}
};
}
pub(crate) use arraylike_get_or_err;
/// 数组下标转 JsValue:超出 i32 范围时用 double 精确表示。
#[inline(always)]
pub(crate) fn js_array_index(i: usize) -> JsValue {
if i <= i32::MAX as usize {
JsValue::int(i as i32)
} else {
JsValue::float(i as f64)
}
}
/// ToIntegerOrInfinity 的 builtins 版本:对象经 ToPrimitive(number) 后取整,
/// NaN/±0 → 0,±Inf 保留;转换异常向上传播。
pub(crate) fn to_integer_or_infinity_bounded<H: VmHost>(vm: &mut H, val: JsValue) -> Result<f64, JsValue> {
let n = match vm.coerce_number_bounded(val) {
Ok(v) => v,
Err(msg) => return Err(from_engine_error(vm, &msg)),
};
Ok(if n.is_nan() || n == 0.0 { 0.0 } else { n.trunc() })
}
/// 把 ToIntegerOrInfinity 结果夹到 [0, len]:负数按 len+rel,正无穷取 len。
#[inline(always)]
pub(crate) fn clamp_relative(rel: f64, n_f: f64, n: usize) -> usize {
if rel.is_infinite() {
if rel < 0.0 {
0
} else {
n
}
} else if rel < 0.0 {
(n_f + rel).max(0.0) as usize
} else {
rel.min(n_f) as usize
}
}
/// IsConstructor 的近似判定(与 construct_array_from_result 保持一致)。
#[inline]
pub(crate) fn is_constructor_value(c: JsValue) -> bool {
if !c.is_object() {
return false;
}
let c_obj = unsafe { &*c.as_js_object_ptr() };
c_obj.is_function()
&& !c_obj.is_arrow()
&& !(c_obj.native_fn().is_some() && c_obj.type_tag != JsObject::OBJ_TYPE_CONSTRUCTOR)
}
pub(crate) fn require_callback<H: VmHost>(vm: &mut H, callback_val: JsValue) -> Result<JsValue, JsValue> {
if !callback_val.is_object() {
return Err(array_type_error(vm, "callback is not a function"));
}
let ptr = callback_val.as_js_object_ptr();
if ptr.is_null() || !unsafe { &*ptr }.is_function() {
return Err(array_type_error(vm, "callback is not a function"));
}
Ok(callback_val)
}
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;
vm.alloc_object(JsObject::new_array(
EMPTY_SHAPE_ID,
JsValue::from_js_object(proto),
n.min(MAX_DENSE_PROPS),
vm.epoch().bump(),
))
}
/// ArrayCreate ?????length > 2**32 - 1 ? RangeError??????/???????
pub(crate) fn check_array_create_len<H: VmHost>(vm: &mut H, n: usize) -> Result<(), JsValue> {
if n > u32::MAX as usize {
return Err(crate::error::create_range_error(vm, "Invalid array length"));
}
Ok(())
}
pub(crate) fn array_length_arg<H: VmHost>(vm: &mut H, value: JsValue) -> Result<usize, JsValue> {
let n = vm.coerce_number_bounded(value).unwrap_or(f64::NAN);
if !n.is_finite() || n < 0.0 || n.fract() != 0.0 || n > MAX_DENSE_PROPS as f64 {
return Err(crate::error::create_range_error(vm, "Invalid array length"));
}
Ok(n as usize)
}
pub(crate) fn invoke_native_callback<H: VmHost>(
vm: &mut H, callback_val: JsValue, this_val: JsValue, cb_args: &[JsValue],
) -> NativeResult {
if !callback_val.is_object() {
return NativeResult::Err(crate::error::create_type_error(vm, "callback is not a function"));
}
let cb_ptr = callback_val.as_js_object_ptr();
if cb_ptr.is_null() {
return NativeResult::Err(crate::error::create_type_error(vm, "callback is not a function"));
}
let cb = unsafe { &*cb_ptr };
if !cb.is_function() {
return NativeResult::Err(crate::error::create_type_error(vm, "callback is not a function"));
}
match vm.call_function_sync(callback_val, this_val, cb_args) {
Ok(value) => NativeResult::Ok(value),
Err(err) => match vm.take_uncaught_value() {
Some(original) => NativeResult::Err(original),
None => NativeResult::Err(crate::error::create_from_text(vm, &err)),
},
}
}
pub(crate) fn unexpected_tail_call_error<H: VmHost>(vm: &mut H) -> NativeResult {
NativeResult::Err(crate::error::create_type_error(vm, "unexpected tail call in array callback"))
}
+2 -238
View File
@@ -8,244 +8,8 @@ use oxide_runtime_api::{NativeResult, VmHost};
use crate::builtins_debug;
use crate::builtins_error;
macro_rules! array_ptr {
($vm:expr, $args:expr) => {{
match get_this_array_ref($vm, $vm.reg($args[0])) {
Ok(ptr) => ptr,
Err(err) => {
builtins_error!("Array method: invalid receiver");
return NativeResult::Err(err);
}
}
}};
}
#[allow(unused_macros)]
macro_rules! array_ptr_len {
($vm:expr, $args:expr) => {{
let this_val = $vm.reg($args[0]);
let (arr_ptr, len, _is_arr) = match get_this_arraylike($vm, this_val) {
Ok(v) => v,
Err(err) => {
builtins_error!("Array method: invalid receiver");
return NativeResult::Err(err);
}
};
(arr_ptr, len)
}};
}
macro_rules! array_ptr_len3 {
($vm:expr, $args:expr) => {{
let this_val = $vm.reg($args[0]);
let (arr_ptr, len, is_arr) = match get_this_arraylike($vm, this_val) {
Ok(v) => v,
Err(err) => {
builtins_error!("Array method: invalid receiver");
return NativeResult::Err(err);
}
};
(arr_ptr, len, is_arr)
}};
}
fn array_type_error<H: VmHost>(vm: &mut H, msg: &str) -> JsValue {
crate::error::create_type_error(vm, msg)
}
fn get_this_array_ref<H: VmHost>(vm: &mut H, val: JsValue) -> Result<*mut JsObject, JsValue> {
if !val.is_object() {
return Err(array_type_error(vm, "Array method called on incompatible receiver"));
}
let ptr = val.as_js_object_ptr();
if ptr.is_null() {
return Err(array_type_error(vm, "Array method called on incompatible receiver"));
}
let obj = unsafe { &*ptr };
if !obj.is_array() {
return Err(array_type_error(vm, "Array method called on incompatible receiver"));
}
Ok(ptr)
}
/// 接受 array 或 ArrayLike (object with length property) — for read-only methods.
/// 返回 (object_ptr, length, is_real_array)
#[inline(always)]
fn get_this_arraylike<H: VmHost>(vm: &mut H, val: JsValue) -> Result<(*mut JsObject, usize, bool), JsValue> {
if !val.is_object() {
return Err(array_type_error(vm, "Array.prototype method called on null or undefined"));
}
let ptr = val.as_js_object_ptr();
if ptr.is_null() {
return Err(array_type_error(vm, "Array.prototype method called on null or undefined"));
}
let obj = unsafe { &*ptr };
let is_array = obj.is_array();
// 读取 length 属性(按规范 Get 语义,getter 抛错需向上传播)。
// 真数组也走 Get:`arr.length = N` 已由 ordinary_set 的数组分支同步元素区,
// 直接 prop_count() 会漏掉 length 赋值。
let length_key = vm.new_string("length");
let length_si = vm.property_key_si(length_key);
let len_val = match vm.ordinary_get(unsafe { &*ptr }, length_si, val) {
Ok(v) => v,
Err(msg) => return Err(from_engine_error(vm, &msg)),
};
if len_val.is_symbol() {
return Err(array_type_error(vm, "Cannot convert a Symbol value to a number"));
}
let len_num = match vm.coerce_number_bounded(len_val) {
Ok(v) => v,
Err(msg) => return Err(from_engine_error(vm, &msg)),
};
// ToLength:min(max(0, ToIntegerOrInfinity(len)), 2**53-1)
let len = if len_num.is_nan() || len_num <= 0.0 {
0
} else {
len_num.min(9_007_199_254_740_991.0) as usize
};
Ok((ptr, len, is_array))
}
/// 从 arraylike 读取 index 位置元素(按规范 Get:访问器/原型链/异常完整传播)。
#[inline(always)]
fn arraylike_get<H: VmHost>(vm: &mut H, ptr: *mut JsObject, i: usize) -> Result<JsValue, JsValue> {
// 真数组密集直读快路径:无元素 meta(无 hole / accessor,O(1) 空指针判定)且
// 索引在元素区内时,直接读数据槽,免每元素构造数字串 + 属性键转换。
// 语义与 ordinary_get 一致:`array_elements_meta_vec().is_none()` 保证该索引
// 恒为数据属性(见 vm_props.rs ordinary_get_inner 数组分支)。
let obj = unsafe { &*ptr };
if obj.is_array() && obj.array_elements_meta_vec().is_none() && i < obj.array_prop_count as usize {
return Ok(obj.get_prop_at(i));
}
let key_str = vm.new_string(&i.to_string());
let key_si = vm.property_key_si(key_str);
let recv = JsValue::from_js_object(ptr);
match vm.ordinary_get(obj, key_si, recv) {
Ok(v) => Ok(v),
Err(msg) => Err(from_engine_error(vm, &msg)),
}
}
/// 元素读取失败时直接把异常作为 NativeResult::Err 返回。
macro_rules! arraylike_get_or_err {
($vm:expr, $ptr:expr, $i:expr) => {
match arraylike_get($vm, $ptr, $i) {
Ok(v) => v,
Err(err) => return NativeResult::Err(err),
}
};
}
/// 数组下标转 JsValue:超出 i32 范围时用 double 精确表示。
#[inline(always)]
fn js_array_index(i: usize) -> JsValue {
if i <= i32::MAX as usize {
JsValue::int(i as i32)
} else {
JsValue::float(i as f64)
}
}
/// ToIntegerOrInfinity 的 builtins 版本:对象经 ToPrimitive(number) 后取整,
/// NaN/±0 → 0,±Inf 保留;转换异常向上传播。
fn to_integer_or_infinity_bounded<H: VmHost>(vm: &mut H, val: JsValue) -> Result<f64, JsValue> {
let n = match vm.coerce_number_bounded(val) {
Ok(v) => v,
Err(msg) => return Err(from_engine_error(vm, &msg)),
};
Ok(if n.is_nan() || n == 0.0 { 0.0 } else { n.trunc() })
}
/// 把 ToIntegerOrInfinity 结果夹到 [0, len]:负数按 len+rel,正无穷取 len。
#[inline(always)]
fn clamp_relative(rel: f64, n_f: f64, n: usize) -> usize {
if rel.is_infinite() {
if rel < 0.0 {
0
} else {
n
}
} else if rel < 0.0 {
(n_f + rel).max(0.0) as usize
} else {
rel.min(n_f) as usize
}
}
/// IsConstructor 的近似判定(与 construct_array_from_result 保持一致)。
#[inline]
fn is_constructor_value(c: JsValue) -> bool {
if !c.is_object() {
return false;
}
let c_obj = unsafe { &*c.as_js_object_ptr() };
c_obj.is_function()
&& !c_obj.is_arrow()
&& !(c_obj.native_fn().is_some() && c_obj.type_tag != JsObject::OBJ_TYPE_CONSTRUCTOR)
}
pub(crate) fn require_callback<H: VmHost>(vm: &mut H, callback_val: JsValue) -> Result<JsValue, JsValue> {
if !callback_val.is_object() {
return Err(array_type_error(vm, "callback is not a function"));
}
let ptr = callback_val.as_js_object_ptr();
if ptr.is_null() || !unsafe { &*ptr }.is_function() {
return Err(array_type_error(vm, "callback is not a function"));
}
Ok(callback_val)
}
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;
vm.alloc_object(JsObject::new_array(
EMPTY_SHAPE_ID,
JsValue::from_js_object(proto),
n.min(MAX_DENSE_PROPS),
vm.epoch().bump(),
))
}
/// ArrayCreate ?????length > 2**32 - 1 ? RangeError??????/???????
fn check_array_create_len<H: VmHost>(vm: &mut H, n: usize) -> Result<(), JsValue> {
if n > u32::MAX as usize {
return Err(crate::error::create_range_error(vm, "Invalid array length"));
}
Ok(())
}
fn array_length_arg<H: VmHost>(vm: &mut H, value: JsValue) -> Result<usize, JsValue> {
let n = vm.coerce_number_bounded(value).unwrap_or(f64::NAN);
if !n.is_finite() || n < 0.0 || n.fract() != 0.0 || n > MAX_DENSE_PROPS as f64 {
return Err(crate::error::create_range_error(vm, "Invalid array length"));
}
Ok(n as usize)
}
pub(crate) fn invoke_native_callback<H: VmHost>(
vm: &mut H, callback_val: JsValue, this_val: JsValue, cb_args: &[JsValue],
) -> NativeResult {
if !callback_val.is_object() {
return NativeResult::Err(crate::error::create_type_error(vm, "callback is not a function"));
}
let cb_ptr = callback_val.as_js_object_ptr();
if cb_ptr.is_null() {
return NativeResult::Err(crate::error::create_type_error(vm, "callback is not a function"));
}
let cb = unsafe { &*cb_ptr };
if !cb.is_function() {
return NativeResult::Err(crate::error::create_type_error(vm, "callback is not a function"));
}
match vm.call_function_sync(callback_val, this_val, cb_args) {
Ok(value) => NativeResult::Ok(value),
Err(err) => match vm.take_uncaught_value() {
Some(original) => NativeResult::Err(original),
None => NativeResult::Err(crate::error::create_from_text(vm, &err)),
},
}
}
fn unexpected_tail_call_error<H: VmHost>(vm: &mut H) -> NativeResult {
NativeResult::Err(crate::error::create_type_error(vm, "unexpected tail call in array callback"))
}
mod common;
pub(crate) use common::*;
/// JS `Array()` 构造逻辑:单个数字参数创建指定长度空数组,其余情况把参数作为元素。
pub fn array_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {