LibJS: Replace strings with the search value coerced to a string

This only causes 1 new test262 test to pass. Other tests that rely on
this coercion fail due to receiving an unexpected value for 'this' when
invoking a functional replacement. For example:

    String/prototype/replaceAll/replaceValue-call-matching-empty.js

Receives 'undefined' for 'this' in the functional replacement invocation
but is expected to receive the global 'this'.
This commit is contained in:
Timothy Flynn 2021-07-06 13:19:59 -04:00 committed by Linus Groh
parent 81fec49ac3
commit e0d26fff8c
3 changed files with 44 additions and 2 deletions

View file

@ -819,7 +819,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringPrototype::replace)
String replacement;
if (replace_value.is_function()) {
auto result = vm.call(replace_value.as_function(), js_undefined(), search_value, Value(position.value()), js_string(vm, string));
auto result = vm.call(replace_value.as_function(), js_undefined(), js_string(vm, search_string), Value(position.value()), js_string(vm, string));
if (vm.exception())
return {};
@ -915,7 +915,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringPrototype::replace_all)
String replacement;
if (replace_value.is_function()) {
auto result = vm.call(replace_value.as_function(), js_undefined(), search_value, Value(position), js_string(vm, string));
auto result = vm.call(replace_value.as_function(), js_undefined(), js_string(vm, search_string), Value(position), js_string(vm, string));
if (vm.exception())
return {};

View file

@ -176,3 +176,24 @@ test("replacement value is evaluated before searching the source string", () =>
expect(newString).toBe("");
expect(calls).toBe(2);
});
test("search value is coerced to a string", () => {
var calls = 0;
var coerced;
var searchValue = {
toString: function () {
calls += 1;
return "x";
},
};
var replaceValue = function (matched) {
coerced = matched;
return "abc";
};
var newString = "x".replace(searchValue, replaceValue);
expect(newString).toBe("abc");
expect(coerced).toBe("x");
});

View file

@ -122,3 +122,24 @@ test("replacement value is evaluated before searching the source string", () =>
expect(newString).toBe("");
expect(calls).toBe(2);
});
test("search value is coerced to a string", () => {
var calls = 0;
var coerced;
var searchValue = {
toString: function () {
calls += 1;
return "x";
},
};
var replaceValue = function (matched) {
coerced = matched;
return "abc";
};
var newString = "x".replaceAll(searchValue, replaceValue);
expect(newString).toBe("abc");
expect(coerced).toBe("x");
});