Implement toString and join for TypedArrays.

Bela Toth · Bela Toth · commit a13243ca9b22 · 2018-03-29T15:40:00.000+02:00
JerryScript-DCO-1.0-Signed-off-by: Bela Toth tbela@inf.u-szeged.hu
diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c
@@ -25,19 +25,19 @@
 #include "ecma-builtin-internal-routines-template.inc.h"
 
 /** \addtogroup ecma ECMA
- * @{
- *
- * \addtogroup ecmabuiltins
- * @{
- *
- * \addtogroup float32arrayprototype ECMA Float32Array.prototype object built-in
- * @{
- */
+* @{
+*
+* \addtogroup ecmabuiltins
+* @{
+*
+* \addtogroup float32arrayprototype ECMA Float32Array.prototype object built-in
+* @{
+*/
 
 /**
- * @}
- * @}
- * @}
- */
+* @}
+* @}
+* @}
+*/
 
 #endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c
@@ -40,5 +40,6 @@
  * @}
  * @}
  */
+
 #endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64 */
 #endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c
@@ -1,17 +1,17 @@
 /* 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.
- */
+*
+* 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-builtins.h"
 
@@ -25,19 +25,19 @@
 #include "ecma-builtin-internal-routines-template.inc.h"
 
 /** \addtogroup ecma ECMA
- * @{
- *
- * \addtogroup ecmabuiltins
- * @{
- *
- * \addtogroup int8arrayprototype ECMA Int8Array.prototype object built-in
- * @{
- */
+* @{
+*
+* \addtogroup ecmabuiltins
+* @{
+*
+* \addtogroup int8arrayprototype ECMA Int8Array.prototype object built-in
+* @{
+*/
 
 /**
- * @}
- * @}
- * @}
- */
+* @}
+* @}
+* @}
+*/
 
 #endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c
@@ -767,6 +767,209 @@ ecma_builtin_typedarray_prototype_set (ecma_value_t this_arg, /**< this argument
   return ret_val;
 } /* ecma_builtin_typedarray_prototype_set */
 
+/**
+ * TypedArray.prototype's 'toString' single element operation routine based
+ * on the Array.prototype's 'toString' single element operation routine
+ *
+ * See also:
+ *          ECMA-262 v5.1, 15.4.4.2
+ *
+ * @return ecma_value_t value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_op_typedarray_get_to_string_at_index (ecma_object_t *obj_p, /**< this object */
+                                     uint32_t index) /**< array index */
+{
+  ecma_value_t ret_value = ECMA_VALUE_EMPTY;
+  ecma_string_t *index_string_p = ecma_new_ecma_string_from_uint32 (index);
+
+  ECMA_TRY_CATCH (index_value,
+                 ecma_op_object_get (obj_p, index_string_p),
+                 ret_value);
+
+  if (ecma_is_value_undefined (index_value)
+     || ecma_is_value_null (index_value))
+  {
+    ret_value = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY);
+  }
+  else
+  {
+    ret_value = ecma_op_to_string (index_value);
+  }
+
+  ECMA_FINALIZE (index_value);
+
+  ecma_deref_ecma_string (index_string_p);
+
+return ret_value;
+} /* ecma_op_typedarray_get_to_string_at_index */
+
+/**
+ * The TypedArray.prototype.toString's separator creation routine based on
+ * the Array.prototype.toString's separator routine
+ *
+ * See also:
+ *          ECMA-262 v5.1, 15.4.4.2 4th step
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_op_typedarray_get_separator_string (ecma_value_t separator) /**< possible separator */
+{
+  if (ecma_is_value_undefined (separator))
+  {
+    return ecma_make_magic_string_value (LIT_MAGIC_STRING_COMMA_CHAR);
+  }
+
+  return ecma_op_to_string (separator);
+} /* ecma_op_typedarray_get_separator_string */
+
+/**
+ * The TypedArray.prototype object's 'join' routine basen on
+ * the Array.porottype object's 'join'
+ *
+ * See also:
+ *          ECMA-262 v5, 15.4.4.5
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_typedarray_prototype_join (const ecma_value_t this_arg, /**< this argument */
+                                  const ecma_value_t separator_arg) /**< separator argument */
+{
+  ecma_value_t ret_value = ECMA_VALUE_EMPTY;
+
+  /* 1. */
+  ECMA_TRY_CATCH (obj_value,
+                 ecma_op_to_object (this_arg),
+                 ret_value);
+
+  ecma_object_t *obj_p = ecma_get_object_from_value (obj_value);
+
+  /* 2. */
+  ECMA_TRY_CATCH (length_value,
+                 ecma_op_object_get_by_magic_id (obj_p, LIT_MAGIC_STRING_LENGTH),
+                 ret_value);
+
+  ECMA_OP_TO_NUMBER_TRY_CATCH (length_number,
+                              length_value,
+                              ret_value);
+
+  /* 3. */
+  uint32_t length = ecma_number_to_uint32 (length_number);
+
+  /* 4-5. */
+  ECMA_TRY_CATCH (separator_value,
+                 ecma_op_typedarray_get_separator_string (separator_arg),
+                 ret_value);
+
+  if (length == 0)
+  {
+    /* 6. */
+    ret_value = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY);
+  }
+  else
+  {
+    ecma_string_t *separator_string_p = ecma_get_string_from_value (separator_value);
+
+    /* 7-8. */
+    ECMA_TRY_CATCH (first_value,
+                   ecma_op_typedarray_get_to_string_at_index (obj_p, 0),
+                   ret_value);
+
+    ecma_string_t *return_string_p = ecma_get_string_from_value (first_value);
+    ecma_ref_ecma_string (return_string_p);
+
+   /* 9-10. */
+    for (uint32_t k = 1; ecma_is_value_empty (ret_value) && (k < length); k++)
+    {
+      /* 10.a */
+      return_string_p = ecma_concat_ecma_strings (return_string_p, separator_string_p);
+
+     /* 10.b, 10.c */
+      ECMA_TRY_CATCH (next_string_value,
+                     ecma_op_typedarray_get_to_string_at_index (obj_p, k),
+                     ret_value);
+
+      /* 10.d */
+      ecma_string_t *next_string_p = ecma_get_string_from_value (next_string_value);
+      return_string_p = ecma_concat_ecma_strings (return_string_p, next_string_p);
+
+      ECMA_FINALIZE (next_string_value);
+    }
+
+    if (ecma_is_value_empty (ret_value))
+    {
+      ret_value = ecma_make_string_value (return_string_p);
+    }
+    else
+    {
+      ecma_deref_ecma_string (return_string_p);
+    }
+
+    ECMA_FINALIZE (first_value);
+  }
+
+  ECMA_FINALIZE (separator_value);
+
+  ECMA_OP_TO_NUMBER_FINALIZE (length_number);
+
+  ECMA_FINALIZE (length_value);
+  ECMA_FINALIZE (obj_value);
+
+  return ret_value;
+} /* ecma_builtin_typedarray_prototype_join */
+
+
+/**
+ * The TypedArray.prototype object's 'toString' routine basen on
+ * the Array.porottype object's 'toString'
+ *
+ * See also:
+ *          ECMA-262 v5, 15.4.4.2
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_typedarray_prototype_object_to_string (ecma_value_t this_arg) /**< this argument */
+{
+  ecma_value_t ret_value = ECMA_VALUE_EMPTY;
+
+  /* 1. */
+  ECMA_TRY_CATCH (obj_this_value,
+                 ecma_op_to_object (this_arg),
+                 ret_value);
+
+  ecma_object_t *obj_p = ecma_get_object_from_value (obj_this_value);
+
+  /* 2. */
+  ECMA_TRY_CATCH (join_value,
+                 ecma_op_object_get_by_magic_id (obj_p, LIT_MAGIC_STRING_JOIN),
+                 ret_value);
+
+  if (!ecma_op_is_callable (join_value))
+  {
+    /* 3. */
+    ret_value = ecma_builtin_helper_object_to_string (this_arg);
+  }
+  else
+  {
+   /* 4. */
+    ecma_object_t *join_func_obj_p = ecma_get_object_from_value (join_value);
+
+    ret_value = ecma_op_function_call (join_func_obj_p, this_arg, NULL, 0);
+  }
+
+  ECMA_FINALIZE (join_value);
+  ECMA_FINALIZE (obj_this_value);
+
+  return ret_value;
+} /* ecma_builtin_typedarray_prototype_object_to_string */
+
 /**
  * @}
  * @}
diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h
@@ -45,6 +45,10 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_LENGTH,
                     ecma_builtin_typedarray_prototype_length_getter,
                     ECMA_PROPERTY_FIXED)
 
+/* Routine properties:
+*  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
+ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ecma_builtin_typedarray_prototype_object_to_string, 0, 0)
+ROUTINE (LIT_MAGIC_STRING_JOIN,  ecma_builtin_typedarray_prototype_join, 1, 1)
 ROUTINE (LIT_MAGIC_STRING_EVERY, ecma_builtin_typedarray_prototype_every, 2, 1)
 ROUTINE (LIT_MAGIC_STRING_SOME, ecma_builtin_typedarray_prototype_some, 2, 1)
 ROUTINE (LIT_MAGIC_STRING_FOR_EACH_UL, ecma_builtin_typedarray_prototype_for_each, 2, 1)
diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c
@@ -1,17 +1,17 @@
 /* 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.
- */
+*
+* 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-builtins.h"
 
@@ -25,14 +25,14 @@
 #include "ecma-builtin-internal-routines-template.inc.h"
 
 /** \addtogroup ecma ECMA
- * @{
- *
- * \addtogroup ecmabuiltins
- * @{
- *
- * \addtogroup uint8arrayprototype ECMA Uint8Array.prototype object built-in
- * @{
- */
+* @{
+*
+* \addtogroup ecmabuiltins
+* @{
+*
+* \addtogroup uint8arrayprototype ECMA Uint8Array.prototype object built-in
+* @{
+*/
 
 /**
  * @}
diff --git a/tests/jerry/es2015/typedArray-tostring.js b/tests/jerry/es2015/typedArray-tostring.js
