From 4c8cf263e280bd1e59241b7a783d61e6621a2c5e Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Fri, 13 Feb 2015 11:34:24 +0100
Subject: added VariantReader::parseBool

---
 src/core/common/VariantReader.cpp      | 30 ++++++++++++++++++++
 src/core/common/VariantReader.hpp      | 13 +++++++++
 test/core/common/VariantReaderTest.cpp | 50 +++++++++++++++++++++++++++++++++-
 3 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/src/core/common/VariantReader.cpp b/src/core/common/VariantReader.cpp
index ef71740..d9e340f 100644
--- a/src/core/common/VariantReader.cpp
+++ b/src/core/common/VariantReader.cpp
@@ -485,6 +485,36 @@ std::pair<bool, std::string> VariantReader::parseUnescapedString(
 	return std::make_pair(true, res.str());
 }
 
+std::pair<bool, Variant::boolType> VariantReader::parseBool(
+    CharReader &reader, Logger &logger)
+{
+	// first we consume all whitespaces.
+	reader.consumePeek();
+	reader.consumeWhitespace();
+	// then we try to find the words "true" or "false".
+
+	bool val = false;
+	CharReaderFork readerFork = reader.fork();
+	LoggerFork loggerFork = logger.fork();
+	auto res = parseToken(readerFork, loggerFork, {});
+	if (res.first) {
+		bool valid = false;
+		if (res.second == "true") {
+			val = true;
+			valid = true;
+		} else if (res.second == "false") {
+			val = false;
+			valid = true;
+		}
+		if (valid) {
+			readerFork.commit();
+			loggerFork.commit();
+			return std::make_pair(true, val);
+		}
+	}
+	return std::make_pair(false, val);
+}
+
 std::pair<bool, int64_t> VariantReader::parseInteger(
     CharReader &reader, Logger &logger, const std::unordered_set<char> &delims)
 {
diff --git a/src/core/common/VariantReader.hpp b/src/core/common/VariantReader.hpp
index 6b157d8..6a87723 100644
--- a/src/core/common/VariantReader.hpp
+++ b/src/core/common/VariantReader.hpp
@@ -132,6 +132,19 @@ public:
 	    CharReader &reader, Logger &logger,
 	    const std::unordered_set<char> &delims);
 
+	/**
+	 * Parses a bool from the given CharReader instance (the strings "true" or
+	 * "false").
+	 *
+	 * @param reader is a reference to the CharReader instance which is
+	 * the source for the character data. The reader will be positioned after
+	 * the bool.
+	 * @param logger is the logger instance that should be used to log error
+	 * messages and warnings.
+	 */
+	static std::pair<bool, Variant::boolType> parseBool(CharReader &reader,
+	                                                    Logger &logger);
+
 	/**
 	 * Parses an integer from the given CharReader instance until one of the
 	 * given delimiter characters is reached.
diff --git a/test/core/common/VariantReaderTest.cpp b/test/core/common/VariantReaderTest.cpp
index f6a699b..7a688c5 100644
--- a/test/core/common/VariantReaderTest.cpp
+++ b/test/core/common/VariantReaderTest.cpp
@@ -205,7 +205,7 @@ TEST(VariantReader, parseUnescapedString)
 
 	// Simple case with whitespace
 	{
-		CharReader reader("    hello world   ;    ");
+		CharReader reader("    hello world   ;    aha");
 		auto res = VariantReader::parseUnescapedString(reader, logger, {';'});
 		ASSERT_TRUE(res.first);
 		ASSERT_EQ("hello world", res.second);
@@ -228,6 +228,54 @@ TEST(VariantReader, parseUnescapedString)
 	}
 }
 
+TEST(VariantReader, parseBool)
+{
+	// Valid bools
+	{
+		CharReader reader("   true   ");
+		auto res = VariantReader::parseBool(reader, logger);
+		ASSERT_TRUE(res.first);
+		ASSERT_TRUE(res.second);
+	}
+	{
+		CharReader reader("   false   ");
+		auto res = VariantReader::parseBool(reader, logger);
+		ASSERT_TRUE(res.first);
+		ASSERT_FALSE(res.second);
+	}
+	{
+		CharReader reader("   true   bla");
+		auto res = VariantReader::parseBool(reader, logger);
+		ASSERT_TRUE(res.first);
+		ASSERT_TRUE(res.second);
+		reader.consumeWhitespace();
+		char c;
+		ASSERT_TRUE(reader.read(c));
+		ASSERT_EQ('b', c);
+		ASSERT_TRUE(reader.read(c));
+		ASSERT_EQ('l', c);
+		ASSERT_TRUE(reader.read(c));
+		ASSERT_EQ('a', c);
+		ASSERT_FALSE(reader.read(c));
+	}
+	// invalid bools.
+	{
+		CharReader reader("   bla   ");
+		auto res = VariantReader::parseBool(reader, logger);
+		ASSERT_FALSE(res.first);
+	}
+	{
+		CharReader reader("   TRUE   ");
+		auto res = VariantReader::parseBool(reader, logger);
+		ASSERT_FALSE(res.first);
+	}
+	{
+		CharReader reader("   tr ue   ");
+		auto res = VariantReader::parseBool(reader, logger);
+		ASSERT_FALSE(res.first);
+	}
+}
+
 static const std::unordered_set<char> noDelim;
 
 TEST(VariantReader, parseInteger)
-- 
cgit v1.2.3