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

LibJS: Convert RegExp.prototype to be a PrototypeObject

Browse source
This commit is contained in:
Timothy Flynn 2021-09-11 13:44:23 -04:00 • committed by Andreas Kling
parent 1078d5e58a
commit 65b0c26c44
2 changed files with 25 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Userland/Libraries/LibJS/Runtime/RegExpPrototype.cpp
View file

@ -23,7 +23,7 @@
namespace JS { namespace JS {
RegExpPrototype::RegExpPrototype(GlobalObject& global_object) RegExpPrototype::RegExpPrototype(GlobalObject& global_object)
: Object(*global_object.object_prototype()) : PrototypeObject(*global_object.object_prototype())
{ {
} }
@ -56,28 +56,6 @@ RegExpPrototype::~RegExpPrototype()
{ {
} }
static Object* this_object_from(VM& vm, GlobalObject& global_object)
{
auto this_value = vm.this_value(global_object);
if (!this_value.is_object()) {
vm.throw_exception<TypeError>(global_object, ErrorType::NotAnObject, this_value.to_string_without_side_effects());
return {};
}
return &this_value.as_object();
}
static RegExpObject* regexp_object_from(VM& vm, GlobalObject& global_object)
{
auto* this_object = vm.this_value(global_object).to_object(global_object);
if (!this_object)
return nullptr;
if (!is<RegExpObject>(this_object)) {
vm.throw_exception<TypeError>(global_object, ErrorType::NotAnObjectOfType, "RegExp");
return nullptr;
}
return static_cast<RegExpObject*>(this_object);
}
static String escape_regexp_pattern(const RegExpObject& regexp_object) static String escape_regexp_pattern(const RegExpObject& regexp_object)
{ {
auto pattern = regexp_object.pattern(); auto pattern = regexp_object.pattern();
@ -342,7 +320,7 @@ Value regexp_exec(GlobalObject& global_object, Object& regexp_object, Utf16Strin
#define __JS_ENUMERATE(flagName, flag_name, flag_char) \ #define __JS_ENUMERATE(flagName, flag_name, flag_char) \
JS_DEFINE_NATIVE_GETTER(RegExpPrototype::flag_name) \ JS_DEFINE_NATIVE_GETTER(RegExpPrototype::flag_name) \
{ \ { \
auto* regexp_object = this_object_from(vm, global_object); \ auto* regexp_object = this_object(global_object); \
if (!regexp_object) \ if (!regexp_object) \
return {}; \ return {}; \
\ \
@ -362,14 +340,14 @@ JS_ENUMERATE_REGEXP_FLAGS
// 22.2.5.4 get RegExp.prototype.flags, https://tc39.es/ecma262/#sec-get-regexp.prototype.flags // 22.2.5.4 get RegExp.prototype.flags, https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
JS_DEFINE_NATIVE_GETTER(RegExpPrototype::flags) JS_DEFINE_NATIVE_GETTER(RegExpPrototype::flags)
{ {
auto this_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!this_object) if (!regexp_object)
return {}; return {};
StringBuilder builder(8); StringBuilder builder(8);
#define __JS_ENUMERATE(flagName, flag_name, flag_char) \ #define __JS_ENUMERATE(flagName, flag_name, flag_char) \
auto flag_##flag_name = this_object->get(vm.names.flagName); \ auto flag_##flag_name = regexp_object->get(vm.names.flagName); \
if (vm.exception()) \ if (vm.exception()) \
return {}; \ return {}; \
if (flag_##flag_name.to_boolean()) \ if (flag_##flag_name.to_boolean()) \
@ -383,7 +361,7 @@ JS_DEFINE_NATIVE_GETTER(RegExpPrototype::flags)
// 22.2.5.12 get RegExp.prototype.source, https://tc39.es/ecma262/#sec-get-regexp.prototype.source // 22.2.5.12 get RegExp.prototype.source, https://tc39.es/ecma262/#sec-get-regexp.prototype.source
JS_DEFINE_NATIVE_GETTER(RegExpPrototype::source) JS_DEFINE_NATIVE_GETTER(RegExpPrototype::source)
{ {
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -400,7 +378,7 @@ JS_DEFINE_NATIVE_GETTER(RegExpPrototype::source)
// 22.2.5.2 RegExp.prototype.exec ( string ), https://tc39.es/ecma262/#sec-regexp.prototype.exec // 22.2.5.2 RegExp.prototype.exec ( string ), https://tc39.es/ecma262/#sec-regexp.prototype.exec
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::exec) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::exec)
{ {
auto* regexp_object = regexp_object_from(vm, global_object); auto* regexp_object = typed_this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -414,7 +392,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::exec)
// 22.2.5.15 RegExp.prototype.test ( S ), https://tc39.es/ecma262/#sec-regexp.prototype.test // 22.2.5.15 RegExp.prototype.test ( S ), https://tc39.es/ecma262/#sec-regexp.prototype.test
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::test) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::test)
{ {
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -432,18 +410,18 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::test)
// 22.2.5.16 RegExp.prototype.toString ( ), https://tc39.es/ecma262/#sec-regexp.prototype.tostring // 22.2.5.16 RegExp.prototype.toString ( ), https://tc39.es/ecma262/#sec-regexp.prototype.tostring
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::to_string) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::to_string)
{ {
auto this_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!this_object) if (!regexp_object)
return {}; return {};
auto source_attr = this_object->get(vm.names.source); auto source_attr = regexp_object->get(vm.names.source);
if (vm.exception()) if (vm.exception())
return {}; return {};
auto pattern = source_attr.to_string(global_object); auto pattern = source_attr.to_string(global_object);
if (vm.exception()) if (vm.exception())
return {}; return {};
auto flags_attr = this_object->get(vm.names.flags); auto flags_attr = regexp_object->get(vm.names.flags);
if (vm.exception()) if (vm.exception())
return {}; return {};
auto flags = flags_attr.to_string(global_object); auto flags = flags_attr.to_string(global_object);
@ -456,7 +434,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::to_string)
// 22.2.5.7 RegExp.prototype [ @@match ] ( string ), https://tc39.es/ecma262/#sec-regexp.prototype-@@match // 22.2.5.7 RegExp.prototype [ @@match ] ( string ), https://tc39.es/ecma262/#sec-regexp.prototype-@@match
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match)
{ {
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -529,7 +507,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match)
// 22.2.5.8 RegExp.prototype [ @@matchAll ] ( string ), https://tc39.es/ecma262/#sec-regexp-prototype-matchall // 22.2.5.8 RegExp.prototype [ @@matchAll ] ( string ), https://tc39.es/ecma262/#sec-regexp-prototype-matchall
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match_all) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_match_all)
{ {
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -581,7 +559,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_replace)
auto string_value = vm.argument(0); auto string_value = vm.argument(0);
auto replace_value = vm.argument(1); auto replace_value = vm.argument(1);
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
auto string = string_value.to_utf16_string(global_object); auto string = string_value.to_utf16_string(global_object);
@ -750,7 +728,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_replace)
// 22.2.5.11 RegExp.prototype [ @@search ] ( string ), https://tc39.es/ecma262/#sec-regexp.prototype-@@search // 22.2.5.11 RegExp.prototype [ @@search ] ( string ), https://tc39.es/ecma262/#sec-regexp.prototype-@@search
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_search) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_search)
{ {
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -797,7 +775,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_search)
// 22.2.5.13 RegExp.prototype [ @@split ] ( string, limit ), https://tc39.es/ecma262/#sec-regexp.prototype-@@split // 22.2.5.13 RegExp.prototype [ @@split ] ( string, limit ), https://tc39.es/ecma262/#sec-regexp.prototype-@@split
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_split) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_split)
{ {
auto* regexp_object = this_object_from(vm, global_object); auto* regexp_object = this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};
@ -919,7 +897,7 @@ JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::symbol_split)
// B.2.4.1 RegExp.prototype.compile ( pattern, flags ), https://tc39.es/ecma262/#sec-regexp.prototype.compile // B.2.4.1 RegExp.prototype.compile ( pattern, flags ), https://tc39.es/ecma262/#sec-regexp.prototype.compile
JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::compile) JS_DEFINE_NATIVE_FUNCTION(RegExpPrototype::compile)
{ {
auto* regexp_object = regexp_object_from(vm, global_object); auto* regexp_object = typed_this_object(global_object);
if (!regexp_object) if (!regexp_object)
return {}; return {};

5
Userland/Libraries/LibJS/Runtime/RegExpPrototype.h
View file

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <LibJS/Runtime/PrototypeObject.h>
#include <LibJS/Runtime/RegExpObject.h> #include <LibJS/Runtime/RegExpObject.h>
#include <LibJS/Runtime/Utf16String.h> #include <LibJS/Runtime/Utf16String.h>
@ -14,8 +15,8 @@ namespace JS {
Value regexp_exec(GlobalObject& global_object, Object& regexp_object, Utf16String string); Value regexp_exec(GlobalObject& global_object, Object& regexp_object, Utf16String string);
size_t advance_string_index(Utf16View const& string, size_t index, bool unicode); size_t advance_string_index(Utf16View const& string, size_t index, bool unicode);
class RegExpPrototype final : public Object { class RegExpPrototype final : public PrototypeObject<RegExpPrototype, RegExpObject> {
JS_OBJECT(RegExpPrototype, Object); JS_PROTOTYPE_OBJECT(RegExpPrototype, RegExpObject, RegExp);
public: public:
explicit RegExpPrototype(GlobalObject&); explicit RegExpPrototype(GlobalObject&);