feat: 数组字面量 spread([...a] 展开为 for-of 追加)
This commit is contained in:
@@ -132,26 +132,33 @@ fn get_iterator<H: VmHost>(vm: &mut H, value: JsValue) -> Result<JsValue, JsValu
|
||||
let obj = unsafe { &*value.as_js_object_ptr() };
|
||||
// 迭代协议:GetIterator 先取 value[Symbol.iterator] 并调用。
|
||||
let sym_iter_si = vm.kernel_core().perm_interner().intern("@@iterator").0;
|
||||
let method = vm.ordinary_get(obj, sym_iter_si, value);
|
||||
if let Ok(method) = method {
|
||||
if is_callable(method) {
|
||||
let iterator = match vm.call_function_sync(method, value, &[]) {
|
||||
Ok(it) => it,
|
||||
Err(err) => {
|
||||
let exc = vm
|
||||
.take_uncaught_value()
|
||||
.unwrap_or_else(|| crate::error::create_type_error(vm, &err));
|
||||
return Err(exc);
|
||||
}
|
||||
};
|
||||
if !iterator.is_object() {
|
||||
return Err(crate::error::create_type_error(
|
||||
vm,
|
||||
"Result of the Symbol.iterator method is not an object",
|
||||
));
|
||||
}
|
||||
return Ok(iterator);
|
||||
let method = match vm.ordinary_get(obj, sym_iter_si, value) {
|
||||
Ok(m) => m,
|
||||
Err(err) => {
|
||||
// GetMethod 取 @@iterator 时 getter 抛出:透传原值,不落入鸭子回退。
|
||||
let exc = vm
|
||||
.take_uncaught_value()
|
||||
.unwrap_or_else(|| crate::error::create_type_error(vm, &err));
|
||||
return Err(exc);
|
||||
}
|
||||
};
|
||||
if is_callable(method) {
|
||||
let iterator = match vm.call_function_sync(method, value, &[]) {
|
||||
Ok(it) => it,
|
||||
Err(err) => {
|
||||
let exc = vm
|
||||
.take_uncaught_value()
|
||||
.unwrap_or_else(|| crate::error::create_type_error(vm, &err));
|
||||
return Err(exc);
|
||||
}
|
||||
};
|
||||
if !iterator.is_object() {
|
||||
return Err(crate::error::create_type_error(
|
||||
vm,
|
||||
"Result of the Symbol.iterator method is not an object",
|
||||
));
|
||||
}
|
||||
return Ok(iterator);
|
||||
}
|
||||
// 鸭子回退:对象自身有可调用 next(Map/Set 迭代器包装等既有用法)。
|
||||
let next_si = vm.kernel_core().perm_interner().intern("next").0;
|
||||
@@ -178,9 +185,7 @@ fn next_array_like<H: VmHost>(
|
||||
let value = match vm.ordinary_get(arr, key_si, inner) {
|
||||
Ok(v) => v,
|
||||
Err(err) => {
|
||||
let exc = vm
|
||||
.take_uncaught_value()
|
||||
.unwrap_or_else(|| crate::error::create_error(vm, &err));
|
||||
let exc = vm.take_uncaught_value().unwrap_or_else(|| crate::error::create_error(vm, &err));
|
||||
return Err(exc);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -357,8 +357,9 @@ pub fn object_define_property<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResul
|
||||
if desc_ptr.is_null() {
|
||||
return NativeResult::Err(crate::error::create_type_error(vm, "Property description must be an object"));
|
||||
}
|
||||
let prop_name_str = oxide_runtime_api::to_string(vm.reg(args[2]));
|
||||
let si = vm.kernel_core().perm_interner().intern(&prop_name_str).0;
|
||||
// well-known symbol 等特殊键统一走 property_key_si(映射到 @@iterator 等别名),
|
||||
// 保证与计算属性访问、Reflect.defineProperty 等读键路径一致。
|
||||
let si = vm.property_key_si(vm.reg(args[2]));
|
||||
|
||||
let value_si = vm.kernel_core().perm_interner().intern("value").0;
|
||||
let get_si = vm.kernel_core().perm_interner().intern("get").0;
|
||||
|
||||
Reference in New Issue
Block a user