fix issue #329: lookbehind rotating inner regex in select<...>

hanickadot · Feb 25, 2025 · dadd207 · dadd207
1 parent a9418a5
commit dadd207
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/include/ctre/rotate.hpp b/include/ctre/rotate.hpp
@@ -44,7 +44,6 @@ static auto rotate(end_lookbehind_mark) -> end_lookbehind_mark;
 template <size_t Id> static auto rotate(numeric_mark<Id>) -> numeric_mark<Id>;
 static auto rotate(any) -> any;
 
-template <typename... Content> static auto rotate(select<Content...>) -> select<Content...>;
 static auto rotate(empty) -> empty;
 
 
@@ -92,6 +91,10 @@ static auto rotate(assert_subject_end_line) -> assert_subject_end_line;
 static auto rotate(assert_line_begin) -> assert_line_begin;
 static auto rotate(assert_line_end) -> assert_line_end;
 
+// select rotates only insides of selection, not select itself
+template <typename... Content> static auto rotate(select<Content...>) -> select<decltype(rotate(Content{}))...>;
+
+
 };
 
 }

diff --git a/single-header/ctre-unicode.hpp b/single-header/ctre-unicode.hpp
@@ -2065,7 +2065,6 @@ static auto rotate(end_lookbehind_mark) -> end_lookbehind_mark;
 template <size_t Id> static auto rotate(numeric_mark<Id>) -> numeric_mark<Id>;
 static auto rotate(any) -> any;
 
-template <typename... Content> static auto rotate(select<Content...>) -> select<Content...>;
 static auto rotate(empty) -> empty;
 
 template <size_t a, size_t b, typename... Content> static auto rotate(repeat<a,b,Content...>) -> decltype(ctre::convert_to_repeat<repeat, a, b>(ctll::rotate(ctll::list<decltype(rotate(Content{}))...>{})));
@@ -2112,6 +2111,9 @@ static auto rotate(assert_subject_end_line) -> assert_subject_end_line;
 static auto rotate(assert_line_begin) -> assert_line_begin;
 static auto rotate(assert_line_end) -> assert_line_end;
 
+// select rotates only insides of selection, not select itself
+template <typename... Content> static auto rotate(select<Content...>) -> select<decltype(rotate(Content{}))...>;
+
 };
 
 }

diff --git a/single-header/ctre.hpp b/single-header/ctre.hpp
@@ -2062,7 +2062,6 @@ static auto rotate(end_lookbehind_mark) -> end_lookbehind_mark;
 template <size_t Id> static auto rotate(numeric_mark<Id>) -> numeric_mark<Id>;
 static auto rotate(any) -> any;
 
-template <typename... Content> static auto rotate(select<Content...>) -> select<Content...>;
 static auto rotate(empty) -> empty;
 
 template <size_t a, size_t b, typename... Content> static auto rotate(repeat<a,b,Content...>) -> decltype(ctre::convert_to_repeat<repeat, a, b>(ctll::rotate(ctll::list<decltype(rotate(Content{}))...>{})));
@@ -2109,6 +2108,9 @@ static auto rotate(assert_subject_end_line) -> assert_subject_end_line;
 static auto rotate(assert_line_begin) -> assert_line_begin;
 static auto rotate(assert_line_end) -> assert_line_end;
 
+// select rotates only insides of selection, not select itself
+template <typename... Content> static auto rotate(select<Content...>) -> select<decltype(rotate(Content{}))...>;
+
 };
 
 }

diff --git a/tests/generating.cpp b/tests/generating.cpp
@@ -270,5 +270,8 @@ static_assert(same_f(CTRE_GEN("(?<!a)"), ctre::lookbehind_negative<ctre::charact
 static_assert(same_f(CTRE_GEN("(?<=ab)"), ctre::lookbehind_positive<ctre::string<'b','a'>>()));
 static_assert(same_f(CTRE_GEN("(?<!ab)"), ctre::lookbehind_negative<ctre::string<'b','a'>>()));
 
+static_assert(same_f(CTRE_GEN("(?<=ab|cd)"), ctre::lookbehind_positive<ctre::select<ctre::string<'b','a'>, ctre::string<'d','c'>>>()));
+static_assert(same_f(CTRE_GEN("(?<!ab|cd)"), ctre::lookbehind_negative<ctre::select<ctre::string<'b','a'>, ctre::string<'d','c'>>>()));
+
 static_assert(same_f(CTRE_GEN("(?<=(ab))"), ctre::lookbehind_positive<ctre::capture<1, ctre::string<'b','a'>>>()));
 static_assert(same_f(CTRE_GEN("(?<!(ab))"), ctre::lookbehind_negative<ctre::capture<1, ctre::string<'b','a'>>>()));
diff --git a/tests/matching3.cpp b/tests/matching3.cpp
@@ -234,3 +234,8 @@ TEST_MATCH(225, R"( ?[\p{N}])", " 1");
 TEST_MATCH(226, R"( ?\p{N})", " 1");
 TEST_MATCH(227, R"( ?\p{N}+)", " 1234");
 
+// issue #339 (rotate didn't rotate inside of selection)
+TEST_SEARCH(228, "(?<=ba|cd)s", "bas"); 
+TEST_NOT_SEARCH(229, "(?<!ba|cd)s", "bas"); // negative means both "ba|cd most not be there"
+TEST_SEARCH(230, "(?<=ba|cd)s", "cds"); 
+TEST_NOT_SEARCH(231, "(?<!ba|cd)s", "cds"); // negative means both "ba|cd most not be there"