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

LibRegex: Use proper CharRange constructor instead of bit_casting

Browse source 
Otherwise the range order would be inverted.
This commit is contained in:
Ali Mohammad Pur 2022-07-05 04:56:21 +04:30 • committed by Andreas Kling
parent c774790975
commit 7d01ee63d6
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibRegex/Regex.cpp
View file

@ -922,6 +922,7 @@ TEST_CASE(optimizer_atomic_groups)
Tuple { "a+b"sv, "aaaaa"sv, false }, Tuple { "a+b"sv, "aaaaa"sv, false },
Tuple { "\\\\(\\d+)"sv, "\\\\"sv, false }, // Rewrite bug turning a+ to a*, see #10952. Tuple { "\\\\(\\d+)"sv, "\\\\"sv, false }, // Rewrite bug turning a+ to a*, see #10952.
Tuple { "[a-z.]+\\."sv, "..."sv, true }, // Rewrite bug, incorrect interpretation of Compare. Tuple { "[a-z.]+\\."sv, "..."sv, true }, // Rewrite bug, incorrect interpretation of Compare.
Tuple { "[.-]+\\."sv, ".-."sv, true },
// Alternative fuse // Alternative fuse
Tuple { "(abcfoo|abcbar|abcbaz).*x"sv, "abcbarx"sv, true }, Tuple { "(abcfoo|abcbar|abcbaz).*x"sv, "abcbarx"sv, true },
Tuple { "(a|a)"sv, "a"sv, true }, Tuple { "(a|a)"sv, "a"sv, true },

4
Userland/Libraries/LibRegex/RegexOptimizer.cpp
View file

@ -187,7 +187,7 @@ static bool has_overlap(Vector<CompareTypeAndValuePair> const& lhs, Vector<Compa
lhs_negated_char_classes.set(static_cast<CharClass>(pair.value)); lhs_negated_char_classes.set(static_cast<CharClass>(pair.value));
break; break;
case CharacterCompareType::CharRange: { case CharacterCompareType::CharRange: {
auto range = bit_cast<CharRange>(pair.value); auto range = CharRange(pair.value);
if (!current_lhs_inversion_state()) if (!current_lhs_inversion_state())
lhs_ranges.insert(range.from, range.to); lhs_ranges.insert(range.from, range.to);
else else
@ -257,7 +257,7 @@ static bool has_overlap(Vector<CompareTypeAndValuePair> const& lhs, Vector<Compa
return true; return true;
break; break;
case CharacterCompareType::CharRange: { case CharacterCompareType::CharRange: {
auto range = bit_cast<CharRange>(pair.value); auto range = CharRange(pair.value);
if (!current_lhs_inversion_state() && range_contains(range)) if (!current_lhs_inversion_state() && range_contains(range))
return true; return true;
break; break;