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

feat: 支持 Date/Map/Set 的 new 运算符

Browse Source
This commit is contained in:
爱特每羊队
2026-06-08 03:42:47 +08:00
parent 55b544da82
commit 201d2e724b
6 changed files with 344 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/builtins/date.rs
+36 -39
View File
@@ -76,6 +76,41 @@ pub fn date_constructor(vm: &mut Vm, args: &[u8]) -> NativeResult {
let timestamp = if args.len() < 2 {
Utc::now().timestamp_millis() as f64
} else if args.len() > 2 {
let y = coercion::to_number(vm.reg(args[1]), vm.kernel().string_forge().as_ref()) as i32;
let m = coercion::to_number(vm.reg(args[2]), vm.kernel().string_forge().as_ref()) as u32;
let d = if args.len() > 3 {
coercion::to_number(vm.reg(args[3]), vm.kernel().string_forge().as_ref()) as u32
} else {
1
};
let h = if args.len() > 4 {
coercion::to_number(vm.reg(args[4]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let min = if args.len() > 5 {
coercion::to_number(vm.reg(args[5]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let sec = if args.len() > 6 {
coercion::to_number(vm.reg(args[6]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let ms = if args.len() > 7 {
coercion::to_number(vm.reg(args[7]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
NaiveDate::from_ymd_opt(y, m + 1, d)
.and_then(|nd| {
nd.and_hms_milli_opt(h, min, sec, ms)
.and_then(|ndt| ndt.and_local_timezone(Utc).earliest())
})
.map(|dt| dt.timestamp_millis() as f64)
.unwrap_or(f64::NAN)
} else {
let val = vm.reg(args[1]);
if val.is_string() {
@@ -120,45 +155,7 @@ pub fn date_constructor(vm: &mut Vm, args: &[u8]) -> NativeResult {
let obj = unsafe { &*val.as_js_object_ptr() };
get_timestamp(obj)
} else {
let y =
coercion::to_number(vm.reg(args[1]), vm.kernel().string_forge().as_ref()) as i32;
let m = if args.len() > 2 {
coercion::to_number(vm.reg(args[2]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let d = if args.len() > 3 {
coercion::to_number(vm.reg(args[3]), vm.kernel().string_forge().as_ref()) as u32
} else {
1
};
let h = if args.len() > 4 {
coercion::to_number(vm.reg(args[4]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let min = if args.len() > 5 {
coercion::to_number(vm.reg(args[5]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let sec = if args.len() > 6 {
coercion::to_number(vm.reg(args[6]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
let ms = if args.len() > 7 {
coercion::to_number(vm.reg(args[7]), vm.kernel().string_forge().as_ref()) as u32
} else {
0
};
NaiveDate::from_ymd_opt(y, m + 1, d)
.and_then(|nd| {
nd.and_hms_milli_opt(h, min, sec, ms)
.and_then(|ndt| ndt.and_local_timezone(Utc).earliest())
})
.map(|dt| dt.timestamp_millis() as f64)
.unwrap_or(f64::NAN)
f64::NAN
}
};
crates/oxide_vm/src/vm.rs
+20 -2
View File
@@ -717,6 +717,9 @@ fn bind_date(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
let sf = kernel.string_forge().as_ref();
let sh = kernel.shape_forge().as_ref();
ctor.set_native_fn(Some(crate::builtins::date::date_constructor as *const ()));
ctor.set_native_arg_count(7);
bind_method!(
kernel.builtin_world(),
ctor,
@@ -1053,7 +1056,11 @@ fn bind_date(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
fn bind_set(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
let ctor_ptr = kernel.builtin_world().set_constructor.as_ptr() as *mut JsObject;
let ctor = unsafe { &mut *ctor_ptr };
let proto_ptr = kernel.builtin_world().set_proto.as_ptr() as *mut JsObject;
ctor.set_native_fn(Some(crate::builtins::set::set_constructor as *const ()));
ctor.set_native_arg_count(1);
let proto = unsafe { &mut *proto_ptr };
let sf = kernel.string_forge().as_ref();
let sh = kernel.shape_forge().as_ref();
@@ -1114,7 +1121,11 @@ fn bind_set(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
fn bind_map(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
let ctor_ptr = kernel.builtin_world().map_constructor.as_ptr() as *mut JsObject;
let ctor = unsafe { &mut *ctor_ptr };
let proto_ptr = kernel.builtin_world().map_proto.as_ptr() as *mut JsObject;
ctor.set_native_fn(Some(crate::builtins::map::map_constructor as *const ()));
ctor.set_native_arg_count(1);
let proto = unsafe { &mut *proto_ptr };
let sf = kernel.string_forge().as_ref();
let sh = kernel.shape_forge().as_ref();
@@ -1182,7 +1193,7 @@ fn bind_map(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
global.bump_generation();
}
fn bind_boolean(kernel: &Arc<OxideKernel>) {
fn bind_boolean(kernel: &Arc<OxideKernel>, global: &mut JsObject) {
let ctor_ptr = kernel.builtin_world().boolean_constructor.as_ptr() as *mut JsObject;
let ctor = unsafe { &mut *ctor_ptr };
let proto_ptr = kernel.builtin_world().boolean_proto.as_ptr() as *mut JsObject;
@@ -1213,6 +1224,13 @@ fn bind_boolean(kernel: &Arc<OxideKernel>) {
crate::builtins::boolean::boolean_prototype_to_string,
0
);
let si_b = kernel.string_forge().intern("Boolean").0;
let b_shape = kernel.shape_forge().make_shape(global.shape_id(), si_b);
let b_val = JsValue::from_js_object(ctor_ptr);
global.set_shape_id(b_shape);
global.ensure_hash_props().push(Box::new(b_val));
global.bump_generation();
}
fn bind_function(kernel: &Arc<OxideKernel>) {
@@ -1242,7 +1260,7 @@ pub fn init_kernel_builtins(kernel: &Arc<OxideKernel>) {
bind_date(kernel, global);
bind_set(kernel, global);
bind_map(kernel, global);
bind_boolean(kernel);
bind_boolean(kernel, global);
bind_function(kernel);
}