浏览代码

[cs] NativeClassWrapper takes care of all Statics, no need to return them when using reflection

Caue Waneck 13 年之前
父节点
当前提交
efb43531fd
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7 7
      std/cs/_std/haxe/lang/Runtime.hx

+ 7 - 7
std/cs/_std/haxe/lang/Runtime.hx

@@ -201,15 +201,15 @@ package haxe.lang;
 			obj = null;
 			obj = null;
 		}
 		}
 
 
-		System.Reflection.FieldInfo f = t.GetField(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
+		System.Reflection.FieldInfo f = t.GetField(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
 		if (f != null)
 		if (f != null)
 		{
 		{
 			return f.GetValue(obj);
 			return f.GetValue(obj);
 		} else {
 		} else {
-			System.Reflection.PropertyInfo prop = t.GetProperty(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
+			System.Reflection.PropertyInfo prop = t.GetProperty(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
 			if (prop == null)
 			if (prop == null)
 			{
 			{
-				System.Reflection.MethodInfo m = t.GetMethod(field,  System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
+				System.Reflection.MethodInfo m = t.GetMethod(field,  System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
 				if (m != null)
 				if (m != null)
 				{
 				{
 					return new haxe.lang.NativeMethodFunction(obj, field);
 					return new haxe.lang.NativeMethodFunction(obj, field);
@@ -239,7 +239,7 @@ package haxe.lang;
 			obj = null;
 			obj = null;
 		}
 		}
 
 
-		System.Reflection.MemberInfo[] mi = t.GetMember(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
+		System.Reflection.MemberInfo[] mi = t.GetMember(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
 		return mi != null && mi.Length > 0;
 		return mi != null && mi.Length > 0;
 	')
 	')
 	public static function slowHasField(obj:Dynamic, field:String):Bool
 	public static function slowHasField(obj:Dynamic, field:String):Bool
@@ -259,13 +259,13 @@ package haxe.lang;
 			obj = null;
 			obj = null;
 		}
 		}
 
 
-		System.Reflection.FieldInfo f = t.GetField(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
+		System.Reflection.FieldInfo f = t.GetField(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
 		if (f != null)
 		if (f != null)
 		{
 		{
 			f.SetValue(obj, @value);
 			f.SetValue(obj, @value);
 			return @value;
 			return @value;
 		} else {
 		} else {
-			System.Reflection.PropertyInfo prop = t.GetProperty(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance);
+			System.Reflection.PropertyInfo prop = t.GetProperty(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
 			prop.SetValue(obj, @value, null);
 			prop.SetValue(obj, @value, null);
 
 
 			return @value;
 			return @value;
@@ -300,7 +300,7 @@ package haxe.lang;
 			ts[i] = oargs[i].GetType();
 			ts[i] = oargs[i].GetType();
 		}
 		}
 
 
-		System.Reflection.MethodInfo mi = t.GetMethod(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Instance, null, ts, null);
+		System.Reflection.MethodInfo mi = t.GetMethod(field, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance, null, ts, null);
 		return mi.Invoke(obj, oargs);
 		return mi.Invoke(obj, oargs);
 	')
 	')
 	public static function slowCallField(obj:Dynamic, field:String, args:Array<Dynamic>):Dynamic
 	public static function slowCallField(obj:Dynamic, field:String, args:Array<Dynamic>):Dynamic