diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp index 0df54097b5..f44b87b0cc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp @@ -2597,6 +2597,151 @@ ecma_builtin_array_prototype_object_reduce (ecma_value_t this_arg, /**< this arg return ret_value; } /* ecma_builtin_array_prototype_object_reduce */ +/** + * The Array.prototype object's 'reduceRight' routine + * + * See also: + * ECMA-262 v5, 15.4.4.22 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +static ecma_completion_value_t +ecma_builtin_array_prototype_object_reduce_right (ecma_value_t this_arg, /**< this argument */ + ecma_value_t arg1, /**< callbackfn */ + ecma_value_t arg2) /**< initialValue */ +{ + ecma_completion_value_t ret_value = ecma_make_empty_completion_value (); + + /* 1 */ + ECMA_TRY_CATCH (obj_this, + ecma_op_to_object (this_arg), + ret_value); + + ecma_object_t *obj_p = ecma_get_object_from_value (obj_this); + ecma_string_t *magic_string_length_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LENGTH); + + /* 2 */ + ECMA_TRY_CATCH (len_value, + ecma_op_object_get (obj_p, magic_string_length_p), + ret_value); + + ECMA_OP_TO_NUMBER_TRY_CATCH (len_number, len_value, ret_value); + + /* 3 */ + uint32_t len = ecma_number_to_uint32 (len_number); + + /* 4 */ + if (!ecma_op_is_callable (arg1)) + { + ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); + } + else + { + ecma_object_t *func_object_p; + + JERRY_ASSERT (ecma_is_value_object (arg1)); + func_object_p = ecma_get_object_from_value (arg1); + + /* 5 */ + if (len_number == ECMA_NUMBER_ZERO && ecma_is_value_undefined (arg2)) + { + ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); + } + else + { + ecma_number_t *num_p = ecma_alloc_number (); + ecma_value_t accumulator = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED); + + /* 6 */ + uint32_t index = len - 1; + bool zero_reached = !len; + + /* 7a */ + if (!ecma_is_value_undefined (arg2)) + { + accumulator = ecma_copy_value (arg2, true); + } + else + { + /* 8a */ + bool k_present = false; + /* 8b */ + while (!k_present && !zero_reached && ecma_is_completion_value_empty (ret_value)) + { + /* 8b-i */ + ecma_string_t *index_str_p = ecma_new_ecma_string_from_uint32 (index); + + /* 8b-ii-iii */ + if ((k_present = (ecma_op_object_get_property (obj_p, index_str_p) != NULL))) + { + ECMA_TRY_CATCH (current_value, ecma_op_object_get (obj_p, index_str_p), ret_value); + accumulator = ecma_copy_value (current_value, true); + ECMA_FINALIZE (current_value); + } + /* 8b-iv */ + index ? --index : zero_reached = true; + + ecma_deref_ecma_string (index_str_p); + } + /* 8c */ + if (!k_present) + { + ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); + } + } + /* 9 */ + ecma_value_t current_index; + + for (; !zero_reached && ecma_is_completion_value_empty (ret_value); index ? --index : zero_reached = true) + { + /* 9a */ + ecma_string_t *index_str_p = ecma_new_ecma_string_from_uint32 (index); + /* 9b */ + if (ecma_op_object_get_property (obj_p, index_str_p) != NULL) + { + /* 9c-i */ + ECMA_TRY_CATCH (current_value, ecma_op_object_get (obj_p, index_str_p), ret_value); + /* 9c-ii */ + *num_p = ecma_uint32_to_number (index); + current_index = ecma_make_number_value (num_p); + ecma_value_t call_args[] = {accumulator, current_value, current_index, obj_this}; + + ECMA_TRY_CATCH (call_value, + ecma_op_function_call (func_object_p, + ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED), + call_args, + 4), + ret_value); + + ecma_free_value (accumulator, true); + accumulator = ecma_copy_value (call_value, true); + + ECMA_FINALIZE (call_value); + ECMA_FINALIZE (current_value); + } + ecma_deref_ecma_string (index_str_p); + /* 9d in for loop */ + } + + if (ecma_is_completion_value_empty (ret_value)) + { + ret_value = ecma_make_normal_completion_value (ecma_copy_value (accumulator, true)); + } + + ecma_free_value (accumulator, true); + ecma_dealloc_number (num_p); + } + } + + ECMA_OP_TO_NUMBER_FINALIZE (len_number); + ECMA_FINALIZE (len_value); + ecma_deref_ecma_string (magic_string_length_p); + ECMA_FINALIZE (obj_this); + + return ret_value; +} /* ecma_builtin_array_prototype_object_reduce */ + /** * @} * @} diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h index 1702e610fb..a041bc95d5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h @@ -77,6 +77,7 @@ ROUTINE (ECMA_MAGIC_STRING_SLICE, ecma_builtin_array_prototype_object_slice, 2, ROUTINE (ECMA_MAGIC_STRING_SPLICE, ecma_builtin_array_prototype_object_splice, NON_FIXED, 2) ROUTINE (ECMA_MAGIC_STRING_FILTER, ecma_builtin_array_prototype_object_filter, 2, 1) ROUTINE (ECMA_MAGIC_STRING_REDUCE, ecma_builtin_array_prototype_object_reduce, 2, 1) +ROUTINE (ECMA_MAGIC_STRING_REDUCE_RIGHT_UL, ecma_builtin_array_prototype_object_reduce_right, 2, 1) #undef OBJECT_ID #undef SIMPLE_VALUE diff --git a/tests/jerry/array_prototype_reduce_right.js b/tests/jerry/array_prototype_reduce_right.js new file mode 100644 index 0000000000..5d2c28629e --- /dev/null +++ b/tests/jerry/array_prototype_reduce_right.js @@ -0,0 +1,69 @@ +// Copyright 2015 Samsung Electronics Co., Ltd. +// Copyright 2015 University of Szeged. +// +// 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. + +var func = function(a, b) { + return a + b; +} + +// check function type +try { + [0].reduceRight(new Object()); + assert(false); +} catch(e) { + assert(e instanceof TypeError); +} + +// check for init value +try { + [].reduceRight(func); + assert(false); +} catch(e) { + assert(e instanceof TypeError); +} + +try { + var arg2; + [].reduceRight(func, arg2); + assert(false); +} catch(e) { + assert(e instanceof TypeError); +} + +// various checks +assert([].reduceRight(func, 1) === 1); + +assert([0].reduceRight(func) === 0); + +assert([0, 1].reduceRight(func) === 1); + +assert([0, 1].reduceRight(func, 1) === 2); + +assert([0, 1, 2, 3].reduceRight(func, 1) === 7); + +assert (["A","B"].reduceRight(func) === "BA"); + +assert (["A","B"].reduceRight(func, "Init:") === "Init:BA"); + +assert ([0, 1].reduceRight(func, 3.2) === 4.2); + +assert ([0, "x", 1].reduceRight(func) === "1x0"); + +assert ([0, "x", 1].reduceRight(func, 3.2) === "4.2x0"); + +var long_array = [0, 1]; +assert (long_array.reduceRight(func,10) === 11); + +long_array[10000] = 1; +assert (long_array.reduceRight(func,10) === 12);