lookahead support (part 2)

Author: Hana Dusíková

NOTES.md

@@ -12,7 +12,6 @@
 * atomic groups
 * comments
 * options/modes
-* lookahead
 * subroutines
 * conditional patterns
 * callouts

include/ctre/evaluation.hpp

@@ -362,8 +362,8 @@ constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, c
 
 // end of lookahead
 template <typename R, typename Iterator, typename EndIterator, typename... Tail> 
-constexpr CTRE_FORCE_INLINE R evaluate(const Iterator, Iterator current, const EndIterator, R captures, ctll::list<end_lookahead_mark>) noexcept {
-	return captures.set_end_mark(current).matched();
+constexpr CTRE_FORCE_INLINE R evaluate(const Iterator, Iterator, const EndIterator, R captures, ctll::list<end_lookahead_mark>) noexcept {
+	return captures.matched();
 }
 
 // lookahead positive

include/ctre/find_captures.hpp

@@ -98,7 +98,14 @@ template <size_t A, size_t B, typename... Content, typename... Tail, typename Ou
 
 
 
+template <typename... Content, typename... Tail, typename Output> constexpr auto find_captures(ctll::list<lookahead_positive<Content...>, Tail...>, Output output) noexcept {
+	return find_captures(ctll::list<Content..., Tail...>(), output);
+}
+
 
+template <typename... Content, typename... Tail, typename Output> constexpr auto find_captures(ctll::list<lookahead_negative<Content...>, Tail...>, Output output) noexcept {
+	return find_captures(ctll::list<Content..., Tail...>(), output);
+}
 
 
 

tests/generating.cpp

@@ -163,8 +163,8 @@ static_assert(same_f("^(?=.*(a))$"_ctre_gen, ctre::sequence<ctre::assert_begin,
 
 static_assert(same_f("^(?=.*(a).*)$"_ctre_gen, ctre::sequence<ctre::assert_begin, ctre::lookahead_positive<ctre::star<ctre::any>,ctre::capture<1,ctre::character<'a'>>, ctre::star<ctre::any>>, ctre::assert_end>()));
 
-//static_assert(same_f("^(?=.*(a)\\g{1}.*)$"_ctre_gen, ctre::sequence<ctre::assert_begin, ctre::lookahead_positive<ctre::star<ctre::any>,ctre::capture<1,ctre::character<'a'>>, ctre::back_reference<1>, ctre::star<ctre::any>>, ctre::assert_end>()));
+static_assert(same_f("^(?=.*(a)\\g{1}.*)$"_ctre_gen, ctre::sequence<ctre::assert_begin, ctre::lookahead_positive<ctre::star<ctre::any>,ctre::capture<1,ctre::character<'a'>>, ctre::back_reference<1>, ctre::star<ctre::any>>, ctre::assert_end>()));
 
+static_assert(same_f("^(?=.*(a)\\g{1}.*)[a-z]$"_ctre_gen, ctre::sequence<ctre::assert_begin, ctre::lookahead_positive<ctre::star<ctre::any>,ctre::capture<1,ctre::character<'a'>>, ctre::back_reference<1>, ctre::star<ctre::any>>, ctre::set<ctre::char_range<'a','z'>>, ctre::assert_end>()));
 
-//static_assert(same_f("^(?=.*(.)\\g{1}+.*)[a-z]+"_ctre_gen, ctre::sequence< ctre::assert_begin, ctre::lookahead_positive<ctre::star<ctre::any>, ctre::capture<1, ctre::any>, ctre::plus<ctre::back_reference<1>> ,ctre::star<ctre::any>>, ctre::plus<ctre::set<ctre::char_range<'a','z'>>> >());
 

tests/matching2.cpp

@@ -217,6 +217,17 @@ static_assert("a(?!3)[0-9]"_ctre.match("a0"sv));
 static_assert("a(?!3)[0-9]"_ctre.match("a9"sv));
 static_assert(!"a(?!3)[0-9]"_ctre.match("a3"sv));
 
-static_assert(!"^(?=.*(.)\\g{1}+.*)[a-z]+"_ctre.search("abcdefgh"sv));
-static_assert("^(?=.*(.)\\g{1}+.*)[a-z]+"_ctre.search("abcddefgh"sv));
+static_assert(!".*(.)\\g{1}.*"_ctre.match("abcdefghijk"sv));
+static_assert(".*(.)\\g{1}.*"_ctre.match("aabcdefghijk"sv));
+static_assert(".*(.)\\g{1}.*"_ctre.match("abcdeffghijk"sv));
+
+static_assert("(?=.*(.)\\g{1})[a-z]+"_ctre.match("abcdeffghijk"sv));
+static_assert(!"(?=.*(.)\\g{1}{2})[a-z]+"_ctre.match("abcddeffghijk"sv));
+static_assert("(?=.*(.)\\g{1}{2})[a-z]+"_ctre.match("abcdddeffghijk"sv));
+
+static_assert( "(?!.*(.)\\g{1})[a-z]+"_ctre.match("abcdefgh"sv));
+static_assert(!"(?!.*(.)\\g{1})[a-z]+"_ctre.match("abcdeefgh"sv));
+
+
+