cleaned up interpolator classes

[chaz/yoink] / src / Moof / Log.cc

diff --git a/src/Moof/Log.cc b/src/Moof/Log.cc
index dcdb5ecf5c205e3aea8f4ab32f6309cf4e04a64e..863ab87317c6cc9f2e7235877a1fa7d0818c8147 100644 (file)
--- a/src/Moof/Log.cc
+++ b/src/Moof/Log.cc
@@ -26,94 +26,61 @@
 
 *******************************************************************************/
 
-#include <cstdarg>
-#include <cstdio>              // snprintf
-#include <cstring>             // strcpy
+#include <fstream>
 
 #include "Log.hh"
+#include "Script.hh"
 
 
 namespace Mf {
 
 
-static LogLevel logLevel_ = WARNING;
+Log::Level Log::gLevel = Log::INFO;
 
-static void printLog_(int logLevel, const char* fmt, va_list args)
-{
-       if (logLevel_ < logLevel) return;
 
-       switch (logLevel)
-       {
-               case ERROR:
-                       fprintf(stderr, "  error: ");
-                       break;
-               case WARNING:
-                       fprintf(stderr, "warning: ");
-                       break;
-               case INFO:
-                       fprintf(stderr, "   info: ");
-                       break;
-               case DEBUGGING:
-                       fprintf(stderr, "  debug: ");
-                       break;
-       }
-
-       vfprintf(stderr, fmt, args);
-       fprintf(stderr, "\n");
+void Log::setLevel(Level level)
+{
+       gLevel = level;
 }
 
-
-LogLevel setLogLevel(LogLevel level)
+Log::Level Log::getLevel()
 {
-       if (level != 0)
-               logLevel_ = level;
-
-       return logLevel_;
+       return gLevel;
 }
 
 
-void
-logError(const char* fmt, ...)
-{
-       va_list args;
-       va_start(args, fmt);
+std::ostream& log(std::clog);
 
-       printLog_(ERROR, fmt, args);
+static std::ofstream nullLog_;
+std::ostream& nullLog(nullLog_);
 
-       va_end(args);
-}
+Log logError(Log::ERRORR, "  error: ");
+Log logWarning(Log::WARNING, "warning: ");
+Log logInfo(Log::INFO, "   info: ");
 
-void
-logWarning(const char* fmt, ...)
-{
-       va_list args;
-       va_start(args, fmt);
 
-       printLog_(WARNING, fmt, args);
-
-       va_end(args);
-}
-
-void
-logInfo(const char* fmt, ...)
+static int logScript_(Script& script, Log::Level level)
 {
-       va_list args;
-       va_start(args, fmt);
+       static Log* logs[] = {0, &logError, &logWarning, &logInfo};
 
-       printLog_(INFO, fmt, args);
+       Script::Slot param = script[1];
 
-       va_end(args);
-}
+       while (!param.isNone())
+       {
+               (*logs[level])(param);
+               ++param.index;
+       }
 
-void
-logDebug(const char* fmt, ...)
-{
-       va_list args;
-       va_start(args, fmt);
+       return 0;
+}
 
-       printLog_(DEBUGGING, fmt, args);
 
-       va_end(args);
+void importLogFunctions(Script& script)
+{
+       script.importFunction("LogError",   boost::bind(logScript_, _1, Log::ERRORR));
+       script.importFunction("LogWarning", boost::bind(logScript_, _1, Log::WARNING));
+       script.importFunction("LogInfo",    boost::bind(logScript_, _1, Log::INFO));
+       script.importFunction("print",      boost::bind(logScript_, _1, Log::INFO));
 }