Add toLength and toInteger operations

JerryScript-DCO-1.0-Signed-off-by: Daniella Barsony [email protected]

Author: Yuyupo

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

@@ -1152,14 +1152,14 @@ typedef double ecma_number_t;
  */
 # define  ECMA_NUMBER_EPSILON ((ecma_number_t) 2.2204460492503130808472633361816e-16)
 #endif /* ENABLED (JERRY_ES2015_BUILTIN) */
-#if ENABLED (JERRY_ES2015_BUILTIN)
+#if ENABLED (JERRY_ES2015)
 /**
  * Number.MAX_SAFE_INTEGER
  *
  * See also: ECMA_262 v6, 20.1.2.1
  */
 # define ECMA_NUMBER_MAX_SAFE_INTEGER ((ecma_number_t) 0x1FFFFFFFFFFFFF)
-#endif /* ENABLED (JERRY_ES2015_BUILTIN) */
+#endif /* ENABLED (JERRY_ES2015) */
 /**
  * Euler number
  */

jerry-core/ecma/operations/ecma-conversion.c

@@ -17,6 +17,8 @@
  * Implementation of ECMA-defined conversion routines
  */
 
+#include <math.h>
+
 #include "ecma-alloc.h"
 #include "ecma-boolean-object.h"
 #include "ecma-conversion.h"
@@ -910,6 +912,122 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
   return ret_value;
 } /* ecma_op_to_property_descriptor */
 
+/**
+ * ToInteger operation.
+ *
+ * See also:
+ *          ECMA-262 v5, 9.4
+ *          ECMA-262 v6, 7.1.4
+ *
+ * @return ECMA_VALUE_EMPTY if successful
+ *         conversion error otherwise
+ */
+ecma_value_t
+ecma_op_to_integer (ecma_value_t value, /**< ecma value*/
+                    ecma_number_t *number_p) /**< [out] ecma number */
+{
+
+  if (ECMA_IS_VALUE_ERROR (value))
+  {
+    return value;
+  }
+
+  /* 1 */
+  ecma_value_t to_number = ecma_get_number (value, number_p);
+
+  /* 2 */
+  if (ECMA_IS_VALUE_ERROR (to_number))
+  {
+    return to_number;
+  }
+
+  ecma_number_t number = *number_p;
+
+  /* 3 */
+  if (ecma_number_is_nan (number))
+  {
+    *number_p = ECMA_NUMBER_ZERO;
+    return ECMA_VALUE_EMPTY;
+  }
+
+  /* 4 */
+  if (ecma_number_is_zero (number) || ecma_number_is_infinity (number))
+  {
+    return ECMA_VALUE_EMPTY;
+  }
+
+  ecma_number_t floor_fabs = floor (fabs (number));
+
+  /* 5 */
+  *number_p = ecma_number_is_negative (number) ? -floor_fabs : floor_fabs;
+  return ECMA_VALUE_EMPTY;
+} /* ecma_op_to_integer */
+
+/**
+ * ToLength operation.
+ *
+ * See also:
+ *          ECMA-262 v6, 7.1.15
+ *
+ * @return ECMA_VALUE_EMPTY if successful
+ *         conversion error otherwise
+ */
+ecma_value_t
+ecma_op_to_length (ecma_value_t value, /**< ecma value*/
+                   uint32_t *length) /**< [out] ecma number */
+{
+  /* 1 */
+  if (ECMA_IS_VALUE_ERROR (value))
+  {
+    return value;
+  }
+
+#if ENABLED (JERRY_ES2015)
+
+  ecma_number_t num;
+
+  /* 2 */
+  ecma_value_t length_num = ecma_op_to_integer (value, &num);
+
+  /* 3 */
+  if (ECMA_IS_VALUE_ERROR (length_num))
+  {
+    return length_num;
+  }
+
+  /* 4 */
+  if (num <= 0.0f)
+  {
+    *length = 0;
+    return ECMA_VALUE_EMPTY;
+  }
+
+  /* 5 */
+  if (ecma_number_is_infinity (num))
+  {
+    *length = UINT32_MAX;
+    return ECMA_VALUE_EMPTY;
+  }
+
+  /* 6 */
+  *length = (uint32_t) JERRY_MIN (num, UINT32_MAX);
+  return ECMA_VALUE_EMPTY;
+#else /* !ENABLED (JERRY_ES2015) */
+  /* In the case of ES5, ToLength(ES6) operation is the same as ToUint32(ES5) */
+  ecma_number_t num;
+  ecma_value_t to_number = ecma_get_number (value, &num);
+
+  /* 2 */
+  if (ECMA_IS_VALUE_ERROR (to_number))
+  {
+    return to_number;
+  }
+
+  *length = ecma_number_to_uint32 (num);
+  return ECMA_VALUE_EMPTY;
+#endif /* ENABLED (JERRY_ES2015) */
+} /* ecma_op_to_length */
+
 /**
  * @}
  * @}

jerry-core/ecma/operations/ecma-conversion.h

@@ -49,6 +49,8 @@ ecma_value_t ecma_get_number (ecma_value_t value, ecma_number_t *number_p);
 ecma_value_t ecma_op_to_string (ecma_value_t value);
 ecma_string_t *ecma_op_to_prop_name (ecma_value_t value);
 ecma_value_t ecma_op_to_object (ecma_value_t value);
+ecma_value_t ecma_op_to_integer (ecma_value_t value, ecma_number_t *number_p);
+ecma_value_t ecma_op_to_length (ecma_value_t value, uint32_t *length);
 
 ecma_object_t *ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_desc_p);
 ecma_value_t ecma_op_to_property_descriptor (ecma_value_t obj_value, ecma_property_descriptor_t *out_prop_desc_p);