Implement Iterator interface and Array iterators

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu

Author: rerobika

jerry-core/config.h

@@ -40,6 +40,7 @@
 # define CONFIG_DISABLE_ES2015_BUILTIN
 # define CONFIG_DISABLE_ES2015_CLASS
 # define CONFIG_DISABLE_ES2015_FUNCTION_PARAMETER_INITIALIZER
+# define CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN
 # define CONFIG_DISABLE_ES2015_MAP_BUILTIN
 # define CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
 # define CONFIG_DISABLE_ES2015_PROMISE_BUILTIN

jerry-core/ecma/base/ecma-gc.c

@@ -39,6 +39,9 @@
 #ifndef CONFIG_DISABLE_ES2015_MAP_BUILTIN
 #include "ecma-map-object.h"
 #endif /* !CONFIG_DISABLE_ES2015_MAP_BUILTIN */
+#ifndef CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN
+#include "ecma-iterator-object.h"
+#endif /* !CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN */
 
 /* TODO: Extract GC to a separate component */
 
@@ -369,6 +372,12 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */
             break;
           }
 #endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
+#ifndef CONFIG_DISABLE_ES2015_BUILTIN
+          case ECMA_PSEUDO_ARRAY_ITERATOR:
+          {
+            break;
+          }
+#endif /* !CONFIG_DISABLE_ES2015_BUILTIN */
           default:
           {
             JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS);
@@ -759,6 +768,13 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
           return;
         }
 #endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
+#ifndef CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN
+        case ECMA_PSEUDO_ARRAY_ITERATOR:
+        {
+          ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t));
+          return;
+        }
+#endif /* !CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN */
         default:
         {
           JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS);

jerry-core/ecma/base/ecma-globals.h

@@ -659,8 +659,9 @@ typedef enum
   ECMA_PSEUDO_ARRAY_ARGUMENTS = 0, /**< Arguments object (10.6) */
   ECMA_PSEUDO_ARRAY_TYPEDARRAY = 1, /**< TypedArray which does NOT need extra space to store length and offset */
   ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO = 2, /**< TypedArray which NEEDS extra space to store length and offset */
+  ECMA_PSEUDO_ARRAY_ITERATOR = 3, /**< Array iterator object (ECMAScript v6, 22.1.5.1) */
 
-  ECMA_PSEUDO_ARRAY__MAX = ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO /**< maximum value */
+  ECMA_PSEUDO_ARRAY__MAX = ECMA_PSEUDO_ARRAY_ITERATOR /**< maximum value */
 } ecma_pseudo_array_type_t;
 
 /**
@@ -681,6 +682,16 @@ typedef enum
   ECMA_LEXICAL_ENVIRONMENT_TYPE__MAX = ECMA_LEXICAL_ENVIRONMENT_SUPER_OBJECT_BOUND /**< maximum value */
 } ecma_lexical_environment_type_t;
 
+/**
+ * Types of array iterators.
+ */
+typedef enum
+{
+  ECMA_ARRAY_ITERATOR_KEYS, /**< List only key indices */
+  ECMA_ARRAY_ITERATOR_VALUES, /**< List only key values */
+  ECMA_ARRAY_ITERATOR_KEYS_VALUES, /**< List key indices and values */
+} ecma_array_iterator_type_t;
+
 /**
  * Offset for JERRY_CONTEXT (status_flags) top 8 bits.
  */
@@ -841,18 +852,21 @@ typedef struct
      */
     struct
     {
-      uint8_t type; /**< pseudo array type, e.g. Arguments, TypedArray*/
+      uint8_t type; /**< pseudo array type, e.g. Arguments, TypedArray, ArrayIterator */
       uint8_t extra_info; /**< extra information about the object.
-                           *   e.g. element_width_shift for typed arrays */
+                           *   e.g. element_width_shift for typed arrays,
+                           *        elementKind for ArrayIterator */
       union
       {
         uint16_t length; /**< for arguments: length of names */
         uint16_t class_id; /**< for typedarray: the specific class name */
+        uint16_t iterator_index; /**< for ArrayIterator: [[ArrayIteratorNextIndex]] property */
       } u1;
       union
       {
         ecma_value_t lex_env_cp; /**< for arguments: lexical environment */
         ecma_value_t arraybuffer; /**< for typedarray: internal arraybuffer */
+        ecma_value_t iterated_value_cp; /**< for ArrayIterator: [[ArrayIteratorNextIndex]] property */
       } u2;
     } pseudo_array;
 

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

@@ -24,6 +24,7 @@
 #include "ecma-gc.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
+#include "ecma-iterator-object.h"
 #include "ecma-objects.h"
 #include "ecma-string-object.h"
 #include "ecma-try-catch-macro.h"
@@ -2504,6 +2505,81 @@ ecma_builtin_array_prototype_object_find (ecma_value_t this_arg, /**< this argum
 } /* ecma_builtin_array_prototype_object_find */
 #endif /* !CONFIG_DISABLE_ES2015_BUILTIN */
 
+#ifndef CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN
+/**
+ * Helper function for Array.prototype object's {'keys', 'values', 'entries'}
+ * routines common parts.
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_array_iterators_helper (ecma_value_t this_arg, /**< this argument */
+                                     uint8_t type) /**< any combination of
+                                                    *   ecma_array_iterator_type_t bits */
+{
+  /* 1. */
+  ecma_value_t obj_this = ecma_op_to_object (this_arg);
+
+  if (ECMA_IS_VALUE_ERROR (obj_this))
+  {
+    /* 2. */
+    return obj_this;
+  }
+
+  /* 3. */
+  ecma_value_t ret_value = ecma_op_create_iterator_object (obj_this, ECMA_PSEUDO_ARRAY_ITERATOR, type);
+  ecma_free_value (obj_this);
+
+  return ret_value;
+} /* ecma_builtin_array_iterators_helper */
+
+/**
+ * The Array.prototype object's 'entries' routine
+ *
+ * See also:
+ *          ECMA-262 v6, 22.1.3.4
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_array_prototype_entries (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_array_iterators_helper (this_arg, ECMA_ARRAY_ITERATOR_KEYS_VALUES);
+} /* ecma_builtin_array_prototype_entries */
+
+/**
+ * The Array.prototype object's 'values' routine
+ *
+ * See also:
+ *          ECMA-262 v6, 22.1.3.29.
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_array_prototype_values (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_array_iterators_helper (this_arg, ECMA_ARRAY_ITERATOR_VALUES);
+} /* ecma_builtin_array_prototype_values */
+
+/**
+ * The Array.prototype object's 'keys' routine
+ *
+ * See also:
+ *          ECMA-262 v6, 22.1.3.13
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_array_prototype_keys (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_array_iterators_helper (this_arg, ECMA_ARRAY_ITERATOR_KEYS);
+} /* ecma_builtin_array_prototype_keys */
+#endif /* !CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN */
+
 /**
  * @}
  * @}

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

@@ -61,6 +61,9 @@ ROUTINE (LIT_MAGIC_STRING_FILTER, ecma_builtin_array_prototype_object_filter, 2,
 ROUTINE (LIT_MAGIC_STRING_REDUCE, ecma_builtin_array_prototype_object_reduce, NON_FIXED, 1)
 ROUTINE (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, ecma_builtin_array_prototype_object_reduce_right, NON_FIXED, 1)
 #ifndef CONFIG_DISABLE_ES2015_BUILTIN
+ROUTINE (LIT_MAGIC_STRING_ENTRIES, ecma_builtin_array_prototype_entries, 0, 0)
+ROUTINE (LIT_MAGIC_STRING_VALUES, ecma_builtin_array_prototype_values, 0, 0)
+ROUTINE (LIT_MAGIC_STRING_KEYS, ecma_builtin_array_prototype_keys, 0, 0)
 ROUTINE (LIT_MAGIC_STRING_FIND, ecma_builtin_array_prototype_object_find, 2, 1)
 #endif /* !CONFIG_DISABLE_ES2015_BUILTIN */
 

jerry-core/ecma/operations/ecma-array-iterator-object.c

@@ -0,0 +1,202 @@
+/* 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.
+ */
+
+#include "ecma-alloc.h"
+#include "ecma-array-object.h"
+#include "ecma-typedarray-object.h"
+#include "ecma-array-iterator-object.h"
+#include "ecma-builtin-helpers.h"
+#include "ecma-builtins.h"
+#include "ecma-exceptions.h"
+#include "ecma-gc.h"
+#include "ecma-globals.h"
+#include "ecma-helpers.h"
+#include "ecma-iterator-object.h"
+#include "ecma-number-arithmetic.h"
+#include "ecma-objects.h"
+#include "ecma-objects-general.h"
+#include "ecma-function-object.h"
+
+/** \addtogroup ecma ECMA
+ * @{
+ *
+ * \addtogroup ecmaarrayiteratorobject ECMA Array iterator object related routines
+ * @{
+ */
+
+#ifndef CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN
+/**
+ * The %ArrayIteratorPrototype% object's 'next' routine
+ *
+ * See also:
+ *          ECMA-262 v6, 22.1.5.2.1
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+ecma_value_t
+ecma_op_array_iterator_next (const ecma_value_t function_obj, /**< the function itself */
+                             const ecma_value_t this_val, /**< this_arg of the function */
+                             const ecma_value_t args_p[], /**< argument list */
+                             const ecma_length_t args_count) /**< argument number */
+{
+  JERRY_UNUSED_3 (function_obj, args_p, args_count);
+
+  /* 1 - 2. */
+  if (!ecma_is_value_object (this_val))
+  {
+    return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not an object."));
+  }
+
+  ecma_object_t *obj_p = ecma_get_object_from_value (this_val);
+  ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) obj_p;
+
+  /* 3. */
+  if (ext_obj_p->u.pseudo_array.type != ECMA_PSEUDO_ARRAY_ITERATOR)
+  {
+    return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not an iterator."));
+  }
+
+  ecma_object_t *array_object_p = ECMA_GET_POINTER (ecma_object_t,
+                                                    ext_obj_p->u.pseudo_array.u2.iterated_value_cp);
+
+
+  /* 4 - 5 */
+  if (array_object_p == NULL)
+  {
+    return ecma_create_iter_result_object (ECMA_VALUE_UNDEFINED, ECMA_VALUE_TRUE);
+  }
+
+  uint32_t length;
+
+  /* 8 - 9. */
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
+  if (ecma_is_typedarray (ecma_make_object_value (array_object_p)))
+  {
+    length = ecma_typedarray_get_length (array_object_p);
+  }
+  else
+  {
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
+    ecma_value_t length_value = ecma_op_object_get_by_magic_id (array_object_p, LIT_MAGIC_STRING_LENGTH);
+
+    if (ECMA_IS_VALUE_ERROR (length_value))
+    {
+      return length_value;
+    }
+
+    /* 3. */
+    ecma_number_t length_number;
+    length_value = ecma_get_number (length_value, &length_number);
+
+    if (!ecma_is_value_empty (length_value))
+    {
+      return length_value;
+    }
+
+    length = ecma_number_to_uint32 (length_number);
+    ecma_free_value (length_value);
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
+  }
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
+
+  uint32_t index = ext_obj_p->u.pseudo_array.u1.iterator_index;
+
+  if (JERRY_UNLIKELY (index == ECMA_ITERATOR_INDEX_LIMIT))
+  {
+    /* After the ECMA_ITERATOR_INDEX_LIMIT limit is reached the [[ArrayIteratorNextIndex]]
+       property is stored as an internal property */
+    ecma_string_t *prop_name_p = ecma_get_magic_string (LIT_INTERNAL_MAGIC_STRING_ITERATOR_NEXT_INDEX);
+    ecma_value_t index_value = ecma_op_object_get (array_object_p, prop_name_p);
+
+    if (!ecma_is_value_undefined (index_value))
+    {
+      index = (uint32_t) (ecma_get_number_from_value (index_value) + 1);
+    }
+
+    ecma_value_t put_result = ecma_op_object_put (array_object_p,
+                                                  prop_name_p,
+                                                  ecma_make_uint32_value (index),
+                                                  true);
+
+    JERRY_ASSERT (ecma_is_value_true (put_result));
+
+    ecma_free_value (index_value);
+  }
+  else
+  {
+    /* 11. */
+    ext_obj_p->u.pseudo_array.u1.iterator_index++;
+  }
+
+  if (index >= length)
+  {
+    ECMA_SET_POINTER (ext_obj_p->u.pseudo_array.u2.iterated_value_cp, NULL);
+    return ecma_create_iter_result_object (ECMA_VALUE_UNDEFINED, ECMA_VALUE_TRUE);
+  }
+
+  /* 7. */
+  uint8_t iterator_type = ext_obj_p->u.pseudo_array.extra_info;
+
+  if (iterator_type == ECMA_ARRAY_ITERATOR_KEYS)
+  {
+    /* 12. */
+    return ecma_create_iter_result_object (ecma_make_uint32_value (index), ECMA_VALUE_FALSE);
+  }
+
+  ecma_value_t result;
+
+  /* 13. */
+  ecma_string_t *index_string_p = ecma_new_ecma_string_from_uint32 (index);
+
+  /* 14. */
+  ecma_value_t get_value = ecma_op_object_get (array_object_p, index_string_p);
+
+  /* 15. */
+  if (ECMA_IS_VALUE_ERROR (get_value))
+  {
+    ecma_deref_ecma_string (index_string_p);
+    return get_value;
+  }
+
+  /* 16. */
+  if (iterator_type == ECMA_ARRAY_ITERATOR_VALUES)
+  {
+    result = ecma_create_iter_result_object (get_value, ECMA_VALUE_FALSE);
+  }
+  else
+  {
+    /* 17.a */
+    JERRY_ASSERT (iterator_type == ECMA_ARRAY_ITERATOR_KEYS_VALUES);
+
+    /* 17.b */
+    ecma_value_t entry_array_value;
+    entry_array_value = ecma_create_array_from_iter_element (get_value,
+                                                             ecma_make_uint32_value (index));
+
+    result = ecma_create_iter_result_object (entry_array_value, ECMA_VALUE_FALSE);
+    ecma_free_value (entry_array_value);
+  }
+
+  ecma_free_value (get_value);
+  ecma_deref_ecma_string (index_string_p);
+  return result;
+} /* ecma_op_array_iterator_next */
+#endif /* !CONFIG_DISABLE_ES2015_ITERATOR_BUILTIN */
+
+/**
+ * @}
+ * @}
+ */