ITStudio_OUC/OxideJS
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Set/Map 构造器接收可迭代实参 + size 访问器 + ES2024 set-methods

Browse Source
This commit is contained in:
爱特每羊队
2026-08-08 18:01:00 +08:00
parent 3a8bf56a68
commit 504ffaf126
10 changed files with 846 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/bindings/bind_map.rs
+7 -2
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use crate::bind_constructor;
use crate::bindings::{apply_binding_table, configure_native_constructor};
use crate::bindings::{apply_binding_table, bind_accessor_getter, bind_method_alias, configure_native_constructor};
use oxide_kernel::kernel::{KernelCore, KernelSession};
use oxide_types::object::JsObject;
@@ -14,6 +14,7 @@ pub fn bind_map(core: &Arc<KernelCore>, session: &KernelSession, global: &mut Js
configure_native_constructor(ctor, oxide_builtins::map::map_constructor::<crate::vm::Vm> as *const (), 1);
let proto = unsafe { &mut *proto_ptr };
// size 是访问器 getter，不进 apply_binding_table。
apply_binding_table(
session.builtin_world(),
proto,
@@ -24,12 +25,16 @@ pub fn bind_map(core: &Arc<KernelCore>, session: &KernelSession, global: &mut Js
("has", oxide_builtins::map::map_has::<crate::vm::Vm> as *const (), 1),
("delete", oxide_builtins::map::map_delete::<crate::vm::Vm> as *const (), 1),
("clear", oxide_builtins::map::map_clear::<crate::vm::Vm> as *const (), 0),
("size", oxide_builtins::map::map_size::<crate::vm::Vm> as *const (), 0),
("forEach", oxide_builtins::map::map_for_each::<crate::vm::Vm> as *const (), 1),
("entries", oxide_builtins::map::map_entries::<crate::vm::Vm> as *const (), 0),
("values", oxide_builtins::map::map_values::<crate::vm::Vm> as *const (), 0),
("keys", oxide_builtins::map::map_keys::<crate::vm::Vm> as *const (), 0),
],
);
// Map 的 @@iterator 是 entries 的同一函数对象。
bind_method_alias(core, proto, "entries", "@@iterator");
bind_accessor_getter(core, session, proto, "size", oxide_builtins::map::map_size::<crate::vm::Vm> as *const ());
bind_constructor!(core, global, "Map", ctor_ptr, oxide_builtins::map::map_constructor::<crate::vm::Vm>, 1, hash: true);
}
crates/oxide_vm/src/bindings/bind_set.rs
+23 -3
View File
@@ -1,7 +1,7 @@
use std::sync::Arc;
use crate::bind_constructor;
use crate::bindings::{apply_binding_table, configure_native_constructor};
use crate::bindings::{apply_binding_table, bind_accessor_getter, bind_method_alias, configure_native_constructor};
use oxide_kernel::kernel::{KernelCore, KernelSession};
use oxide_types::object::JsObject;
@@ -14,6 +14,7 @@ pub fn bind_set(core: &Arc<KernelCore>, session: &KernelSession, global: &mut Js
configure_native_constructor(ctor, oxide_builtins::set::set_constructor::<crate::vm::Vm> as *const (), 1);
let proto = unsafe { &mut *proto_ptr };
// size 是访问器 getter，不进 apply_binding_table。
apply_binding_table(
session.builtin_world(),
proto,
@@ -23,12 +24,31 @@ pub fn bind_set(core: &Arc<KernelCore>, session: &KernelSession, global: &mut Js
("has", oxide_builtins::set::set_has::<crate::vm::Vm> as *const (), 1),
("delete", oxide_builtins::set::set_delete::<crate::vm::Vm> as *const (), 1),
("clear", oxide_builtins::set::set_clear::<crate::vm::Vm> as *const (), 0),
("size", oxide_builtins::set::set_size::<crate::vm::Vm> as *const (), 0),
("forEach", oxide_builtins::set::set_for_each::<crate::vm::Vm> as *const (), 1),
("entries", oxide_builtins::set::set_entries::<crate::vm::Vm> as *const (), 0),
("values", oxide_builtins::set::set_values::<crate::vm::Vm> as *const (), 0),
("keys", oxide_builtins::set::set_keys::<crate::vm::Vm> as *const (), 0),
("union", oxide_builtins::set::set_union::<crate::vm::Vm> as *const (), 1),
("intersection", oxide_builtins::set::set_intersection::<crate::vm::Vm> as *const (), 1),
("difference", oxide_builtins::set::set_difference::<crate::vm::Vm> as *const (), 1),
(
"symmetricDifference",
oxide_builtins::set::set_symmetric_difference::<crate::vm::Vm> as *const (),
1,
),
("isSubsetOf", oxide_builtins::set::set_is_subset_of::<crate::vm::Vm> as *const (), 1),
("isSupersetOf", oxide_builtins::set::set_is_superset_of::<crate::vm::Vm> as *const (), 1),
(
"isDisjointFrom",
oxide_builtins::set::set_is_disjoint_from::<crate::vm::Vm> as *const (),
1,
),
],
);
// keys 与 @@iterator 是 values 的同一函数对象。
bind_method_alias(core, proto, "values", "keys");
bind_method_alias(core, proto, "values", "@@iterator");
bind_accessor_getter(core, session, proto, "size", oxide_builtins::set::set_size::<crate::vm::Vm> as *const ());
bind_constructor!(core, global, "Set", ctor_ptr, oxide_builtins::set::set_constructor::<crate::vm::Vm>, 1, hash: true);
}
crates/oxide_vm/src/bindings/mod.rs
+69 -1
View File
@@ -51,7 +51,7 @@ use oxide_kernel::builtin::BuiltinWorld;
use oxide_kernel::kernel::{BuiltinDirtySet, KernelCore, KernelSession};
use oxide_kernel::shape_forge::EMPTY_SHAPE_ID;
use oxide_types::mem::P;
use oxide_types::object::{JsObject, NativeFnPtr};
use oxide_types::object::{JsObject, NativeFnPtr, PropAttributes};
use oxide_types::value::JsValue;
#[macro_export]
@@ -108,6 +108,74 @@ pub(crate) fn apply_binding_table(
}
}
/// 在原型上绑定一个原生访问器 getter（如 Set/Map 的 `size`），set 恒为 undefined。
///
/// # 步骤
/// 1. 构造一个 native getter 函数对象（name 为 `get <prop>`，length 0）。
/// 2. 为属性名开 shape 槽位并写入访问器 meta。
///
/// # 注意事项
/// getter 函数对象经 `Box::into_raw` 持有，与 `bind_method` 的方法 wrapper 同一生命周期约定
/// （内置对象在 session 生命周期内不被回收）。
pub(crate) fn bind_accessor_getter(
core: &Arc<KernelCore>, session: &KernelSession, proto: &mut JsObject, name: &str, getter_fn: *const (),
) {
let shape_forge = core.shape_forge().as_ref();
let string_forge = core.perm_interner().as_ref();
let fn_proto_val = JsValue::from_js_object(session.builtin_world().function_proto.as_ptr() as *mut JsObject);
let getter_name = format!("get {name}");
let mut getter = Box::new(JsObject::new_empty(EMPTY_SHAPE_ID, fn_proto_val));
getter.set_function(true);
// SAFETY: getter_fn 是转成 *const () 的 NativeFn 函数项指针。
getter.set_native_fn(Some(unsafe { oxide_types::object::NativeFnPtr::from_raw(getter_fn) }));
getter.set_native_arg_count(0);
let si_name = string_forge.intern("name").0;
let name_shape = shape_forge.make_shape(getter.shape_id(), si_name);
getter.set_shape_id(name_shape);
getter
.ensure_hash_props()
.push(JsValue::perm_string(string_forge.string_ptr(string_forge.intern(&getter_name).0)));
let name_pos = getter.hash_props_vec().map_or(0, |v| v.len() as u32).saturating_sub(1);
getter.set_data_meta(name_pos, PropAttributes::new(false, false, true));
let si_length = string_forge.intern("length").0;
let length_shape = shape_forge.make_shape(getter.shape_id(), si_length);
getter.set_shape_id(length_shape);
getter.ensure_hash_props().push(JsValue::int(0));
let length_pos = getter.hash_props_vec().map_or(0, |v| v.len() as u32).saturating_sub(1);
getter.set_data_meta(length_pos, PropAttributes::new(false, false, true));
let getter_val = JsValue::from_js_object(Box::into_raw(getter));
let si = string_forge.intern(name).0;
let new_shape = shape_forge.make_shape(proto.shape_id(), si);
proto.set_shape_id(new_shape);
let pos = proto.push_prop(JsValue::undefined());
proto.set_accessor_meta(pos, getter_val, JsValue::undefined(), PropAttributes::new(true, false, true));
proto.bump_generation();
}
/// 把原型上 `source` 属性已绑定的函数值复制到 `alias` 名下（共享同一函数对象）。
///
/// 用于规范要求的方法别名（如 Set 的 `keys`/`@@iterator` 与 `values` 同一函数对象）。
pub(crate) fn bind_method_alias(core: &Arc<KernelCore>, proto: &mut JsObject, source: &str, alias: &str) {
let shape_forge = core.shape_forge().as_ref();
let string_forge = core.perm_interner().as_ref();
let src_si = string_forge.intern(source).0;
let Some(pos) = shape_forge.lookup_position(proto.shape_id(), src_si) else {
return;
};
let value = proto.get_prop_at(pos);
let alias_si = string_forge.intern(alias).0;
let new_shape = shape_forge.make_shape(proto.shape_id(), alias_si);
proto.set_shape_id(new_shape);
let alias_pos = proto.push_prop(value);
proto.set_data_meta(alias_pos, PropAttributes::new(true, false, true));
proto.bump_generation();
}
pub(crate) fn bind_global_value(core: &Arc<KernelCore>, global: &mut JsObject, name: &str, value: JsValue) {
let si = core.perm_interner().intern(name).0;
let shape = core.shape_forge().make_shape(global.shape_id(), si);
crates/oxide_vm/src/session_gc.rs
+30 -3
View File
@@ -710,6 +710,30 @@ mod tests {
}
}
/// 分配一个原型指向 Map.prototype 的占位对象并写入寄存器，作为构造器调用的 `this`。
fn map_this(vm: &mut Vm, reg: u8) -> JsValue {
let proto = vm.session.builtin_world().map_proto.as_ptr() as *mut JsObject;
let obj = vm.epoch.alloc(JsObject::new_empty(
oxide_kernel::shape_forge::EMPTY_SHAPE_ID,
JsValue::from_js_object(proto),
));
let val = JsValue::from_js_object(obj);
vm.regs[reg as usize] = val;
val
}
/// 分配一个原型指向 Set.prototype 的占位对象并写入寄存器，作为构造器调用的 `this`。
fn set_this(vm: &mut Vm, reg: u8) -> JsValue {
let proto = vm.session.builtin_world().set_proto.as_ptr() as *mut JsObject;
let obj = vm.epoch.alloc(JsObject::new_empty(
oxide_kernel::shape_forge::EMPTY_SHAPE_ID,
JsValue::from_js_object(proto),
));
let val = JsValue::from_js_object(obj);
vm.regs[reg as usize] = val;
val
}
#[test]
fn reset_maybe_collect_collects_after_threshold() {
let mut vm = vm_with_low_threshold();
@@ -770,7 +794,8 @@ mod tests {
#[test]
fn map_native_storage_is_not_a_normal_object_edge() {
let mut vm = Vm::new();
let map_value = native_ok(map::map_constructor(&mut vm, &[]));
map_this(&mut vm, 1);
let map_value = native_ok(map::map_constructor(&mut vm, &[1]));
let map_obj = unsafe { &*map_value.as_js_object_ptr() };
let native_ptr = map_obj.native_data() as *mut JsObject;
@@ -784,7 +809,8 @@ mod tests {
#[test]
fn session_gc_traces_map_object_key_and_value() {
let mut vm = vm_with_low_threshold();
let map_value = native_ok(map::map_constructor(&mut vm, &[]));
map_this(&mut vm, 3);
let map_value = native_ok(map::map_constructor(&mut vm, &[3]));
let key = JsValue::from_js_object(plain_object(&mut vm));
let value = JsValue::from_js_object(plain_object(&mut vm));
vm.regs[0] = map_value;
@@ -809,7 +835,8 @@ mod tests {
#[test]
fn session_gc_traces_set_object_key() {
let mut vm = vm_with_low_threshold();
let set_value = native_ok(set::set_constructor(&mut vm, &[]));
set_this(&mut vm, 2);
let set_value = native_ok(set::set_constructor(&mut vm, &[2]));
let key = JsValue::from_js_object(plain_object(&mut vm));
vm.regs[0] = set_value;
vm.regs[1] = key;
crates/oxide_vm/tests/builtins_map_tests.rs
+17
View File
@@ -1,5 +1,7 @@
use oxide_builtins::map::{map_clear, map_constructor as new_map, map_delete, map_get, map_has, map_set, map_size};
use oxide_compiler::compiler::Compiler;
use oxide_kernel::shape_forge::EMPTY_SHAPE_ID;
use oxide_types::object::JsObject;
use oxide_types::value::JsValue;
use oxide_vm::vm::Vm;
@@ -14,11 +16,23 @@ fn str_val(vm: &Vm, val: JsValue) -> String {
vm.lookup_str(val).unwrap_or_default()
}
/// 分配一个原型指向 Map.prototype 的占位对象并写入 reg 0，作为构造器调用的 `this`。
fn map_this(vm: &mut Vm) -> JsValue {
let proto = vm.session().builtin_world().map_proto.as_ptr() as *mut JsObject;
let obj = vm
.epoch()
.alloc(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto)));
let val = JsValue::from_js_object(obj);
vm.set_reg(0, val);
val
}
// -- direct native fn tests --
#[test]
fn tmap_constructor_returns_object() {
let mut vm = Vm::new();
map_this(&mut vm);
let r = new_map(&mut vm, &[0]).unwrap();
assert!(r.is_object());
}
@@ -26,6 +40,7 @@ fn tmap_constructor_returns_object() {
#[test]
fn tmap_set_get() {
let mut vm = Vm::new();
map_this(&mut vm);
let m = new_map(&mut vm, &[0]).unwrap();
vm.set_reg(0, m);
vm.set_reg(1, JsValue::float(42.0));
@@ -38,6 +53,7 @@ fn tmap_set_get() {
#[test]
fn tmap_has_and_delete() {
let mut vm = Vm::new();
map_this(&mut vm);
let m = new_map(&mut vm, &[0]).unwrap();
vm.set_reg(0, m);
vm.set_reg(1, JsValue::float(7.0));
@@ -51,6 +67,7 @@ fn tmap_has_and_delete() {
#[test]
fn tmap_size_and_clear() {
let mut vm = Vm::new();
map_this(&mut vm);
let m = new_map(&mut vm, &[0]).unwrap();
vm.set_reg(0, m);
assert_eq!(map_size(&mut vm, &[0]).unwrap().as_double(), 0.0);
crates/oxide_vm/tests/builtins_set_tests.rs
+20
View File
@@ -1,5 +1,7 @@
use oxide_builtins::set::{set_add, set_clear, set_constructor as new_set, set_delete, set_has, set_size};
use oxide_compiler::compiler::Compiler;
use oxide_kernel::shape_forge::EMPTY_SHAPE_ID;
use oxide_types::object::JsObject;
use oxide_types::value::JsValue;
use oxide_vm::vm::Vm;
@@ -10,11 +12,23 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
vm.run(&module)
}
/// 分配一个原型指向 Set.prototype 的占位对象并写入 reg 0，作为构造器调用的 `this`。
fn set_this(vm: &mut Vm) -> JsValue {
let proto = vm.session().builtin_world().set_proto.as_ptr() as *mut JsObject;
let obj = vm
.epoch()
.alloc(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto)));
let val = JsValue::from_js_object(obj);
vm.set_reg(0, val);
val
}
// -- direct native fn tests --
#[test]
fn tset_constructor_returns_object() {
let mut vm = Vm::new();
set_this(&mut vm);
let r = new_set(&mut vm, &[0]).unwrap();
assert!(r.is_object());
}
@@ -22,6 +36,7 @@ fn tset_constructor_returns_object() {
#[test]
fn tset_add_has() {
let mut vm = Vm::new();
set_this(&mut vm);
let s = new_set(&mut vm, &[0]).unwrap();
vm.set_reg(0, s);
vm.set_reg(1, JsValue::float(42.0));
@@ -32,6 +47,7 @@ fn tset_add_has() {
#[test]
fn tset_has_missing() {
let mut vm = Vm::new();
set_this(&mut vm);
let s = new_set(&mut vm, &[0]).unwrap();
vm.set_reg(0, s);
vm.set_reg(1, JsValue::float(99.0));
@@ -41,6 +57,7 @@ fn tset_has_missing() {
#[test]
fn tset_delete_works() {
let mut vm = Vm::new();
set_this(&mut vm);
let s = new_set(&mut vm, &[0]).unwrap();
vm.set_reg(0, s);
vm.set_reg(1, JsValue::float(7.0));
@@ -52,6 +69,7 @@ fn tset_delete_works() {
#[test]
fn tset_size_and_clear() {
let mut vm = Vm::new();
set_this(&mut vm);
let s = new_set(&mut vm, &[0]).unwrap();
vm.set_reg(0, s);
assert_eq!(set_size(&mut vm, &[0]).unwrap().as_double(), 0.0);
@@ -67,6 +85,7 @@ fn tset_size_and_clear() {
#[test]
fn tset_nan_equality() {
let mut vm = Vm::new();
set_this(&mut vm);
let s = new_set(&mut vm, &[0]).unwrap();
vm.set_reg(0, s);
vm.set_reg(1, JsValue::float(f64::NAN));
@@ -79,6 +98,7 @@ fn tset_nan_equality() {
#[test]
fn tset_signed_zero() {
let mut vm = Vm::new();
set_this(&mut vm);
let s = new_set(&mut vm, &[0]).unwrap();
vm.set_reg(0, s);
vm.set_reg(1, JsValue::float(0.0));