Add __repr__ implement for delegate objects

amos402 · amos402 · commit 86d6befa96bb · 2018-08-24T14:11:47.000+08:00
diff --git a/src/runtime/methodbinding.cs b/src/runtime/methodbinding.cs
@@ -356,13 +356,4 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)
             return self._caller.PyCall(self._target, args);
         }
     }
-
-    internal class DelegateGenericBinding : ExtensionType
-    {
-
-        public DelegateGenericBinding()
-        {
-
-        }
-    }
 }
diff --git a/src/runtime/methodobject.cs b/src/runtime/methodobject.cs
@@ -288,12 +288,13 @@ public static void ClearFreeList()
 
     class DelegateCallableObject
     {
-        Dictionary<int, List<Method.IMethodCaller>> _callers;
-        private string _name;
+        public string Name { get; private set; }
+
+        private Dictionary<int, List<Method.IMethodCaller>> _callers;
 
         public DelegateCallableObject(string name)
         {
-            _name = name;
+            Name = name;
             _callers = new Dictionary<int, List<Method.IMethodCaller>>();
         }
 
@@ -398,7 +399,6 @@ public IntPtr PyCall(IntPtr self, IntPtr args)
                 }
             }
             return Exceptions.RaiseTypeError("No match found for given type params");
-            //return IntPtr.Zero;
         }
 
         internal static Type CreateDelegateType(Type type, Type returnType, Type[] paramTypes)
@@ -551,6 +551,12 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)
             var self = (DelegateMethodObject)GetManagedObject(ob);
             return self._caller.PyCall(ob, args);
         }
+
+        public static IntPtr tp_repr(IntPtr ob)
+        {
+            var self = (DelegateMethodObject)GetManagedObject(ob);
+            return Runtime.PyString_FromString($"<method '{self._caller.Name}'>");
+        }
     }
 
     internal class DelegateBoundMethodObject : ExtensionType
@@ -598,6 +604,14 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)
             }
             FinalizeObject(self);
         }
+
+        public static IntPtr tp_repr(IntPtr ob)
+        {
+            var self = (DelegateBoundMethodObject)GetManagedObject(ob);
+            string type = self.Target == IntPtr.Zero ? "unbound" : "bound";
+            string name = self.Caller.Name;
+            return Runtime.PyString_FromString($"<{type} method '{name}'>");
+        }
     }
 
     internal class DelegateGenericMethodObject : DelegateMethodObject
diff --git a/src/runtime/propertyobject.cs b/src/runtime/propertyobject.cs
@@ -171,10 +171,12 @@ internal interface IPropertyObject
     internal class DelegatePropertyObject : ExtensionType
     {
         private IPropertyObject _propCaller;
+        private string _name;
 
         public DelegatePropertyObject(PropertyInfo md)
         {
             _propCaller = CreateProp(md);
+            _name = md.Name;
         }
 
         private static IPropertyObject CreateProp(PropertyInfo pi)
@@ -214,6 +216,12 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
             var self = (DelegatePropertyObject)GetManagedObject(ds);
             return self._propCaller.OnDescrSet(ds, ob, val);
         }
+
+        public static IntPtr tp_repr(IntPtr ob)
+        {
+            var self = (DelegatePropertyObject)GetManagedObject(ob);
+            return Runtime.PyString_FromString($"<property '{self._name}'>");
+        }
     }
 
     internal class StaticPropertyObject<T> : IPropertyObject

Original file line number	Diff line number	Diff line change
`@@ -356,13 +356,4 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)`
`356`	`356`	`return self._caller.PyCall(self._target, args);`
`357`	`357`	`}`
`358`	`358`	`}`
`359`		`-`
`360`		`- internal class DelegateGenericBinding : ExtensionType`
`361`		`- {`
`362`		`-`
`363`		`- public DelegateGenericBinding()`
`364`		`- {`
`365`		`-`
`366`		`- }`
`367`		`- }`
`368`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,12 +288,13 @@ public static void ClearFreeList()`
`288`	`288`
`289`	`289`	`class DelegateCallableObject`
`290`	`290`	`{`
`291`		`- Dictionary<int, List<Method.IMethodCaller>> _callers;`
`292`		`- private string _name;`
	`291`	`+ public string Name { get; private set; }`
	`292`	`+`
	`293`	`+ private Dictionary<int, List<Method.IMethodCaller>> _callers;`
`293`	`294`
`294`	`295`	`public DelegateCallableObject(string name)`
`295`	`296`	`{`
`296`		`- _name = name;`
	`297`	`+ Name = name;`
`297`	`298`	`_callers = new Dictionary<int, List<Method.IMethodCaller>>();`
`298`	`299`	`}`
`299`	`300`
`@@ -398,7 +399,6 @@ public IntPtr PyCall(IntPtr self, IntPtr args)`
`398`	`399`	`}`
`399`	`400`	`}`
`400`	`401`	`return Exceptions.RaiseTypeError("No match found for given type params");`
`401`		`- //return IntPtr.Zero;`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`internal static Type CreateDelegateType(Type type, Type returnType, Type[] paramTypes)`
`@@ -551,6 +551,12 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)`
`551`	`551`	`var self = (DelegateMethodObject)GetManagedObject(ob);`
`552`	`552`	`return self._caller.PyCall(ob, args);`
`553`	`553`	`}`
	`554`	`+`
	`555`	`+ public static IntPtr tp_repr(IntPtr ob)`
	`556`	`+ {`
	`557`	`+ var self = (DelegateMethodObject)GetManagedObject(ob);`
	`558`	`+ return Runtime.PyString_FromString($"<method '{self._caller.Name}'>");`
	`559`	`+ }`
`554`	`560`	`}`
`555`	`561`
`556`	`562`	`internal class DelegateBoundMethodObject : ExtensionType`
`@@ -598,6 +604,14 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)`
`598`	`604`	`}`
`599`	`605`	`FinalizeObject(self);`
`600`	`606`	`}`
	`607`	`+`
	`608`	`+ public static IntPtr tp_repr(IntPtr ob)`
	`609`	`+ {`
	`610`	`+ var self = (DelegateBoundMethodObject)GetManagedObject(ob);`
	`611`	`+ string type = self.Target == IntPtr.Zero ? "unbound" : "bound";`
	`612`	`+ string name = self.Caller.Name;`
	`613`	`+ return Runtime.PyString_FromString($"<{type} method '{name}'>");`
	`614`	`+ }`
`601`	`615`	`}`
`602`	`616`
`603`	`617`	`internal class DelegateGenericMethodObject : DelegateMethodObject`
Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,12 @@ internal interface IPropertyObject`
`171`	`171`	`internal class DelegatePropertyObject : ExtensionType`
`172`	`172`	`{`
`173`	`173`	`private IPropertyObject _propCaller;`
	`174`	`+ private string _name;`
`174`	`175`
`175`	`176`	`public DelegatePropertyObject(PropertyInfo md)`
`176`	`177`	`{`
`177`	`178`	`_propCaller = CreateProp(md);`
	`179`	`+ _name = md.Name;`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`private static IPropertyObject CreateProp(PropertyInfo pi)`
`@@ -214,6 +216,12 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)`
`214`	`216`	`var self = (DelegatePropertyObject)GetManagedObject(ds);`
`215`	`217`	`return self._propCaller.OnDescrSet(ds, ob, val);`
`216`	`218`	`}`
	`219`	`+`
	`220`	`+ public static IntPtr tp_repr(IntPtr ob)`
	`221`	`+ {`
	`222`	`+ var self = (DelegatePropertyObject)GetManagedObject(ob);`
	`223`	`+ return Runtime.PyString_FromString($"<property '{self._name}'>");`
	`224`	`+ }`
`217`	`225`	`}`
`218`	`226`
`219`	`227`	`internal class StaticPropertyObject<T> : IPropertyObject`