Add keys, values, entires functions for typedArray

Extended the typedArray functionality based on ES2015

Co-authored-by: Tibor Dusnoki tdusnoki@inf.u-szeged.hu
JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu

Author: szilagyiadam

jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c

@@ -29,6 +29,7 @@
 #include "jrt-libc-includes.h"
 #include "ecma-gc.h"
 #include "jmem.h"
+#include "ecma-iterator-object.h"
 
 #if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
 
@@ -312,6 +313,95 @@ ecma_builtin_typedarray_prototype_for_each (ecma_value_t this_arg, /**< this arg
                                                          TYPEDARRAY_ROUTINE_FOREACH);
 } /* ecma_builtin_typedarray_prototype_for_each */
 
+
+#if ENABLED (JERRY_ES2015_BUILTIN_ITERATOR)
+/**
+ * Helper function for typedArray.prototype object's {'keys', 'values', 'entries', '@@iterator'}
+ * routines common parts.
+ *
+ * See also:
+ *          ECMA-262 v6, 22.2.3.15
+ *          ECMA-262 v6, 22.2.3.29
+ *          ECMA-262 v6, 22.2.3.6
+ *          ECMA-262 v6, 22.1.3.30
+ *
+ * Note:
+ *      Returned value must be freed with ecma_free_value.
+ *
+ * @return iterator result object, if success
+ *         error - otherwise
+ */
+static ecma_value_t
+ecma_builtin_typedarray_iterators_helper (ecma_value_t this_arg, /**< this argument */
+                                          uint8_t type) /**< any combination of ecma_iterator_type_t bits */
+{
+  ecma_value_t this_obj = ecma_op_to_object (this_arg);
+
+  if (ECMA_IS_VALUE_ERROR (this_obj))
+  {
+    return this_obj;
+  }
+
+  ecma_object_t *obj_p = ecma_get_object_from_value (this_obj);
+
+  ecma_object_t *prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_ARRAY_ITERATOR_PROTOTYPE);
+
+  ecma_value_t ret_value = ecma_op_create_iterator_object (this_obj,
+                                                            prototype_obj_p,
+                                                            ECMA_PSEUDO_ARRAY_ITERATOR,
+                                                            type);
+  ecma_deref_object (obj_p);
+
+  return ret_value;
+} /* ecma_builtin_array_iterators_helper */
+
+/**
+ * The %TypedArray%.prototype object's 'keys' routine
+ *
+ * See also:
+ *          ES2015, 22.2.3.15
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_typedarray_prototype_keys (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_typedarray_iterators_helper (this_arg, ECMA_ITERATOR_KEYS);
+} /* ecma_builtin_typedarray_prototype_keys */
+
+/**
+ * The %TypedArray%.prototype object's 'values' routine
+ *
+ * See also:
+ *          ES2015, 22.2.3.29
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_typedarray_prototype_values (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_typedarray_iterators_helper (this_arg, ECMA_ITERATOR_VALUES);
+} /* ecma_builtin_typedarray_prototype_values */
+
+/**
+ * The %TypedArray%.prototype object's 'entries' routine
+ *
+ * See also:
+ *          ES2015, 22.2.3.6
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_typedarray_prototype_entries (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_typedarray_iterators_helper (this_arg, ECMA_ITERATOR_KEYS_VALUES);
+} /* ecma_builtin_typedarray_prototype_entries */
+
+#endif /* ENABLED (JERRY_ES2015_BUILTIN_ITERATOR) */
+
 /**
  * The %TypedArray%.prototype object's 'map' routine
  *

jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h

@@ -71,6 +71,14 @@ ROUTINE (LIT_MAGIC_STRING_SORT, ecma_builtin_typedarray_prototype_sort, 1, 1)
 ROUTINE (LIT_MAGIC_STRING_FIND, ecma_builtin_typedarray_prototype_find, 2, 1)
 ROUTINE (LIT_MAGIC_STRING_FIND_INDEX, ecma_builtin_typedarray_prototype_find_index, 2, 1)
 
+#if ENABLED (JERRY_ES2015_BUILTIN_ITERATOR)
+
+ROUTINE (LIT_MAGIC_STRING_KEYS, ecma_builtin_typedarray_prototype_keys, 0, 0)
+ROUTINE (LIT_MAGIC_STRING_VALUES, ecma_builtin_typedarray_prototype_values, 0, 0)
+ROUTINE (LIT_MAGIC_STRING_ENTRIES, ecma_builtin_typedarray_prototype_entries, 0, 0)
+
+#endif /* ENABLED (JERRY_ES2015_BUILTIN_ITERATOR) */
+
 #endif /* ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"

tests/jerry/es2015/typedarray-prototype-entires.js

@@ -0,0 +1,103 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+try {
+  var array = [Uint8Array, Uint16Array, Uint32Array,
+               Float32Array, Float64Array,
+               Int8Array, Int16Array, Int32Array];
+
+  array.forEach (function(e){
+    e.prototype.entries.call (undefined);
+    assert (false);
+  });
+
+} catch (e) {
+  assert (e instanceof TypeError)
+}
+
+var buffer = new ArrayBuffer(8);
+var array = new Uint8Array(buffer);
+array = [1, 2, 3, 4, 5, 6, 7, 8];
+
+var iterator = array.entries ();
+
+var current_item = iterator.next ();
+
+for (var i = 0; i < array.length; i++) {
+  assert (current_item.value[0] === i);
+  assert (current_item.value[1] === array[i]);
+  assert (current_item.done === false);
+
+  current_item = iterator.next ();
+}
+
+assert (current_item.value === undefined);
+assert (current_item.done === true);
+
+function foo_error () {
+  throw new ReferenceError ("foo");
+}
+
+array = [1, 2, 3, 4, 5, 6, 7];
+
+['0', '3', '5'].forEach (function (e) {
+  Object.defineProperty (array, e, { 'get' : foo_error });
+})
+
+iterator = array.entries ();
+
+var expected_values = [2, 3, 5, 7];
+var expected_indices = [1, 2, 4, 6];
+var expected_values_idx = 0;
+
+for (var i = 0; i < array.length; i++) {
+  try {
+    current_item = iterator.next ();
+    assert (current_item.value[0] === expected_indices[expected_values_idx]);
+    assert (current_item.value[1] === expected_values[expected_values_idx]);
+    assert (current_item.done === false);
+    expected_values_idx++;
+  } catch (e) {
+    assert (e instanceof ReferenceError);
+    assert (e.message === "foo");
+  }
+}
+
+current_item = iterator.next ();
+assert (current_item.value === undefined);
+assert (current_item.done === true);
+
+/* Test empty array */
+array = [];
+
+iterator = array.entries ();
+current_item = iterator.next ();
+
+assert (current_item.value === undefined);
+assert (current_item.done === true);
+
+/* Test delete elements after the iterator has been constructed */
+
+array = [0, 1, 2, 3, 4, 5];
+iterator = array.entries ();
+
+for (var i = 0; i < array.length; i++) {
+  current_item = iterator.next ();
+  assert (current_item.value[0] === i);
+  assert (current_item.value[1] === array[i]);
+  assert (current_item.done === false);
+  array.pop();
+}
+
+assert ([].entries ().toString () === "[object Array Iterator]");

tests/jerry/es2015/typedarray-prototype-keys.js

@@ -0,0 +1,95 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+try {
+  var array = [Uint8Array, Uint16Array, Uint32Array, 
+               Float32Array, Float64Array, 
+               Int8Array, Int16Array, Int32Array];
+
+  array.forEach (function(e){
+    e.prototype.keys.call (undefined);
+    assert (false);
+  });
+
+} catch (e) {
+  assert (e instanceof TypeError)
+}
+
+var buffer = new ArrayBuffer(8);
+var array = new Uint8Array(buffer);
+array = [1, 2, 3, 4, 5, 6, 7, 8];
+
+var iterator = array.keys ();
+
+var current_item = iterator.next ();
+
+for (var i = 0; i < array.length; i++) {
+  assert (current_item.value === i);
+  assert (current_item.done === false);
+
+  current_item = iterator.next ();
+}
+
+assert (current_item.value === undefined);
+assert (current_item.done === true);
+
+function foo_error () {
+  throw new ReferenceError ("foo");
+}
+
+array = [1, 2, 3, 4, 5, 6, 7];
+
+['0', '3', '5'].forEach (function (e) {
+  Object.defineProperty (array, e, { 'get' : foo_error });
+})
+
+iterator = array.keys ();
+
+for (var i = 0; i < array.length; i++) {
+  try {
+    current_item = iterator.next ();
+    assert (current_item.value === i);
+    assert (current_item.done === false);
+  } catch (e) {
+    assert (e instanceof ReferenceError);
+    assert (e.message === "foo");
+  }
+}
+
+current_item = iterator.next ();
+assert (current_item.value === undefined);
+assert (current_item.done === true);
+
+/* Test empty array */
+array = [];
+
+iterator = array.keys ();
+current_item = iterator.next ();
+
+assert (current_item.value === undefined);
+assert (current_item.done === true);
+
+/* Test delete elements after the iterator has been constructed */
+
+array = [0, 1, 2, 3, 4, 5];
+iterator = array.keys ();
+
+for (var i = 0; i < array.length; i++) {
+  current_item = iterator.next ();
+  assert (current_item.value === i);
+  assert (current_item.done === false);
+  array.pop();
+}
+
+assert ([].keys ().toString () === "[object Array Iterator]");