archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Support string iterator for strings longer than 64K (#4727)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg 2021-08-03 10:44:19 +02:00 committed by GitHub
parent f71a4a6975
commit c438d5fa92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c
View File

@ -97,7 +97,13 @@ ecma_builtin_string_iterator_prototype_object_next (ecma_value_t this_val) /**<
if (JERRY_UNLIKELY (position == ECMA_ITERATOR_INDEX_LIMIT)) if (JERRY_UNLIKELY (position == ECMA_ITERATOR_INDEX_LIMIT))
{ {
return ecma_raise_range_error (ECMA_ERR_MSG ("String iteration cannot be continued")); /* After the ECMA_ITERATOR_INDEX_LIMIT limit is reached the [[%Iterator%NextIndex]]
property is stored as an internal property */
ecma_string_t *prop_name_p = ecma_get_magic_string (LIT_INTERNAL_MAGIC_STRING_ITERATOR_NEXT_INDEX);
ecma_value_t position_value = ecma_op_object_get (obj_p, prop_name_p);
position = (lit_utf8_size_t) (ecma_get_number_from_value (position_value));
ecma_free_value (position_value);
} }
/* 7. */ /* 7. */
@ -142,7 +148,22 @@ ecma_builtin_string_iterator_prototype_object_next (ecma_value_t this_val) /**<
} }
/* 13. */ /* 13. */
if (position + result_size < ECMA_ITERATOR_INDEX_LIMIT)
{
ext_obj_p->u.cls.u2.iterator_index = (uint16_t) (position + result_size); ext_obj_p->u.cls.u2.iterator_index = (uint16_t) (position + result_size);
}
else
{
ext_obj_p->u.cls.u2.iterator_index = ECMA_ITERATOR_INDEX_LIMIT;
ecma_string_t *prop_name_p = ecma_get_magic_string (LIT_INTERNAL_MAGIC_STRING_ITERATOR_NEXT_INDEX);
ecma_value_t put_result = ecma_op_object_put (obj_p,
prop_name_p,
ecma_make_length_value (position + result_size),
true);
JERRY_ASSERT (ecma_is_value_true (put_result));
}
/* 14. */ /* 14. */
ecma_value_t result = ecma_create_iter_result_object (ecma_make_string_value (result_str_p), ECMA_VALUE_FALSE); ecma_value_t result = ecma_create_iter_result_object (ecma_make_string_value (result_str_p), ECMA_VALUE_FALSE);

12
tests/jerry/es.next/string-iterator.js
View File

@ -75,3 +75,15 @@ assert(next.value === undefined);
assert(iterator.toString() === '[object String Iterator]'); assert(iterator.toString() === '[object String Iterator]');
assert(iterator[Symbol.toStringTag] === 'String Iterator'); assert(iterator[Symbol.toStringTag] === 'String Iterator');
iterator = (' '.repeat(80000))[Symbol.iterator]();
next = iterator.next();
idx = 0;
while (!next.done) {
assert(next.value === ' ');
assert(next.done === false);
next = iterator.next();
idx++;
}
assert(idx == 80000);