mirror of
https://github.com/orange-cpp/omath.git
synced 2026-02-13 15:03:27 +00:00
improved scanner interface
This commit is contained in:
@@ -8,31 +8,14 @@ namespace omath
|
||||
{
|
||||
|
||||
std::optional<std::span<std::byte>::const_iterator>
|
||||
PatternScanner::scan_for_pattern(const std::string_view& pattern, const std::span<std::byte>& range)
|
||||
PatternScanner::scan_for_pattern(const std::span<std::byte>& range, const std::string_view& pattern)
|
||||
{
|
||||
const auto parsed_pattern = parse_pattern(pattern);
|
||||
auto result = scan_for_pattern(range.begin(), range.end(), pattern);
|
||||
|
||||
if (!parsed_pattern) [[unlikely]]
|
||||
if (result == range.end())
|
||||
return std::nullopt;
|
||||
|
||||
const std::ptrdiff_t scan_size =
|
||||
static_cast<std::ptrdiff_t>(range.size()) - static_cast<std::ptrdiff_t>(pattern.size());
|
||||
|
||||
for (std::ptrdiff_t i = 0; i < scan_size; i++)
|
||||
{
|
||||
bool found = true;
|
||||
|
||||
for (std::ptrdiff_t j = 0; j < static_cast<std::ptrdiff_t>(parsed_pattern->size()); j++)
|
||||
{
|
||||
found = parsed_pattern->at(j) == std::nullopt || parsed_pattern->at(j) == *(range.data() + i + j);
|
||||
|
||||
if (!found)
|
||||
break;
|
||||
}
|
||||
if (found)
|
||||
return range.begin() + i;
|
||||
}
|
||||
return std::nullopt;
|
||||
return result;
|
||||
}
|
||||
std::expected<std::vector<std::optional<std::byte>>, PatternScanError>
|
||||
PatternScanner::parse_pattern(const std::string_view& pattern_string)
|
||||
|
||||
Reference in New Issue
Block a user