Merge branch 'master' of github.com:hanickadot/compile-time-regular-expressions

Author: Hana Dusíková

include/ctll/grammars.hpp

@@ -60,18 +60,31 @@ template <auto A, decltype(A) B> struct range {
 	template <auto V, typename = std::enable_if_t<(A <= V) && (V <= B)>> constexpr inline range(term<V>) noexcept;
 };
 
+#ifdef __EDG__
+template <auto V, auto... Set> struct contains {
+	static constexpr bool value = ((Set == V) || ... || false);
+};
+#endif
+
 // match terms defined in set
 template <auto... Def> struct set {
 	constexpr inline set() noexcept { };
-	//template <auto V> constexpr set(term<V>) noexcept requires ((Def == V) || ... || false);
-	template <auto V, typename = std::enable_if_t<((Def == V) || ... || false)>> constexpr inline set(term<V>) noexcept;
+	#ifdef __EDG__
+	template <auto V, typename = std::enable_if_t<contains<V, Def...>::value>> constexpr inline set(term<V>) noexcept;
+	#else
+	template <auto V, typename = std::enable_if_t<((Set == V) || ... || false)>> constexpr inline set(term<V>) noexcept;
+	#endif
 };
 
 // match terms not defined in set
 template <auto... Def> struct neg_set {
 	constexpr inline neg_set() noexcept { };
-	//template <auto V> constexpr set(term<V>) noexcept requires ((Def == V) || ... || false);
-	template <auto V, typename = std::enable_if_t<((Def != V) && ... && true)>> constexpr inline neg_set(term<V>) noexcept;
+	
+	#ifdef __EDG__
+	template <auto V, typename = std::enable_if_t<!contains<V, Def...>::value>> constexpr inline neg_set(term<V>) noexcept;
+	#else
+	template <auto V, typename = std::enable_if_t<!(Set == V) || ... || false)>> constexpr inline neg_set(term<V>) noexcept;
+	#endif
 };
 
 // AUGMENTED grammar which completes user-defined grammar for all other cases

include/ctre/actions/asserts.inc.hpp

@@ -12,4 +12,3 @@ template <auto V, typename... Ts, typename Parameters> static constexpr auto app
 }
 
 #endif
-	

include/ctre/actions/set.inc.hpp

@@ -64,4 +64,3 @@ template <auto V, auto B, auto A, typename... Ts, typename Parameters> static co
 }
 
 #endif
-	

include/ctre/evaluation.hpp

@@ -238,7 +238,7 @@ constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, c
 // (gready) repeat
 template <typename R, typename Iterator, typename EndIterator, size_t A, size_t B, typename... Content, typename... Tail> 
 constexpr inline R evaluate_recursive(size_t i, const Iterator begin, Iterator current, const EndIterator end, R captures, ctll::list<repeat<A,B,Content...>, Tail...> stack) {
-	if ((i < B) || (B == 0)) {
+	if ((B == 0) || (i < B)) {
 
 		// a*ab
 		// aab

include/ctre/id.hpp

@@ -18,4 +18,4 @@ template <auto... Name, typename T> constexpr auto operator==(id<Name...>, T) no
 }
 
 
-#endif
+#endif

include/ctre/literals.hpp

@@ -7,6 +7,7 @@
 #include "wrapper.hpp"
 #include "id.hpp"
 
+#ifndef __EDG__
 
 namespace ctre {
 
@@ -123,3 +124,5 @@ template <ctll::fixed_string input> CTRE_FLATTEN constexpr CTRE_FORCE_INLINE aut
 } // ctre
 
 #endif
+
+#endif

include/ctre/return_type.hpp

@@ -274,6 +274,7 @@ template <typename Iterator, typename... Captures> regex_results(Iterator, ctll:
 
 // support for structured bindings
 
+#ifndef __EDG__
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wmismatched-tags"
@@ -293,5 +294,6 @@ namespace std {
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
+#endif
 
 #endif

include/ctre/utility.hpp

@@ -9,4 +9,4 @@
 #define CTRE_FLATTEN __attribute__((flatten))
 #endif
 
-#endif
+#endif

include/ctre/wrapper.hpp

@@ -107,4 +107,4 @@ template <typename RE> regular_expression(RE) -> regular_expression<RE>;
 
 }
 
-#endif
+#endif