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

Utilities/grep: Implement using multiple patterns

Browse source
This commit is contained in:
Tim Schumacher 2021-11-13 01:55:47 +01:00 • committed by Andreas Kling
parent c94574d313
commit 6fe37a1e52
1 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Userland/Utilities/grep.cpp
View file

@ -43,7 +43,7 @@ int main(int argc, char** argv)
bool recursive { false }; bool recursive { false };
bool use_ere { false }; bool use_ere { false };
const char* pattern = nullptr; Vector<const char*> patterns;
BinaryFileMode binary_mode { BinaryFileMode::Binary }; BinaryFileMode binary_mode { BinaryFileMode::Binary };
bool case_insensitive = false; bool case_insensitive = false;
bool line_numbers = false; bool line_numbers = false;
@ -58,7 +58,17 @@ int main(int argc, char** argv)
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(recursive, "Recursively scan files", "recursive", 'r'); args_parser.add_option(recursive, "Recursively scan files", "recursive", 'r');
args_parser.add_option(use_ere, "Extended regular expressions", "extended-regexp", 'E'); args_parser.add_option(use_ere, "Extended regular expressions", "extended-regexp", 'E');
args_parser.add_option(pattern, "Pattern", "regexp", 'e', "Pattern"); args_parser.add_option(Core::ArgsParser::Option {
.requires_argument = true,
.help_string = "Pattern",
.long_name = "regexp",
.short_name = 'e',
.value_name = "Pattern",
.accept_value = [&](auto* str) {
patterns.append(str);
return true;
},
});
args_parser.add_option(case_insensitive, "Make matches case-insensitive", nullptr, 'i'); args_parser.add_option(case_insensitive, "Make matches case-insensitive", nullptr, 'i');
args_parser.add_option(line_numbers, "Output line-numbers", "line-numbers", 'n'); args_parser.add_option(line_numbers, "Output line-numbers", "line-numbers", 'n');
args_parser.add_option(invert_match, "Select non-matching lines", "invert-match", 'v'); args_parser.add_option(invert_match, "Select non-matching lines", "invert-match", 'v');
@ -121,8 +131,8 @@ int main(int argc, char** argv)
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
// mock grep behavior: if -e is omitted, use first positional argument as pattern // mock grep behavior: if -e is omitted, use first positional argument as pattern
if (pattern == nullptr && files.size()) if (patterns.size() == 0 && files.size())
pattern = files.take_first(); patterns.append(files.take_first());
auto user_has_specified_files = !files.is_empty(); auto user_has_specified_files = !files.is_empty();
auto user_specified_multiple_files = files.size() >= 2; auto user_specified_multiple_files = files.size() >= 2;
@ -131,18 +141,23 @@ int main(int argc, char** argv)
if (case_insensitive) if (case_insensitive)
options |= PosixFlags::Insensitive; options |= PosixFlags::Insensitive;
auto grep_logic = [&](auto&& re) { auto grep_logic = [&](auto&& regular_expressions) {
for (auto& re : regular_expressions) {
if (re.parser_result.error != regex::Error::NoError) { if (re.parser_result.error != regex::Error::NoError) {
return 1; return 1;
} }
}
auto matches = [&](StringView str, StringView filename, size_t line_number, bool print_filename, bool is_binary) { auto matches = [&](StringView str, StringView filename, size_t line_number, bool print_filename, bool is_binary) {
size_t last_printed_char_pos { 0 }; size_t last_printed_char_pos { 0 };
if (is_binary && binary_mode == BinaryFileMode::Skip) if (is_binary && binary_mode == BinaryFileMode::Skip)
return false; return false;
for (auto& re : regular_expressions) {
auto result = re.match(str, PosixFlags::Global); auto result = re.match(str, PosixFlags::Global);
if (result.success ^ invert_match) { if (!(result.success ^ invert_match))
continue;
if (quiet_mode) if (quiet_mode)
return true; return true;
@ -264,8 +279,17 @@ int main(int argc, char** argv)
return did_match_something ? 0 : 1; return did_match_something ? 0 : 1;
}; };
if (use_ere) if (use_ere) {
return grep_logic(Regex<PosixExtended>(pattern, options)); Vector<Regex<PosixExtended>> regular_expressions;
for (auto pattern : patterns) {
return grep_logic(Regex<PosixBasic>(pattern, options)); regular_expressions.append(Regex<PosixExtended>(pattern, options));
}
return grep_logic(regular_expressions);
}
Vector<Regex<PosixBasic>> regular_expressions;
for (auto pattern : patterns) {
regular_expressions.append(Regex<PosixBasic>(pattern, options));
}
return grep_logic(regular_expressions);
} }