Merge branch 'master' of somweyr.de:ousia

1 files changed, 88 insertions, 0 deletions

diff --git a/src/core/Logger.hpp b/src/core/Logger.hpp
index a30374c..fd7bb08 100644
--- a/src/core/Logger.hpp
+++ b/src/core/Logger.hpp
@@ -241,6 +241,23 @@ public:
 	}
 
 	/**
+	 * Logs the given message. The file name is set to the topmost file name on
+	 * the file name stack.
+	 *
+	 * @param severity is the severity of the log message.
+	 * @param msg is the actual log message.
+	 * @param pos is a const reference to a variable which provides position
+	 * information.
+	 * @tparam PosType is the actual type of pos and must implement a getLine
+	 * and getColumn function.
+	 */
+	template<class PosType>
+	void logAt(Severity severity, const std::string &msg, const PosType &pos)
+	{
+		log(severity, msg, pos.getLine(), pos.getColumn());
+	}
+
+	/**
 	 * Logs the given loggable exception.
 	 *
 	 * @param ex is the exception that should be logged.
@@ -283,6 +300,21 @@ public:
 	}
 
 	/**
+	 * Logs a debug message. The file name is set to the topmost file name on
+	 * the file name stack.
+	 *
+	 * @param severity is the severity of the log message.
+	 * @param msg is the actual log message.
+	 * @param pos is a const reference to a variable which provides position
+	 * information.
+	 */
+	template<class PosType>
+	void debugAt(const std::string &msg, const PosType &pos)
+	{
+		debug(msg, pos.getLine(), pos.getColumn());
+	}
+
+	/**
 	 * Logs a note. The file name is set to the topmost file name on
 	 * the file name stack.
 	 *
@@ -314,6 +346,20 @@ public:
 	}
 
 	/**
+	 * Logs a note. The file name is set to the topmost file name on
+	 * the file name stack.
+	 *
+	 * @param msg is the actual log message.
+	 * @param pos is a const reference to a variable which provides position
+	 * information.
+	 */
+	template<class PosType>
+	void noteAt(const std::string &msg, const PosType &pos)
+	{
+		note(msg, pos.getLine(), pos.getColumn());
+	}
+
+	/**
 	 * Logs a warning. The file name is set to the topmost file name on
 	 * the file name stack.
 	 *
@@ -334,6 +380,20 @@ public:
 	 * the file name stack.
 	 *
 	 * @param msg is the actual log message.
+	 * @param pos is a const reference to a variable which provides position
+	 * information.
+	 */
+	template<class PosType>
+	void warningAt(const std::string &msg, const PosType &pos)
+	{
+		warning(msg, pos.getLine(), pos.getColumn());
+	}
+
+	/**
+	 * Logs a warning. The file name is set to the topmost file name on
+	 * the file name stack.
+	 *
+	 * @param msg is the actual log message.
 	 * @param line is the line in the above file at which the error occured.
 	 * Ignored if negative.
 	 * @param column is the column in the above file at which the error occured.
@@ -376,6 +436,20 @@ public:
 	}
 
 	/**
+	 * Logs an error message. The file name is set to the topmost file name on
+	 * the file name stack.
+	 *
+	 * @param msg is the actual log message.
+	 * @param pos is a const reference to a variable which provides position
+	 * information.
+	 */
+	template<class PosType>
+	void errorAt(const std::string &msg, const PosType &pos)
+	{
+		error(msg, pos.getLine(), pos.getColumn());
+	}
+
+	/**
 	 * Logs a fatal error. The file name is set to the topmost file name on
 	 * the file name stack.
 	 *
@@ -407,6 +481,20 @@ public:
 	}
 
 	/**
+	 * Logs a fatal error. The file name is set to the topmost file name on
+	 * the file name stack.
+	 *
+	 * @param msg is the actual log message.
+	 * @param pos is a const reference to a variable which provides position
+	 * information.
+	 */
+	template<class PosType>
+	void fatalErrorAt(const std::string &msg, const PosType &pos)
+	{
+		fatalError(msg, pos.getLine(), pos.getColumn());
+	}
+
+	/**
 	 * Pushes a new file name onto the internal filename stack.
 	 *
 	 * @param name is the name of the file that should be added to the filename