RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:37:45 +00:00
Code Issues Activity Actions

LibJS: Make RegExp.prototype.toString() spec-compliant

Browse source 
It should use the 'source' and 'flags' properties of the object, and
therefore work with non-RegExp objects as well.
This commit is contained in:
Linus Groh 2020-11-27 23:10:19 +00:00 • committed by Andreas Kling
parent ee66eaa1b0
commit b6e5442d55
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Libraries/LibJS/Runtime/RegExpPrototype.cpp
View file

@ -248,10 +248,25 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::test)
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::to_string) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::to_string)
{ {
auto* regexp_object = regexp_object_from(vm, global_object); auto this_object = this_object_from(vm, global_object);
if (!regexp_object) if (!this_object)
return {}; return {};
return js_string(vm, String::formatted("/{}/{}", regexp_object->pattern(), regexp_object->flags()));
auto source_attr = this_object->get(vm.names.source).value_or(js_undefined());
if (vm.exception())
return {};
auto pattern = source_attr.to_string(global_object);
if (vm.exception())
return {};
auto flags_attr = this_object->get(vm.names.flags).value_or(js_undefined());
if (vm.exception())
return {};
auto flags = flags_attr.to_string(global_object);
if (vm.exception())
return {};
return js_string(vm, String::formatted("/{}/{}", pattern, flags));
} }
} }

1
Libraries/LibJS/Tests/builtins/RegExp/RegExp.prototype.toString.js
View file

@ -2,4 +2,5 @@ test("basic functionality", () => {
expect(RegExp.prototype.toString).toHaveLength(0); expect(RegExp.prototype.toString).toHaveLength(0);
expect(/test/g.toString()).toBe("/test/g"); expect(/test/g.toString()).toBe("/test/g");
expect(RegExp.prototype.toString.call({ source: "test", flags: "g" })).toBe("/test/g");
}); });