更新tolua#到1.0.7.367版

Assets/LuaFramework/ToLua/Core/LuaDLL.cs

@@ -187,7 +187,7 @@ public string short_src
 
     public class LuaDLL
     {
-        public static string version = "1.0.7.358";
+        public static string version = "1.0.7.364";
         public static int LUA_MULTRET = -1;
         public static string[] LuaTypeName = { "none", "nil", "boolean", "lightuserdata", "number", "string", "table", "function", "userdata", "thread" };        
 

Assets/LuaFramework/ToLua/Core/ToLua.cs

@@ -1026,6 +1026,10 @@ static public Type CheckMonoType(IntPtr L, int stackPos)
 
                 return null;
             }
+            else if (LuaDLL.lua_isnil(L, stackPos))
+            {
+                return null;
+            }
 
             LuaDLL.luaL_typerror(L, stackPos, "Type");
             return null;
@@ -1052,6 +1056,10 @@ public static IEnumerator CheckIter(IntPtr L, int stackPos)
 
                 return null;
             }
+            else if (LuaDLL.lua_isnil(L, stackPos))
+            {
+                return null;
+            }
 
             LuaDLL.luaL_typerror(L, stackPos, "Type");
             return null;

Assets/LuaFramework/ToLua/Lua/event.lua

@@ -77,7 +77,8 @@ function _event:Add(func, obj)
 
 	if self.lock then
 		local node = {value = func, _prev = 0, _next = 0}
-		table.insert(self.addList, node)
+		table.insert(self.opList, node)
+		node.op = list.pushnode		
 		return node
 	else
 		return self.list:push(func)
@@ -88,12 +89,12 @@ end
 function _event:Remove(func, obj)	
 	for i, v in ilist(self.list) do							
 		if v.func == func and v.obj == obj then
-			if self.lock and self.current ~= i then
-				table.insert(self.rmList, i)
+			if self.lock then
+				table.insert(self.opList, i)
+				node.op = list.remove
 			else
 				self.list:remove(i)
 			end
-
 			break
 		end
 	end		
@@ -106,23 +107,25 @@ function _event:CreateListener(func, obj)
 		func = functor(func, obj)
 	end	
 
-	return {value = func, _prev = 0, _next = 0}		
+	return {value = func, _prev = 0, _next = 0, removed = true}		
 end
 
-function _event:AddListener(handle)
+function _event:AddListener(handle)	
 	if self.lock then
-		table.insert(self.addList, handle)
+		table.insert(self.opList, handle)	
+		handle.op = list.pushnode			
 	else
 		self.list:pushnode(handle)
-	end
+	end	
 end
 
 function _event:RemoveListener(handle)		
-	if self.lock and self.current ~= handle then		
-		table.insert(self.rmList, handle)
+	if self.lock then		
+		table.insert(self.opList, handle)		
+		handle.op = list.remove		
 	else
 		self.list:remove(handle)
-	end
+	end	
 end
 
 function _event:Count()
@@ -131,8 +134,7 @@ end
 
 function _event:Clear()
 	self.list:clear()
-	self.rmList = {}
-	self.addList = {}
+	self.opList = {}	
 	self.lock = false
 	self.keepSafe = false
 	self.current = nil
@@ -157,12 +159,11 @@ end
 _event.__call = function(self, ...)			
 	local _list = self.list	
 	self.lock = true
-	local ilist = ilist			
-	local flag, msg = false, nil
+	local ilist = ilist				
 
 	for i, f in ilist(_list) do		
 		self.current = i						
-		flag, msg = f(...)
+		local flag, msg = f(...)
 
 		if not flag then
 			if self.keepSafe then								
@@ -173,23 +174,17 @@ _event.__call = function(self, ...)
 		end
 	end	
 
-	for _, i in ipairs(self.rmList) do							
-		_list:remove(i)		
+	for _, i in ipairs(self.opList) do									
+		i.op(_list, i)
 	end
 
-	self.rmList = {}
-	self.lock = false		
-
-	for _, i in ipairs(self.addList) do
-		_list:pushnode(i)
-	end
-
-	self.addList = {}
-		end
+	self.lock = false	
+	self.opList = {}
+end
 
 function event(name, safe)
 	safe = safe or false
-	return setmetatable({name = name, keepSafe = safe, lock = false, rmList = {}, addList = {}, list = list:new()}, _event)				
+	return setmetatable({name = name, keepSafe = safe, lock = false, opList = {}, list = list:new()}, _event)				
 end
 
 UpdateBeat 		= event("Update", true)

Assets/LuaFramework/ToLua/Lua/list.lua

@@ -22,24 +22,25 @@ function list:clear()
 end
 
 function list:push(value)
-	local node = {value = value, _prev = 0, _next = 0}
+	--assert(value)
+	local node = {value = value, _prev = 0, _next = 0, removed = false}
 
 	self._prev._next = node
 	node._next = self
 	node._prev = self._prev
 	self._prev = node
 
-	node.removed = false
 	self.length = self.length + 1
 	return node
 end
 
 function list:pushnode(node)
+	if not node.removed then return end
+
 	self._prev._next = node
 	node._next = self
 	node._prev = self._prev
 	self._prev = node
-
 	node.removed = false
 	self.length = self.length + 1
 end
@@ -51,14 +52,13 @@ function list:pop()
 end
 
 function list:unshift(v)
-	local node = {value = v, _prev = 0, _next = 0}
+	local node = {value = v, _prev = 0, _next = 0, removed = false}
 
 	self._next._prev = node
 	node._prev = self
 	node._next = self._next
 	self._next = node
 
-	node.removed = false
 	self.length = self.length + 1
 	return node
 end
@@ -70,42 +70,41 @@ function list:shift()
 end
 
 function list:remove(iter)
+	if iter.removed then return end
+
 	local _prev = iter._prev
 	local _next = iter._next
-
-	if iter.removed == false then
-		_next._prev = _prev
-		_prev._next = _next
-
-		self.length = math.max(0, self.length - 1)
-		iter.removed = true
-	end	
+	_next._prev = _prev
+	_prev._next = _next
+
+	self.length = math.max(0, self.length - 1)
+	iter.removed = true
 end
 
 function list:find(v, iter)
 	iter = iter or self
 
-	while iter do
+	repeat
 		if v == iter.value then
 			return iter
 		else
 			iter = iter._next
 		end		
-	end
+	until iter == self
 
 	return nil
 end
 
 function list:findlast(v, iter)
 	iter = iter or self
 
-	while iter do
+	repeat
 		if v == iter.value then
 			return iter
 		end
 
 		iter = iter._prev
-	end
+	until iter == self
 
 	return nil
 end
@@ -141,7 +140,7 @@ function list:insert(v, iter)
 		return self:push(v)
 	end
 
-	local node = {value = v, _next = 0, _prev = 0}
+	local node = {value = v, _next = 0, _prev = 0, removed = false}
 
 	if iter._next then
 		iter._next._prev = node
@@ -152,7 +151,6 @@ function list:insert(v, iter)
 
 	node._prev = iter
 	iter._next = node
-	node.removed = false
 	self.length = self.length + 1
 	return node
 end

ReadMe.txt

@@ -21,6 +21,11 @@ XlsxToLua:   https://github.com/zhangqi-ulua/XlsxToLua
 UnityHello:  https://github.com/woshihuo12/UnityHello
 Excel配置：https://github.com/sy-yanghuan/proton
 
+ULUA/TOLUA骏擎Unity素材商店: https://junfine.taobao.com
+
+//-------------2017-08-22-------------
+(1)更新tolua#到1.0.7.367版
+
 //-------------2017-08-10-------------
 (1)更新tolua#到1.0.7.359版