cleaning

Author: Hana Dusíková

include/ctll/actions.hpp

@@ -2,26 +2,28 @@
 #define CTLL__ACTIONS__HPP
 
 namespace ctll {
+	struct empty_subject { };
+	
 	struct empty_actions {
 		// dummy operator so using Actions::operator() later will not give error
 		template <typename Action, typename InputSymbol, typename Subject> static constexpr auto apply(Action, InputSymbol, Subject subject) {
 			return subject;
 		}
 	};
 
+	template <typename Actions> struct identity: public Actions {
+		using Actions::apply;
+		// allow empty_subject to exists
+		template <typename Action, auto V> constexpr static auto apply(Action, term<V>, empty_subject) -> empty_subject { return {}; }
+		template <typename Action> constexpr static auto apply(Action, epsilon, empty_subject) -> empty_subject { return {}; }	
+	};
 
-	template <bool IgnoreUnknown, typename Actions> struct augment_actions: public Actions {
+	template <typename Actions> struct ignore_unknown: public Actions {
 		using Actions::apply;
 		// allow flow thru unknown actions
 		template <typename Action, auto V, typename Subject> constexpr static auto apply(Action, term<V>, Subject) -> Subject { return {}; }
 		template <typename Action, typename Subject> constexpr static auto apply(Action, epsilon, Subject) -> Subject { return {}; }	
 	};
-	
-	template <typename Actions> struct augment_actions<false, Actions>: public Actions {
-		using Actions::apply;
-		// will fail if unknown action is called
-		constexpr static auto apply(...) = delete;
-	};
 }
 
 #endif

include/ctll/parser.hpp

@@ -7,8 +7,7 @@
 #include "actions.hpp"
 
 namespace ctll {
-	
-struct empty_subject { };
+
 
 enum class decision {
 	reject,
@@ -17,12 +16,12 @@ enum class decision {
 };
 
 #if !__cpp_nontype_template_parameter_class
-template <typename Grammar, const auto & input, typename ActionSelector = empty_actions, bool IngoreUnknownActions = false> struct parser {
+template <typename Grammar, const auto & input, typename ActionSelector = empty_actions, bool IgnoreUnknownActions = false> struct parser {
 #else
-template <typename Grammar, basic_fixed_string input, typename ActionSelector = empty_actions, bool IngoreUnknownActions = true> struct parser { // in c++20
+template <typename Grammar, basic_fixed_string input, typename ActionSelector = empty_actions, bool IgnoreUnknownActions = true> struct parser { // in c++20
 #endif
+	using Actions = ctll::conditional<IgnoreUnknownActions, ignore_unknown<ActionSelector>, identity<ActionSelector>>;
 	static inline constexpr auto grammar = augment_grammar<Grammar>();
-	static inline constexpr auto select_action = augment_actions<IngoreUnknownActions, ActionSelector>();
 
 	template <size_t Pos, typename Stack = void, typename Subject = void, decision Decision = decision::undecided> struct seed;
 
@@ -92,7 +91,7 @@ template <typename Grammar, basic_fixed_string input, typename ActionSelector =
 
 		// in case top_symbol is action type (apply it on previous subject and get new one)
 		if constexpr (std::is_base_of_v<ctll::action, decltype(top_symbol)>) {
-			auto subject = select_action.apply(top_symbol, get_previous_term<Pos>(), previous_subject);
+			auto subject = Actions::apply(top_symbol, get_previous_term<Pos>(), previous_subject);
 
 			// in case that semantic action is error => reject input
 			if constexpr (std::is_same_v<ctll::reject, decltype(subject)>) {

include/ctre/return_type.hpp

@@ -52,7 +52,7 @@ template <size_t Id, typename Name = void> struct captured_content {
 		}
 
 		constexpr CTRE_FORCE_INLINE auto to_view() const noexcept {
-			return std::basic_string_view{_begin, static_cast<size_t>(std::distance(_begin, _end))};
+			return std::string_view{_begin, static_cast<size_t>(std::distance(_begin, _end))};
 		}
 
 		constexpr operator std::string_view() const noexcept {
@@ -163,15 +163,15 @@ template <typename Iterator, typename... Captures> struct regex_results {
 	constexpr CTRE_FORCE_INLINE operator bool() const noexcept {
 		return bool(_captures.template select<0>());
 	}
-	
-	using string_view_type = decltype(_captures.template select<0>().to_view());
-	
+
 	constexpr operator std::string_view() const noexcept {
 		return to_view();
 	}
+	
 	constexpr auto to_view() const noexcept {
 		return _captures.template select<0>().to_view();
 	}
+	
 	constexpr CTRE_FORCE_INLINE regex_results & set_start_mark(Iterator pos) noexcept {
 		_captures.template select<0>().set_start(pos);
 		return *this;

include/ctre/wrapper.hpp

@@ -31,6 +31,7 @@ template <typename RE> struct regular_expression {
 	template <typename IteratorBegin, typename IteratorEnd> constexpr CTRE_FORCE_INLINE static auto search_2(IteratorBegin begin, IteratorEnd end) noexcept {
 		return search_re(begin, end, RE());
 	}
+	constexpr CTRE_FORCE_INLINE regular_expression() noexcept { };
 	constexpr CTRE_FORCE_INLINE regular_expression(RE) noexcept { };
 	template <typename Iterator> constexpr CTRE_FORCE_INLINE static auto match(Iterator begin, Iterator end) noexcept {
 		return match_re(begin, end, RE());