mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 13:57:36 +00:00
LibRegex: Ensure the GoBack operation decrements the code unit index
This was missed in commit 27d555bab0
.
This commit is contained in:
parent
c4ee576531
commit
325eabc770
3 changed files with 33 additions and 2 deletions
|
@ -102,6 +102,17 @@ static void advance_string_position(MatchState& state, RegexStringView const& vi
|
|||
}
|
||||
}
|
||||
|
||||
static void reverse_string_position(MatchState& state, RegexStringView const& view, size_t amount)
|
||||
{
|
||||
VERIFY(state.string_position >= amount);
|
||||
state.string_position -= amount;
|
||||
|
||||
if (view.unicode())
|
||||
state.string_position_in_code_units = view.code_unit_offset_of(state.string_position);
|
||||
else
|
||||
state.string_position_in_code_units -= amount;
|
||||
}
|
||||
|
||||
static void save_string_position(MatchInput const& input, MatchState const& state)
|
||||
{
|
||||
input.saved_positions.append(state.string_position);
|
||||
|
@ -226,12 +237,12 @@ ALWAYS_INLINE ExecutionResult OpCode_Restore::execute(MatchInput const& input, M
|
|||
return ExecutionResult::Continue;
|
||||
}
|
||||
|
||||
ALWAYS_INLINE ExecutionResult OpCode_GoBack::execute(MatchInput const&, MatchState& state) const
|
||||
ALWAYS_INLINE ExecutionResult OpCode_GoBack::execute(MatchInput const& input, MatchState& state) const
|
||||
{
|
||||
if (count() > state.string_position)
|
||||
return ExecutionResult::Failed_ExecuteLowPrioForks;
|
||||
|
||||
state.string_position -= count();
|
||||
reverse_string_position(state, input.view, count());
|
||||
return ExecutionResult::Continue;
|
||||
}
|
||||
|
||||
|
|
|
@ -274,6 +274,22 @@ public:
|
|||
});
|
||||
}
|
||||
|
||||
size_t code_unit_offset_of(size_t code_point_index) const
|
||||
{
|
||||
return m_view.visit(
|
||||
[&](StringView const& view) -> u32 {
|
||||
Utf8View utf8_view { view };
|
||||
return utf8_view.byte_offset_of(code_point_index);
|
||||
},
|
||||
[&](Utf32View const&) -> u32 { return code_point_index; },
|
||||
[&](Utf16View const& view) -> u32 {
|
||||
return view.code_unit_offset_of(code_point_index);
|
||||
},
|
||||
[&](Utf8View const& view) -> u32 {
|
||||
return view.byte_offset_of(code_point_index);
|
||||
});
|
||||
}
|
||||
|
||||
bool operator==(char const* cstring) const
|
||||
{
|
||||
return m_view.visit(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue