Changeset 910

Timestamp:

03/10/10 23:08:56 (5 months ago)

Author:

zoogie

Message:

Client::Console now extends Script::Env.
We now only use one scripting state, with SysConsole and HighConsole running inside sandboxed environments.

Location:

trunk/client/Game2

Files:

• Console.cpp (modified) (8 diffs)
• Console.h (modified) (3 diffs)
• GameApp.cpp (modified) (1 diff)
• HighConsole.cpp (modified) (1 diff)
• HighConsole.h (modified) (1 diff)

trunk/client/Game2/Console.cpp

@@ -58 +58 @@
 };
 
-Console::Console() :
-    inputState(ISTATE_COMMAND)
+Console::Console(Script::Core *scripting) :
+    SUPER(scripting), inputState(ISTATE_COMMAND)
 {
     chunk.reserve(1024);
+    outHandle = scripting->AddOutput(boost::make_shared<LogStream>(this));
 }
 
 Console::~Console()
 {
-    Cleanup();
-    delete scripting;
-}
-
-void Console::Init()
-{
-    scripting = new Core();
-    InitEnv(scripting);
-    InitGlobals(scripting);
-}
-
-/**
- * Set intial settings on the scripting environment.
- * @param scripting The environment to initialize (may not be @c NULL).
- */
-void Console::InitEnv(Script::Core *scripting)
-{
-    scripting->AddOutput(boost::make_shared<LogStream>(this));
-}
-
-/**
- * Populate the globals in the environment.
- * @param scripting The environment to initialize (may not be @c NULL).
- */
-void Console::InitGlobals(Script::Core *scripting)
-{
-    lua_State *state = scripting->GetState();
-
+    GetScripting()->RemoveOutput(outHandle);
+}
+
+void Console::InitEnv()
+{
+    lua_State *state = GetScripting()->GetState();
+
+    // Start with the standard global environment.
+    CopyGlobals();
+
+    lua_pushlightuserdata(state, this);  // table this
+    lua_pushcclosure(state, Console::LClear, 1);  // table fn
+    lua_pushstring(state, "clear");  // table fn str
+    lua_insert(state, -2);  // table str fn
+    lua_rawset(state, -3);  // table
+
+    /*
     lua_pushlightuserdata(state, this);
     lua_pushcclosure(state, Console::LClear, 1);
@@ -99 +89 @@
 
     lua_pushlightuserdata(state, this);
-    lua_pushcclosure(state, Console::LReinit, 1);
-    lua_setglobal(state, "reinit");
-
-    lua_pushlightuserdata(state, this);
     lua_pushcclosure(state, Console::LReset, 1);
     lua_setglobal(state, "reset");
@@ -109 +95 @@
     lua_pushcclosure(state, Console::LSandbox, 1);
     lua_setglobal(state, "sandbox");
-}
-
-/**
- * Clean up any resources invalidated during script execution.
- * Note that this is not the same as invoking the garbage collector for the
- * scripting environment; this is for console-specific resources which
- * have been invalidated but could not be freed while the script was executing.
- */
-void Console::Cleanup()
-{
-    if (!oldScriptings.empty()) {
-        for (oldScriptings_t::iterator iter = oldScriptings.begin();
-            iter != oldScriptings.end(); ++iter)
-        {
-            delete *iter;
-        }
-        oldScriptings.clear();
-    }
+    */
 }
 
@@ -138 +107 @@
 
     try {
-        scripting->Execute(chunk);
+        Execute(chunk);
     }
     catch (const IncompleteExn&) {
@@ -147 +116 @@
         LogError(exn.GetMessage());
     }
-
-    Cleanup();
 
     chunk.clear();
@@ -175 +142 @@
 }
 
+/*
 int Console::LReset(lua_State *state)
 {
@@ -185 +153 @@
     self->LogInfo("Console script environment reset complete.");
     return 0;
-}
-
-int Console::LReinit(lua_State *state)
-{
-    // function reinit()
-    // Completely reinitialize the environment.
-    // This is a last-resort call for fixing an environment that is very
-    // messed up.  reset() does not need to be called afterwards; this function
-    // is a superset of what reset() does.
-    Console *self = static_cast<Console*>(lua_touserdata(state, lua_upvalueindex(1)));
-
-    // Save the current environment to be cleaned up later (in Clean()).
-    // We can't destroy it just yet -- we were called from it!
-    self->oldScriptings.push_back(self->scripting);
-
-    self->Init();
-
-    // Cause an error in order to terminate execution in the current environment
-    // immediately.
-    lua_pushstring(state, "Console script environment reinitialization complete.");
-    return lua_error(state);
 }
 
@@ -221 +168 @@
     return 0;
 }
+*/
 
 // Console::LogStreamBuf

trunk/client/Game2/Console.h

@@ -25 +25 @@
 #include <lua.hpp>
 
+#include "../../engine/Script/Core.h"
+#include "../../engine/Script/Env.h"
 #include "../../engine/Util/OS.h"
-
-namespace HoverRace {
-    namespace Script {
-        class Core;
-    }
-}
 
 namespace HoverRace {
@@ -40 +36 @@
  * @author Michael Imamura
  */
-class Console
+class Console : public Script::Env
 {
+    typedef Script::Env SUPER;
+
     public:
-        Console();
+        Console(Script::Core *scripting);
         virtual ~Console();
 
-    public:
-        void Init();
     protected:
-        Script::Core *GetScripting() const { return scripting; }
-        virtual void InitEnv(Script::Core *scripting);
-        virtual void InitGlobals(Script::Core *scripting);
-
-        virtual void Cleanup();
+        virtual void InitEnv();
 
     public:
@@ -76 +68 @@
     private:
         static int LClear(lua_State *state);
+        /*
         static int LReset(lua_State *state);
-        static int LReinit(lua_State *state);
         static int LSandbox(lua_State *state);
+        */
 
     private:
-        Script::Core *scripting;
-        typedef std::list<Script::Core*> oldScriptings_t;
-        oldScriptings_t oldScriptings;
+        inputState_t inputState;
+        Script::Core::OutHandle outHandle;
         std::string chunk;
-        inputState_t inputState;
 
         class LogStreamBuf;

trunk/client/Game2/GameApp.cpp

@@ -1561 +1561 @@
         highObserver = new HighObserver();
         if (Config::GetInstance()->runtime.enableConsole) {
-            highConsole = new HighConsole();
-            highConsole->Init();
+            highConsole = new HighConsole(scripting);
         }
 

trunk/client/Game2/HighConsole.cpp

@@ -76 +76 @@
 };
 
-HighConsole::HighConsole() :
-    SUPER(), visible(false), cursorOn(true), cursorTick(0)
+HighConsole::HighConsole(Script::Core *scripting) :
+    SUPER(scripting), visible(false), cursorOn(true), cursorTick(0)
 {
     vp = new MR_2DViewPort();

trunk/client/Game2/HighConsole.h

@@ -46 +46 @@
     typedef Console SUPER;
     public:
-        HighConsole();
+        HighConsole(Script::Core *scripting);
         virtual ~HighConsole();