*luax

1 files changed, 31 insertions, 8 deletions

diff --git a/Source/3rdParty/Luax/luax_state.h b/Source/3rdParty/Luax/luax_state.h
index 166ac26..a936ea6 100644
--- a/Source/3rdParty/Luax/luax_state.h
+++ b/Source/3rdParty/Luax/luax_state.h
@@ -9,7 +9,7 @@
 namespace Luax 
 {
 
-	class Context;
+	class LuaxContext;
 	class LuaxEnum;
 	class LuaxStrongRef;
 	class LuaxWeakRef;
@@ -43,11 +43,14 @@ namespace Luax
 		//------------------------------------------------------------------------------------------------------------
 		// ���ƿռ���������ƿռ����һ������_G��������ı�
 
+		void PushGlobalNamespace();
 		void PushNamespace(cc8* name);
 		void PopNamespace();
-
+		bool IsNamespace(int idx);
+		
 		//------------------------------------------------------------------------------------------------------------
 
+		void SetTop(int top);
 		int GetTop();
 		bool CheckParams(int idx, cc8* format);
 		int AbsIndex(int idx);
@@ -55,11 +58,6 @@ namespace Luax
 
 		//------------------------------------------------------------------------------------------------------------
 
-		///
-		/// ע��C������ע������һ��{0�� 0}
-		///
-		void RegisterMethods(const luaL_Reg *l);
-		
 		void GetField(int idx, cc8* name);
 		void GetField(int idx, int key);
 		std::string	GetField(int idx, cc8* key, cc8* value);
@@ -126,6 +124,7 @@ namespace Luax
 		void DoFile(const std::string& file);
 
 		//------------------------------------------------------------------------------------------------------------
+		// ע�᷽��
 
 		///
 		/// ע�Ṥ������������ͨ�࣬��New����
@@ -142,9 +141,33 @@ namespace Luax
 		///
 		void RegisterEnum(cc8* name, LuaxEnum* enums);
 
+		///
+		/// ע��C������ע������һ��{0�� 0}
+		///
+		void RegisterMethods(const luaL_Reg *l);
+
+		///
+		/// ע�ᵥ��C����
+		///
+		void RegisterMethod(cc8* fname, lua_CFunction func);
+
+		///
+		/// ��preloader�ӵ�package.preload���require"libname"ʱlua��loader_preload����libname�ҵ�preloaderֱ�Ӽ��ء�
+		/// ����ʵ����Ҫrequire��ʱ��ż��أ����Ҽ��ع�һ�κ�package.loaded��¼�������´β����ټ��ء�ͨ��require��������
+		/// preloader��
+		///
+		void RegisterPreloader(cc8* libname, lua_CFunction preloader);
+
+		///
+		/// ����luaL_Reg����lib table������_G��package.loaded������libname��������ָ��lib table��
+		///
+		void RegisterLib(cc8* libname, const luaL_Reg* l);
+
+		//------------------------------------------------------------------------------------------------------------
+
 	private:
 
-		friend class Context;
+		friend class LuaxContext;
 
 		LuaxState(lua_State* state);
 		LuaxState(const LuaxState& state);