fix interface export

pangweiwei · Sep 26, 2017 · cd5b0aa · cd5b0aa
1 parent 937fad3
commit cd5b0aa
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/Assets/Plugins/Slua_Managed/LuaObject_basetype.cs b/Assets/Plugins/Slua_Managed/LuaObject_basetype.cs
@@ -157,11 +157,19 @@ public static void pushValue(IntPtr l, ushort v)
 		{
 		    LuaDLL.lua_pushinteger(l, v);
 		}
-
-		#endregion
 
-		#region int
-		static public bool checkType(IntPtr l, int p, out int v)
+        #endregion
+
+
+        #region interface
+        static public void pushInterface(IntPtr l,object i,Type t) {
+			ObjectCache oc = ObjectCache.get(l);
+            oc.pushInterface(l, i, t);
+        }
+        #endregion
+
+        #region int
+        static public bool checkType(IntPtr l, int p, out int v)
 		{
 			v = (int)LuaDLL.luaL_checkinteger(l, p);
 			return true;

diff --git a/Assets/Plugins/Slua_Managed/LuaState.cs b/Assets/Plugins/Slua_Managed/LuaState.cs
@@ -897,6 +897,7 @@ public virtual void Dispose(bool dispose)
         public static int errorReport(IntPtr L)
         {
             s.Length = 0;
+            s.Append(LuaDLL.lua_tostring(L,1));
 
             LuaDLL.lua_getglobal(L, "debug");
             LuaDLL.lua_getfield(L, -1, "traceback");

diff --git a/Assets/Plugins/Slua_Managed/ObjectCache.cs b/Assets/Plugins/Slua_Managed/ObjectCache.cs
@@ -251,6 +251,17 @@ internal int allocID(IntPtr l,object o) {
 			return index;
 		}
 
+		internal void pushInterface(IntPtr l, object o, Type t)
+		{
+
+			int index = allocID(l, o);
+			if (index < 0)
+				return;
+
+			LuaDLL.luaS_pushobject(l, index, getAQName(t), true, udCacheRef);
+		}
+
+
 		internal void push(IntPtr l, object o, bool checkReflect)
 		{
 

diff --git a/Assets/Slua/Editor/LuaCodeGen.cs b/Assets/Slua/Editor/LuaCodeGen.cs
@@ -2357,6 +2357,8 @@ void WritePushValue(Type t, StreamWriter file)
 		{
 			if (t.IsEnum)
 				Write(file, "pushEnum(l,(int)ret);");
+            else if (t.IsInterface && t.IsDefined(typeof(CustomLuaClassAttribute), false))
+                Write(file, "pushInterface(l,ret, typeof({0}));", TypeDecl(t));
 			else
 				Write(file, "pushValue(l,ret);");
 		}
@@ -2365,10 +2367,11 @@ void WritePushValue(Type t, StreamWriter file, string ret)
 		{
 			if (t.IsEnum)
 				Write(file, "pushEnum(l,(int){0});", ret);
+            else if (t.IsInterface && t.IsDefined(typeof(CustomLuaClassAttribute),false))
+                Write(file, "pushInterface(l,{0}, typeof({1}));", ret,TypeDecl(t));
 			else
 				Write(file, "pushValue(l,{0});", ret);
-		}
-
+		}	
 
 		void Write(StreamWriter file, string fmt, params object[] args)
 		{

diff --git a/Assets/Slua/Resources/custom.txt b/Assets/Slua/Resources/custom.txt
@@ -25,5 +25,6 @@ function main()
 	print("-->"..c:getItem("test"))
 
     assert(c:getInterface():getInt()==10)
+    c:getInterface():setInt(11)
     print("assert interface ok")
 end
diff --git a/Assets/Slua/example/Custom.cs b/Assets/Slua/example/Custom.cs
@@ -75,20 +75,30 @@ public string getTypeName(Type t)
     public interface IFoo
     {
         int getInt();
+        void setInt(int i, bool ok);
     }
 
     class Foo : IFoo {
         public int getInt() {
             return 10;
         }
+        public void setInt(int i,bool ok) {
+
+        }
     }
 
     public IFoo getInterface() {
         return new Foo();
     }
-
 }
 
+public static class IFooExt
+{
+	public static void setInt(this Custom.IFoo f, int i)
+	{
+
+	}
+}
 
 namespace SLua {