patch: make atomic sequence work like lookahead / lookbehind

(Appears to be working)

Author: Andersama

include/ctre/actions/sequence.inc.hpp

@@ -18,29 +18,16 @@ template <auto V, auto... As, auto B, typename... Ts, typename Parameters> stati
 	return pcre_context{ctll::push_front(string<B,As...>(), ctll::list<Ts...>()), subject.parameters};
 }
 
-// atomic sequence
-template <auto V, typename... Content, typename... Ts, typename Parameters>
-static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<sequence<Content...>, Ts...>, Parameters> subject) {
-	//return pcre_context{ ctll::push_front(atomic_sequence<Content...>(), ctll::list<Ts...>()), subject.parameters };
-	return pcre_context{ ctll::list<atomic_sequence<Content...>,Ts...>(), subject.parameters };
+// atomic sequence start
+template <auto V, typename... Ts, size_t Counter> static constexpr auto apply(pcre::start_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<Ts...>, pcre_parameters<Counter>>) {
+	return pcre_context{ ctll::list<atomic_sequence_start<atomic_sequence<>>, Ts...>(), pcre_parameters<Counter>() };
 }
-
-/*
-// make_atomic_sequence
-template <auto V, typename A, typename B, typename... Ts, typename Parameters> static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<B, A, Ts...>, Parameters> subject) {
-	return pcre_context{ ctll::push_front(atomic_sequence<A,B>(), ctll::list<Ts...>()), subject.parameters };
-}
-// make_atomic_sequence (concat)
-template <auto V, typename... As, typename B, typename... Ts, typename Parameters> static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<atomic_sequence<As...>, B, Ts...>, Parameters> subject) {
-	return pcre_context{ ctll::push_front(atomic_sequence<B,As...>(), ctll::list<Ts...>()), subject.parameters };
-}
-// make_atomic_sequence (make string)
-template <auto V, auto A, auto B, typename... Ts, typename Parameters> static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<character<B>, character<A>, Ts...>, Parameters> subject) {
-	return pcre_context{ ctll::push_front(string<A,B>(), ctll::list<Ts...>()), subject.parameters };
+// atomic sequence end
+template <auto V, typename Atom, typename... Ts, size_t Counter> static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<Atom, atomic_sequence_start<atomic_sequence<>>, Ts...>, pcre_parameters<Counter>>) {
+	return pcre_context{ ctll::list<lookahead_positive<Atom>, Ts...>(), pcre_parameters<Counter>() };
 }
-// make_atomic_sequence (concat string)
-template <auto V, auto... As, auto B, typename... Ts, typename Parameters> static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<string<As...>, character<B>, Ts...>, Parameters> subject) {
-	return pcre_context{ ctll::push_front(string<B,As...>(), ctll::list<Ts...>()), subject.parameters };
+// atomic sequence end (atomic_sequence)
+template <auto V, typename... Atom, typename... Ts, size_t Counter> static constexpr auto apply(pcre::make_atomic_sequence, ctll::term<V>, pcre_context<ctll::list<ctre::atomic_sequence<Atom...>, atomic_sequence_start<atomic_sequence<>>, Ts...>, pcre_parameters<Counter>>) {
+	return pcre_context{ ctll::list<lookahead_positive<Atom...>, Ts...>(), pcre_parameters<Counter>() };
 }
-*/
 #endif

include/ctre/atoms.hpp

@@ -44,6 +44,7 @@ template <size_t Index> struct back_reference { };
 template <typename Name> struct back_reference_with_name { };
 
 template <typename Type> struct look_start { };
+template <typename Type> struct atomic_sequence_start {};
 
 template <typename... Content> struct lookahead_positive { };
 template <typename... Content> struct lookahead_negative { };

include/ctre/pcre.hpp

@@ -125,6 +125,7 @@ struct pcre {
 	struct set_start: ctll::action {};
 	struct start_lookahead_negative: ctll::action {};
 	struct start_lookahead_positive: ctll::action {};
+	struct start_atomic_sequence: ctll::action {};
 
 // (q)LL1 function:
 	using _others = ctll::neg_set<'!','$','\x28','\x29','*','+',',','-','.',':','<','=','>','?','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','[','\\',']','^','_','a','b','c','d','e','f','g','h','0','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','\x7B','|','\x7D','1','2','3','4','5','6','7','8','9'>;
@@ -246,7 +247,7 @@ struct pcre {
 	static constexpr auto rule(d, ctll::term<':'>) -> ctll::push<reset_capture, ctll::anything, content_in_capture, ctll::term<'\x29'>>;
 	static constexpr auto rule(d, ctll::term<'!'>) -> ctll::push<reset_capture, ctll::anything, start_lookahead_negative, content_in_capture, look_finish, ctll::term<'\x29'>>;
 	static constexpr auto rule(d, ctll::term<'='>) -> ctll::push<reset_capture, ctll::anything, start_lookahead_positive, content_in_capture, look_finish, ctll::term<'\x29'>>;
-	static constexpr auto rule(d, ctll::term<'>'>) -> ctll::push<reset_capture, ctll::anything, content_in_capture, make_atomic_sequence, ctll::term<'\x29'>>;
+	static constexpr auto rule(d, ctll::term<'>'>) -> ctll::push<reset_capture, ctll::anything, start_atomic_sequence, content_in_capture, make_atomic_sequence, ctll::term<'\x29'>>;
 
 	static constexpr auto rule(e, ctll::term<'d'>) -> ctll::push<ctll::anything, class_digit>;
 	static constexpr auto rule(e, ctll::term<'h'>) -> ctll::push<ctll::anything, class_horizontal_space>;