fix Yield crash on lua5.3

pangweiwei · pangweiwei · commit fe23f35b27d6 · 2015-05-15T15:25:12.000+08:00
diff --git a/Assets/Slua/Script/Coroutine.cs b/Assets/Slua/Script/Coroutine.cs
@@ -36,11 +36,30 @@ public class LuaCoroutine : LuaObject
 		static public void reg(IntPtr l, MonoBehaviour m)
 		{
 			mb = m;
-			reg(l, Yield, "UnityEngine");
+			reg(l, Yieldk, "UnityEngine");
+
+			string yield =
+@"
+local Yield = UnityEngine.Yieldk
+UnityEngine.Yield = function(x)
+	local co,ismain=coroutine.running()
+	if ismain then error('Can not yield in main thread') end
+
+	Yield(x,function()
+		coroutine.resume(co)
+	end)
+	coroutine.yield()
+end
+return yield
+";
+				// overload resume function for report error
+			if(LuaDLL.lua_dostring(l, yield)!=0)
+				LuaObject.throwLuaError(l);
+			LuaDLL.lua_pop(l, 1);
 		}
 
 		[MonoPInvokeCallback(typeof(LuaCSFunction))]
-		static public int Yield(IntPtr l)
+		static public int Yieldk(IntPtr l)
 		{
 			try
 			{
@@ -50,28 +69,11 @@ static public int Yield(IntPtr l)
 					return 0;
 				}
 				object y = checkObj(l, 1);
+				LuaFunction f;
+				checkType(l, 2, out f);
 
-				Action act = () =>
-				{
-#if LUA_5_3
-					if(LuaDLL.lua_resume(l,IntPtr.Zero,0) > (int) LuaThreadStatus.LUA_YIELD )
-#else
-					if (LuaDLL.lua_resume(l, 0) > (int) LuaThreadStatus.LUA_YIELD )
-#endif
-                    {
-						LuaObject.pushTry(l);
-						LuaDLL.lua_pushvalue(l, -2);
-						LuaDLL.lua_call(l, 1, 0);
-						LuaDLL.lua_pop(l, 1);
-                    }
-				};
-
-				mb.StartCoroutine(yieldReturn(y, act));
-#if LUA_5_3
-				return LuaDLL.luaS_yield(l, 0);
-#else
-				return LuaDLL.lua_yield(l, 0);
-#endif
+				mb.StartCoroutine(yieldReturn(y, f));
+				return 0;
 			}
 			catch (Exception e)
 			{
@@ -80,13 +82,13 @@ static public int Yield(IntPtr l)
 			}
 		}
 
-		static public IEnumerator yieldReturn(object y, Action act)
+		static public IEnumerator yieldReturn(object y, LuaFunction f)
 		{
 			if (y is IEnumerator)
 				yield return mb.StartCoroutine((IEnumerator)y);
 			else
 				yield return y;
-			act();
+			f.call();
 		}
 
 	}
diff --git a/Assets/Slua/Script/LuaDLL.cs b/Assets/Slua/Script/LuaDLL.cs
@@ -291,6 +291,11 @@ public static void lua_remove(IntPtr l, int idx)
 		[DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
 		public static extern int luaS_yield(IntPtr luaState,int nrets);
 
+		public static int lua_yield(IntPtr luaState,int nrets) {
+			return luaS_yield(luaState,nrets);
+		}
+
+
 		[DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
 		public static extern int lua_resume(IntPtr L, IntPtr from, int narg);
 
diff --git a/Assets/Slua/Script/LuaState.cs b/Assets/Slua/Script/LuaState.cs
@@ -500,25 +500,16 @@ public LuaState()
 			LuaDLL.lua_pushcfunction(L, import);
 			LuaDLL.lua_setglobal(L, "import");
 
-#if LUA_5_3
-			string resumefunc = @"
-local resume = coroutine.resume
-coroutine.resume=function(co,...)
-	local ret={resume(co,...)}
-	if not ret[1] then UnityEngine.Debug.LogError(debug.traceback(co,ret[2])) end
-	return table.unpack(ret)
-end
-";
-#else
+
 			string resumefunc = @"
 local resume = coroutine.resume
+local unpack = unpack or table.unpack
 coroutine.resume=function(co,...)
 	local ret={resume(co,...)}
 	if not ret[1] then UnityEngine.Debug.LogError(debug.traceback(co,ret[2])) end
 	return unpack(ret)
 end
 ";
-#endif
 			// overload resume function for report error
 			if(LuaDLL.lua_dostring(L, resumefunc)!=0)
 				LuaObject.throwLuaError(L);
diff --git a/Assets/slua_src/slua.c b/Assets/slua_src/slua.c
@@ -132,8 +132,7 @@ static int k(lua_State *L, int status, lua_KContext ctx) {
 }
 
 LUA_API int luaS_yield(lua_State *L, int nrets) {
-	int ret = lua_yieldk(L, nrets, 0, k);
-	return ret;
+	return k(L, lua_yieldk(L, nrets, 0, k), 0);
 }
 
 LUA_API int luaS_pcall(lua_State *L, int nargs, int nresults, int err) {

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,7 @@ static int k(lua_State *L, int status, lua_KContext ctx) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`LUA_API int luaS_yield(lua_State *L, int nrets) {`
`135`		`- int ret = lua_yieldk(L, nrets, 0, k);`
`136`		`- return ret;`
	`135`	`+ return k(L, lua_yieldk(L, nrets, 0, k), 0);`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`LUA_API int luaS_pcall(lua_State *L, int nargs, int nresults, int err) {`