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

Update Symbol.split functions for String and Regexp to match new standard (#3942)

Browse Source 
In newest ES standard limit parameter is calculated using
ToUint32 function instead of ToLength.

JerryScript-DCO-1.0-Signed-off-by: Rafal Walczyna r.walczyna@samsung.com
This commit is contained in:
Rafal Walczyna 2020-06-30 16:03:11 +02:00 committed by GitHub
parent 3e866258db
commit 9d2b7334bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,10 +795,13 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a
uint32_t limit = UINT32_MAX;
if (!ecma_is_value_undefined (limit_value))
{
if (ECMA_IS_VALUE_ERROR (ecma_op_to_length (limit_value, &limit)))
/* ECMA-262 v11, 21.1.3.20 6 */
ecma_number_t num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (limit_value, &num)))
{
goto cleanup_string;
}
limit = ecma_number_to_uint32 (num);
}
/* 12. */

11
jerry-core/ecma/operations/ecma-regexp-object.c
View File

@ -2113,10 +2113,13 @@ ecma_regexp_split_helper (ecma_value_t this_arg, /**< this value */
uint32_t limit = UINT32_MAX;
if (!ecma_is_value_undefined (limit_arg))
{
if (ECMA_IS_VALUE_ERROR (ecma_op_to_length (limit_arg, &limit)))
/* ECMA-262 v11, 21.2.5.13 13 */
ecma_number_t num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (limit_arg, &num)))
{
goto cleanup_splitter;
}
limit = ecma_number_to_uint32 (num);
}
/* 15. */
@ -2215,6 +2218,12 @@ ecma_regexp_split_helper (ecma_value_t this_arg, /**< this value */
goto cleanup_array;
}
/* ECMA-262 v11, 21.2.5.11 19.d.ii */
if (end_index > string_length)
{
end_index = string_length;
}
/* 24.f.iii. */
if (previous_index == end_index)
{

20
tests/jerry/es.next/regexp-prototype-split.js Normal file
View File

@ -0,0 +1,20 @@
// 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.
result = /./[Symbol.split]('string', -13);
assert(result.length === 7);
result = /./[Symbol.split]('string', 2);
assert(result.length === 2);

4
tests/jerry/es.next/string-prototype-split.js
View File

@ -13,11 +13,11 @@
// limitations under the License.
var str = "foo//bar/baz//foo";
res = str.split("a", Infinity);
res = str.split("a", -1);
assert (res.length === 3);
assert (res[0] === "foo//b");
assert (res[1] === "r/b");
assert (res[2] === "z//foo");
res = str.split(/\/\//, -1);
res = str.split(/\/\//, Infinity);
assert (res.length === 0);

11
tests/jerry/es.next/symbol-split.js
View File

@ -107,3 +107,14 @@ try {
} catch (e) {
assert (e === "abrupt capture");
}
Object.defineProperty(RegExp.prototype, "exec", { value: function (str) {
this.lastIndex = 10;
return { };
}});
var result = split.call ({flags: "g"}, "string");
assert(result.length === 2)
assert(result[0] === "")
assert(result[1] === "")

2
tests/test262-es6-excludelist.xml
View File

@ -86,6 +86,7 @@
<test id="built-ins/RegExp/prototype/Symbol.replace/y-set-lastindex.js"><reason></reason></test>
<test id="built-ins/RegExp/prototype/Symbol.search/get-sticky-coerce.js"><reason></reason></test>
<test id="built-ins/RegExp/prototype/Symbol.search/get-sticky-err.js"><reason></reason></test>
<test id="built-ins/RegExp/prototype/Symbol.split/coerce-limit.js"><reason>Test is outdated: ES11, 21.2.5.13 13</reason></test>
<test id="built-ins/RegExp/prototype/test/get-sticky-err.js"><reason></reason></test>
<test id="built-ins/String/prototype/normalize/form-is-not-valid-throws.js"><reason></reason></test>
<test id="built-ins/String/prototype/normalize/length.js"><reason></reason></test>
@ -96,7 +97,6 @@
<test id="built-ins/String/prototype/normalize/return-normalized-string-from-coerced-form.js"><reason></reason></test>
<test id="built-ins/String/prototype/normalize/return-normalized-string.js"><reason></reason></test>
<test id="built-ins/String/prototype/normalize/return-normalized-string-using-default-parameter.js"><reason></reason></test>
<test id="built-ins/String/prototype/split/S15.5.4.14_A2_T37.js"><reason></reason></test>
<test id="built-ins/String/prototype/toLocaleLowerCase/special_casing_conditional.js"><reason></reason></test>
<test id="built-ins/String/prototype/toLocaleLowerCase/supplementary_plane.js"><reason></reason></test>
<test id="built-ins/String/prototype/toLocaleUpperCase/supplementary_plane.js"><reason></reason></test>