From a1f3e711c09b3c1d315507323de676a8ea3ce886 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 26 Jun 2021 01:01:39 +0100 Subject: [PATCH] LibJS: Add %TypedArray%.prototype.entries --- .../LibJS/Runtime/TypedArrayPrototype.cpp | 10 ++++ .../LibJS/Runtime/TypedArrayPrototype.h | 1 + .../TypedArray.prototype.entries.js | 46 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 Userland/Libraries/LibJS/Tests/builtins/TypedArray/TypedArray.prototype.entries.js diff --git a/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.cpp b/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.cpp index 887ea51914..496565494c 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.cpp @@ -36,6 +36,7 @@ void TypedArrayPrototype::initialize(GlobalObject& object) define_native_function(vm.names.join, join, 1, attr); define_native_function(vm.names.keys, keys, 0, attr); define_native_function(vm.names.values, values, 0, attr); + define_native_function(vm.names.entries, entries, 0, attr); define_native_accessor(*vm.well_known_symbol_to_string_tag(), to_string_tag_getter, nullptr, Attribute::Configurable); @@ -259,6 +260,15 @@ JS_DEFINE_NATIVE_FUNCTION(TypedArrayPrototype::values) return ArrayIterator::create(global_object, typed_array, Object::PropertyKind::Value); } +// 23.2.3.6 %TypedArray%.prototype.entries ( ), https://tc39.es/ecma262/#sec-%typedarray%.prototype.entries +JS_DEFINE_NATIVE_FUNCTION(TypedArrayPrototype::entries) +{ + auto typed_array = typed_array_from(vm, global_object); + if (!typed_array) + return {}; + return ArrayIterator::create(global_object, typed_array, Object::PropertyKind::KeyAndValue); +} + // 23.2.3.1 get %TypedArray%.prototype.buffer, https://tc39.es/ecma262/#sec-get-%typedarray%.prototype.buffer JS_DEFINE_NATIVE_GETTER(TypedArrayPrototype::buffer_getter) { diff --git a/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.h b/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.h index 06a802ff4f..e33a789794 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.h +++ b/Userland/Libraries/LibJS/Runtime/TypedArrayPrototype.h @@ -34,6 +34,7 @@ private: JS_DECLARE_NATIVE_FUNCTION(join); JS_DECLARE_NATIVE_FUNCTION(keys); JS_DECLARE_NATIVE_FUNCTION(values); + JS_DECLARE_NATIVE_FUNCTION(entries); }; } diff --git a/Userland/Libraries/LibJS/Tests/builtins/TypedArray/TypedArray.prototype.entries.js b/Userland/Libraries/LibJS/Tests/builtins/TypedArray/TypedArray.prototype.entries.js new file mode 100644 index 0000000000..0cc44d26d1 --- /dev/null +++ b/Userland/Libraries/LibJS/Tests/builtins/TypedArray/TypedArray.prototype.entries.js @@ -0,0 +1,46 @@ +const TYPED_ARRAYS = [ + Uint8Array, + Uint16Array, + Uint32Array, + Int8Array, + Int16Array, + Int32Array, + Float32Array, + Float64Array, +]; + +const BIGINT_TYPED_ARRAYS = [BigUint64Array, BigInt64Array]; + +test("length is 0", () => { + TYPED_ARRAYS.forEach(T => { + expect(T.prototype.entries).toHaveLength(0); + }); + + BIGINT_TYPED_ARRAYS.forEach(T => { + expect(T.prototype.entries).toHaveLength(0); + }); +}); + +test("basic functionality", () => { + TYPED_ARRAYS.forEach(T => { + const a = new T([30, 40, 50]); + const it = a.entries(); + expect(it.next()).toEqual({ value: [0, 30], done: false }); + expect(it.next()).toEqual({ value: [1, 40], done: false }); + expect(it.next()).toEqual({ value: [2, 50], done: false }); + expect(it.next()).toEqual({ value: undefined, done: true }); + expect(it.next()).toEqual({ value: undefined, done: true }); + expect(it.next()).toEqual({ value: undefined, done: true }); + }); + + BIGINT_TYPED_ARRAYS.forEach(T => { + const a = new T([30n, 40n, 50n]); + const it = a.entries(); + expect(it.next()).toEqual({ value: [0, 30n], done: false }); + expect(it.next()).toEqual({ value: [1, 40n], done: false }); + expect(it.next()).toEqual({ value: [2, 50n], done: false }); + expect(it.next()).toEqual({ value: undefined, done: true }); + expect(it.next()).toEqual({ value: undefined, done: true }); + expect(it.next()).toEqual({ value: undefined, done: true }); + }); +});