post merging

Author: Hana Dusíková

Makefile

@@ -2,7 +2,7 @@
 
 default: all
 
-TARGETS := a.cpp result.cpp test.cpp $(wildcard tests/benchmark-exec/*.cpp)
+TARGETS := result.cpp test.cpp $(wildcard tests/benchmark-exec/*.cpp)
 IGNORE := $(wildcard tests/benchmark/*.cpp) $(wildcard tests/benchmark-exec/*.cpp)
 
 DESATOMAT := /www/root/desatomat/console/desatomat.php

clang-bench.txt

@@ -6,6 +6,8 @@
 #include "grammars.hpp"
 #include "actions.hpp"
 
+#include <limits>
+
 namespace ctll {
 
 
@@ -59,7 +61,13 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 
 	template <size_t Pos> static constexpr auto get_current_term() noexcept {
 		if constexpr (Pos < input.size()) {
-			return term<input[Pos]>{};
+			constexpr auto value = input[Pos];
+			if constexpr (value <= std::numeric_limits<char>::max()) {
+				return term<static_cast<char>(value)>{};
+			} else {
+				return term<input[Pos]>{};
+			}
+			
 		} else {
 			// return epsilon if we are past the input
 			return epsilon{};
@@ -70,7 +78,12 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 			// there is no previous character on input if we are on start
 			return epsilon{};
 		} else if constexpr ((Pos-1) < input.size()) {
-			return term<input[Pos-1]>{};
+			constexpr auto value = input[Pos-1];
+			if constexpr (value <= std::numeric_limits<char>::max()) {
+				return term<static_cast<char>(value)>{};
+			} else {
+				return term<input[Pos]>{};
+			}
 		} else {
 			return epsilon{};
 		}
@@ -96,7 +109,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	}
 	// if rule is string => push it to the front of stack
 	template <size_t Pos, typename... Content, typename Terminal, typename Stack, typename Subject>
-	static constexpr auto move(ctll::list<Content...> string, Terminal, Stack stack, Subject subject) noexcept {
+	static constexpr auto move(push<Content...> string, Terminal, Stack stack, Subject subject) noexcept {
 		return decide<Pos>(push_front(string, stack), subject);
 	}
 	// if rule is epsilon (empty string) => continue
@@ -107,7 +120,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	// if rule is string with current character at the beginning (term<V>) => move to next character 
 	// and push string without the character (quick LL(1))
 	template <size_t Pos, auto V, typename... Content, typename Stack, typename Subject>
-	static constexpr auto move(ctll::list<term<V>, Content...>, term<V>, Stack stack, Subject) noexcept {
+	static constexpr auto move(push<term<V>, Content...>, term<V>, Stack stack, Subject) noexcept {
 		#ifdef EXPERIMENTAL_GCC_9
 		return decide<Pos+1>(push_front(list<Content...>(), stack), Subject());
 		#else
@@ -117,7 +130,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	// if rule is string with any character at the beginning (compatible with current term<T>) => move to next character 
 	// and push string without the character (quick LL(1))
 	template <size_t Pos, auto V, typename... Content, auto T, typename Stack, typename Subject>
-	static constexpr auto move(ctll::list<anything, Content...>, term<T>, Stack stack, Subject) noexcept {
+	static constexpr auto move(ctll::push<anything, Content...>, term<T>, Stack stack, Subject) noexcept {
 		#ifdef EXPERIMENTAL_GCC_9
 		return decide<Pos+1>(push_front(list<Content...>(), stack), Subject());
 		#else

include/ctll/parser.hpp

@@ -19,18 +19,21 @@ template <typename CharT, CharT... input> static inline constexpr auto _fixed_st
 
 namespace literals {
 
+// clang and GCC <9 supports LITERALS with packs
+
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template"
-
 #define CTRE_ENABLE_LITERALS
 #endif
 
 #ifdef __INTEL_COMPILER
 // not enable literals
 #elif defined __GNUC__
+#ifndef EXPERIMENTAL_GCC_9
 #define CTRE_ENABLE_LITERALS
 #endif
+#endif
 
 #ifdef CTRE_ENABLE_LITERALS
 
@@ -101,18 +104,6 @@ template <ctll::basic_fixed_string input> CTRE_FLATTEN constexpr CTRE_FORCE_INLI
 }
 
 
-#if !__cpp_nontype_template_parameter_class
-template <typename CharT, CharT... charpack> CTRE_FLATTEN constexpr inline auto operator""_simple_test() noexcept {
-	constexpr auto & _input = _fixed_string_reference<CharT, charpack...>;
-#else
-template <ctll::basic_fixed_string input> CTRE_FLATTEN constexpr inline auto operator""_simple_test() noexcept {
-	constexpr auto _input = input; // workaround for GCC 9 bug 88092
-#endif
-	return ctll::parser<ctre::simple, _input>::correct;
-}
-
-#endif
-#endif
 #endif
 
 #ifdef __clang__

include/ctre/literals.hpp

@@ -1,6 +1,8 @@
 #include <ctre.hpp>
 #include <string_view>
 
+#ifndef EXPERIMENTAL_GCC_9
+
 using namespace ctre::literals;
 using namespace ctre::test_literals;
 using namespace std::string_view_literals;
@@ -230,4 +232,4 @@ static_assert(!"(?!.*(.)\\g{1})[a-z]+"_ctre.match("abcdeefgh"sv));
 
 
 
-
+#endif

a.cpp renamed to tests/cnttp.cpp

@@ -1,6 +1,8 @@
 #include <ctre.hpp>
 #include <string_view>
 
+#ifndef EXPERIMENTAL_GCC_9
+
 using namespace ctre::literals;
 using namespace ctre::test_literals;
 using namespace std::string_view_literals;
@@ -195,7 +197,7 @@ TEST_MATCH(112, "\\[\\]", "[]");
 
 
 
-
+#endif
 
 
 

tests/matching2.cpp

@@ -1,6 +1,6 @@
 #include <ctre.hpp>
 
-static constexpr auto Pattern = ctll::basic_fixed_string{ LR"(^(\S+;\d+)\s+(\d+|\d+/\d+)?\s+((\d{1,2})-([A-Z]{3,3})-(\d{4,4})\s+(\d{1,2}):(\d{2,2})(:(\d{2,2})(\.\d{2,2})?)?(\s+\[(\S+),(\S+)\]\s+\(([A-Z]*),([A-Z]*),([A-Z]*),([A-Z]*)\))?)?)" };
+static constexpr auto Pattern = ctll::basic_fixed_string{ L"[a-z]+" };
 
 int main()
 {