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

LibRegex: Merge inverse string table mappings separately

Browse source
This commit is contained in:
Ali Mohammad Pur 2025-04-06 02:10:01 +02:00
commit 2253706b53
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibRegex/RegexByteCode.h
View file

@ -261,6 +261,7 @@ public:
} }
FlyString get_string(size_t index) const { return m_string_table.get(index); } FlyString get_string(size_t index) const { return m_string_table.get(index); }
auto const& string_table() const { return m_string_table; }
void last_chunk() const = delete; void last_chunk() const = delete;
void first_chunk() const = delete; void first_chunk() const = delete;
@ -279,6 +280,8 @@ public:
} }
m_string_table.m_table.set(entry.key, entry.value); m_string_table.m_table.set(entry.key, entry.value);
} }
for (auto const& entry : other.m_string_table.m_inverse_table)
m_string_table.m_inverse_table.set(entry.key, entry.value);
} }
} }

7
Libraries/LibRegex/RegexDebug.h
View file

@ -51,6 +51,13 @@ public:
state.instruction_position += opcode.size(); state.instruction_position += opcode.size();
} }
out(m_file, "String Table:\n");
for (auto const& entry : bytecode.string_table().m_table)
outln(m_file, "+ {} -> {:x}\n", entry.key, entry.value);
out(m_file, "Reverse String Table:\n");
for (auto const& entry : bytecode.string_table().m_inverse_table)
outln(m_file, "+ {:x} -> {}\n", entry.key, entry.value);
fflush(m_file); fflush(m_file);
} }

3
Libraries/LibRegex/RegexOptimizer.cpp
View file

@ -999,11 +999,10 @@ void Optimizer::append_alternation(ByteCode& target, Span<ByteCode> alternatives
if (alternatives.size() == 0) if (alternatives.size() == 0)
return; return;
target.merge_string_tables_from(alternatives);
if (alternatives.size() == 1) if (alternatives.size() == 1)
return target.extend(move(alternatives[0])); return target.extend(move(alternatives[0]));
target.merge_string_tables_from(alternatives);
if (all_of(alternatives, [](auto& x) { return x.is_empty(); })) if (all_of(alternatives, [](auto& x) { return x.is_empty(); }))
return; return;

2
Tests/LibRegex/Regex.cpp
View file

@ -743,6 +743,8 @@ TEST_CASE(ECMA262_match)
{ "(?=)(?=\\d)"sv, "smart"sv, false }, { "(?=)(?=\\d)"sv, "smart"sv, false },
// Backrefs are cleared after lookaheads, the indices should be checked before lookup. // Backrefs are cleared after lookaheads, the indices should be checked before lookup.
{ "(?!(b))\\1"sv, "a"sv, false }, { "(?!(b))\\1"sv, "a"sv, false },
// String table merge bug: inverse map should be merged regardless of available direct mappings.
{ "((?<x>a)|(?<x>b))"sv, "aa"sv, false },
}; };
for (auto& test : tests) { for (auto& test : tests) {