12 files changed, 267 insertions, 57 deletions

diff --git a/Source/3rdParty/Luax/luax.h b/Source/3rdParty/Luax/luax.h
index 9a6b0b9..6935e71 100644
--- a/Source/3rdParty/Luax/luax.h
+++ b/Source/3rdParty/Luax/luax.h
@@ -6,9 +6,9 @@
 #include "luax_namespace.h"
 #include "luax_ref.h"
 #include "luax_reftable.h"
-#include "luax_memberref.h"
 #include "luax_enum.h"
 #include "luax_class.hpp"
+#include "luax_memberref.h"
 #include "luax_class.inl"
 #include "luax_state.inl"
 
diff --git a/Source/3rdParty/Luax/luax_cfunctions.cpp b/Source/3rdParty/Luax/luax_cfunctions.cpp
new file mode 100644
index 0000000..d93a0ee
--- /dev/null
+++ b/Source/3rdParty/Luax/luax_cfunctions.cpp
@@ -0,0 +1,19 @@
+#include "luax_cfunctions.h"
+#include "luax_config.h"
+
+namespace Luax
+{
+
+	int luax_c_getupvalue(lua_State* L)
+	{
+		lua_pushvalue(L, lua_upvalueindex(1));
+		return 1;
+	}
+
+	int luax_c_errfunc(lua_State* L)
+	{
+		cc8* msg = luaL_optstring(L, lua_upvalueindex(1), "");
+		return luaL_error(L, msg);
+	}
+
+}
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_cfunctions.h b/Source/3rdParty/Luax/luax_cfunctions.h
new file mode 100644
index 0000000..2570bb9
--- /dev/null
+++ b/Source/3rdParty/Luax/luax_cfunctions.h
@@ -0,0 +1,25 @@
+#ifndef __LUAX_CFUNCTIONS_H__
+#define __LUAX_CFUNCTIONS_H__
+
+#include "luax_config.h"
+
+/**
+ * luax_cfunction��ĺ�������ע���lua��һЩ���⹦�ܵ�ͨ�ú�����
+*/
+
+namespace Luax
+{
+
+	///
+	/// ��õ�һ��upvalue
+	///
+	extern int luax_c_getupvalue(lua_State* L);
+
+	///
+	/// ���ô˺���ʱ�ᱨ����upvalue(1)�Ǵ�����Ϣ
+	///
+	extern int luax_c_errfunc(lua_State* L);
+
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_class.hpp b/Source/3rdParty/Luax/luax_class.hpp
index a76d501..539093c 100644
--- a/Source/3rdParty/Luax/luax_class.hpp
+++ b/Source/3rdParty/Luax/luax_class.hpp
@@ -5,6 +5,7 @@
 
 #include "luax_config.h"
 #include "luax_ref.h"
+#include "luax_memberref.h"
 
 namespace Luax
 {
@@ -30,6 +31,7 @@ namespace Luax
 	///
 #define LUAX_DECL_SINGLETON(type) \
 	static void RegisterLuaxClass(Luax::LuaxState&);  \
+	static void RegisterLuaxPostprocess(Luax::LuaxState&); \
 	static const char* GetLuaxSingletonName() { return #type; }; \
 	static const char* GetLuaxClassName() { return #type; }; \
 	static bool IsLuaxClassSingleton() { return true; };
@@ -42,8 +44,15 @@ namespace Luax
 	{
 	public:
 
-		void Retain();
-		void Release();
+		///
+		/// ��userdata��Ϊkey����ref table���userdata����һ�����ã���ά��userdata���������ڡ�
+		///
+		template<class U> void LuaRetain(LuaxState& state, U* userdata);
+
+		///
+		/// ��userdata����һ��������ref table��Գ��Ի���userdata��
+		/// 
+		template<class U> void LuaRelease(LuaxState& state, U* userdata);
 
 	protected:
 
@@ -57,6 +66,13 @@ namespace Luax
 		bool PushLuaxMemberTable(LuaxState& state);
 		bool PushLuaxRefTable(LuaxState& state);
 
+		///
+		/// ��Ա���ù�������ʵ����ref table����á�ȡ�����
+		///
+		void SetMemberRef(LuaxState& state, LuaxMemberRef& memRef, int idx);
+		bool PushMemberRef(LuaxState& state, LuaxMemberRef& memRef);
+		void ClearMemberRef(LuaxState& state, LuaxMemberRef& memRef);
+
 	private:
 
 		friend class LuaxState;
@@ -80,7 +96,7 @@ namespace Luax
 		void* operator &();
 
 		///
-		/// ����userdata����ʵ����state����������ǹ���
+		/// ����userdata����ʵ����state��
 		///
 		void BindToLua(LuaxState& state);
 
@@ -102,30 +118,22 @@ namespace Luax
 		///
 		LuaxWeakRef mUserdata;
 
-		///
-		/// ���ü��������������̼߳乲��
-		///
-		int mRC;
-
-		///
-		/// ȷ����������ֻ��ͨ��Release���õ�safer������ֻҪ�̳���LuaxClass���࣬���ʹ��deleteֱ���������ͻᱨ��
-		///
-		bool mSafer; 
-
 	public:
 
 		//------------------------------------------------------------------------------------------------------------
 		// ��������
 
-		LUAX_DECL_METHOD( l_GetClassName      );
-		LUAX_DECL_METHOD( l_GetInterfaceTable );
-		LUAX_DECL_METHOD( l___tostring        );
+		LUAX_DECL_METHOD( l___tostring   );
+		LUAX_DECL_METHOD( l_GetClassName );
 
 		//------------------------------------------------------------------------------------------------------------
 		// ���������
 
-		LUAX_DECL_METHOD( l_ExtendFactory );
-		LUAX_DECL_METHOD( l___gc          );
+		LUAX_DECL_METHOD( l___gc              );
+		LUAX_DECL_METHOD( l_ExtendFactory     );
+		LUAX_DECL_METHOD( l_GetClass          );
+		LUAX_DECL_METHOD( l_GetInterfaceTable );
+		LUAX_DECL_METHOD( l_GetRefTable       );
 
 		//------------------------------------------------------------------------------------------------------------
 		// ���������
diff --git a/Source/3rdParty/Luax/luax_class.inl b/Source/3rdParty/Luax/luax_class.inl
index 8cf0f55..bbda6de 100644
--- a/Source/3rdParty/Luax/luax_class.inl
+++ b/Source/3rdParty/Luax/luax_class.inl
@@ -5,7 +5,7 @@ namespace Luax
 	// �ӿ�
 
 	///
-	/// �Բ�ͬ���ͣ�ͨ������GetLuaClassName���������
+	/// �Բ�ͬ���ͣ�ͨ������GetLuaClassName���������������������࣬GetClassName�ᱻ���ǣ�ָ��luax_c_getupvalue��
 	///
 	template<typename T>
 	int LuaxClass<T>::l_GetClassName(lua_State* L)
@@ -33,7 +33,6 @@ namespace Luax
 		state.RegisterMethods(regTable);
 	}
 
-
 	///
 	/// ������ij�Ա��ע����class table
 	///
@@ -48,7 +47,6 @@ namespace Luax
 		state.RegisterMethods(regTable);
 	}
 
-
 	///
 	/// ����ʵ���ij�Ա��ע����interface table
 	///
@@ -56,14 +54,14 @@ namespace Luax
 	void LuaxClass<T>::RegisterLuaxInterface(LuaxState& state)
 	{
 		luaL_Reg regTable[] = {
-			{ "__gc", l___gc },
-			{ NULL,   NULL   }
+			{ "GetClass",    l_GetClass    },
+			{ "GetRefTable", l_GetRefTable },
+			{ NULL,          NULL          }
 		};
 
 		state.RegisterMethods(regTable);
 	}
 
-
 	///
 	/// ������ij�Ա��ע����class table
 	///
@@ -107,30 +105,55 @@ namespace Luax
 
 	template<typename T>
 	LuaxClass<T>::LuaxClass()
-		: mRC(1) // ����ʱĬ����һ������
-		, mSafer(false)
 	{
 	}
 
 	template<typename T>
 	LuaxClass<T>::~LuaxClass()
 	{
-		assert(mSafer);
 	}
 
 	template<typename T>
-	void LuaxClass<T>::Retain()
+	template<typename U>
+	void LuaxClass<T>::LuaRetain(LuaxState& state, U* userdata)
 	{
-		++mRC;
+		if (PushLuaxRefTable(state))
+		{
+			if (userdata->PushLuaxUserdata(state))
+			{
+				lua_pushvalue(state, -1); // copy the userdata
+				lua_gettable(state, -3); // get the count (or nil)
+				u32 count = state.GetValue<u32>(-1, 0); // get the count (or 0)
+				lua_pop(state, 1); // pop the old count
+				lua_pushnumber(state, count + 1); // push the new count
+				lua_settable(state, -3); // save it in the table: reftable[userdata] = count
+			}
+		}
 	}
 
 	template<typename T>
-	void LuaxClass<T>::Release()
+	template<typename U>
+	void LuaxClass<T>::LuaRelease(LuaxState& state, U* userdata)
 	{
-		if (--mRC <= 0)
+		if (PushLuaxRefTable(state))
 		{
-			mSafer = true; // ������safer
-			delete this;
+			if (userdata->PushLuaxUserdata(state))
+			{
+				lua_pushvalue(state, -1); // copy the userdata
+				lua_gettable(state, -3); // get the count (or nil)
+				u32 count = state.GetValue<u32>(-1, 0); // get the count (or 0)
+				lua_pop(state, 1); // pop the old count
+
+				if (count == 0) return; // nothing to do
+
+				if (count > 1) {
+					lua_pushnumber(state, count - 1); // push the new count
+				}
+				else {
+					lua_pushnil(state); // maybe cause gc
+				}
+				lua_settable(state, -3); // save it in the table
+			}
 		}
 	}
 
@@ -197,6 +220,12 @@ namespace Luax
 		return false;
 	}
 
+	///
+	/// ����userdata�����Դ�����ref table��member table��interface table��
+	///     ref table ��kvǿ����table�����������userdata�����ü�����ͨ��userdata��Ϊkey������Ϊvalue�����Լ���Ա����
+	///     member table ����lua������ʵ���ij�Ա
+	///     interface table ���б����͵�ʵ�����еij�Ա������
+	///
 	template<typename T>
 	void LuaxClass<T>::BindToLua(LuaxState& state)
 	{
@@ -221,14 +250,14 @@ namespace Luax
 		int memberTable = top - 1;
 		int refTable = top - 2;
 
-		// ref table ע�� __gc��__tostring
+		// ref table ע�� __gc �� __tostring
 		lua_pushcfunction(state, l___gc);
 		lua_setfield(state, refTable, "__gc");
 
 		lua_pushcfunction(state, l___tostring);
 		lua_setfield(state, refTable, "__tostring");
 
-		// member table ��Ϊ ref table �� __index �� __newindex
+		// ref table �� __index �� __newindex ��Ϊ member table
 		lua_pushvalue(state, memberTable);
 		lua_setfield(state, refTable, "__index");
 
@@ -245,6 +274,59 @@ namespace Luax
 		assert(mUserdata);
 	}
 
+	///
+	/// ��Ա���ù���
+	///
+	template<typename T>
+	void LuaxClass<T>::SetMemberRef(LuaxState& state, LuaxMemberRef& memRef, int idx)
+	{
+		ClearMemberRef(state, memRef);
+		if (!lua_isnil(state, idx))
+		{
+			idx = state.AbsIndex(idx);
+			if (PushLuaxRefTable(state))
+			{
+				lua_pushvalue(state, idx);
+				memRef.refID = luaL_ref(state, -2);
+				state.Pop(); // ref table
+			}
+		}
+	}
+
+	template<typename T>
+	bool LuaxClass<T>::PushMemberRef(LuaxState& state, LuaxMemberRef& memRef)
+	{
+		if (memRef)
+		{
+			if (PushLuaxRefTable(state))
+			{
+				lua_rawgeti(state, -1, memRef.refID);
+				lua_replace(state, -2); // ref table
+				if (lua_isnil(state, -1))
+					goto failed;
+				return true;
+			}
+		}
+		lua_pushnil(state);
+	failed:
+		memRef.refID = LUA_NOREF;
+		return false;
+	}
+
+	template<typename T>
+	void LuaxClass<T>::ClearMemberRef(LuaxState& state, LuaxMemberRef& memRef)
+	{
+		if (memRef)
+		{
+			if (PushLuaxRefTable(state))
+			{
+				luaL_unref(state, -1, memRef.refID);
+				state.Pop(); // ref table
+			}
+			memRef.refID = LUA_NOREF;
+		}
+	}
+
 	//--------------------------------------------------------------------------------------------------------------
 
 	///
@@ -258,15 +340,51 @@ namespace Luax
 		return 0;
 	}
 
+	///
+	/// �����ʽ����:
+	/// ��ַ ����
+	///
 	template<typename T>
 	int LuaxClass<T>::l___tostring(lua_State* L)
 	{
+		LUAX_STATE(L);
+		T* self = state.GetLuaUserdata<T>(1);
+		if (self)
+		{
+			char buf[1024] = {0};
+			const char* fmt = "%p <%s>";
+			cc8* classname = "";
+			lua_getfield(state, 1, "GetClassName");
+			if (state.IsType(-1, LUA_TFUNCTION))
+			{
+				lua_pushvalue(L, 1); // userdata 
+				state.Call(1, 1); // �������GetClassName����
+				classname = state.GetValue<cc8*>(-1, "");
+			}
+			else
+			{
+				classname = T::GetLuaxClassName();
+			}
+			sprintf(buf, fmt, self, classname);
+			lua_pushstring(L, buf);
+			return 1;
+		}
 		return 0;
 	}
 
 	template<typename T>
 	int LuaxClass<T>::l_ExtendFactory(lua_State* L)
 	{
+
+
+		return 0;
+	}
+
+	template<typename T>
+	int LuaxClass<T>::l_ExtendSingleton(lua_State* L)
+	{
+
+
 		return 0;
 	}
 
@@ -274,9 +392,33 @@ namespace Luax
 	int LuaxClass<T>::l_GetInterfaceTable(lua_State* L)
 	{
 		LUAX_STATE(L);
-		assert(mInterfaceTable);
-		mInterfaceTable.PushRef(state);
-		return 0;
+		if (!mInterfaceTable)
+			lua_pushnil(L);
+		else 
+			mInterfaceTable.PushRef(state);
+		return 1;
+	}
+
+	template<typename T> 
+	int LuaxClass<T>::l_GetClass(lua_State* L)
+	{
+		LUAX_STATE(L);
+		if (!mClassTable)
+			lua_pushnil(L);
+		else
+			mClassTable.PushRef(state);
+		return 1;
+	}
+
+	template<typename T>
+	int LuaxClass<T>::l_GetRefTable(lua_State* L)
+	{
+		LUAX_STATE(L);
+		T* self = state.GetLuaUserdata<T>(1);
+		bool success = self->PushLuaxRefTable(state);
+		if (!success)
+			lua_pushnil(L);
+		return 1;
 	}
 
 	template<typename T> LuaxStrongRef LuaxClass<T>::mInterfaceTable;    // interface table 
diff --git a/Source/3rdParty/Luax/luax_function.cpp b/Source/3rdParty/Luax/luax_function.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Source/3rdParty/Luax/luax_function.cpp
+++ /dev/null
diff --git a/Source/3rdParty/Luax/luax_function.h b/Source/3rdParty/Luax/luax_function.h
deleted file mode 100644
index f4cc98b..0000000
--- a/Source/3rdParty/Luax/luax_function.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __LUAX_FUNCTION_H__
-#define __LUAX_FUNCTION_H__
-
-namespace Luax
-{
-
-
-
-}
-
-#endif
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_memberref.cpp b/Source/3rdParty/Luax/luax_memberref.cpp
index e69de29..a8a09ba 100644
--- a/Source/3rdParty/Luax/luax_memberref.cpp
+++ b/Source/3rdParty/Luax/luax_memberref.cpp
@@ -0,0 +1,16 @@
+#include "luax_memberref.h"
+
+namespace Luax
+{
+
+	LuaxMemberRef::LuaxMemberRef()
+		: refID(LUA_NOREF)
+	{
+	}
+
+	LuaxMemberRef::~LuaxMemberRef()
+	{
+
+	}
+
+}
\ No newline at end of file
diff --git a/Source/3rdParty/Luax/luax_memberref.h b/Source/3rdParty/Luax/luax_memberref.h
index a7ff1f6..bb373ab 100644
--- a/Source/3rdParty/Luax/luax_memberref.h
+++ b/Source/3rdParty/Luax/luax_memberref.h
@@ -1,14 +1,23 @@
 #ifndef __LUAX_MEMBER_REF_H__
 #define __LUAX_MEMBER_REF_H__
 
+#include "luax_config.h"
+
 namespace Luax
 {
 
 	///
-	/// LuaxClass�ij�Ա���ã�����ref table���֤��ȷ�ͷţ���ǿ���á�
+	/// ʵ����ref table�����member ref����luax class������Ĺ�����ʵ����ref table��ǿ���ã�������������member���������ڡ�
 	///
 	class LuaxMemberRef
 	{
+	public:
+		LuaxMemberRef();
+		~LuaxMemberRef();
+
+		inline operator bool() { return refID != LUA_NOREF; };
+
+		int refID;
 
 	};
 
diff --git a/Source/3rdParty/Luax/luax_state.cpp b/Source/3rdParty/Luax/luax_state.cpp
index 1414591..a60a021 100644
--- a/Source/3rdParty/Luax/luax_state.cpp
+++ b/Source/3rdParty/Luax/luax_state.cpp
@@ -100,9 +100,9 @@ namespace Luax
 		return idx;
 	}
 
-	int LuaxState::Call(int nArgs, int nResults)
+	void LuaxState::Call(int nArgs, int nResults)
 	{
-		return 0;
+		lua_pcall(mState, nArgs, nResults, 0);
 	}
 
 	void LuaxState::PushNil() 
diff --git a/Source/3rdParty/Luax/luax_state.h b/Source/3rdParty/Luax/luax_state.h
index a936ea6..2bcfd9b 100644
--- a/Source/3rdParty/Luax/luax_state.h
+++ b/Source/3rdParty/Luax/luax_state.h
@@ -54,7 +54,7 @@ namespace Luax
 		int GetTop();
 		bool CheckParams(int idx, cc8* format);
 		int AbsIndex(int idx);
-		int Call(int nArgs, int nResults);
+		void Call(int nArgs, int nResults);
 
 		//------------------------------------------------------------------------------------------------------------
 
diff --git a/Source/3rdParty/Luax/luax_state.inl b/Source/3rdParty/Luax/luax_state.inl
index bd7ca9a..c9a95f6 100644
--- a/Source/3rdParty/Luax/luax_state.inl
+++ b/Source/3rdParty/Luax/luax_state.inl
@@ -56,7 +56,7 @@ namespace Luax
 
 		LuaxClass<T>::SetLuaxClassTableRef(state, -1);
 
-		const char* type = T::GetLuaxFactoryName();
+		cc8* type = T::GetLuaxFactoryName();
 		SetField(top, type);
 
 		// reset top
@@ -78,8 +78,6 @@ namespace Luax
 		int top = lua_gettop(L); // namespace table
 		assert(lua_istable(L, top));
 
-		const char* type = T::GetLuaxSingletonName();
-
 		// class table.
 		lua_newtable(L);
 		LuaxClass<T>::RegisterLuaxClass(state);
@@ -94,10 +92,14 @@ namespace Luax
 		lua_pushvalue(state, -1);
 		lua_setfield(state, -2, "__newindex");
 
+		cc8* type = T::GetLuaxSingletonName();
 		SetField(top, type);
 
 		// reset top
 		lua_settop(L, top);
+
+		// ����
+		T::RegisterLuaxPostprocess(state);
 	}
 
 	template<typename T>