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

LibJS: Convert the MakeIndicesArray AO to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-10-23 03:54:57 +03:00 • committed by Andreas Kling
parent e3181a7ded
commit a2fbf6a3d5
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ static Value get_match_indices_array(GlobalObject& global_object, Utf16View cons
} }
// 1.1.4.1.5 MakeIndicesArray ( S , indices, groupNames, hasGroups ), https://tc39.es/proposal-regexp-match-indices/#sec-makeindicesarray // 1.1.4.1.5 MakeIndicesArray ( S , indices, groupNames, hasGroups ), https://tc39.es/proposal-regexp-match-indices/#sec-makeindicesarray
static Value make_indices_array(GlobalObject& global_object, Utf16View const& string, Vector<Optional<Match>> const& indices, HashMap<FlyString, Match> const& group_names, bool has_groups) static ThrowCompletionOr<Value> make_indices_array(GlobalObject& global_object, Utf16View const& string, Vector<Optional<Match>> const& indices, HashMap<FlyString, Match> const& group_names, bool has_groups)
{ {
// Note: This implementation differs from the spec, but has the same behavior. // Note: This implementation differs from the spec, but has the same behavior.
// //
@ -120,7 +120,7 @@ static Value make_indices_array(GlobalObject& global_object, Utf16View const& st
auto& vm = global_object.vm(); auto& vm = global_object.vm();
auto* array = TRY_OR_DISCARD(Array::create(global_object, indices.size())); auto* array = TRY(Array::create(global_object, indices.size()));
auto groups = has_groups ? Object::create(global_object, nullptr) : js_undefined(); auto groups = has_groups ? Object::create(global_object, nullptr) : js_undefined();
@ -131,16 +131,16 @@ static Value make_indices_array(GlobalObject& global_object, Utf16View const& st
if (match_indices.has_value()) if (match_indices.has_value())
match_indices_array = get_match_indices_array(global_object, string, *match_indices); match_indices_array = get_match_indices_array(global_object, string, *match_indices);
TRY_OR_DISCARD(array->create_data_property(i, match_indices_array)); TRY(array->create_data_property(i, match_indices_array));
} }
for (auto const& entry : group_names) { for (auto const& entry : group_names) {
auto match_indices_array = get_match_indices_array(global_object, string, entry.value); auto match_indices_array = get_match_indices_array(global_object, string, entry.value);
TRY_OR_DISCARD(groups.as_object().create_data_property(entry.key, match_indices_array)); TRY(groups.as_object().create_data_property(entry.key, match_indices_array));
} }
TRY_OR_DISCARD(array->create_data_property(vm.names.groups, groups)); TRY(array->create_data_property(vm.names.groups, groups));
return array; return array;
} }
@ -234,7 +234,7 @@ static Value regexp_builtin_exec(GlobalObject& global_object, RegExpObject& rege
MUST(array->create_data_property_or_throw(vm.names.groups, groups)); MUST(array->create_data_property_or_throw(vm.names.groups, groups));
if (has_indices) { if (has_indices) {
auto indices_array = make_indices_array(global_object, string_view, indices, group_names, has_groups); auto indices_array = TRY_OR_DISCARD(make_indices_array(global_object, string_view, indices, group_names, has_groups));
TRY_OR_DISCARD(array->create_data_property(vm.names.indices, indices_array)); TRY_OR_DISCARD(array->create_data_property(vm.names.indices, indices_array));
} }