diff --git a/src/ctre.cpp b/src/ctre.cpp index 220d3cf..8af0cca 100644 --- a/src/ctre.cpp +++ b/src/ctre.cpp @@ -5,7 +5,7 @@ #include #include "main.h" -#include +#include using RegexFn = std::function; using RegexMap = std::unordered_map; @@ -16,7 +16,7 @@ using RegexMap = std::unordered_map; [](const std::string_view &sv) -> int \ { \ int cnt = 0; \ - for (auto match : ctre::range(sv)) \ + for (auto match : ctre::multiline_range(sv)) \ cnt++; \ return cnt; \ } \ @@ -26,13 +26,13 @@ RegexMap remap = { ENTRY("(.*?,){13}z"), ENTRY("[a-z]shing"), ENTRY("Twain"), - // ENTRY("(?i)Twain"), + ENTRY("(?i)Twain"), ENTRY("[a-z]shing"), ENTRY("Huck[a-zA-Z]+|Saw[a-zA-Z]+"), - // ENTRY("\\b\\w+nn\\b"), + ENTRY("\\b\\w+nn\\b"), ENTRY("[a-q][^u-z]{13}x"), ENTRY("Tom|Sawyer|Huckleberry|Finn"), - // ENTRY("(?i)Tom|Sawyer|Huckleberry|Finn"), + ENTRY("(?i)Tom|Sawyer|Huckleberry|Finn"), ENTRY(".{0,2}(Tom|Sawyer|Huckleberry|Finn)"), ENTRY(".{2,4}(Tom|Sawyer|Huckleberry|Finn)"), ENTRY("Tom.{10,25}river|river.{10,25}Tom"), @@ -40,8 +40,8 @@ RegexMap remap = { ENTRY("\\s[a-zA-Z]{0,12}ing\\s"), ENTRY("([A-Za-z]awyer|[A-Za-z]inn)\\s"), ENTRY("[\"'][^\"']{0,30}[?!\\.][\"']"), - ENTRY("\u221E|\u2713") - // ENTRY("\\p{Sm}") + ENTRY("\u221E|\u2713"), + ENTRY("\\p{Sm}") }; extern "C" int ctre_find_all(char *pattern, char *subject, int subject_len, int repeat, struct result *res) diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index fa55d29..fea09d7 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -127,7 +127,7 @@ AddExternalProject( "ctre" "ctre" "https://github.com/hanickadot/compile-time-regular-expressions.git" - "master" + "main" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/local )