Changeset 893

Timestamp:

03/07/10 00:47:52 (5 months ago)

Author:

zoogie

Message:

Allow multiple output streams to be attached to a single scripting env.

This is to support multiple consoles attached to one env.

Location:

trunk

Files:

• client/Game2/Console.cpp (modified) (1 diff)
• engine/Script/Env.cpp (modified) (4 diffs)
• engine/Script/Env.h (modified) (3 diffs)

trunk/client/Game2/Console.cpp

@@ -85 +85 @@
 void Console::InitEnv(Script::Env *scripting)
 {
-    scripting->SetOutput(logStream);
+    scripting->AddOutput(logStream);
 }
 

trunk/engine/Script/Env.cpp

@@ -24 +24 @@
 
 #include <iostream>
+
+#include <boost/foreach.hpp>
 
 #include "../Util/OS.h"
@@ -143 +145 @@
  * @param out The output stream (wrapped in a shared pointer).
  *            May be @c NULL to use the system default.
- */
-void Env::SetOutput(boost::shared_ptr<std::ostream> out)
-{
-    this->out = out;
+ * @return A handle for removing the stream later.
+ */
+Env::OutHandle Env::AddOutput(boost::shared_ptr<std::ostream> out)
+{
+    outs.push_back(out);
+    return --(outs.end());
+}
+
+void Env::RemoveOutput(const OutHandle &handle)
+{
+    outs.erase(handle);
 }
 
@@ -221 +230 @@
 {
     Env *self = static_cast<Env*>(lua_touserdata(state, lua_upvalueindex(1)));
-    std::ostream &oss = (self->out == NULL) ? std::cout : *(self->out);
+    //std::ostream &oss = (self->out == NULL) ? std::cout : *(self->out);
+    //bool hasOut = !outs.empty();
 
     int numParams = lua_gettop(state);
@@ -246 +256 @@
             continue;
         }
-        if (i > 1) oss << '\t';
-        oss << s;
+        BOOST_FOREACH(boost::shared_ptr<std::ostream> &oss, self->outs) {
+            if (i > 1) *oss << '\t';
+            *oss << s;
+        }
         lua_pop(state, 1);
     }
-    oss << std::endl;
+    BOOST_FOREACH(boost::shared_ptr<std::ostream> &oss, self->outs) {
+        *oss << std::endl;
+    }
 
     return 0;

trunk/engine/Script/Env.h

@@ -23 +23 @@
 #pragma once
 
-#include <queue>
+#include <list>
 
 #include <lua.hpp>
@@ -64 +64 @@
         void Reset();
         void ActivateSandbox();
-        void SetOutput(boost::shared_ptr<std::ostream> out);
+
+    private:
+        typedef std::list<boost::shared_ptr<std::ostream> > outs_t;
+    public:
+        typedef outs_t::iterator OutHandle;
+        OutHandle AddOutput(boost::shared_ptr<std::ostream> out);
+        void RemoveOutput(const OutHandle &handle);
 
         std::string GetVersionString() const;
@@ -78 +84 @@
 
     private:
-        boost::shared_ptr<std::ostream> out;
+        outs_t outs;
         lua_State *state;
 };