Merge branch 'master' of somweyr.de:ousia

2 files changed, 24 insertions, 5 deletions

diff --git a/src/core/resource/ResourceManager.cpp b/src/core/resource/ResourceManager.cpp
index a5e76b0..184a16d 100644
--- a/src/core/resource/ResourceManager.cpp
+++ b/src/core/resource/ResourceManager.cpp
@@ -22,6 +22,7 @@
 #include <core/common/Exceptions.hpp>
 #include <core/common/Logger.hpp>
 #include <core/common/Rtti.hpp>
+#include <core/common/SourceContextReader.hpp>
 #include <core/common/Utils.hpp>
 #include <core/model/Node.hpp>
 #include <core/parser/ParserContext.hpp>
@@ -128,7 +129,7 @@ Rooted<Node> ResourceManager::parse(ParserContext &ctx, Resource &resource,
 	Rooted<Node> node;
 	try {
 		// Set the current source id in the logger instance
-		ScopedLogger logger(ctx.logger, SourceLocation{sourceId});
+		GuardedLogger logger(ctx.logger, SourceLocation{sourceId});
 
 		// Fetch the input stream and create a char reader
 		std::unique_ptr<std::istream> is = resource.stream();
@@ -280,5 +281,11 @@ SourceContext ResourceManager::readContext(const SourceLocation &location,
 	}
 	return SourceContext{};
 }
+
+SourceContext ResourceManager::readContext(const SourceLocation &location)
+{
+	return readContext(location, SourceContextReader::MAX_MAX_CONTEXT_LENGTH);
+}
+
 }
 
diff --git a/src/core/resource/ResourceManager.hpp b/src/core/resource/ResourceManager.hpp
index d5381b9..221e2cc 100644
--- a/src/core/resource/ResourceManager.hpp
+++ b/src/core/resource/ResourceManager.hpp
@@ -34,7 +34,6 @@
 
 #include <core/common/Location.hpp>
 #include <core/common/Rtti.hpp>
-#include <core/common/SourceContextReader.hpp>
 #include <core/managed/Managed.hpp>
 
 #include "Resource.hpp"
@@ -230,9 +229,22 @@ public:
 	 * @return a valid SourceContext if a valid SourceLocation was given or an
 	 * invalid SourceContext if the location is invalid.
 	 */
-	SourceContext readContext(
-	    const SourceLocation &location,
-	    size_t maxContextLength = SourceContextReader::MAX_MAX_CONTEXT_LENGTH);
+	SourceContext readContext(const SourceLocation &location,
+	                          size_t maxContextLength);
+	/**
+	 * Creates and returns a SourceContext structure containing information
+	 * about the given SourceLocation (such as line and column number). Throws
+	 * a LoggableException if an irrecoverable error occurs while looking up the
+	 * context (such as a no longer existing resource). Does not limit the
+	 * context length.
+	 *
+	 * @param location is the SourceLocation for which context information
+	 * should be retrieved. This method is used by the Logger class to print
+	 * pretty messages.
+	 * @return a valid SourceContext if a valid SourceLocation was given or an
+	 * invalid SourceContext if the location is invalid.
+	 */
+	SourceContext readContext(const SourceLocation &location);
 };
 }