Fix nits

christabella · christabella · commit 5855a1ba9e82 · 2020-12-24T11:46:05.000Z
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -470,7 +470,7 @@ private static ClassInfo GetClassInfo(Type type)
 
                 ob = new MethodObject(type, name, mlist);
                 ci.members[name] = ob;
-                if (OperatorMethod.IsOperatorMethod(mlist[0]))
+                if (mlist.Any(OperatorMethod.IsOperatorMethod))
                 {
                     ci.members[OperatorMethod.GetPyMethodName(name)] = ob;
                 }
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -342,7 +342,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                 bool paramsArray;
                 int kwargsMatched;
                 int defaultsNeeded;
-                bool isOperator = OperatorMethod.IsOperatorMethod(mi);  // e.g. op_Addition is defined for OperableObject
+                bool isOperator = OperatorMethod.IsOperatorMethod(mi);
                 if (!MatchesArgumentCount(pynargs, pi, kwargDict, isOperator, out paramsArray, out defaultArgList, out kwargsMatched, out defaultsNeeded))
                 {
                     continue;
@@ -362,12 +362,11 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                 {
                     if (inst != IntPtr.Zero)
                     {
-                        var co = ManagedType.GetManagedObject(inst) as CLRObject;
-                        if (co == null)
+                        if (ManagedType.GetManagedObject(inst) is CLRObject co)
                         {
-                            break;
+                            margs[0] = co.inst;
                         }
-                        margs[0] = co.inst;
+                        else { break; }
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ private static ClassInfo GetClassInfo(Type type)`
`470`	`470`
`471`	`471`	`ob = new MethodObject(type, name, mlist);`
`472`	`472`	`ci.members[name] = ob;`
`473`		`- if (OperatorMethod.IsOperatorMethod(mlist[0]))`
	`473`	`+ if (mlist.Any(OperatorMethod.IsOperatorMethod))`
`474`	`474`	`{`
`475`	`475`	`ci.members[OperatorMethod.GetPyMethodName(name)] = ob;`
`476`	`476`	`}`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth`
`342`	`342`	`bool paramsArray;`
`343`	`343`	`int kwargsMatched;`
`344`	`344`	`int defaultsNeeded;`
`345`		`- bool isOperator = OperatorMethod.IsOperatorMethod(mi); // e.g. op_Addition is defined for OperableObject`
	`345`	`+ bool isOperator = OperatorMethod.IsOperatorMethod(mi);`
`346`	`346`	`if (!MatchesArgumentCount(pynargs, pi, kwargDict, isOperator, out paramsArray, out defaultArgList, out kwargsMatched, out defaultsNeeded))`
`347`	`347`	`{`
`348`	`348`	`continue;`
`@@ -362,12 +362,11 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth`
`362`	`362`	`{`
`363`	`363`	`if (inst != IntPtr.Zero)`
`364`	`364`	`{`
`365`		`- var co = ManagedType.GetManagedObject(inst) as CLRObject;`
`366`		`- if (co == null)`
	`365`	`+ if (ManagedType.GetManagedObject(inst) is CLRObject co)`
`367`	`366`	`{`
`368`		`- break;`
	`367`	`+ margs[0] = co.inst;`
`369`	`368`	`}`
`370`		`- margs[0] = co.inst;`
	`369`	`+ else { break; }`
`371`	`370`	`}`
`372`	`371`	`}`
`373`	`372`