ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-26 03:31:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Map set/getOrInsert 缺省实参取 undefined 而非寄存器残留

Browse Source
This commit is contained in:
彭俊皓
2026-10-14 08:14:29 +00:00
parent fe430d4bcb
commit 38885df582
4 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_builtins/src/map.rs
+4 -4
View File
@@ -292,8 +292,8 @@ pub fn map_constructor<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn map_set<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let inner = native_try!(get_map_inner(vm, this_val));
let key = vm.reg(if args.len() > 1 { args[1] } else { 0 });
let val = vm.reg(if args.len() > 2 { args[2] } else { 0 });
let key = if args.len() > 1 { vm.reg(args[1]) } else { JsValue::undefined() };
let val = if args.len() > 2 { vm.reg(args[2]) } else { JsValue::undefined() };
unsafe {
(*inner).insert(SetKey(key), val);
}
@@ -318,8 +318,8 @@ pub fn map_get<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn map_get_or_insert<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let this_val = vm.reg(if args.is_empty() { 0 } else { args[0] });
let inner = native_try!(get_map_inner(vm, this_val));
let key = vm.reg(if args.len() > 1 { args[1] } else { 0 });
let val = vm.reg(if args.len() > 2 { args[2] } else { 0 });
let key = if args.len() > 1 { vm.reg(args[1]) } else { JsValue::undefined() };
let val = if args.len() > 2 { vm.reg(args[2]) } else { JsValue::undefined() };
let found = unsafe { (*inner).get(&SetKey(key)) };
if let Some(existing) = found {
return NativeResult::Ok(existing);