RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:38:12 +00:00
Code Issues Activity Actions

LibRegex: Assign unique serial IDs to checkpoints

Browse source 
This makes the compiler assign a serial ID to each checkpoint instead of
using the IP as the identifier.
This will be used in a future commit to replace the backing store of
checkpoints with a vector.
This commit is contained in:
Ali Mohammad Pur 2023-07-14 09:15:35 +03:30 • committed by Andreas Kling
parent 06573cd46d
commit 2d6f50932b
3 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibRegex/RegexByteCode.cpp
View file

@ -160,6 +160,7 @@ static bool restore_string_position(MatchInput const& input, MatchState& state)
OwnPtr<OpCode> ByteCode::s_opcodes[(size_t)OpCodeId::Last + 1];
bool ByteCode::s_opcodes_initialized { false };
size_t ByteCode::s_next_checkpoint_serial_id { 0 };
void ByteCode::ensure_opcodes_initialized()
{
@ -1063,15 +1064,14 @@ ALWAYS_INLINE ExecutionResult OpCode_ResetRepeat::execute(MatchInput const&, Mat
ALWAYS_INLINE ExecutionResult OpCode_Checkpoint::execute(MatchInput const& input, MatchState& state) const
{
input.checkpoints.set(state.instruction_position, state.string_position);
input.checkpoints.set(id(), state.string_position);
return ExecutionResult::Continue;
}
ALWAYS_INLINE ExecutionResult OpCode_JumpNonEmpty::execute(MatchInput const& input, MatchState& state) const
{
u64 current_position = state.string_position;
auto checkpoint_ip = state.instruction_position + size() + checkpoint();
auto checkpoint_position = input.checkpoints.find(checkpoint_ip);
auto checkpoint_position = input.checkpoints.find(checkpoint());
if (checkpoint_position != input.checkpoints.end() && checkpoint_position->value != current_position) {
auto form = this->form();