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

refactor: 哈希表存储属性以支持无上限属性个数

Browse Source
This commit is contained in:
爱特每羊队
2026-06-07 15:25:47 +08:00
parent 52fbd3c3d4
commit f6e635cdbe
19 changed files with 779 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_vm/src/builtins/array.rs
+36 -38
View File
@@ -100,7 +100,7 @@ pub fn array_constructor(vm: &mut Vm, args: &[u8]) -> NativeResult {
));
for i in 0..n_elems {
unsafe {
(*arr).set_prop(i as u8, vm.reg(args[1 + i]));
(*arr).set_prop_at(i as u8, vm.reg(args[1 + i]));
}
}
unsafe {
@@ -113,10 +113,9 @@ pub fn array_push(vm: &mut Vm, args: &[u8]) -> NativeResult {
let arr_ptr = get_this_array_ref(vm.reg(args[0]))?;
let arr = unsafe { &mut *arr_ptr };
let mut len = arr.prop_count() as usize;
let bump = vm.epoch().bump();
for &arg_reg in args.iter().skip(1) {
let val = vm.reg(arg_reg);
arr.set_prop_expand(len as u8, val, bump);
arr.set_prop_at(len as u8, val);
len += 1;
}
let new_len = (len as u8).min(31);
@@ -131,7 +130,7 @@ pub fn array_pop(vm: &mut Vm, args: &[u8]) -> NativeResult {
if len == 0 {
return Ok(JsValue::undefined());
}
let last = arr.get_prop(len - 1);
let last = arr.get_prop_at(len - 1);
arr.set_prop_count(len - 1);
Ok(last)
}
@@ -157,7 +156,7 @@ pub fn array_slice(vm: &mut Vm, args: &[u8]) -> NativeResult {
let new_arr = create_new_array(vm, count);
unsafe {
for i in 0..count {
(*new_arr).set_prop(i as u8, arr.get_prop((start + i) as u8));
(*new_arr).set_prop_at(i as u8, arr.get_prop_at((start + i) as u8));
}
(*new_arr).set_prop_count(count.min(31) as u8);
}
@@ -192,26 +191,25 @@ pub fn array_splice(vm: &mut Vm, args: &[u8]) -> NativeResult {
let mut removed: Vec<JsValue> = Vec::new();
for i in 0..delete_count {
removed.push(arr.get_prop((start + i) as u8));
removed.push(arr.get_prop_at((start + i) as u8));
}
let bump = vm.epoch().bump();
if insert_count > delete_count {
let shift = insert_count - delete_count;
for i in (start + delete_count..n).rev() {
let val = arr.get_prop(i as u8);
arr.set_prop_expand((i + shift) as u8, val, bump);
let val = arr.get_prop_at(i as u8);
arr.set_prop_at((i + shift) as u8, val);
}
} else if insert_count < delete_count {
let shift = delete_count - insert_count;
for i in start + delete_count..n {
let val = arr.get_prop(i as u8);
arr.set_prop((i - shift) as u8, val);
let val = arr.get_prop_at(i as u8);
arr.set_prop_at((i - shift) as u8, val);
}
}
for i in 0..insert_count {
arr.set_prop((start + i) as u8, vm.reg(args[3 + i]));
arr.set_prop_at((start + i) as u8, vm.reg(args[3 + i]));
}
let new_len = n + insert_count - delete_count;
@@ -220,7 +218,7 @@ pub fn array_splice(vm: &mut Vm, args: &[u8]) -> NativeResult {
let removed_arr = create_new_array(vm, removed.len());
unsafe {
for (i, val) in removed.iter().enumerate() {
(*removed_arr).set_prop(i as u8, *val);
(*removed_arr).set_prop_at(i as u8, *val);
}
(*removed_arr).set_prop_count(removed.len().min(31) as u8);
}
@@ -233,7 +231,7 @@ pub fn array_concat(vm: &mut Vm, args: &[u8]) -> NativeResult {
let n = arr.prop_count() as usize;
let mut all: Vec<JsValue> = Vec::new();
for i in 0..n {
all.push(arr.get_prop(i as u8));
all.push(arr.get_prop_at(i as u8));
}
for &arg_reg in args.iter().skip(1) {
let val = vm.reg(arg_reg);
@@ -244,7 +242,7 @@ pub fn array_concat(vm: &mut Vm, args: &[u8]) -> NativeResult {
if o.is_array() {
let on = o.prop_count() as usize;
for i in 0..on {
all.push(o.get_prop(i as u8));
all.push(o.get_prop_at(i as u8));
}
continue;
}
@@ -255,7 +253,7 @@ pub fn array_concat(vm: &mut Vm, args: &[u8]) -> NativeResult {
let new_arr = create_new_array(vm, all.len());
unsafe {
for (i, val) in all.iter().enumerate() {
(*new_arr).set_prop(i as u8, *val);
(*new_arr).set_prop_at(i as u8, *val);
}
(*new_arr).set_prop_count(all.len().min(31) as u8);
}
@@ -274,7 +272,7 @@ pub fn array_join(vm: &mut Vm, args: &[u8]) -> NativeResult {
let sf = vm.kernel().string_forge().as_ref();
let parts: Vec<String> = (0..n)
.map(|i| {
let v = arr.get_prop(i as u8);
let v = arr.get_prop_at(i as u8);
if v.is_undefined() || v.is_null() {
String::new()
} else {
@@ -296,7 +294,7 @@ pub fn array_index_of(vm: &mut Vm, args: &[u8]) -> NativeResult {
}
let target = vm.reg(args[1]);
for i in 0..n {
if coercion::strict_equality(arr.get_prop(i as u8), target) {
if coercion::strict_equality(arr.get_prop_at(i as u8), target) {
return Ok(JsValue::int(i as i32));
}
}
@@ -312,7 +310,7 @@ pub fn array_includes(vm: &mut Vm, args: &[u8]) -> NativeResult {
}
let target = vm.reg(args[1]);
for i in 0..n {
let elem = arr.get_prop(i as u8);
let elem = arr.get_prop_at(i as u8);
if elem.is_double() && target.is_double() {
let ea = elem.as_double();
let ta = target.as_double();
@@ -334,9 +332,9 @@ pub fn array_reverse(vm: &mut Vm, args: &[u8]) -> NativeResult {
let mut i = 0;
let mut j = n.saturating_sub(1);
while i < j {
let tmp = arr.get_prop(i as u8);
arr.set_prop(i as u8, arr.get_prop(j as u8));
arr.set_prop(j as u8, tmp);
let tmp = arr.get_prop_at(i as u8);
arr.set_prop_at(i as u8, arr.get_prop_at(j as u8));
arr.set_prop_at(j as u8, tmp);
i += 1;
j = j.saturating_sub(1);
}
@@ -363,7 +361,7 @@ pub fn array_flat(vm: &mut Vm, args: &[u8]) -> NativeResult {
let o = unsafe { &*ptr };
if o.is_array() {
let on = o.prop_count() as usize;
let sub: Vec<JsValue> = (0..on).map(|i| o.get_prop(i as u8)).collect();
let sub: Vec<JsValue> = (0..on).map(|i| o.get_prop_at(i as u8)).collect();
let flat = flatten(&sub, remaining_depth - 1);
out.extend(flat);
continue;
@@ -375,12 +373,12 @@ pub fn array_flat(vm: &mut Vm, args: &[u8]) -> NativeResult {
out
}
let all: Vec<JsValue> = (0..n).map(|i| arr.get_prop(i as u8)).collect();
let all: Vec<JsValue> = (0..n).map(|i| arr.get_prop_at(i as u8)).collect();
let flat = flatten(&all, depth);
let new_arr = create_new_array(vm, flat.len());
unsafe {
for (i, val) in flat.iter().enumerate() {
(*new_arr).set_prop(i as u8, *val);
(*new_arr).set_prop_at(i as u8, *val);
}
(*new_arr).set_prop_count(flat.len().min(31) as u8);
}
@@ -403,7 +401,7 @@ pub fn array_for_each(vm: &mut Vm, args: &[u8]) -> NativeResult {
JsValue::undefined()
};
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
let _ = invoke_native_callback(
vm,
callback_val,
@@ -431,7 +429,7 @@ pub fn array_map(vm: &mut Vm, args: &[u8]) -> NativeResult {
};
let new_arr = create_new_array(vm, n);
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -439,7 +437,7 @@ pub fn array_map(vm: &mut Vm, args: &[u8]) -> NativeResult {
&[elem, JsValue::int(i as i32), vm.reg(args[0])],
) {
Ok(mapped) => unsafe {
(*new_arr).set_prop(i as u8, mapped);
(*new_arr).set_prop_at(i as u8, mapped);
},
Err(_) => return Err(JsValue::undefined()),
}
@@ -467,7 +465,7 @@ pub fn array_filter(vm: &mut Vm, args: &[u8]) -> NativeResult {
};
let mut kept: Vec<JsValue> = Vec::new();
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -486,7 +484,7 @@ pub fn array_filter(vm: &mut Vm, args: &[u8]) -> NativeResult {
let new_arr = create_new_array(vm, kept.len());
unsafe {
for (i, val) in kept.iter().enumerate() {
(*new_arr).set_prop(i as u8, *val);
(*new_arr).set_prop_at(i as u8, *val);
}
(*new_arr).set_prop_count(kept.len().min(31) as u8);
}
@@ -513,12 +511,12 @@ pub fn array_reduce(vm: &mut Vm, args: &[u8]) -> NativeResult {
accumulator = vm.reg(args[2]);
start_idx = 0;
} else {
accumulator = unsafe { (*arr_ptr).get_prop(0) };
accumulator = unsafe { (*arr_ptr).get_prop_at(0) };
start_idx = 1;
}
let this_val = JsValue::undefined();
for i in start_idx..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -548,7 +546,7 @@ pub fn array_find(vm: &mut Vm, args: &[u8]) -> NativeResult {
JsValue::undefined()
};
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -583,7 +581,7 @@ pub fn array_some(vm: &mut Vm, args: &[u8]) -> NativeResult {
JsValue::undefined()
};
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -618,7 +616,7 @@ pub fn array_every(vm: &mut Vm, args: &[u8]) -> NativeResult {
JsValue::undefined()
};
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -654,7 +652,7 @@ pub fn array_flat_map(vm: &mut Vm, args: &[u8]) -> NativeResult {
};
let mut flat: Vec<JsValue> = Vec::new();
for i in 0..n {
let elem = unsafe { (*arr_ptr).get_prop(i as u8) };
let elem = unsafe { (*arr_ptr).get_prop_at(i as u8) };
match invoke_native_callback(
vm,
callback_val,
@@ -669,7 +667,7 @@ pub fn array_flat_map(vm: &mut Vm, args: &[u8]) -> NativeResult {
if r.is_array() {
let rn = r.prop_count() as usize;
for j in 0..rn {
flat.push(r.get_prop(j as u8));
flat.push(r.get_prop_at(j as u8));
}
continue;
}
@@ -683,7 +681,7 @@ pub fn array_flat_map(vm: &mut Vm, args: &[u8]) -> NativeResult {
let new_arr = create_new_array(vm, flat.len());
unsafe {
for (i, val) in flat.iter().enumerate() {
(*new_arr).set_prop(i as u8, *val);
(*new_arr).set_prop_at(i as u8, *val);
}
(*new_arr).set_prop_count(flat.len().min(31) as u8);
}