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

LibRegex: Don't push LibRegex's "Error" into the global namespace

Browse source
This commit is contained in:
Andreas Kling 2021-11-06 10:33:46 +01:00
parent af562c857e
commit a54be656ae
6 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Tests/LibRegex/Regex.cpp
View file

@ -125,7 +125,7 @@ TEST_CASE(parser_error_parens)
PosixExtendedParser p(l); PosixExtendedParser p(l);
p.parse(); p.parse();
EXPECT(p.has_error()); 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) 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); l.set_source(pattern);
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::InvalidRepetitionMarker); EXPECT(p.error() == regex::Error::InvalidRepetitionMarker);
// After vertical line // After vertical line
b.clear(); b.clear();
@ -155,7 +155,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place)
l.set_source(pattern); l.set_source(pattern);
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::InvalidRepetitionMarker); EXPECT(p.error() == regex::Error::InvalidRepetitionMarker);
// After circumflex // After circumflex
b.clear(); b.clear();
@ -165,7 +165,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place)
l.set_source(pattern); l.set_source(pattern);
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::InvalidRepetitionMarker); EXPECT(p.error() == regex::Error::InvalidRepetitionMarker);
// After dollar // After dollar
b.clear(); b.clear();
@ -175,7 +175,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place)
l.set_source(pattern); l.set_source(pattern);
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::InvalidRepetitionMarker); EXPECT(p.error() == regex::Error::InvalidRepetitionMarker);
// After left parens // After left parens
b.clear(); b.clear();
@ -186,7 +186,7 @@ TEST_CASE(parser_error_special_characters_used_at_wrong_place)
l.set_source(pattern); l.set_source(pattern);
p.parse(); p.parse();
EXPECT(p.has_error()); 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"); l.set_source("|asdf");
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::EmptySubExpression); EXPECT(p.error() == regex::Error::EmptySubExpression);
// Last in ere // Last in ere
l.set_source("asdf|"); l.set_source("asdf|");
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::EmptySubExpression); EXPECT(p.error() == regex::Error::EmptySubExpression);
// After left parens // After left parens
l.set_source("(|asdf)"); l.set_source("(|asdf)");
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::EmptySubExpression); EXPECT(p.error() == regex::Error::EmptySubExpression);
// Proceed right parens // Proceed right parens
l.set_source("(asdf)|"); l.set_source("(asdf)|");
p.parse(); p.parse();
EXPECT(p.has_error()); EXPECT(p.has_error());
EXPECT(p.error() == Error::EmptySubExpression); EXPECT(p.error() == regex::Error::EmptySubExpression);
} }
TEST_CASE(catch_all_first) TEST_CASE(catch_all_first)
@ -687,7 +687,7 @@ TEST_CASE(ECMA262_match)
regex_dbg.print_bytecode(re); regex_dbg.print_bytecode(re);
dbgln("\n"); 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); EXPECT_EQ(re.match(test.subject).success, test.matches);
} }
} }
@ -734,7 +734,7 @@ TEST_CASE(ECMA262_unicode_match)
dbgln("\n"); 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); EXPECT_EQ(re.match(view).success, test.matches);
} }
} }
@ -809,7 +809,7 @@ TEST_CASE(ECMA262_property_match)
dbgln("\n"); 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); EXPECT_EQ(re.match(view).success, test.matches);
} }
} }
@ -842,7 +842,7 @@ TEST_CASE(replace)
regex_dbg.print_bytecode(re); regex_dbg.print_bytecode(re);
dbgln("\n"); 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); EXPECT_EQ(re.replace(test.subject, test.replacement), test.expected);
} }
} }

1
Userland/Libraries/LibRegex/Forward.h
View file

@ -34,7 +34,6 @@ class RegexStringView;
} }
using regex::ECMA262Parser; using regex::ECMA262Parser;
using regex::Error;
using regex::Lexer; using regex::Lexer;
using regex::PosixExtendedParser; using regex::PosixExtendedParser;
using regex::RegexStringView; using regex::RegexStringView;

1
Userland/Libraries/LibRegex/RegexError.h
View file

@ -81,5 +81,4 @@ inline String get_error_string(Error error)
} }
} }
using regex::Error;
using regex::get_error_string; using regex::get_error_string;

2
Userland/Utilities/grep.cpp
View file

@ -127,7 +127,7 @@ int main(int argc, char** argv)
options |= PosixFlags::Insensitive; options |= PosixFlags::Insensitive;
auto grep_logic = [&](auto&& re) { auto grep_logic = [&](auto&& re) {
if (re.parser_result.error != Error::NoError) { if (re.parser_result.error != regex::Error::NoError) {
return 1; return 1;
} }

2
Userland/Utilities/pgrep.cpp
View file

@ -32,7 +32,7 @@ int main(int argc, char** argv)
options |= PosixFlags::Insensitive; options |= PosixFlags::Insensitive;
Regex<PosixExtended> re(pattern, options); Regex<PosixExtended> re(pattern, options);
if (re.parser_result.error != Error::NoError) { if (re.parser_result.error != regex::Error::NoError) {
return 1; return 1;
} }

4
Userland/Utilities/run-tests.cpp
View file

@ -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) exclude_pattern = config->read_entry("Global", "NotTestsPattern", "$^"); // default is match nothing (aka match end then beginning)
Regex<PosixExtended> exclude_regex(exclude_pattern, {}); Regex<PosixExtended> 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); warnln("Exclude pattern \"{}\" is invalid", exclude_pattern);
return 1; return 1;
} }
@ -346,7 +346,7 @@ int main(int argc, char** argv)
// in the Testrunner // in the Testrunner
auto skip_regex_pattern = config->read_entry("Global", "SkipRegex", "$^"); auto skip_regex_pattern = config->read_entry("Global", "SkipRegex", "$^");
Regex<PosixExtended> skip_regex { skip_regex_pattern, {} }; Regex<PosixExtended> 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); warnln("SkipRegex pattern \"{}\" is invalid", skip_regex_pattern);
return 1; return 1;
} }