1、封装getglobal，setglobal的lua异常；

2、c#的callback，统一把异常给catch，转成lua异常；

Author: chexiongsheng

.gitignore

@@ -15,7 +15,7 @@ UnityVS
 /Assets/UnityVS.meta
 .DS_Store
 *.o
-*.a
+/build/*/*.a
 luajit
 buildvm
 minilua

Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so

@@ -265,8 +265,8 @@ namespace CSObjectWrap
             <%end)%>
             return LuaAPI.luaL_error(L, "invalid arguments to right hand of <%=OpCallNameMap[operator.Name]%> operator, need <%=CsFullTypeName(type)%>!");
             <%else%>
-            <%=GetCasterStatement(type, 1, "rightside", true)%>;
             try {
+                <%=GetCasterStatement(type, 1, "rightside", true)%>;
                 <%=GetPushStatement(operator.Overloads[0].ReturnType, OpCallNameMap[operator.Name] .. " rightside")%>;
             } catch(System.Exception __gen_e) {
                 return LuaAPI.luaL_error(L, "c# exception:" + __gen_e);

Assets/Plugins/Android/libs/x86/libxlua.so

@@ -96,10 +96,10 @@ public static void lua_newtable(IntPtr L)//[-0, +0, m]
 		}
 
         [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int lua_getglobal(IntPtr L, string name);//[-1, +0, m]
+        public static extern int xlua_getglobal(IntPtr L, string name);//[-1, +0, m]
 
         [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void lua_setglobal(IntPtr L, string name);//[-1, +0, m]
+        public static extern int xlua_setglobal(IntPtr L, string name);//[-1, +0, m]
 
         [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)]
         public static extern void xlua_getloaders(IntPtr L);

Assets/Plugins/x86/xlua.dll

@@ -59,7 +59,10 @@ public LuaEnv()
                 LuaAPI.lua_atpanic(L, StaticLuaCallbacks.Panic);
 
                 LuaAPI.lua_pushstdcallcfunction(L, StaticLuaCallbacks.Print);
-                LuaAPI.lua_setglobal(L, "print");
+                if (0 != LuaAPI.xlua_setglobal(L, "print"))
+                {
+                    throw new Exception("call xlua_setglobal fail!");
+                }
 
                 //template engine lib register
                 TemplateEngine.LuaTemplate.OpenLib(L);
@@ -111,7 +114,10 @@ public LuaEnv()
 
                 translator.Alias(typeof(Type), "System.MonoType");
 
-                LuaAPI.lua_getglobal(L, "_G");
+                if (0 != LuaAPI.xlua_getglobal(L, "_G"))
+                {
+                    throw new Exception("call xlua_getglobal fail!");
+                }
                 translator.Get(L, -1, out _G);
                 LuaAPI.lua_pop(L, 1);
 

Assets/Plugins/x86_64/xlua.dll

@@ -469,7 +469,10 @@ public void CreateDelegateMetatable(RealStatePtr L)
 
 		public void OpenLib(RealStatePtr L)
 		{
-            LuaAPI.lua_getglobal(L, "xlua");
+            if (0 != LuaAPI.xlua_getglobal(L, "xlua"))
+            {
+                throw new Exception("call xlua_getglobal fail!" + LuaAPI.lua_tostring(L, -1));
+            }
             LuaAPI.xlua_pushasciistring(L, "import_type");
 			LuaAPI.lua_pushstdcallcfunction(L,importTypeFunction);
 			LuaAPI.lua_rawset(L, -3);

Assets/XLua/Src/Editor/Template/LuaClassWrap.tpl.txt

@@ -244,7 +244,10 @@ public static void OpenLib(RealStatePtr L)
             LuaAPI.xlua_pushasciistring(L, "execute");
             LuaAPI.lua_pushstdcallcfunction(L, templateExecuteFunction);
             LuaAPI.lua_rawset(L, -3);
-            LuaAPI.lua_setglobal(L, "template");
+            if (0 != LuaAPI.xlua_setglobal(L, "template"))
+            {
+                throw new Exception("call xlua_setglobal fail!");
+            }
         }
     }
 }

Assets/XLua/Src/LuaDLL.cs

@@ -1092,7 +1092,10 @@ static List<string> getPathOfType(Type type)
         public static void LoadCSTable(RealStatePtr L, Type type)
         {
             int oldTop = LuaAPI.lua_gettop(L);
-            LuaAPI.lua_getglobal(L, "CS");
+            if (0 != LuaAPI.xlua_getglobal(L, "CS"))
+            {
+                throw new Exception("call xlua_getglobal fail!");
+            }
 
             List<string> path = getPathOfType(type);
 
@@ -1119,7 +1122,10 @@ public static void SetCSTable(RealStatePtr L, Type type, int cls_table)
         {
             int oldTop = LuaAPI.lua_gettop(L);
             cls_table = abs_idx(oldTop, cls_table);
-            LuaAPI.lua_getglobal(L, "CS");
+            if (0 != LuaAPI.xlua_getglobal(L, "CS"))
+            {
+                throw new Exception("call xlua_getglobal fail!");
+            }
 
             List<string> path = getPathOfType(type);
 

Assets/XLua/Src/LuaEnv.cs

@@ -4,6 +4,7 @@ mkdir -p build_v7a && cd build_v7a
 cmake -DANDROID_ABI=armeabi-v7a -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 -DANDROID_NATIVE_API_LEVEL=android-9 ../
 cd ..
 cmake --build build_v7a --config Release
+mkdir -p plugin_lua53/Plugins/Android/libs/armeabi-v7a/
 cp build_v7a/libxlua.so plugin_lua53/Plugins/Android/libs/armeabi-v7a/libxlua.so
 
 mkdir -p build_x86 && cd build_x86

Assets/XLua/Src/ObjectTranslator.cs

@@ -18,6 +18,7 @@ mkdir -p build_lj_v7a && cd build_lj_v7a
 cmake -DUSING_LUAJIT=ON -DANDROID_ABI=armeabi-v7a -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 -DANDROID_NATIVE_API_LEVEL=android-9 ../
 cd "$DIR"
 cmake --build build_lj_v7a --config Release
+mkdir -p plugin_luajit/Plugins/Android/libs/armeabi-v7a/
 cp build_lj_v7a/libxlua.so plugin_luajit/Plugins/Android/libs/armeabi-v7a/libxlua.so
 
 

Assets/XLua/Src/StaticLuaCallbacks.cs

@@ -285,6 +285,29 @@ LUA_API int xlua_psettable_bypath(lua_State* L, int idx, const char *path) {
     return lua_pcall(L, 3, 0, 0);
 }
 
+static int c_lua_getglobal(lua_State* L) {
+	lua_getglobal(L, lua_tostring(L, 1));
+	return 1;
+}
+
+LUA_API int xlua_getglobal (lua_State *L, const char *name) {
+	lua_pushcfunction(L, c_lua_getglobal);
+	lua_pushstring(L, name);
+	return lua_pcall(L, 1, 1, 0);
+}
+
+static int c_lua_setglobal(lua_State* L) {
+	lua_setglobal(L, lua_tostring(L, 1));
+	return 0;
+}
+
+LUA_API int xlua_setglobal (lua_State *L, const char *name) {
+	lua_pushcfunction(L, c_lua_setglobal);
+	lua_pushstring(L, name);
+	lua_pushvalue(L, -3);
+	return lua_pcall(L, 2, 0, 0);
+}
+
 LUA_API int xlua_tryget_cachedud(lua_State *L, int key, int cache_ref) {
 	lua_rawgeti(L, LUA_REGISTRYINDEX, cache_ref);
 	lua_rawgeti(L, -1, key);