X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FScript.hh;h=2f285cecc2bcdd740529783fcc8d4f7ea0fa581b;hp=a1b536cf1a3d49786725c6ac8e07f57134ff84f6;hb=e495074443d9fd7bc16137084cf9de3d031b75c4;hpb=8a1acac01b444dccf8b57cedf08392ada2e473c1

diff --git a/src/Moof/Script.hh b/src/Moof/Script.hh
index a1b536c..2f285ce 100644
--- a/src/Moof/Script.hh
+++ b/src/Moof/Script.hh
@@ -59,8 +59,10 @@ class Script;
 typedef boost::shared_ptr<Script> ScriptP;
 
 
-struct Script
+class Script
 {
+public:
+
 	typedef boost::function<int(Script&)> Function;
 
 	enum Type
@@ -469,15 +471,14 @@ struct Script
 
 
 	Script() :
-		mState(luaL_newstate())
+		mState(0)
 	{
-		lua_pushlightuserdata(mState, this);
-		lua_setfield(mState, LUA_REGISTRYINDEX, "_script_obj");
+		reset();
 	}
 
 	~Script()
 	{
-		if (mIsMainThread) lua_close(mState);
+		destroy();
 	}
 
 
@@ -486,12 +487,77 @@ struct Script
 		return ScriptP(new Script);
 	}
 
+	void reset()
+	{
+		if (mState) destroy();
+		mState = luaL_newstate();
+		lua_pushlightuserdata(mState, this);
+		lua_setfield(mState, LUA_REGISTRYINDEX, "_script_obj");
+	}
+
 
 	void importStandardLibraries()
 	{
 		luaL_openlibs(mState);
 	}
 
+	void importBaseLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_base);
+		push(LUA_COLIBNAME);
+		call(1, 0);
+	}
+
+	void importPackageLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_package);
+		push(LUA_LOADLIBNAME);
+		call(1, 0);
+	}
+
+	void importStringLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_string);
+		push(LUA_STRLIBNAME);
+		call(1, 0);
+	}
+
+	void importTableLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_table);
+		push(LUA_TABLIBNAME);
+		call(1, 0);
+	}
+
+	void importMathLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_math);
+		push(LUA_MATHLIBNAME);
+		call(1, 0);
+	}
+
+	void importIoLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_io);
+		push(LUA_IOLIBNAME);
+		call(1, 0);
+	}
+
+	void importOsLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_os);
+		push(LUA_OSLIBNAME);
+		call(1, 0);
+	}
+
+	void importDebugLibrary()
+	{
+		lua_pushcfunction(mState, luaopen_debug);
+		push(LUA_DBLIBNAME);
+		call(1, 0);
+	}
+
+
 	void importFunction(const std::string& name, const Function& function)
 	{
 		push(function);
@@ -794,6 +860,7 @@ struct Script
 		lua_gc(mState, LUA_GCSETSTEPMUL, step);
 	}
 
+
 private:
 
 	Script(lua_State* state) :
@@ -812,6 +879,11 @@ private:
 		return (*function)(*script);
 	}
 
+	void destroy()
+	{
+		if (mIsMainThread) lua_close(mState);
+	}
+
 	lua_State*			mState;
 	bool				mIsMainThread;
 	std::list<Function>	mFunctions;