1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:17:44 +00:00

LibJS: Implement RegExp.prototype.match with RegExpExec abstraction

This commit is contained in:
Timothy Flynn 2021-07-07 13:18:52 -04:00 committed by Linus Groh
parent ec898a3370
commit b6b5adb47d
2 changed files with 46 additions and 9 deletions

View file

@ -302,7 +302,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::to_string)
// 22.2.5.7 RegExp.prototype [ @@match ] ( string ), https://tc39.es/ecma262/#sec-regexp.prototype-@@match
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match)
{
auto* rx = this_object_from(vm, global_object);
auto* rx = regexp_object_from(vm, global_object);
if (!rx)
return {};
auto s = vm.argument(0).to_string(global_object);
@ -312,16 +312,18 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match)
if (vm.exception())
return {};
bool global = global_value.to_boolean();
// FIXME: Implement and use RegExpExec, this does something different - https://tc39.es/ecma262/#sec-regexpexec
auto* exec = Value(rx).get_method(global_object, vm.names.exec);
if (!exec)
return js_undefined();
// FIXME end
if (!global)
return vm.call(*exec, rx, js_string(vm, s));
if (!global) {
auto result = regexp_exec(global_object, *rx, s);
if (vm.exception())
return {};
return result;
}
// FIXME: This should exec the RegExp repeatedly while updating "lastIndex"
return vm.call(*exec, rx, js_string(vm, s));
auto result = regexp_exec(global_object, *rx, s);
if (vm.exception())
return {};
return result;
}
// 22.2.5.10 RegExp.prototype [ @@replace ] ( string, replaceValue ), https://tc39.es/ecma262/#sec-regexp.prototype-@@replace

View file

@ -4,3 +4,38 @@ test("basic functionality", () => {
expect("hello friends".match(/hello/)).not.toBeNull();
expect("hello friends".match(/enemies/)).toBeNull();
});
test("override exec with function", () => {
let calls = 0;
let re = /test/;
let oldExec = re.exec.bind(re);
re.exec = function (...args) {
++calls;
return oldExec(...args);
};
expect("test".match(re)).not.toBeNull();
expect(calls).toBe(1);
});
test("override exec with bad function", () => {
let calls = 0;
let re = /test/;
re.exec = function (...args) {
++calls;
return 4;
};
expect(() => {
"test".match(re);
}).toThrow(TypeError);
expect(calls).toBe(1);
});
test("override exec with non-function", () => {
let re = /test/;
re.exec = 3;
expect("test".match(re)).not.toBeNull();
});