Skip to content

Implement String.prototype.lastIndexOf() #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 170 additions & 2 deletions jerry-core/ecma/builtin-objects/ecma-builtin-helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "ecma-builtin-helpers.h"

#include "ecma-alloc.h"
#include "ecma-array-object.h"
#include "ecma-builtins.h"
#include "ecma-conversion.h"
Expand Down Expand Up @@ -470,22 +471,33 @@ ecma_builtin_helper_array_concat_value (ecma_object_t *obj_p, /**< array */
* This function clamps the given index to the [0, length] range.
* If the index is negative, 0 value is used.
* If the index is greater than the length of the string, the normalized index will be the length of the string.
* NaN is mapped to zero or length depending on the nan_to_zero parameter.
*
* See also:
* ECMA-262 v5, 15.5.4.15
*
* Used by:
* - The String.prototype.substring routine.
* - The String.prototype.indexOf routine.
* - The ecma_builtin_helper_string_prototype_object_index_of helper routine.
*
* @return uint32_t - the normalized value of the index
*/
uint32_t
ecma_builtin_helper_string_index_normalize (ecma_number_t index, /**< index */
uint32_t length) /**< string's length */
uint32_t length, /**< string's length */
bool nan_to_zero) /**< whether NaN is mapped to zero (t) or length (f) */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This argument modifies the behavior a bit so we need to update the function comment above.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the first time this appeared as problem? I think charCodeAt also depends on this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

charCodeAt needs similar checks, but is a bit simpler and does not use the helper function.

{
uint32_t norm_index = 0;

if (!ecma_number_is_nan (index) && !ecma_number_is_negative (index))
if (ecma_number_is_nan (index))
{
if (!nan_to_zero)
{
norm_index = length;
}
}
else if (!ecma_number_is_negative (index))
{
if (ecma_number_is_infinity (index))
{
Expand All @@ -505,6 +517,162 @@ ecma_builtin_helper_string_index_normalize (ecma_number_t index, /**< index */
return norm_index;
} /* ecma_builtin_helper_string_index_normalize */

/*
* Helper function for string indexOf and lastIndexOf functions
*
* This function implements string indexOf and lastIndexOf with required checks and conversions.
*
* See also:
* ECMA-262 v5, 15.5.4.7
* ECMA-262 v5, 15.5.4.8
*
* Used by:
* - The String.prototype.indexOf routine.
* - The String.prototype.lastIndexOf routine.
*
* @return uint32_t - (last)index of search string
*/
ecma_completion_value_t
ecma_builtin_helper_string_prototype_object_index_of (ecma_value_t this_arg, /**< this argument */
ecma_value_t arg1, /**< routine's first argument */
ecma_value_t arg2, /**< routine's second argument */
bool firstIndex) /**< routine's third argument */
{
ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();

/* 1 */
ECMA_TRY_CATCH (check_coercible_val,
ecma_op_check_object_coercible (this_arg),
ret_value);

/* 2 */
ECMA_TRY_CATCH (to_str_val,
ecma_op_to_string (this_arg),
ret_value);

/* 3 */
ECMA_TRY_CATCH (search_str_val,
ecma_op_to_string (arg1),
ret_value);

/* 4 */
ECMA_OP_TO_NUMBER_TRY_CATCH (pos_num,
arg2,
ret_value);

/* 6 */
ecma_string_t *original_str_p = ecma_get_string_from_value (to_str_val);
const ecma_length_t original_len = ecma_string_get_length (original_str_p);
const lit_utf8_size_t original_size = ecma_string_get_size (original_str_p);

/* 4b, 5, 7 */
ecma_length_t start = ecma_builtin_helper_string_index_normalize (pos_num, original_len, firstIndex);

/* 8 */
ecma_string_t *search_str_p = ecma_get_string_from_value (search_str_val);
const ecma_length_t search_len = ecma_string_get_length (search_str_p);
const lit_utf8_size_t search_size = ecma_string_get_size (search_str_p);

ecma_number_t *ret_num_p = ecma_alloc_number ();
*ret_num_p = ecma_int32_to_number (-1);

/* 9 */
if (search_len <= original_len)
{
if (!search_len)
{
*ret_num_p = ecma_uint32_to_number (firstIndex ? 0 : original_len);
}
else
{
/* create utf8 string from original string and advance to position */
MEM_DEFINE_LOCAL_ARRAY (original_str_utf8_p,
original_size,
lit_utf8_byte_t);

ecma_string_to_utf8_string (original_str_p,
original_str_utf8_p,
(ssize_t) (original_size));

lit_utf8_iterator_t original_it = lit_utf8_iterator_create (original_str_utf8_p, original_size);

ecma_length_t index = start;
lit_utf8_iterator_advance (&original_it, index);

/* create utf8 string from search string */
MEM_DEFINE_LOCAL_ARRAY (search_str_utf8_p,
search_size,
lit_utf8_byte_t);

ecma_string_to_utf8_string (search_str_p,
search_str_utf8_p,
(ssize_t) (search_size));

lit_utf8_iterator_t search_it = lit_utf8_iterator_create (search_str_utf8_p, search_size);

/* iterate original string and try to match at each position */
bool searching = true;

while (searching)
{
/* match as long as possible */
ecma_length_t match_len = 0;
lit_utf8_iterator_t stored_original_it = original_it;

while (match_len < search_len &&
index + match_len < original_len &&
lit_utf8_iterator_read_next (&original_it) == lit_utf8_iterator_read_next (&search_it))
{
match_len++;
}

/* check for match */
if (match_len == search_len)
{
*ret_num_p = ecma_uint32_to_number (index);
break;
}
else
{
/* inc/dec index and update iterators and search condition */
lit_utf8_iterator_seek_bos (&search_it);
original_it = stored_original_it;

if (firstIndex)
{
if ((searching = (index <= original_len - search_len)))
{
lit_utf8_iterator_incr (&original_it);
index++;
}
}
else
{
if ((searching = (index > 0)))
{
lit_utf8_iterator_decr (&original_it);
index--;
}
}
}
}

MEM_FINALIZE_LOCAL_ARRAY (search_str_utf8_p);
MEM_FINALIZE_LOCAL_ARRAY (original_str_utf8_p);
}
}

ecma_value_t new_value = ecma_make_number_value (ret_num_p);
ret_value = ecma_make_normal_completion_value (new_value);

ECMA_OP_TO_NUMBER_FINALIZE (pos_num);
ECMA_FINALIZE (search_str_val);
ECMA_FINALIZE (to_str_val);
ECMA_FINALIZE (check_coercible_val);

return ret_value;
} /* ecma_builtin_helper_string_index_normalize */

/**
* Helper function for using [[DefineOwnProperty]].
*
Expand Down
6 changes: 5 additions & 1 deletion jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ extern ecma_completion_value_t ecma_builtin_helper_array_concat_value (ecma_obje
uint32_t *length,
ecma_value_t);
extern uint32_t ecma_builtin_helper_array_index_normalize (ecma_number_t index, uint32_t length);
extern uint32_t ecma_builtin_helper_string_index_normalize (ecma_number_t index, uint32_t length);
extern uint32_t ecma_builtin_helper_string_index_normalize (ecma_number_t index, uint32_t length, bool nan_to_zero);
extern ecma_completion_value_t ecma_builtin_helper_string_prototype_object_index_of (ecma_value_t this_arg,
ecma_value_t arg1,
ecma_value_t arg2,
bool firstIndex);
extern ecma_completion_value_t ecma_builtin_helper_def_prop (ecma_object_t *obj_p,
ecma_string_t *index_p,
ecma_value_t value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ ecma_builtin_string_prototype_object_index_of (ecma_value_t this_arg, /**< this
const lit_utf8_size_t original_size = ecma_string_get_size (original_str_p);

/* 4b, 6 */
ecma_length_t start = ecma_builtin_helper_string_index_normalize (pos_num, original_len);
ecma_length_t start = ecma_builtin_helper_string_index_normalize (pos_num, original_len, true);

/* 7 */
ecma_string_t *search_str_p = ecma_get_string_from_value (search_str_val);
Expand Down Expand Up @@ -439,7 +439,7 @@ ecma_builtin_string_prototype_object_last_index_of (ecma_value_t this_arg, /**<
ecma_value_t arg1, /**< routine's first argument */
ecma_value_t arg2) /**< routine's second argument */
{
ECMA_BUILTIN_CP_UNIMPLEMENTED (this_arg, arg1, arg2);
return ecma_builtin_helper_string_prototype_object_index_of (this_arg, arg1, arg2, false);
} /* ecma_builtin_string_prototype_object_last_index_of */

/**
Expand Down Expand Up @@ -906,7 +906,7 @@ ecma_builtin_string_prototype_object_substring (ecma_value_t this_arg, /**< this

ecma_length_t start = 0, end = len;

start = ecma_builtin_helper_string_index_normalize (start_num, len);
start = ecma_builtin_helper_string_index_normalize (start_num, len, true);

/* 5, 7 */
if (ecma_is_value_undefined (arg2))
Expand All @@ -919,7 +919,7 @@ ecma_builtin_string_prototype_object_substring (ecma_value_t this_arg, /**< this
arg2,
ret_value);

end = ecma_builtin_helper_string_index_normalize (end_num, len);
end = ecma_builtin_helper_string_index_normalize (end_num, len, true);

ECMA_OP_TO_NUMBER_FINALIZE (end_num);
}
Expand Down
101 changes: 101 additions & 0 deletions tests/jerry/string-prototype-lastindexof.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
// 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.

// check properties
assert(Object.getOwnPropertyDescriptor(String.prototype.lastIndexOf, 'length').configurable === false);

assert(Object.getOwnPropertyDescriptor(String.prototype.lastIndexOf, 'length').enumerable === false);

assert(Object.getOwnPropertyDescriptor(String.prototype.lastIndexOf, 'length').writable === false);

assert(String.prototype.lastIndexOf.length === 1);

// simple checks
assert("Hello welcome, welcome to the universe.".lastIndexOf("welcome") === 15);

assert("Hello world, welcome to the universe.".lastIndexOf("Hello world, welcome to the universe.") === 0);

assert("Hello welcome, welcome to the universe.".lastIndexOf("welcome", 5) === -1);

assert("Hello welcome, welcome to the universe.".lastIndexOf("welcome", -100) == -1);

assert("Hello welcome, welcome to the universe.".lastIndexOf("welcome", 15) === 15);

assert("Hello welcome, welcome to the universe o.".lastIndexOf("o", 10) === 10);

assert("Hello welcome, welcome to the universe o.".lastIndexOf("o", 25) === 24);

assert("Helloooo woooorld".lastIndexOf("oooo", 6) === 4);

// check empty string
assert(String.prototype.lastIndexOf.call(new String()) === -1);

assert(String.prototype.lastIndexOf.call("Hello world, welcome to the universe.","") === 37);

assert(String.prototype.lastIndexOf.call("","") === 0);

// check NaN
assert("Hello world, welcome to the universe.".lastIndexOf(NaN) === -1);

assert("Hello world, welcome to the universe.".lastIndexOf("o", NaN) === 22);

// check Object
assert(String.prototype.lastIndexOf.call({}) === -1);

// check +-Inf
assert("hello world!".lastIndexOf("world", -Infinity) === -1);

assert("hello world!".lastIndexOf("world", Infinity) === 6);

// check numbers
assert("hello world!".lastIndexOf(-1) === -1);

assert("hello 0 world!".lastIndexOf(-0) === 6);

// check undefined
assert("hello world!".lastIndexOf(undefined) === -1);

var undefined_var;
assert("Hello world, welcome to the universe.".lastIndexOf("welcome", undefined_var) === 13);

// check booleans
assert("true".lastIndexOf(true, false) === 0);

// check coercible - undefined
try {
assert(String.prototype.lastIndexOf.call(undefined) === -1);
assert(false);
} catch(e) {
assert(e instanceof TypeError);
}

// check coercible - null
try {
assert(String.prototype.lastIndexOf.call(null, 0) === -1);
assert(false);
} catch (e) {
assert(e instanceof TypeError);
}

// check coercible - Boolean
assert(String.prototype.lastIndexOf.call(true, "e") === 3);
assert(String.prototype.lastIndexOf.call(false, "e") === 4);

// check coercible - Object
var test_object = {firstName:"John", lastName:"Doe"};
assert(String.prototype.lastIndexOf.call(test_object, "Obj") === 8);

// check coercible - Number
assert(String.prototype.lastIndexOf.call(123, "2") === 1);