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

Author: Hana Dusíková

.travis.yml

@@ -39,19 +39,6 @@ matrix:
   - os: osx
     osx_image: xcode10
 
-before_install:
-  - |
-     if [[ (-x $(which brew)) ]]; then
-       brew update
-       brew install boost || brew upgrade boost
-       brew install pcre2 || brew upgrade pcre2
-       brew install re2 || brew upgrade re2
-     else
-       sudo add-apt-repository -y ppa:sergey-dryabzhinsky/packages
-       sudo apt-get update -qq
-       sudo apt-get install -qq libpcre2-dev libre2-dev libboost-all-dev
-     fi
-
 install:
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
   - uname -a

Makefile

@@ -10,7 +10,7 @@ DESATOMAT := /www/root/desatomat/console/desatomat.php
 CPP_STANDARD := $(shell ./cpp-20-check.sh $(CXX))
 
 override CXXFLAGS := $(CXXFLAGS) $(CPP_STANDARD) -Iinclude -O3 -pedantic -Wall -Wextra 
-LDFLAGS := -lre2 -lboost_regex -lpcre2-8 
+LDFLAGS := 
 
 TESTS := $(wildcard tests/*.cpp) $(wildcard tests/benchmark/*.cpp)
 TRUE_TARGETS := $(TARGETS:%.cpp=%)

README.md

@@ -43,8 +43,9 @@ More documentation on [pcre.org](https://www.pcre.org/current/doc/html/pcre2synt
 
 ## Supported compilers
 
-* clang 5.0+ (template UDL, C++17 syntax)
-* gcc 7.2+ (template UDL, C++17 syntax)
+* clang 6.0+ (template UDL, C++17 syntax)
+* xcode clang 10.0+ (template UDL, C++17 syntax)
+* gcc 7.4+ (template UDL, C++17 syntax)
 * gcc 9.0+ (C++17 & C++20 cNTTP syntax)
 * MSVC 15.8.8+ (C++17 syntax only)
 

include/ctll/fixed_string.hpp

@@ -4,6 +4,7 @@
 #include <utility>
 #include <cstddef>
 #include <string_view>
+#include <cstdint>
 
 namespace ctll {
 

include/ctre/evaluation.hpp

@@ -7,6 +7,7 @@
 #include "utility.hpp"
 #include "return_type.hpp"
 #include "find_captures.hpp"
+#include "first.hpp"
 
 namespace ctre {
 
@@ -219,23 +220,15 @@ constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, c
 // possessive repeat
 template <typename R, typename Iterator, typename EndIterator, size_t A, size_t B, typename... Content, typename... Tail> 
 constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, const EndIterator end, R captures, ctll::list<possessive_repeat<A,B,Content...>, Tail...>) noexcept {
-	// A..B
-	size_t i{0};
-	for (; i < A && (A != 0); ++i) {
-		if (auto inner_result = evaluate(begin, current, end, captures, ctll::list<sequence<Content...>, end_cycle_mark>())) {
-			captures = inner_result.unmatch();
-			current = inner_result.get_end_position();
-		} else {
-			return not_matched;
-		}
-	}
-	
-	for (; (i < B) || (B == 0); ++i) {
+
+	for (size_t i{0}; (i < B) || (B == 0); ++i) {
 		// try as many of inner as possible and then try outer once
 		if (auto inner_result = evaluate(begin, current, end, captures, ctll::list<sequence<Content...>, end_cycle_mark>())) {
+			captures = inner_result.unmatch();
 			current = inner_result.get_end_position();
 		} else {
-			return evaluate(begin, current, end, captures, ctll::list<Tail...>());
+			if (i < A && (A != 0)) return not_matched;
+			else return evaluate(begin, current, end, captures, ctll::list<Tail...>());
 		}
 	}
 
@@ -263,20 +256,43 @@ constexpr inline R evaluate_recursive(size_t i, const Iterator begin, Iterator c
 	return evaluate(begin, current, end, captures, ctll::list<Tail...>());
 }	
 
+
+// (gready) repeat optimization
+// basic one, if you are at the end of RE, just change it into possessive
+// TODO do the same if there is no collision with rest of the RE
 template <typename R, typename Iterator, typename EndIterator, size_t A, size_t B, typename... Content, typename... Tail> 
-constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, const EndIterator end, R captures, ctll::list<repeat<A,B,Content...>, Tail...> stack) {
-	// A..B
-	size_t i{0};
-	for (; i < A && (A != 0); ++i) {
-		if (auto inner_result = evaluate(begin, current, end, captures, ctll::list<sequence<Content...>, end_cycle_mark>())) {
-			captures = inner_result.unmatch();
-			current = inner_result.get_end_position();
-		} else {
-			return not_matched;
+constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, const EndIterator end, R captures, ctll::list<repeat<A,B,Content...>,assert_end, Tail...>) {
+	return evaluate(begin, current, end, captures, ctll::list<possessive_repeat<A,B,Content...>, assert_end, Tail...>());
+}
+
+template <typename... T> struct identify_type;
+
+// (greedy) repeat 
+template <typename R, typename Iterator, typename EndIterator, size_t A, size_t B, typename... Content, typename... Tail> 
+constexpr CTRE_FORCE_INLINE R evaluate(const Iterator begin, Iterator current, const EndIterator end, R captures, [[maybe_unused]] ctll::list<repeat<A,B,Content...>, Tail...> stack) {
+	// check if it can be optimized
+#ifndef CTRE_DISABLE_GREEDY_OPT
+	if constexpr (collides(calculate_first(Content{}...), calculate_first(Tail{}...))) {
+#endif
+		// A..B
+		size_t i{0};
+		for (; i < A && (A != 0); ++i) {
+			if (auto inner_result = evaluate(begin, current, end, captures, ctll::list<sequence<Content...>, end_cycle_mark>())) {
+				captures = inner_result.unmatch();
+				current = inner_result.get_end_position();
+			} else {
+				return not_matched;
+			}
 		}
-	}
 
-	return evaluate_recursive(i, begin, current, end, captures, stack);
+		return evaluate_recursive(i, begin, current, end, captures, stack);
+#ifndef CTRE_DISABLE_GREEDY_OPT
+	} else {
+		// if there is no collision we can go possessive
+		return evaluate(begin, current, end, captures, ctll::list<possessive_repeat<A,B,Content...>, Tail...>());
+	}
+#endif
+
 }
 
 // repeat lazy_star