mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibJS: Convert typed_array_create() to ThrowCompletionOr

Browse source 
Also add spec step comments to it while we're here.
This commit is contained in:
Linus Groh 2021-10-03 21:03:57 +01:00
parent 04ff12740c
commit 253d9a38d1
4 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Userland/Libraries/LibJS/Runtime/TypedArray.cpp
View file

@ -345,29 +345,32 @@ static ThrowCompletionOr<void> initialize_typed_array_from_list(GlobalObject& gl
}
// 23.2.4.2 TypedArrayCreate ( constructor, argumentList ), https://tc39.es/ecma262/#typedarray-create
TypedArrayBase* typed_array_create(GlobalObject& global_object, FunctionObject& constructor, MarkedValueList arguments)
ThrowCompletionOr<TypedArrayBase*> typed_array_create(GlobalObject& global_object, FunctionObject& constructor, MarkedValueList arguments)
{
auto& vm = global_object.vm();
auto argument_count = arguments.size();
auto first_argument = argument_count > 0 ? arguments[0] : js_undefined();
Optional<Value> first_argument;
if (!arguments.is_empty())
first_argument = arguments[0];
// 1. Let newTypedArray be ? Construct(constructor, argumentList).
auto new_typed_array = vm.construct(constructor, constructor, move(arguments));
if (vm.exception())
return nullptr;
if (!new_typed_array.is_object() || !new_typed_array.as_object().is_typed_array()) {
vm.throw_exception<TypeError>(global_object, ErrorType::NotAnObjectOfType, "TypedArray");
return nullptr;
}
if (auto* exception = vm.exception())
return throw_completion(exception->value());
// 2. Perform ? ValidateTypedArray(newTypedArray).
if (!new_typed_array.is_object() || !new_typed_array.as_object().is_typed_array())
return vm.throw_completion<TypeError>(global_object, ErrorType::NotAnObjectOfType, "TypedArray");
auto& typed_array = static_cast<TypedArrayBase&>(new_typed_array.as_object());
if (typed_array.viewed_array_buffer()->is_detached()) {
vm.throw_exception<TypeError>(global_object, ErrorType::DetachedArrayBuffer);
return nullptr;
}
if (argument_count == 1 && first_argument.is_number() && typed_array.array_length() < first_argument.as_double()) {
vm.throw_exception<TypeError>(global_object, ErrorType::InvalidLength, "typed array");
return nullptr;
TRY(validate_typed_array(global_object, typed_array));
// 3. If argumentList is a List of a single Number, then
if (first_argument.has_value() && first_argument->is_number()) {
// a. If newTypedArray.[[ArrayLength]] < ℝ(argumentList[0]), throw a TypeError exception.
if (typed_array.array_length() < first_argument->as_double())
return vm.throw_completion<TypeError>(global_object, ErrorType::InvalidLength, "typed array");
}
// 4. Return newTypedArray.
return &typed_array;
}

2
Userland/Libraries/LibJS/Runtime/TypedArray.h
View file

@ -480,7 +480,7 @@ private:
virtual bool is_typed_array() const final { return true; }
};
TypedArrayBase* typed_array_create(GlobalObject& global_object, FunctionObject& constructor, MarkedValueList arguments);
ThrowCompletionOr<TypedArrayBase*> typed_array_create(GlobalObject& global_object, FunctionObject& constructor, MarkedValueList arguments);
#define JS_DECLARE_TYPED_ARRAY(ClassName, snake_name, PrototypeName, ConstructorName, Type) \
class ClassName : public TypedArray<Type> { \

12
Userland/Libraries/LibJS/Runtime/TypedArrayConstructor.cpp
View file

@ -85,9 +85,7 @@ JS_DEFINE_NATIVE_FUNCTION(TypedArrayConstructor::from)
MarkedValueList arguments(vm.heap());
arguments.empend(values.size());
auto target_object = typed_array_create(global_object, constructor.as_function(), move(arguments));
if (vm.exception())
return {};
auto target_object = TRY_OR_DISCARD(typed_array_create(global_object, constructor.as_function(), move(arguments)));
for (size_t k = 0; k < values.size(); ++k) {
auto k_value = values[k];
@ -107,9 +105,7 @@ JS_DEFINE_NATIVE_FUNCTION(TypedArrayConstructor::from)
MarkedValueList arguments(vm.heap());
arguments.empend(length);
auto target_object = typed_array_create(global_object, constructor.as_function(), move(arguments));
if (vm.exception())
return {};
auto target_object = TRY_OR_DISCARD(typed_array_create(global_object, constructor.as_function(), move(arguments)));
for (size_t k = 0; k < length; ++k) {
auto k_value = TRY_OR_DISCARD(array_like->get(k));
@ -135,9 +131,7 @@ JS_DEFINE_NATIVE_FUNCTION(TypedArrayConstructor::of)
}
MarkedValueList arguments(vm.heap());
arguments.append(Value(length));
auto new_object = typed_array_create(global_object, constructor.as_function(), move(arguments));
if (vm.exception())
return {};
auto new_object = TRY_OR_DISCARD(typed_array_create(global_object, constructor.as_function(), move(arguments)));
for (size_t k = 0; k < length; ++k) {
auto success = TRY_OR_DISCARD(new_object->set(k, vm.argument(k), Object::ShouldThrowExceptions::Yes));
if (!success) {

4
Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.cpp
View file

@ -177,9 +177,7 @@ static TypedArrayBase* typed_array_species_create(GlobalObject& global_object, T
auto* constructor = TRY_OR_DISCARD(species_constructor(global_object, exemplar, *typed_array_default_constructor));
auto* result = typed_array_create(global_object, *constructor, move(arguments));
if (vm.exception())
return nullptr;
auto* result = TRY_OR_DISCARD(typed_array_create(global_object, *constructor, move(arguments)));
if (result->content_type() != exemplar.content_type()) {
vm.throw_exception<TypeError>(global_object, ErrorType::TypedArrayContentTypeMismatch, result->class_name(), exemplar.class_name());