From f7d20e142adc3fcab9ce528c58ee2f70f5802d10 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Wed, 28 Jan 2015 03:30:26 +0100
Subject: Printing error messages for deferred resolution at the correct
 location

---
 src/core/parser/ParserScope.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/core/parser/ParserScope.cpp')

diff --git a/src/core/parser/ParserScope.cpp b/src/core/parser/ParserScope.cpp
index 3d1ba78..2bacf10 100644
--- a/src/core/parser/ParserScope.cpp
+++ b/src/core/parser/ParserScope.cpp
@@ -78,7 +78,9 @@ bool DeferredResolution::resolve(Logger &logger)
 	Rooted<Node> res = scope.resolve(path, type, logger);
 	if (res != nullptr) {
 		try {
-			resultCallback(res, logger);
+			// Push the location onto the logger default location stack
+			GuardedLogger localLogger(logger, location);
+			resultCallback(res, localLogger);
 		}
 		catch (LoggableException ex) {
 			logger.log(ex);
-- 
cgit v1.2.3