From 86d11c73f637f5e858ecb84fe6dfb90281f266a9 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 18 Jan 2015 13:28:15 +0100
Subject: Allowing to override location when logging exceptions.

---
 src/core/common/Logger.hpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/core/common')

diff --git a/src/core/common/Logger.hpp b/src/core/common/Logger.hpp
index b365a39..767d8ab 100644
--- a/src/core/common/Logger.hpp
+++ b/src/core/common/Logger.hpp
@@ -242,6 +242,16 @@ public:
 		log(Severity::ERROR, ex.msg, ex.getLocation());
 	}
 
+	/**
+	 * Logs the given loggable exception at the given location.
+	 *
+	 * @param ex is the exception that should be logged.
+	 */
+	void log(const LoggableException &ex, const SourceLocation &loc)
+	{
+		log(Severity::ERROR, ex.msg, loc.valid() ? loc : ex.getLocation());
+	}
+
 	/**
 	 * Logs the given message. The file name is set to the topmost file name on
 	 * the file name stack.
-- 
cgit v1.2.3


From 89e0b786d01246d1e8e57cc5da855372e27e7b63 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 18 Jan 2015 13:28:36 +0100
Subject: Added function for parsing complete strings (as needed in the xml
 parser)

---
 src/core/common/VariantReader.cpp | 16 +++++++++++++++-
 src/core/common/VariantReader.hpp | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'src/core/common')

diff --git a/src/core/common/VariantReader.cpp b/src/core/common/VariantReader.cpp
index faad40c..bded618 100644
--- a/src/core/common/VariantReader.cpp
+++ b/src/core/common/VariantReader.cpp
@@ -618,8 +618,22 @@ std::pair<bool, Variant> VariantReader::parseGenericToken(
 		v.setMagic(res.second.c_str());
 		return std::make_pair(res.first, v);
 	} else {
-		return std::make_pair(res.first, Variant{res.second.c_str()});
+		return std::make_pair(res.first, Variant::fromString(res.second));
 	}
 }
+
+std::pair<bool, Variant> VariantReader::parseGenericString(
+    const std::string &str, Logger &logger)
+{
+	CharReader reader{str};
+	LoggerFork loggerFork = logger.fork();
+	std::pair<bool, Variant> res =
+	    parseGenericToken(reader, loggerFork, std::unordered_set<char>{}, true);
+	if (reader.atEnd()) {
+		loggerFork.commit();
+		return res;
+	}
+	return std::make_pair(true, Variant::fromString(str));
+}
 }
 
diff --git a/src/core/common/VariantReader.hpp b/src/core/common/VariantReader.hpp
index abf529c..8aaffd8 100644
--- a/src/core/common/VariantReader.hpp
+++ b/src/core/common/VariantReader.hpp
@@ -229,6 +229,26 @@ public:
 	    CharReader &reader, Logger &logger,
 	    const std::unordered_set<char> &delims,
 	    bool extractUnescapedStrings = false);
+
+	/**
+	 * Tries to parse the most specific item from the given string. The
+	 * resulting variant represents the value that has been read. If the end of
+	 * the string was not reached while parsing an element, the result is
+	 * returned as string.
+	 *
+	 * @param str is the string from which the value should be read.
+	 * @param logger is the logger instance to which errors or warnings will be
+	 * written.
+	 * @return a pair indicating whether the operation was successful and the
+	 * extracted variant value. Note that the variant value most times contains
+	 * some meaningful data that can be worked with even if the operation was
+	 * not successful (e.g. if a syntax error is encountered while reading an
+	 * array, the successfully read elements will still be in the returned
+	 * variant.) Information on why the operation has failed is passed to the
+	 * logger.
+	 */
+	static std::pair<bool, Variant> parseGenericString(
+	    const std::string &str, Logger &logger);
 };
 }
 
-- 
cgit v1.2.3


From f723034fe9769ac4e482194b96d59be8e6ad0b11 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 18 Jan 2015 13:45:01 +0100
Subject: Fixed bug in VariantReader::parseGenericToken when a number is at the
 beginning of the string

---
 src/core/common/VariantReader.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/common')

diff --git a/src/core/common/VariantReader.cpp b/src/core/common/VariantReader.cpp
index bded618..600fd9b 100644
--- a/src/core/common/VariantReader.cpp
+++ b/src/core/common/VariantReader.cpp
@@ -583,6 +583,7 @@ std::pair<bool, Variant> VariantReader::parseGenericToken(
 				return std::make_pair(true, n.doubleValue());
 			}
 		}
+		reader.resetPeek();
 	}
 
 	// Try to parse an object
-- 
cgit v1.2.3