Changeset 895

Timestamp:

03/07/10 22:44:42 (5 months ago)

Author:

zoogie

Message:

Renamed Script::Env to Script::Core.

Script::Env will refer instead to a specific sandboxed environment within a Script::Core.

Location:

trunk

Files:

• client/Game2/Console.cpp (modified) (4 diffs)
• client/Game2/Console.h (modified) (3 diffs)
• client/Game2/HighConsole.cpp (modified) (2 diffs)
• client/Game2/SysConsole.cpp (modified) (3 diffs)
• client/Game2/SysConsole.h (modified) (1 diff)
• engine/engine.vcproj (modified) (1 diff)
• engine/Script/Core.cpp (moved) (moved from trunk/engine/Script/Env.cpp) (14 diffs)
• engine/Script/Core.h (moved) (moved from trunk/engine/Script/Env.h) (2 diffs)

trunk/client/Game2/Console.cpp

@@ -23 +23 @@
 #include "StdAfx.h"
 
-#include "../../engine/Script/Env.h"
+#include "../../engine/Script/Core.h"
 
 #include "Console.h"
@@ -74 +74 @@
 void Console::Init()
 {
-    scripting = new Env();
+    scripting = new Core();
     InitEnv(scripting);
     InitGlobals(scripting);
@@ -83 +83 @@
  * @param scripting The environment to initialize (may not be @c NULL).
  */
-void Console::InitEnv(Script::Env *scripting)
+void Console::InitEnv(Script::Core *scripting)
 {
     scripting->AddOutput(logStream);
@@ -92 +92 @@
  * @param scripting The environment to initialize (may not be @c NULL).
  */
-void Console::InitGlobals(Script::Env *scripting)
+void Console::InitGlobals(Script::Core *scripting)
 {
     lua_State *state = scripting->GetState();

trunk/client/Game2/Console.h

@@ -30 +30 @@
 
 namespace Script {
-    class Env;
+    class Core;
 }
 
@@ -46 +46 @@
         void Init();
     protected:
-        Script::Env *GetScripting() const { return scripting; }
-        virtual void InitEnv(Script::Env *scripting);
-        virtual void InitGlobals(Script::Env *scripting);
+        Script::Core *GetScripting() const { return scripting; }
+        virtual void InitEnv(Script::Core *scripting);
+        virtual void InitGlobals(Script::Core *scripting);
 
         virtual void Cleanup();
@@ -78 +78 @@
 
     private:
-        Script::Env *scripting;
-        typedef std::list<Script::Env*> oldScriptings_t;
+        Script::Core *scripting;
+        typedef std::list<Script::Core*> oldScriptings_t;
         oldScriptings_t oldScriptings;
         boost::shared_ptr<std::ostream> logStream;

trunk/client/Game2/HighConsole.cpp

@@ -27 +27 @@
 #include <boost/thread/locks.hpp>
 
-#include "../../engine/Script/Env.h"
+#include "../../engine/Script/Core.h"
 #include "../../engine/Util/Config.h"
 #include "../../engine/VideoServices/2DViewPort.h"
@@ -101 +101 @@
         Font("Arial", 20, true), 0x0a);
 
-    Script::Env *env = GetScripting();
+    Script::Core *env = GetScripting();
     std::string intro = env->GetVersionString();
     intro += " :: Console active.";

trunk/client/Game2/SysConsole.cpp

@@ -29 +29 @@
 #include <boost/format.hpp>
 
-#include "../../engine/Script/Env.h"
+#include "../../engine/Script/Core.h"
 
 #include "SysConsole.h"
@@ -52 +52 @@
 }
 
-void SysConsole::InitEnv(Script::Env *scripting)
+void SysConsole::InitEnv(Script::Core *scripting)
 {
     SUPER::InitEnv(scripting);
@@ -58 +58 @@
 }
 
-void SysConsole::InitGlobals(Script::Env *scripting)
+void SysConsole::InitGlobals(Script::Core *scripting)
 {
     SUPER::InitGlobals(scripting);

trunk/client/Game2/SysConsole.h

@@ -37 +37 @@
 
     protected:
-        virtual void InitEnv(Script::Env *scripting);
-        virtual void InitGlobals(Script::Env *scripting);
+        virtual void InitEnv(Script::Core *scripting);
+        virtual void InitGlobals(Script::Core *scripting);
 
     public:

trunk/engine/engine.vcproj

@@ -808 +808 @@
             >
             <File
-                RelativePath=".\Script\Env.cpp"
-                >
-            </File>
-            <File
-                RelativePath=".\Script\Env.h"
+                RelativePath=".\Script\Core.cpp"
+                >
+            </File>
+            <File
+                RelativePath=".\Script\Core.h"
                 >
             </File>

trunk/engine/Script/Core.cpp

@@ -1 +1 @@
 
-// Env.cpp
+// Core.cpp
 // Scripting support.
 //
@@ -29 +29 @@
 #include "../Util/OS.h"
 
-#include "Env.h"
+#include "Core.h"
 
 using namespace HoverRace::Script;
@@ -45 +45 @@
 #define DISALLOW_LUA_GLOBAL(state, name) \
     lua_pushstring((state), (name)); \
-    lua_pushcclosure((state), Env::LSandboxedFunction, 1); \
+    lua_pushcclosure((state), Core::LSandboxedFunction, 1); \
     lua_setglobal((state), (name))
 
-Env::Env()
+Core::Core()
 {
     state = luaL_newstate();
@@ -57 +57 @@
 }
 
-Env::~Env()
+Core::~Core()
 {
     lua_close(state);
@@ -69 +69 @@
  * The state returned by GetState() is otherwise unchanged.
  */
-void Env::Reset()
+void Core::Reset()
 {
     // Register a "safe" set of standard libraries.
@@ -79 +79 @@
     // Override the print function so we can reroute the output.
     lua_pushlightuserdata(state, this);
-    lua_pushcclosure(state, Env::LPrint, 1);
+    lua_pushcclosure(state, Core::LPrint, 1);
     lua_setglobal(state, "print");
 
@@ -96 +96 @@
  * or break out of the sandbox.
  */
-void Env::ActivateSandbox()
+void Core::ActivateSandbox()
 {
     if (!lua_checkstack(state, 2))
@@ -147 +147 @@
  * @return A handle for removing the stream later.
  */
-Env::OutHandle Env::AddOutput(boost::shared_ptr<std::ostream> out)
+Core::OutHandle Core::AddOutput(boost::shared_ptr<std::ostream> out)
 {
     outs.push_back(out);
@@ -153 +153 @@
 }
 
-void Env::RemoveOutput(const OutHandle &handle)
+void Core::RemoveOutput(const OutHandle &handle)
 {
     outs.erase(handle);
@@ -162 +162 @@
  * @return The string (never empty).
  */
-std::string Env::GetVersionString() const
+std::string Core::GetVersionString() const
 {
     return LUA_VERSION;
@@ -176 +176 @@
  *                  while executing.
  */
-void Env::Execute(const std::string &chunk)
+void Core::Execute(const std::string &chunk)
 {
     // Compile the chunk.
@@ -218 +218 @@
  * @return The error as a string.
  */
-std::string Env::PopError()
+std::string Core::PopError()
 {
     size_t len;
@@ -227 +227 @@
 }
 
-int Env::LPrint(lua_State *state)
-{
-    Env *self = static_cast<Env*>(lua_touserdata(state, lua_upvalueindex(1)));
+int Core::LPrint(lua_State *state)
+{
+    Core *self = static_cast<Core*>(lua_touserdata(state, lua_upvalueindex(1)));
 
     int numParams = lua_gettop(state);
@@ -267 +267 @@
 }
 
-int Env::LSandboxedFunction(lua_State *state)
+int Core::LSandboxedFunction(lua_State *state)
 {
     const char *name = lua_tostring(state, lua_upvalueindex(1));

trunk/engine/Script/Core.h

@@ -1 +1 @@
 
-// Env.h
+// Core.h
 // Header for the scripting engine environment.
 //
@@ -54 +54 @@
  * @author Michael Imamura
  */
-class MR_DllDeclare Env
+class MR_DllDeclare Core
 {
     public:
-        Env();
-        ~Env();
+        Core();
+        ~Core();
 
     public: