X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FLog.hh;h=96585a1d5dc0041c7deea6b4027dd69eff9eb056;hb=4f62ce947db282f0bbf4d49b3aafb83d7cf51adc;hp=09130ed5010aeb535eef7abc09802d959494c98e;hpb=ca0f7bdfba63140dca0bd20586d31980f3938eb2;p=chaz%2Fyoink

diff --git a/src/Moof/Log.hh b/src/Moof/Log.hh
index 09130ed..96585a1 100644
--- a/src/Moof/Log.hh
+++ b/src/Moof/Log.hh
@@ -37,6 +37,7 @@
  */
 
 #include <cstdlib>		// exit
+#include <iostream>
 
 
 /**
@@ -44,79 +45,75 @@
  * @param X test to perform
  */
 
-#if ! NDEBUG
-#define ASSERT(X) if (!(X)) Mf::logError("false assertion at %s:%d, " #X, \
-		__FILE__, __LINE__), exit(1)
-#else
+#undef ASSERT
+
+#if NDEBUG
 #define ASSERT(X)
+#else
+#define ASSERT(X) if (!(X)) Mf::logError << \
+	"false assertion at " << __FILE__ << ":" << __LINE__ << ", " << #X, exit(1)
 #endif
 
 
 namespace Mf {
 
 
-/**
- * Possible values used for setting the log level using LogLevel().  Log
- * messages of lesser importance than the level specified are ignored.
- * @see LogLevel()
- */
-
-enum LogLevel
+class Log
 {
-	LOG_NONE		= -1,		///< Disable all logging.
-	LOG_ERROR		=  1,		///< Log only errors.
-	LOG_WARNING		=  2,		///< Log warnings and errors.
-	LOG_SCRIPT		=  3,		///< Log messages from Lua, too.
-	LOG_INFO		=  4,		///< Log info, warnings, errors.
-	LOG_DEBUG		=  5,		///< Log all messages.
-};
+public:
 
+	enum Level
+	{
+		NONE		= 0,		///< Disable all logging.
+		ERRORR		= 1,		///< Log only errors.
+		WARNING		= 2,		///< Log warnings and errors.
+		INFO		= 3,		///< Log everything.
+	};
 
-/**
- * Set and/or get the level of logs which will be logged.  If not called,
- * defaults to WARNING
- * @param level LOG_LEVEL_* constant or 0 for no change.
- * @return The currently set log level.
- */
+	static void setLevel(Level level);
+	static Level getLevel();
 
-LogLevel setLogLevel(LogLevel level);
 
+	Log(Level level, const char* type) :
+		mLevel(level),
+		mType(type) /* only pass literal strings */ {}
 
-/**
- * Log an error.
- * @param fmt Log format string.
- * @param ... Extra format arguments.
- */
 
-void logError(const char* fmt, ...);
+	template <typename T>
+	void operator () (const T& item)
+	{
+		*this << item << std::endl;
+	}
 
-/**
- * Log a warning.
- * @param fmt Log format string.
- * @param ... Extra format arguments.
- */
+private:
 
-void logWarning(const char* fmt, ...);
+	template <typename T> friend std::ostream& operator << (Log&, const T&);
 
-/**
- * Log a message.
- * @param fmt Log format string.
- * @param ... Extra format arguments.
- */
+	static Level	gLevel;
 
-void logInfo(const char* fmt, ...);
+	Level			mLevel;
+	const char*		mType;
+};
 
-/**
- * Log a debug message.
- * @param fmt Log format string.
- * @param ... Extra format arguments.
- */
 
-void logDebug(const char* fmt, ...);
+extern std::ostream&	log;
+extern std::ostream&	nullLog;
+
+extern Log logError;
+extern Log logWarning;
+extern Log logInfo;
+
+
+template <typename T>
+inline std::ostream& operator << (Log& logObj, const T& item)
+{
+	if (Log::gLevel < logObj.mLevel) return nullLog;
+	return log << logObj.mType << item;
+}
+
 
 class Script;
-int logScript(Script& script);
-void importLogScript(Script& script);
+void importLogFunctions(Script& script);
 
 
 } // namespace Mf