Remove unused variables and add comments.

christabella · christabella · commit bafe87e4aab2 · 2020-12-20T14:05:41.000Z
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -690,7 +690,6 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
             var match = false;
             int clrnargs = parameters.Length;
             paramsArray = clrnargs > 0 ? Attribute.IsDefined(parameters[clrnargs - 1], typeof(ParamArrayAttribute)) : false;
-            var kwargCount = kwargDict.Count;
             kwargsMatched = 0;
             defaultsNeeded = 0;
             if (pynargs == clrnargs && kwargDict.Count == 0)
@@ -701,7 +700,8 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
             {
                 // every parameter past 'positionalArgumentCount' must have either
                 // a corresponding keyword argument or a default parameter, unless
-                // the method is an operator or accepts a params array.
+                // the method is an operator or accepts a params array (which cannot
+                // have a default value)
                 match = true;
                 defaultArgList = new ArrayList();
                 for (var v = pynargs; v < clrnargs; v++)
@@ -725,6 +725,8 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
                     }
                     else if (!isOperator && !paramsArray)
                     {
+                        // this is separate above because an operator method cannot have
+                        // keyword args, default args, or params arrays (exclusive cases)
                         match = false;
                     }
                 }
diff --git a/src/runtime/operatormethod.cs b/src/runtime/operatormethod.cs
@@ -78,9 +78,6 @@ public static bool IsOperatorMethod(MethodBase method)
 
         public static void FixupSlots(IntPtr pyType, Type clrType)
         {
-            // This is not used
-            IntPtr tp_as_number = Marshal.ReadIntPtr(pyType, TypeOffset.tp_as_number);
-
             const BindingFlags flags = BindingFlags.Public | BindingFlags.Static;
             Debug.Assert(_opType != null);
             foreach (var method in clrType.GetMethods(flags))

Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,6 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
`690`	`690`	`var match = false;`
`691`	`691`	`int clrnargs = parameters.Length;`
`692`	`692`	`paramsArray = clrnargs > 0 ? Attribute.IsDefined(parameters[clrnargs - 1], typeof(ParamArrayAttribute)) : false;`
`693`		`- var kwargCount = kwargDict.Count;`
`694`	`693`	`kwargsMatched = 0;`
`695`	`694`	`defaultsNeeded = 0;`
`696`	`695`	`if (pynargs == clrnargs && kwargDict.Count == 0)`
`@@ -701,7 +700,8 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
`701`	`700`	`{`
`702`	`701`	`// every parameter past 'positionalArgumentCount' must have either`
`703`	`702`	`// a corresponding keyword argument or a default parameter, unless`
`704`		`- // the method is an operator or accepts a params array.`
	`703`	`+ // the method is an operator or accepts a params array (which cannot`
	`704`	`+ // have a default value)`
`705`	`705`	`match = true;`
`706`	`706`	`defaultArgList = new ArrayList();`
`707`	`707`	`for (var v = pynargs; v < clrnargs; v++)`
`@@ -725,6 +725,8 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
`725`	`725`	`}`
`726`	`726`	`else if (!isOperator && !paramsArray)`
`727`	`727`	`{`
	`728`	`+ // this is separate above because an operator method cannot have`
	`729`	`+ // keyword args, default args, or params arrays (exclusive cases)`
`728`	`730`	`match = false;`
`729`	`731`	`}`
`730`	`732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,6 @@ public static bool IsOperatorMethod(MethodBase method)`
`78`	`78`
`79`	`79`	`public static void FixupSlots(IntPtr pyType, Type clrType)`
`80`	`80`	`{`
`81`		`- // This is not used`
`82`		`- IntPtr tp_as_number = Marshal.ReadIntPtr(pyType, TypeOffset.tp_as_number);`
`83`		`-`
`84`	`81`	`const BindingFlags flags = BindingFlags.Public \| BindingFlags.Static;`
`85`	`82`	`Debug.Assert(_opType != null);`
`86`	`83`	`foreach (var method in clrType.GetMethods(flags))`