mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-29 20:29:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibRegex: Make Match::capture_group_name an index into the string table

Browse source 
This removes another Match member that required destruction. The "API"
for accessing the strings is definitely a bit awkward. We'll think of
something nicer eventually.
This commit is contained in:
Andreas Kling 2025-04-13 18:24:31 +02:00 • committed by Andreas Kling
commit 54edf29f1b
Notes: github-actions[bot] 2025-04-14 15:41:26 +00:00
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -330,7 +330,7 @@ static ThrowCompletionOr<Value> regexp_builtin_exec(VM& vm, RegExpObject& regexp
// e. If the ith capture of R was defined with a GroupName, then
if (capture.capture_group_name.has_value()) {
// i. Let s be the CapturingGroupName of the corresponding RegExpIdentifierName.
auto group_name = capture.capture_group_name.release_value();
auto group_name = regex.parser_result.bytecode.get_string(capture.capture_group_name.release_value());
// ii. Perform ! CreateDataPropertyOrThrow(groups, s, capturedValue).
MUST(groups_object->create_data_property_or_throw(group_name, captured_value));

2
Libraries/LibRegex/RegexByteCode.cpp
View file

@ -409,7 +409,7 @@ ALWAYS_INLINE ExecutionResult OpCode_SaveRightNamedCaptureGroup::execute(MatchIn
auto view = input.view.substring_view(start_position, length);
match = { view, name(), input.line, start_position, input.global_offset + start_position };
match = { view, name_string_table_index(), input.line, start_position, input.global_offset + start_position };
return ExecutionResult::Continue;
}

3
Libraries/LibRegex/RegexByteCode.h
View file

@ -839,7 +839,8 @@ public:
ExecutionResult execute(MatchInput const& input, MatchState& state) const override;
ALWAYS_INLINE OpCodeId opcode_id() const override { return OpCodeId::SaveRightNamedCaptureGroup; }
ALWAYS_INLINE size_t size() const override { return 3; }
ALWAYS_INLINE FlyString name() const { return m_bytecode->get_string(argument(0)); }
ALWAYS_INLINE FlyString name() const { return m_bytecode->get_string(name_string_table_index()); }
ALWAYS_INLINE size_t name_string_table_index() const { return argument(0); }
ALWAYS_INLINE size_t length() const { return name().bytes_as_string_view().length(); }
ALWAYS_INLINE size_t id() const { return argument(1); }
ByteString arguments_string() const override

6
Libraries/LibRegex/RegexMatch.h
View file

@ -489,9 +489,9 @@ public:
{
}
Match(RegexStringView const view_, StringView capture_group_name_, size_t const line_, size_t const column_, size_t const global_offset_)
Match(RegexStringView const view_, size_t capture_group_name_, size_t const line_, size_t const column_, size_t const global_offset_)
: view(view_)
, capture_group_name(MUST(FlyString::from_utf8(capture_group_name_)))
, capture_group_name(capture_group_name_)
, line(line_)
, column(column_)
, global_offset(global_offset_)
@ -510,7 +510,7 @@ public:
}
RegexStringView view {};
Optional<FlyString> capture_group_name {};
Optional<size_t> capture_group_name {}; // This is a string table index.
size_t line { 0 };
size_t column { 0 };
size_t global_offset { 0 };

8
Tests/LibRegex/Regex.cpp
View file

@ -426,10 +426,10 @@ TEST_CASE(named_capture_group)
EXPECT_EQ(result.count, 2u);
EXPECT_EQ(result.matches.at(0).view, "Opacity=255");
EXPECT_EQ(result.capture_group_matches.at(0).at(0).view, "255");
EXPECT_EQ(result.capture_group_matches.at(0).at(0).capture_group_name, "Test");
EXPECT_EQ(re.parser_result.bytecode.get_string(result.capture_group_matches.at(0).at(0).capture_group_name.value()), "Test");
EXPECT_EQ(result.matches.at(1).view, "AudibleBeep=0");
EXPECT_EQ(result.capture_group_matches.at(1).at(0).view, "0");
EXPECT_EQ(result.capture_group_matches.at(1).at(0).capture_group_name, "Test");
EXPECT_EQ(re.parser_result.bytecode.get_string(result.capture_group_matches.at(1).at(0).capture_group_name.value()), "Test");
}
TEST_CASE(ecma262_named_capture_group_with_dollar_sign)
@ -449,10 +449,10 @@ TEST_CASE(ecma262_named_capture_group_with_dollar_sign)
EXPECT_EQ(result.count, 2u);
EXPECT_EQ(result.matches.at(0).view, "Opacity=255");
EXPECT_EQ(result.capture_group_matches.at(0).at(0).view, "255");
EXPECT_EQ(result.capture_group_matches.at(0).at(0).capture_group_name, "$Test$");
EXPECT_EQ(re.parser_result.bytecode.get_string(result.capture_group_matches.at(0).at(0).capture_group_name.value()), "$Test$");
EXPECT_EQ(result.matches.at(1).view, "AudibleBeep=0");
EXPECT_EQ(result.capture_group_matches.at(1).at(0).view, "0");
EXPECT_EQ(result.capture_group_matches.at(1).at(0).capture_group_name, "$Test$");
EXPECT_EQ(re.parser_result.bytecode.get_string(result.capture_group_matches.at(1).at(0).capture_group_name.value()), "$Test$");
}
TEST_CASE(a_star)