Add Array.prototype.fill method (#3201)

JerryScript-DCO-1.0-Signed-off-by: Daniella Barsony bella@inf.u-szeged.hu
2019-10-16 16:37:56 +02:00
parent 5320f5a396
commit 390916e989
4 changed files with 281 additions and 3 deletions
@@ -76,6 +76,7 @@ enum
  ECMA_ARRAY_PROTOTYPE_VALUES,
  ECMA_ARRAY_PROTOTYPE_KEYS,
  ECMA_ARRAY_PROTOTYPE_SYMBOL_ITERATOR,
+  ECMA_ARRAY_PROTOTYPE_FILL,
 };

 #define BUILTIN_INC_HEADER_NAME "ecma-builtin-array-prototype.inc.h"
@@ -1919,6 +1920,98 @@ ecma_builtin_array_reduce_from (ecma_value_t callbackfn, /**< routine's 1st argu
 } /* ecma_builtin_array_reduce_from */

 #if ENABLED (JERRY_ES2015_BUILTIN)
+/**
+ * The Array.prototype object's 'fill' routine
+ *
+ * Note: this method only supports length up to uint32, instead of max_safe_integer
+ *
+ * See also:
+ *          ECMA-262 v6, 22.1.3.6
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_array_prototype_fill (ecma_value_t value, /**< value */
+                                   ecma_value_t start_val, /**< start value */
+                                   ecma_value_t end_val, /**< end value */
+                                   ecma_object_t *obj_p, /**< array object */
+                                   uint32_t len) /**< array object's length */
+{
+  /* 5 */
+  ecma_number_t start;
+  ecma_value_t to_number = ecma_op_to_integer (start_val, &start);
+
+  /* 6 */
+  if (ECMA_IS_VALUE_ERROR (to_number))
+  {
+    return to_number;
+  }
+
+  ecma_number_t k;
+
+  /* 7 */
+  if (ecma_number_is_negative (start))
+  {
+    k = JERRY_MAX (((ecma_number_t) len + start), 0);
+  }
+  else
+  {
+    k = JERRY_MIN (start, (ecma_number_t) len);
+  }
+
+  /* 8 */
+  ecma_number_t relative_end;
+
+  if (ecma_is_value_undefined (end_val))
+  {
+    relative_end = (ecma_number_t) len;
+  }
+  else
+  {
+    to_number = ecma_op_to_integer (end_val, &relative_end);
+
+    if (ECMA_IS_VALUE_ERROR (to_number))
+    {
+      return to_number;
+    }
+  }
+
+  /* 10 */
+  ecma_number_t final;
+  if (relative_end < 0)
+  {
+    final = JERRY_MAX (((ecma_number_t) len + relative_end), 0);
+  }
+  else
+  {
+    final = JERRY_MIN (relative_end, (ecma_number_t) len);
+  }
+
+  /* 11 */
+  while (k < final)
+  {
+    /* 11.a */
+    ecma_string_t *pk = ecma_new_ecma_string_from_number (k);
+
+    /* 11.b */
+    ecma_value_t put_val = ecma_op_object_put (obj_p, pk, value, true);
+    ecma_deref_ecma_string (pk);
+
+    /* 11. c */
+    if (ECMA_IS_VALUE_ERROR (put_val))
+    {
+      return put_val;
+    }
+
+    /* 11.d */
+    k++;
+  }
+
+  ecma_ref_object (obj_p);
+  return ecma_make_object_value (obj_p);
+} /* ecma_builtin_array_prototype_fill */
+
 /**
 * The Array.prototype object's 'find' and 'findIndex' routine
 *
@@ -2249,6 +2342,15 @@ ecma_builtin_array_prototype_dispatch_routine (uint16_t builtin_routine_id, /**<
                                                            length);
      break;
    }
+    case ECMA_ARRAY_PROTOTYPE_FILL:
+    {
+      ret_value = ecma_builtin_array_prototype_fill (routine_arg_1,
+                                                     routine_arg_2,
+                                                     arguments_list_p[2],
+                                                     obj_p,
+                                                     length);
+      break;
+    }
 #endif /* ENABLED (JERRY_ES2015_BUILTIN) */
    default:
    {
@@ -65,6 +65,7 @@ ROUTINE (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, ECMA_ARRAY_PROTOTYPE_REDUCE_RIGHT, NO
 #if ENABLED (JERRY_ES2015_BUILTIN)
 ROUTINE (LIT_MAGIC_STRING_FIND, ECMA_ARRAY_PROTOTYPE_FIND, 2, 1)
 ROUTINE (LIT_MAGIC_STRING_FIND_INDEX, ECMA_ARRAY_PROTOTYPE_FIND_INDEX, 2, 1)
+ROUTINE (LIT_MAGIC_STRING_FILL, ECMA_ARRAY_PROTOTYPE_FILL, 3, 1)
 #endif /* ENABLED (JERRY_ES2015_BUILTIN) */
 #if ENABLED (JERRY_ES2015_BUILTIN_ITERATOR)
 ROUTINE (LIT_MAGIC_STRING_ENTRIES, ECMA_ARRAY_PROTOTYPE_ENTRIES, 0, 0)
@@ -128,11 +128,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVAL, "eval")
 #if ENABLED (JERRY_BUILTIN_REGEXP)
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXEC, "exec")
 #endif
-#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
-LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILL, "fill")
-#endif
 #if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ES2015_BUILTIN) \
 || ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
+LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILL, "fill")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND, "find")
 #endif
 #if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)