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

LibJS: Convert a few TRYs to MUST in RegExp.prototype

Browse source 
These are marked with ! in the spec. This also adds assertions above
a couple of these operations to be extra sure (the spec also indicates
we should make these assertions).
This commit is contained in:
Timothy Flynn 2021-10-23 12:29:42 -04:00 • committed by Linus Groh
parent cb868cfa41
commit e503b60bdc
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
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 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) 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)
{ {
// 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,8 @@ static ThrowCompletionOr<Value> make_indices_array(GlobalObject& global_object,
auto& vm = global_object.vm(); auto& vm = global_object.vm();
auto* array = TRY(Array::create(global_object, indices.size())); VERIFY(indices.size() < NumericLimits<u32>::max());
auto* array = MUST(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 +132,16 @@ static ThrowCompletionOr<Value> make_indices_array(GlobalObject& global_object,
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(array->create_data_property(i, match_indices_array)); MUST(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(groups.as_object().create_data_property(entry.key, match_indices_array)); MUST(groups.as_object().create_data_property(entry.key, match_indices_array));
} }
TRY(array->create_data_property(vm.names.groups, groups)); MUST(array->create_data_property(vm.names.groups, groups));
return array; return array;
} }
@ -204,7 +205,8 @@ static ThrowCompletionOr<Value> regexp_builtin_exec(GlobalObject& global_object,
if (global || sticky) if (global || sticky)
TRY(regexp_object.set(vm.names.lastIndex, Value(end_index), Object::ShouldThrowExceptions::Yes)); TRY(regexp_object.set(vm.names.lastIndex, Value(end_index), Object::ShouldThrowExceptions::Yes));
auto* array = TRY(Array::create(global_object, result.n_named_capture_groups + 1)); VERIFY(result.n_named_capture_groups < NumericLimits<u32>::max());
auto* array = MUST(Array::create(global_object, result.n_named_capture_groups + 1));
Vector<Optional<Match>> indices { Match::create(match) }; Vector<Optional<Match>> indices { Match::create(match) };
HashMap<FlyString, Match> group_names; HashMap<FlyString, Match> group_names;
@ -234,7 +236,7 @@ static ThrowCompletionOr<Value> regexp_builtin_exec(GlobalObject& global_object,
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 = TRY(make_indices_array(global_object, string_view, indices, group_names, has_groups)); auto indices_array = make_indices_array(global_object, string_view, indices, group_names, has_groups);
TRY(array->create_data_property(vm.names.indices, indices_array)); TRY(array->create_data_property(vm.names.indices, indices_array));
} }