add str() and view() ... also add missing update in single-header

Author: Hana Dusíková

include/ctre/return_type.hpp

@@ -67,6 +67,14 @@ template <size_t Id, typename Name = void> struct captured_content {
 			return std::basic_string<char_type>(begin(), end());
 		}
 
+		constexpr CTRE_FORCE_INLINE auto view() const noexcept {
+			return std::basic_string_view<char_type>(&*_begin, static_cast<size_t>(std::distance(_begin, _end)));
+		}
+		
+		constexpr CTRE_FORCE_INLINE auto str() const noexcept {
+			return std::basic_string<char_type>(begin(), end());
+		}
+		
 		constexpr CTRE_FORCE_INLINE operator std::basic_string_view<char_type>() const noexcept {
 			return to_view();
 		}
@@ -247,6 +255,14 @@ template <typename Iterator, typename... Captures> class regex_results {
 		return _captures.template select<0>().to_string();
 	}
 
+	constexpr CTRE_FORCE_INLINE auto view() const noexcept {
+		return _captures.template select<0>().view();
+	}
+	
+	constexpr CTRE_FORCE_INLINE auto str() const noexcept {
+		return _captures.template select<0>().to_string();
+	}
+	
 	constexpr CTRE_FORCE_INLINE regex_results & set_start_mark(Iterator pos) noexcept {
 		_captures.template select<0>().set_start(pos);
 		return *this;

single-header/ctre.hpp

@@ -1057,9 +1057,8 @@ struct pcre {
 	static constexpr auto rule(c, ctll::term<'\\'>) -> ctll::push<ctll::anything, e, set_start, set2b, set_make, ctll::term<']'>>;
 	static constexpr auto rule(c, ctll::set<'!','$','\x28','\x29','*','+',',','.',':','<','=','>','?','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','0','s','t','u','v','w','x','y','z','\x7B','\x7D','1','2','3','4','5','6','7','8','9'>) -> ctll::push<ctll::anything, push_character, range, set_start, set2b, set_make, ctll::term<']'>>;
 	static constexpr auto rule(c, _others) -> ctll::push<ctll::anything, push_character, range, set_start, set2b, set_make, ctll::term<']'>>;
-	static constexpr auto rule(c, ctll::term<'-'>) -> ctll::push<ctll::anything, push_character, set_start, set2b, set_make, ctll::term<']'>>;
 	static constexpr auto rule(c, ctll::term<'^'>) -> ctll::push<ctll::anything, set2a, set_make_negative, ctll::term<']'>>;
-	static constexpr auto rule(c, ctll::set<']','|'>) -> ctll::reject;
+	static constexpr auto rule(c, ctll::set<'-',']','|'>) -> ctll::reject;
 
 	static constexpr auto rule(class_named_name, ctll::term<'x'>) -> ctll::push<ctll::anything, ctll::term<'d'>, ctll::term<'i'>, ctll::term<'g'>, ctll::term<'i'>, ctll::term<'t'>, class_named_xdigit>;
 	static constexpr auto rule(class_named_name, ctll::term<'d'>) -> ctll::push<ctll::anything, ctll::term<'i'>, ctll::term<'g'>, ctll::term<'i'>, ctll::term<'t'>, class_named_digit>;
@@ -2264,6 +2263,14 @@ template <size_t Id, typename Name = void> struct captured_content {
 			return std::basic_string<char_type>(begin(), end());
 		}
 
+		constexpr CTRE_FORCE_INLINE auto view() const noexcept {
+			return std::basic_string_view<char_type>(&*_begin, static_cast<size_t>(std::distance(_begin, _end)));
+		}
+		
+		constexpr CTRE_FORCE_INLINE auto str() const noexcept {
+			return std::basic_string<char_type>(begin(), end());
+		}
+		
 		constexpr CTRE_FORCE_INLINE operator std::basic_string_view<char_type>() const noexcept {
 			return to_view();
 		}
@@ -2444,6 +2451,14 @@ template <typename Iterator, typename... Captures> class regex_results {
 		return _captures.template select<0>().to_string();
 	}
 
+	constexpr CTRE_FORCE_INLINE auto view() const noexcept {
+		return _captures.template select<0>().view();
+	}
+	
+	constexpr CTRE_FORCE_INLINE auto str() const noexcept {
+		return _captures.template select<0>().to_string();
+	}
+	
 	constexpr CTRE_FORCE_INLINE regex_results & set_start_mark(Iterator pos) noexcept {
 		_captures.template select<0>().set_start(pos);
 		return *this;