pop extra nil value if checkType with Type argument

fix byref base type
pangweiwei · Oct 16, 2015 · 3dd3b39 · 3dd3b39
1 parent b5f9584
commit 3dd3b39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Assets/Slua/Editor/LuaCodeGen.cs b/Assets/Slua/Editor/LuaCodeGen.cs
@@ -1708,17 +1708,13 @@ bool IsValueType(Type t)
 
 		bool IsBaseType(Type t)
 		{
+			if (t.IsByRef) t = t.GetElementType();
 			return t.IsPrimitive
 				|| t == typeof(Color)
 				|| t == typeof(Vector2)
 				|| t == typeof(Vector3)
 				|| t == typeof(Vector4)
-				|| t == typeof(Quaternion)
-				|| t.Name == "Color2&"
-				|| t.Name == "Vector2&"
-				|| t.Name == "Vector3&"
-				|| t.Name == "Vector4&"
-				|| t.Name == "Quaternion&";
+				|| t == typeof(Quaternion);
 		}
 
 		string FullName(string str)

diff --git a/Assets/Slua/Script/LuaObject.cs b/Assets/Slua/Script/LuaObject.cs
@@ -1078,7 +1078,7 @@ static public bool checkType(IntPtr l, int p, out Type t)
                         LuaDLL.lua_pushstring(l, "__fullname");
                         LuaDLL.lua_rawget(l, p);
                         tname = LuaDLL.lua_tostring(l, -1);
-                        LuaDLL.lua_pop(l, 1);
+                        LuaDLL.lua_pop(l, 2);
                     }
                     break;