Dont PyObjects precedence in Operator methods

C-SELLERS · C-SELLERS · commit 0f5f0ba7622e · 2021-02-15T13:18:57.000-08:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -200,13 +200,13 @@ private static int GetPrecedence(MethodInformation methodInformation)
             val += mi.IsGenericMethod ? 1 : 0;
             for (var i = 0; i < num; i++)
             {
-                val += ArgPrecedence(pi[i].ParameterType);
+                val += ArgPrecedence(pi[i].ParameterType, methodInformation);
             }
 
             var info = mi as MethodInfo;
             if (info != null)
             {
-                val += ArgPrecedence(info.ReturnType);
+                val += ArgPrecedence(info.ReturnType, methodInformation);
                 val += mi.DeclaringType == mi.ReflectedType ? 0 : 3000;
             }
 
@@ -216,15 +216,15 @@ private static int GetPrecedence(MethodInformation methodInformation)
         /// <summary>
         /// Return a precedence value for a particular Type object.
         /// </summary>
-        internal static int ArgPrecedence(Type t)
+        internal static int ArgPrecedence(Type t, MethodInformation mi)
         {
             Type objectType = typeof(object);
             if (t == objectType)
             {
                 return 3000;
             }
 
-            if (t.IsAssignableFrom(typeof(PyObject)))
+            if (t.IsAssignableFrom(typeof(PyObject)) && !OperatorMethod.IsOperatorMethod(mi.MethodBase))
             {
                 return -1;
             }
@@ -283,7 +283,7 @@ internal static int ArgPrecedence(Type t)
                 {
                     return 2500;
                 }
-                return 100 + ArgPrecedence(e);
+                return 100 + ArgPrecedence(e, mi);
             }
 
             return 2000;

Original file line number	Diff line number	Diff line change
`@@ -200,13 +200,13 @@ private static int GetPrecedence(MethodInformation methodInformation)`
`200`	`200`	`val += mi.IsGenericMethod ? 1 : 0;`
`201`	`201`	`for (var i = 0; i < num; i++)`
`202`	`202`	`{`
`203`		`- val += ArgPrecedence(pi[i].ParameterType);`
	`203`	`+ val += ArgPrecedence(pi[i].ParameterType, methodInformation);`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`var info = mi as MethodInfo;`
`207`	`207`	`if (info != null)`
`208`	`208`	`{`
`209`		`- val += ArgPrecedence(info.ReturnType);`
	`209`	`+ val += ArgPrecedence(info.ReturnType, methodInformation);`
`210`	`210`	`val += mi.DeclaringType == mi.ReflectedType ? 0 : 3000;`
`211`	`211`	`}`
`212`	`212`
`@@ -216,15 +216,15 @@ private static int GetPrecedence(MethodInformation methodInformation)`
`216`	`216`	`/// <summary>`
`217`	`217`	`/// Return a precedence value for a particular Type object.`
`218`	`218`	`/// </summary>`
`219`		`- internal static int ArgPrecedence(Type t)`
	`219`	`+ internal static int ArgPrecedence(Type t, MethodInformation mi)`
`220`	`220`	`{`
`221`	`221`	`Type objectType = typeof(object);`
`222`	`222`	`if (t == objectType)`
`223`	`223`	`{`
`224`	`224`	`return 3000;`
`225`	`225`	`}`
`226`	`226`
`227`		`- if (t.IsAssignableFrom(typeof(PyObject)))`
	`227`	`+ if (t.IsAssignableFrom(typeof(PyObject)) && !OperatorMethod.IsOperatorMethod(mi.MethodBase))`
`228`	`228`	`{`
`229`	`229`	`return -1;`
`230`	`230`	`}`
`@@ -283,7 +283,7 @@ internal static int ArgPrecedence(Type t)`
`283`	`283`	`{`
`284`	`284`	`return 2500;`
`285`	`285`	`}`
`286`		`- return 100 + ArgPrecedence(e);`
	`286`	`+ return 100 + ArgPrecedence(e, mi);`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`return 2000;`