diff --git a/Tests/LibRegex/Regex.cpp b/Tests/LibRegex/Regex.cpp index 31a22bdddf..9097de4d1a 100644 --- a/Tests/LibRegex/Regex.cpp +++ b/Tests/LibRegex/Regex.cpp @@ -125,7 +125,7 @@ TEST_CASE(parser_error_parens) PosixExtendedParser p(l); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::EmptySubExpression); + EXPECT(p.error() == regex::Error::EmptySubExpression); } TEST_CASE(parser_error_special_characters_used_at_wrong_place) @@ -145,7 +145,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place) l.set_source(pattern); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::InvalidRepetitionMarker); + EXPECT(p.error() == regex::Error::InvalidRepetitionMarker); // After vertical line b.clear(); @@ -155,7 +155,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place) l.set_source(pattern); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::InvalidRepetitionMarker); + EXPECT(p.error() == regex::Error::InvalidRepetitionMarker); // After circumflex b.clear(); @@ -165,7 +165,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place) l.set_source(pattern); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::InvalidRepetitionMarker); + EXPECT(p.error() == regex::Error::InvalidRepetitionMarker); // After dollar b.clear(); @@ -175,7 +175,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place) l.set_source(pattern); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::InvalidRepetitionMarker); + EXPECT(p.error() == regex::Error::InvalidRepetitionMarker); // After left parens b.clear(); @@ -186,7 +186,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place) l.set_source(pattern); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::InvalidRepetitionMarker); + EXPECT(p.error() == regex::Error::InvalidRepetitionMarker); } } @@ -199,25 +199,25 @@ TEST_CASE(parser_error_vertical_line_used_at_wrong_place) l.set_source("|asdf"); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::EmptySubExpression); + EXPECT(p.error() == regex::Error::EmptySubExpression); // Last in ere l.set_source("asdf|"); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::EmptySubExpression); + EXPECT(p.error() == regex::Error::EmptySubExpression); // After left parens l.set_source("(|asdf)"); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::EmptySubExpression); + EXPECT(p.error() == regex::Error::EmptySubExpression); // Proceed right parens l.set_source("(asdf)|"); p.parse(); EXPECT(p.has_error()); - EXPECT(p.error() == Error::EmptySubExpression); + EXPECT(p.error() == regex::Error::EmptySubExpression); } TEST_CASE(catch_all_first) @@ -687,7 +687,7 @@ TEST_CASE(ECMA262_match) regex_dbg.print_bytecode(re); dbgln("\n"); } - EXPECT_EQ(re.parser_result.error, Error::NoError); + EXPECT_EQ(re.parser_result.error, regex::Error::NoError); EXPECT_EQ(re.match(test.subject).success, test.matches); } } @@ -734,7 +734,7 @@ TEST_CASE(ECMA262_unicode_match) dbgln("\n"); } - EXPECT_EQ(re.parser_result.error, Error::NoError); + EXPECT_EQ(re.parser_result.error, regex::Error::NoError); EXPECT_EQ(re.match(view).success, test.matches); } } @@ -809,7 +809,7 @@ TEST_CASE(ECMA262_property_match) dbgln("\n"); } - EXPECT_EQ(re.parser_result.error, Error::NoError); + EXPECT_EQ(re.parser_result.error, regex::Error::NoError); EXPECT_EQ(re.match(view).success, test.matches); } } @@ -842,7 +842,7 @@ TEST_CASE(replace) regex_dbg.print_bytecode(re); dbgln("\n"); } - EXPECT_EQ(re.parser_result.error, Error::NoError); + EXPECT_EQ(re.parser_result.error, regex::Error::NoError); EXPECT_EQ(re.replace(test.subject, test.replacement), test.expected); } } diff --git a/Userland/Libraries/LibRegex/Forward.h b/Userland/Libraries/LibRegex/Forward.h index 0c5516f7dd..25cf3ba25b 100644 --- a/Userland/Libraries/LibRegex/Forward.h +++ b/Userland/Libraries/LibRegex/Forward.h @@ -34,7 +34,6 @@ class RegexStringView; } using regex::ECMA262Parser; -using regex::Error; using regex::Lexer; using regex::PosixExtendedParser; using regex::RegexStringView; diff --git a/Userland/Libraries/LibRegex/RegexError.h b/Userland/Libraries/LibRegex/RegexError.h index 57cc5527f1..5a4428c93f 100644 --- a/Userland/Libraries/LibRegex/RegexError.h +++ b/Userland/Libraries/LibRegex/RegexError.h @@ -81,5 +81,4 @@ inline String get_error_string(Error error) } } -using regex::Error; using regex::get_error_string; diff --git a/Userland/Utilities/grep.cpp b/Userland/Utilities/grep.cpp index 7f67535e9e..cf74d5d52d 100644 --- a/Userland/Utilities/grep.cpp +++ b/Userland/Utilities/grep.cpp @@ -127,7 +127,7 @@ int main(int argc, char** argv) options |= PosixFlags::Insensitive; auto grep_logic = [&](auto&& re) { - if (re.parser_result.error != Error::NoError) { + if (re.parser_result.error != regex::Error::NoError) { return 1; } diff --git a/Userland/Utilities/pgrep.cpp b/Userland/Utilities/pgrep.cpp index 3dc85091fe..419bbb3c39 100644 --- a/Userland/Utilities/pgrep.cpp +++ b/Userland/Utilities/pgrep.cpp @@ -32,7 +32,7 @@ int main(int argc, char** argv) options |= PosixFlags::Insensitive; Regex re(pattern, options); - if (re.parser_result.error != Error::NoError) { + if (re.parser_result.error != regex::Error::NoError) { return 1; } diff --git a/Userland/Utilities/run-tests.cpp b/Userland/Utilities/run-tests.cpp index cd00f4075d..8c6645a547 100644 --- a/Userland/Utilities/run-tests.cpp +++ b/Userland/Utilities/run-tests.cpp @@ -337,7 +337,7 @@ int main(int argc, char** argv) exclude_pattern = config->read_entry("Global", "NotTestsPattern", "$^"); // default is match nothing (aka match end then beginning) Regex exclude_regex(exclude_pattern, {}); - if (exclude_regex.parser_result.error != Error::NoError) { + if (exclude_regex.parser_result.error != regex::Error::NoError) { warnln("Exclude pattern \"{}\" is invalid", exclude_pattern); return 1; } @@ -346,7 +346,7 @@ int main(int argc, char** argv) // in the Testrunner auto skip_regex_pattern = config->read_entry("Global", "SkipRegex", "$^"); Regex skip_regex { skip_regex_pattern, {} }; - if (skip_regex.parser_result.error != Error::NoError) { + if (skip_regex.parser_result.error != regex::Error::NoError) { warnln("SkipRegex pattern \"{}\" is invalid", skip_regex_pattern); return 1; }