RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:17:44 +00:00
Code Issues Activity Actions

LibRegex: Store 'String' matches inside the bytecode

Browse source 
Also removes an unnecessary 'length' argument (StringView has a length!)
This commit is contained in:
AnotherTest 2020-12-06 17:02:03 +03:30 • committed by Andreas Kling
parent 6b4281c3aa
commit 19bf7734a4
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibRegex/RegexByteCode.h
View file

@ -186,7 +186,7 @@ public:
append(move(bytecode));
}
void insert_bytecode_compare_string(StringView view, size_t length)
void insert_bytecode_compare_string(StringView view)
{
ByteCode bytecode;
@ -196,8 +196,7 @@ public:
ByteCode arguments;
arguments.empend(static_cast<ByteCodeValueType>(CharacterCompareType::String));
arguments.empend(reinterpret_cast<ByteCodeValueType>(view.characters_without_null_termination()));
arguments.empend(length);
arguments.insert_string(view);
bytecode.empend(arguments.size()); // size of arguments
bytecode.append(move(arguments));
@ -205,7 +204,7 @@ public:
append(move(bytecode));
}
void insert_bytecode_compare_named_reference(StringView name, size_t length)
void insert_bytecode_compare_named_reference(StringView name)
{
ByteCode bytecode;
@ -216,7 +215,7 @@ public:
arguments.empend(static_cast<ByteCodeValueType>(CharacterCompareType::NamedReference));
arguments.empend(reinterpret_cast<ByteCodeValueType>(name.characters_without_null_termination()));
arguments.empend(length);
arguments.empend(name.length());
bytecode.empend(arguments.size()); // size of arguments
bytecode.append(move(arguments));
@ -458,6 +457,13 @@ public:
OpCode* get_opcode(MatchState& state) const;
private:
void insert_string(const StringView& view)
{
empend((ByteCodeValueType)view.length());
for (size_t i = 0; i < view.length(); ++i)
empend((ByteCodeValueType)view[i]);
}
ALWAYS_INLINE OpCode* get_opcode_by_id(OpCodeId id) const;
static HashMap<u32, OwnPtr<OpCode>> s_opcodes;
};