Fix up QuotedString/CLFString parsing

Refactors CLFString in terms of QuotedString, but with the optional of
being null (nullopt)
Moves the whole decode function into QuotedString's parser, fixing
support for escaping of " which would otherwise prematurely end the
string in the middle.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/logTypes.hpp b/src/logTypes.hpp
index 7a78cc1..0262060 100644
--- a/src/logTypes.hpp
+++ b/src/logTypes.hpp
@@ -16,9 +16,9 @@ namespace WebStat {
 		bool operator<=>(const QueryString &) const = default;
 	};
 
-	struct CLFString : std::optional<std::string> {
-		using std::optional<std::string>::optional;
-		using std::optional<std::string>::operator=;
+	struct CLFString : std::optional<QuotedString> {
+		using std::optional<QuotedString>::optional;
+		using std::optional<QuotedString>::operator=;
 		bool operator<=>(const CLFString &) const = default;
 	};
 
@@ -49,7 +49,5 @@ namespace scn {
 
 	template<> struct scanner<WebStat::CLFString> : scanner<std::string, char> {
 		static scan_expected<typename ContextType::iterator> scan(WebStat::CLFString & value, ContextType & ctx);
-
-		static void decode(std::string &);
 	};
 }