0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibJS: Convert the RegExpCreate AO to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-10-23 03:52:23 +03:00 • committed by Andreas Kling
parent d9f5e2d461
commit 844be7a0a5
Notes: sideshowbarker 2024-07-18 01:59:40 +09:00
5 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibJS/Bytecode/Op.cpp
View file

@ -184,7 +184,10 @@ void NewRegExp::execute_impl(Bytecode::Interpreter& interpreter) const
auto source = interpreter.current_executable().get_string(m_source_index); auto source = interpreter.current_executable().get_string(m_source_index);
auto flags = interpreter.current_executable().get_string(m_flags_index); auto flags = interpreter.current_executable().get_string(m_flags_index);
interpreter.accumulator() = regexp_create(interpreter.global_object(), js_string(interpreter.vm(), source), js_string(interpreter.vm(), flags)); auto regexp_or_error = regexp_create(interpreter.global_object(), js_string(interpreter.vm(), source), js_string(interpreter.vm(), flags));
if (regexp_or_error.is_error())
return;
interpreter.accumulator() = regexp_or_error.value();
} }
void CopyObjectExcludingProperties::execute_impl(Bytecode::Interpreter& interpreter) const void CopyObjectExcludingProperties::execute_impl(Bytecode::Interpreter& interpreter) const

5
Userland/Libraries/LibJS/Runtime/RegExpConstructor.cpp
View file

@ -88,10 +88,7 @@ ThrowCompletionOr<Object*> RegExpConstructor::construct(FunctionObject&)
flags_value = flags; flags_value = flags;
} }
auto* regexp = regexp_create(global_object, pattern_value, flags_value); return TRY(regexp_create(global_object, pattern_value, flags_value));
if (auto* exception = vm.exception())
return throw_completion(exception->value());
return regexp;
} }
// 22.2.4.2 get RegExp [ @@species ], https://tc39.es/ecma262/#sec-get-regexp-@@species // 22.2.4.2 get RegExp [ @@species ], https://tc39.es/ecma262/#sec-get-regexp-@@species

4
Userland/Libraries/LibJS/Runtime/RegExpObject.cpp
View file

@ -190,10 +190,10 @@ String RegExpObject::escape_regexp_pattern() const
} }
// 22.2.3.2.4 RegExpCreate ( P, F ), https://tc39.es/ecma262/#sec-regexpcreate // 22.2.3.2.4 RegExpCreate ( P, F ), https://tc39.es/ecma262/#sec-regexpcreate
RegExpObject* regexp_create(GlobalObject& global_object, Value pattern, Value flags) ThrowCompletionOr<RegExpObject*> regexp_create(GlobalObject& global_object, Value pattern, Value flags)
{ {
auto* regexp_object = RegExpObject::create(global_object); auto* regexp_object = RegExpObject::create(global_object);
return TRY_OR_DISCARD(regexp_object->regexp_initialize(global_object, pattern, flags)); return TRY(regexp_object->regexp_initialize(global_object, pattern, flags));
} }
} }

2
Userland/Libraries/LibJS/Runtime/RegExpObject.h
View file

@ -14,7 +14,7 @@
namespace JS { namespace JS {
RegExpObject* regexp_create(GlobalObject&, Value pattern, Value flags); ThrowCompletionOr<RegExpObject*> regexp_create(GlobalObject&, Value pattern, Value flags);
Result<regex::RegexOptions<ECMAScriptFlags>, String> regex_flags_from_string(StringView flags); Result<regex::RegexOptions<ECMAScriptFlags>, String> regex_flags_from_string(StringView flags);
String parse_regex_pattern(StringView pattern, bool unicode); String parse_regex_pattern(StringView pattern, bool unicode);

12
Userland/Libraries/LibJS/Runtime/StringPrototype.cpp
View file

@ -729,9 +729,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringPrototype::match)
auto string = TRY(this_object.to_utf16_string(global_object)); auto string = TRY(this_object.to_utf16_string(global_object));
auto* rx = regexp_create(global_object, regexp, js_undefined()); auto* rx = TRY(regexp_create(global_object, regexp, js_undefined()));
if (auto* exception = vm.exception())
return throw_completion(exception->value());
return TRY(Value(rx).invoke(global_object, *vm.well_known_symbol_match(), js_string(vm, move(string)))); return TRY(Value(rx).invoke(global_object, *vm.well_known_symbol_match(), js_string(vm, move(string))));
} }
@ -755,9 +753,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringPrototype::match_all)
auto string = TRY(this_object.to_utf16_string(global_object)); auto string = TRY(this_object.to_utf16_string(global_object));
auto* rx = regexp_create(global_object, regexp, js_string(vm, "g")); auto* rx = TRY(regexp_create(global_object, regexp, js_string(vm, "g")));
if (auto* exception = vm.exception())
return throw_completion(exception->value());
return TRY(Value(rx).invoke(global_object, *vm.well_known_symbol_match_all(), js_string(vm, move(string)))); return TRY(Value(rx).invoke(global_object, *vm.well_known_symbol_match_all(), js_string(vm, move(string))));
} }
@ -884,9 +880,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringPrototype::search)
auto string = TRY(this_object.to_utf16_string(global_object)); auto string = TRY(this_object.to_utf16_string(global_object));
auto* rx = regexp_create(global_object, regexp, js_undefined()); auto* rx = TRY(regexp_create(global_object, regexp, js_undefined()));
if (auto* exception = vm.exception())
return throw_completion(exception->value());
return TRY(Value(rx).invoke(global_object, *vm.well_known_symbol_search(), js_string(vm, move(string)))); return TRY(Value(rx).invoke(global_object, *vm.well_known_symbol_search(), js_string(vm, move(string))));
} }