benchmark and tests updated

Author: Hana Dusíková

tests/benchmark-exec/baseline.cpp

@@ -0,0 +1,18 @@
+#include <cstdio>
+#include <iostream>
+#include <fstream> 
+#include <regex>
+#include "ctre.hpp"
+
+extern "C" {
+
+#define PCRE2_CODE_UNIT_WIDTH 8
+#define PCRE2_STATIC
+#include <pcre2.h>
+
+}
+
+int main (int argc, char ** argv)
+{
+	return 0;
+}

tests/benchmark-exec/ctre.cpp

@@ -1,18 +1,26 @@
-#include <ctre.hpp>
 #include <cstdio>
 #include <iostream>
 #include <fstream> 
+#include <regex>
+#include "ctre.hpp"
+
+extern "C" {
+
+#define PCRE2_CODE_UNIT_WIDTH 8
+#define PCRE2_STATIC
+#include <pcre2.h>
+
+}
 
 int main (int argc, char ** argv)
 {
 	using namespace ctre::literals;
-	//constexpr auto re1 = "ABCD|DEFGH|EFGHI|A{4,}+"_pcre;
-	constexpr auto re1 = "^[0-9]{4,16}?[aA]"_pcre;
+	constexpr auto re = "([aAbB]{4,}|[xXyY]{4,}|[1234]{4,})0"_ctre;
 
 	auto grep = [&](auto && stream) {
 		std::string line;
 		while (std::getline(stream, line)) {
-			if (bool(re1.match(line))) {
+			if (bool(re.search(line))) {
 				std::cout << line << '\n';
 			}
 		}
@@ -24,7 +32,5 @@ int main (int argc, char ** argv)
 		std::string fname{std::string(argv[i])};
 		grep(std::ifstream(fname, std::ifstream::in));
 	}
-	
-	return 0;
 }
 

tests/benchmark-exec/pcre.cpp

@@ -1,6 +1,8 @@
 #include <cstdio>
 #include <iostream>
 #include <fstream> 
+#include <regex>
+#include "ctre.hpp"
 
 extern "C" {
 
@@ -14,26 +16,15 @@ int main (int argc, char ** argv)
 {
 	int errornumber = 0;
 	size_t erroroffset = 0;
-	//const unsigned char * pattern = "^[0-9]{4,16}?[aA]";
-	auto * pattern = reinterpret_cast<const unsigned char *>("ABCD|DEFGH|EFGHI|A{4,}+");
+	auto * pattern = reinterpret_cast<const unsigned char *>("([aAbB]{4,}|[xXyY]{4,}|[1234]{4,})0");
 	pcre2_code * re = pcre2_compile(pattern, PCRE2_ZERO_TERMINATED, 0, &errornumber, &erroroffset, NULL);
-	if (!re) {
-		std::cerr << "can't compile RE\n";
-		return 1;
-	}
-	
-	size_t subject_length;
-	pcre2_match_data * match_data = pcre2_match_data_create_from_pattern(re, NULL);
 
 	auto grep = [&](auto && stream) {
 		std::string line;
 		while (std::getline(stream, line)) {
-			if (pcre2_match(re, reinterpret_cast<const unsigned char *>(line.c_str()), line.length(), 0, 0, match_data, NULL) >= 0) {
+			if (pcre2_match(re, reinterpret_cast<const unsigned char *>(line.c_str()), line.length(), 0, 0, NULL, NULL) >= 0) {
 				std::cout << line << '\n';
 			}
-			//if (bool(re.match(line))) {
-			//	std::cout << line << '\n';
-			//}
 		}
 	}; 
 
@@ -44,8 +35,5 @@ int main (int argc, char ** argv)
 		grep(std::ifstream(fname, std::ifstream::in));
 	}
 
-	pcre2_match_data_free(match_data);
 	pcre2_code_free(re);
-	
-	return 0;
 }

tests/benchmark-exec/std.cpp

@@ -2,22 +2,26 @@
 #include <iostream>
 #include <fstream> 
 #include <regex>
+#include "ctre.hpp"
+
+extern "C" {
+
+#define PCRE2_CODE_UNIT_WIDTH 8
+#define PCRE2_STATIC
+#include <pcre2.h>
+
+}
 
 int main (int argc, char ** argv)
 {
-	//using namespace ctre::literals;
-	//constexpr auto re = "ABCD|DEFGH|EFGHI|A{4,}"_pcre;
-	std::regex re1("^[0-9]{4,16}?[aA]");
+	std::regex re("([aAbB]{4,}|[xXyY]{4,}|[1234]{4,})0");
 
 	auto grep = [&](auto && stream) {
 		std::string line;
 		while (std::getline(stream, line)) {
-			if (std::regex_search(line, re1)) {
+			if (std::regex_search(line, re)) {
 				std::cout << line << '\n';
 			}
-			//if (bool(re.match(line))) {
-			//	std::cout << line << '\n';
-			//}
 		}
 	}; 
 
@@ -27,6 +31,4 @@ int main (int argc, char ** argv)
 		std::string fname{std::string(argv[i])};
 		grep(std::ifstream(fname, std::ifstream::in));
 	}
-	
-	return 0;
 }

tests/matching.cpp

@@ -5,10 +5,14 @@ template <typename Pattern> constexpr bool match(std::string_view input, Pattern
 	return bool(ctre::match_re(input.begin(), input.end(), pattern));
 }
 
+template <typename Pattern> constexpr bool search(std::string_view input, Pattern pattern) {
+	return bool(ctre::search_re(input.begin(), input.end(), pattern));
+}
+
 using namespace std::string_view_literals;
 
 static_assert(match("a"sv, ctre::character<'a'>()));
-static_assert(match("abc"sv, ctre::character<'a'>())); // only match from start
+static_assert(search("abc"sv, ctre::character<'a'>())); // only match from start
 static_assert(!match("abc"sv, ctre::character<'b'>()));
 static_assert(!match("a"sv, ctre::character<'b'>()));
 static_assert(match("a"sv, ctre::any()));
@@ -67,7 +71,7 @@ static_assert(match("aba"sv, ctre::sequence<ctre::possessive_plus<ctre::characte
 
 static_assert(match("aaax"sv, ctre::sequence<ctre::lazy_repeat<3,0,ctre::character<'a'>>, ctre::character<'x'>>()));
 
-static_assert(match("aaaaaa"sv, ctre::repeat<0,5,ctre::character<'a'>>()));
+static_assert(search("aaaaaa"sv, ctre::repeat<0,5,ctre::character<'a'>>()));
 static_assert(!match("aaaaaa"sv, ctre::sequence<ctre::repeat<0,5,ctre::character<'a'>>, ctre::assert_end>()));
 static_assert(match("aaaaa"sv, ctre::sequence<ctre::repeat<0,5,ctre::character<'a'>>, ctre::assert_end>()));
 

tests/matching2.cpp

@@ -5,16 +5,16 @@ using namespace ctre::literals;
 using namespace ctre::test_literals;
 using namespace std::string_view_literals;
 
-static_assert(""_pcre.match("abc"sv));
+static_assert(""_pcre.search("abc"sv));
 static_assert("abc"_pcre.match("abc"sv));
 
 static_assert("a"_pcre.match("a"sv));
-static_assert("a"_pcre.match("abc"sv));
+static_assert("a"_pcre.search("abc"sv));
 static_assert("b"_pcre.search("abc"sv));
 static_assert(!"^b"_pcre.match("abc"sv));
 static_assert(!"b"_pcre.match("a"sv));
 static_assert("."_pcre.match("a"sv));
-static_assert("."_pcre.match("abc"sv));
+static_assert("."_pcre.search("abc"sv));
 static_assert("[a-z]"_pcre.match("a"sv));
 static_assert("[a-z]"_pcre.match("f"sv));
 static_assert("[a-z]"_pcre.match("z"sv));
@@ -37,7 +37,7 @@ static_assert("(?:a|b|c)"_pcre.match("c"sv));
 static_assert(!"(?:a|b|c)"_pcre.match("d"sv));
 static_assert("(?:xy)?"_pcre.match("xy"sv));
 static_assert("(?:xy)?"_pcre.match(""sv));
-static_assert("(?:xy)?"_pcre.match("zxy"sv));
+static_assert("(?:xy)?"_pcre.search("zxy"sv));
 static_assert("(?:xy)?$"_pcre.search("zxy"sv));
 static_assert(!"~(?:xy)?$"_pcre.match("zxy"sv));
 
@@ -46,12 +46,12 @@ static_assert("^def$"_pcre.match("def"sv));
 static_assert(!"a^"_pcre.match("a"sv));
 static_assert(!"$a"_pcre.match("a"sv));
 
-static_assert("a+?"_pcre.match("aaax"sv));
-static_assert("a+?"_pcre.match("ax"sv));
+static_assert("a+?"_pcre.search("aaax"sv));
+static_assert("a+?"_pcre.search("ax"sv));
 static_assert(!"a+?"_pcre.match("x"sv));
 
-static_assert("a++"_pcre.match("aaax"sv));
-static_assert("a++"_pcre.match("ax"sv));
+static_assert("a++"_pcre.search("aaax"sv));
+static_assert("a++"_pcre.search("ax"sv));
 static_assert(!"a++"_pcre.match("x"sv));
 
 static_assert("a*?x"_pcre.match("aaax"sv));
@@ -78,7 +78,7 @@ static_assert("a{3,}x"_pcre.match("aaax"sv));
 static_assert("a{3,}x"_pcre.match("aaaax"sv));
 
 static_assert("^a{5}"_pcre.match("aaaaa"sv));
-static_assert("^a{5}"_pcre.match("aaaaaa"sv));
+static_assert("^a{5}"_pcre.search("aaaaaa"sv));
 static_assert(!"^a{5}$"_pcre.match("aaaaaa"sv));
 
 static_assert("a*"_pcre.match("aaa"sv));
@@ -119,9 +119,9 @@ static_assert("(?<name>abc)+"_pcre.match("abcabc"sv));
 static_assert("(?<name>abc)+"_pcre.match("abcabcabc"sv));
 static_assert(!"(?<name>abc)+"_pcre.match("name"sv));
 
-static_assert(std::string_view{"^([a-z]+)"_pcre.match("abcdef1234"sv)} == "abcdef"sv);
+static_assert(std::string_view{"^([a-z]+)"_pcre.search("abcdef1234"sv)} == "abcdef"sv);
 static_assert(std::string_view{"^([a-z]+)1234"_pcre.match("abcdef1234"sv)} == "abcdef1234"sv);
-static_assert(std::string_view{"^([a-z])"_pcre.match("abcdef1234"sv)} == "a"sv);
+static_assert(std::string_view{"^([a-z])"_pcre.search("abcdef1234"sv)} == "a"sv);
 
 static_assert("^([0-9]+[a-z]+)+"_pcre.match("123abc456def"sv));
 static_assert("^([0-9]+[a-z]+)+"_pcre.match("123abc456def"sv).template get<1>() == "456def"sv);
@@ -131,9 +131,9 @@ static_assert("^([0-9]++[a-z]++)+"_pcre.match("123abc456def"sv));
 static_assert("^([0-9]++[a-z]++)+"_pcre.match("123abc456def"sv).template get<1>() == "456def"sv);
 static_assert("^([0-9]++[a-z]++)+"_pcre.match("123abc456def"sv).template get<0>() == "123abc456def"sv);
 
-static_assert("^([0-9]+?[a-z]+?)+"_pcre.match("123abc456def"sv));
-static_assert("^([0-9]+?[a-z]+?)+"_pcre.match("123abc456def"sv).template get<1>() == "123a"sv);
-static_assert("^([0-9]+?[a-z]+?)+"_pcre.match("123abc456def"sv).template get<0>() == "123a"sv);
+static_assert("^([0-9]+?[a-z]+?)+"_pcre.search("123abc456def"sv));
+static_assert("^([0-9]+?[a-z]+?)+"_pcre.search("123abc456def"sv).template get<1>() == "123a"sv);
+static_assert("^([0-9]+?[a-z]+?)+"_pcre.search("123abc456def"sv).template get<0>() == "123a"sv);
 
 static_assert("^([0-9]+?[a-z]++)+"_pcre.match("123abc456def"sv));
 static_assert("^([0-9]+?[a-z]++)+"_pcre.match("123abc456def"sv).template get<1>() == "456def"sv);