Merge commit '4dba519e4534416dfff885b61720e43572cc7260'

Author: Hana Dusíková

include/ctre/atoms_characters.hpp

@@ -39,77 +39,38 @@ template <typename... Content> struct set {
 	}
 };
 
+template <auto... Cs> struct enumeration : set<character<Cs>...> { };
+
 template <typename... Content> struct negate {
 	template <typename CharT> inline static constexpr bool match_char(CharT value) noexcept {
 		return !(Content::match_char(value) || ... || false);
 	}
 };
 
-// I know word_chars and others can be expressed with set<> and range<>, but this makes the regex bad readable when debugging, please keep this in mind when touching this code in future :)
-
-struct word_chars {
+template <auto A, auto B> struct char_range {
 	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= 'A' && value <= 'Z') || (value >= 'a' && value <= 'z') || (value >= '0' && value <= '9') || (value == '_');
+		return (value >= A) && (value <= B);
 	}
 };
 
-struct space_chars {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return value == ' ' || value == '\t' || value == '\n' || value == '\v' || value == '\f' || value == '\r';
-	}
-};
+struct word_chars : set<char_range<'A','Z'>, char_range<'a','z'>, char_range<'0','9'>, character<'_'> > { };
 
-struct alphanum_chars {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= 'A' && value <= 'Z') || (value >= 'a' && value <= 'z') || (value >= '0' && value <= '9');
-	}
-};
+struct space_chars : enumeration<' ', '\t', '\n', '\v', '\f', '\r'> {};
 
-struct alpha_chars {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= 'A' && value <= 'Z') || (value >= 'a' && value <= 'z');
-	}
-};
+struct alphanum_chars : set<char_range<'A','Z'>, char_range<'a','z'>, char_range<'0','9'> > { };
 
-struct xdigit_chars {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= 'A' && value <= 'F') || (value >= 'a' && value <= 'f') || (value >= '0' && value <= '9');
-	}
-};
+struct alpha_chars : set<char_range<'A','Z'>, char_range<'a','z'> > { };
 
-struct punct_chars {
-	template <typename CharT> inline static constexpr bool match_char(CharT value) noexcept {
-		return value == '!' || value == '"' || value == '#' || value == '$' || value == '%'
-			|| value == '&' || value == '\''|| value == '(' || value == ')' || value == '*' || value == ','
-			|| value == '-' || value == '.' || value == '/' || value == ':' || value == ';'
-			|| value == '<' || value == '=' || value == '>' || value == '?' || value == '@' || value == '['
-			|| value == '\\'|| value == ']' || value == '^' || value == '_' || value == '`'
-			|| value == '{' || value == '|' || value == '}' || value == '~';
-	}
-};
+struct xdigit_chars : set<char_range<'A','F'>, char_range<'a','f'>, char_range<'0','9'> > { };
 
-struct digit_chars {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= '0' && value <= '9');
-	}
-};
+struct punct_chars
+    : enumeration<'!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', ',', '-',
+		  '.', '/', ':', ';', '<', '=', '>', '?', '@', '[', '\\', ']',
+		  '^', '_', '`', '{', '|', '}', '~'> {};
 
-struct ascii_chars {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= '\x00' && value <= '\x7F');
-	}
-};
+struct digit_chars : char_range<'0','9'> { };
 
-template <auto A, auto B> struct char_range {
-	template <typename CharT> CTRE_FORCE_INLINE static constexpr bool match_char(CharT value) noexcept {
-		return (value >= A) && (value <= B);
-	}
-};
-template <auto... Cs> struct enumeration {
-	template <typename CharT> inline static constexpr bool match_char(CharT value) noexcept {
-		return ((value == Cs) || ... || false);
-	}
-};
+struct ascii_chars : char_range<'\x00','\x7F'> { };
 
 }
 

include/ctre/return_type.hpp

@@ -53,7 +53,11 @@ template <size_t Id, typename Name = void> struct captured_content {
 		constexpr CTRE_FORCE_INLINE operator bool() const noexcept {
 			return _matched;
 		}
-		
+
+		constexpr CTRE_FORCE_INLINE auto size() const noexcept {
+			return static_cast<size_t>(std::distance(_begin, _end));
+		}
+
 		constexpr CTRE_FORCE_INLINE auto to_view() const noexcept {
 			return std::basic_string_view<char_type>(&*_begin, static_cast<size_t>(std::distance(_begin, _end)));
 		}
@@ -215,4 +219,4 @@ namespace std {
 	};
 }
 
-#endif
+#endif