Revert rename to pynargs

christabella · christabella · commit 35be4bcfa3e9 · 2020-12-23T09:15:25.000Z
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -674,7 +674,7 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool
         /// <summary>
         /// Check whether the number of Python and .NET arguments match, and compute additional arg information.
         /// </summary>
-        /// <param name="pynargs">Number of positional args passed from Python.</param>
+        /// <param name="positionalArgumentCount">Number of positional args passed from Python.</param>
         /// <param name="parameters">Parameters of the specified .NET method.</param>
         /// <param name="kwargDict">Keyword args passed from Python.</param>
         /// <param name="isOperator">True if the parameters' method is an operator.</param>
@@ -683,7 +683,7 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool
         /// <param name="kwargsMatched">Number of kwargs from Python that are also present in the .NET method.</param>
         /// <param name="defaultsNeeded">Number of non-null defaultsArgs.</param>
         /// <returns></returns>
-        static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
+        static bool MatchesArgumentCount(int positionalArgumentCount, ParameterInfo[] parameters,
             Dictionary<string, IntPtr> kwargDict,
             bool isOperator,
             out bool paramsArray,
@@ -696,11 +696,11 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
             paramsArray = parameters.Length > 0 ? Attribute.IsDefined(parameters[parameters.Length - 1], typeof(ParamArrayAttribute)) : false;
             kwargsMatched = 0;
             defaultsNeeded = 0;
-            if (pynargs == parameters.Length && kwargDict.Count == 0)
+            if (positionalArgumentCount == parameters.Length && kwargDict.Count == 0)
             {
                 match = true;
             }
-            else if (pynargs < parameters.Length && (!paramsArray || pynargs == parameters.Length - 1))
+            else if (positionalArgumentCount < parameters.Length && (!paramsArray || positionalArgumentCount == parameters.Length - 1))
             {
                 match = true;
                 // operator methods will have 2 CLR args but only one Python arg,
@@ -715,7 +715,7 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
                 // a corresponding keyword arg or a default param, unless the method
                 // method accepts a params array (which cannot have a default value)
                 defaultArgList = new ArrayList();
-                for (var v = pynargs; v < parameters.Length; v++)
+                for (var v = positionalArgumentCount; v < parameters.Length; v++)
                 {
                     if (kwargDict.ContainsKey(parameters[v].Name))
                     {
@@ -740,7 +740,7 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,
                     }
                 }
             }
-            else if (pynargs > parameters.Length && parameters.Length > 0 &&
+            else if (positionalArgumentCount > parameters.Length && parameters.Length > 0 &&
                        Attribute.IsDefined(parameters[parameters.Length - 1], typeof(ParamArrayAttribute)))
             {
                 // This is a `foo(params object[] bar)` style method

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool`
`674`	`674`	`/// <summary>`
`675`	`675`	`/// Check whether the number of Python and .NET arguments match, and compute additional arg information.`
`676`	`676`	`/// </summary>`
`677`		`- /// <param name="pynargs">Number of positional args passed from Python.</param>`
	`677`	`+ /// <param name="positionalArgumentCount">Number of positional args passed from Python.</param>`
`678`	`678`	`/// <param name="parameters">Parameters of the specified .NET method.</param>`
`679`	`679`	`/// <param name="kwargDict">Keyword args passed from Python.</param>`
`680`	`680`	`/// <param name="isOperator">True if the parameters' method is an operator.</param>`
`@@ -683,7 +683,7 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool`
`683`	`683`	`/// <param name="kwargsMatched">Number of kwargs from Python that are also present in the .NET method.</param>`
`684`	`684`	`/// <param name="defaultsNeeded">Number of non-null defaultsArgs.</param>`
`685`	`685`	`/// <returns></returns>`
`686`		`- static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
	`686`	`+ static bool MatchesArgumentCount(int positionalArgumentCount, ParameterInfo[] parameters,`
`687`	`687`	`Dictionary<string, IntPtr> kwargDict,`
`688`	`688`	`bool isOperator,`
`689`	`689`	`out bool paramsArray,`
`@@ -696,11 +696,11 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
`696`	`696`	`paramsArray = parameters.Length > 0 ? Attribute.IsDefined(parameters[parameters.Length - 1], typeof(ParamArrayAttribute)) : false;`
`697`	`697`	`kwargsMatched = 0;`
`698`	`698`	`defaultsNeeded = 0;`
`699`		`- if (pynargs == parameters.Length && kwargDict.Count == 0)`
	`699`	`+ if (positionalArgumentCount == parameters.Length && kwargDict.Count == 0)`
`700`	`700`	`{`
`701`	`701`	`match = true;`
`702`	`702`	`}`
`703`		`- else if (pynargs < parameters.Length && (!paramsArray \|\| pynargs == parameters.Length - 1))`
	`703`	`+ else if (positionalArgumentCount < parameters.Length && (!paramsArray \|\| positionalArgumentCount == parameters.Length - 1))`
`704`	`704`	`{`
`705`	`705`	`match = true;`
`706`	`706`	`// operator methods will have 2 CLR args but only one Python arg,`
`@@ -715,7 +715,7 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
`715`	`715`	`// a corresponding keyword arg or a default param, unless the method`
`716`	`716`	`// method accepts a params array (which cannot have a default value)`
`717`	`717`	`defaultArgList = new ArrayList();`
`718`		`- for (var v = pynargs; v < parameters.Length; v++)`
	`718`	`+ for (var v = positionalArgumentCount; v < parameters.Length; v++)`
`719`	`719`	`{`
`720`	`720`	`if (kwargDict.ContainsKey(parameters[v].Name))`
`721`	`721`	`{`
`@@ -740,7 +740,7 @@ static bool MatchesArgumentCount(int pynargs, ParameterInfo[] parameters,`
`740`	`740`	`}`
`741`	`741`	`}`
`742`	`742`	`}`
`743`		`- else if (pynargs > parameters.Length && parameters.Length > 0 &&`
	`743`	`+ else if (positionalArgumentCount > parameters.Length && parameters.Length > 0 &&`
`744`	`744`	`Attribute.IsDefined(parameters[parameters.Length - 1], typeof(ParamArrayAttribute)))`
`745`	`745`	`{`
`746`	`746`	// This is a `foo(params object[] bar)` style method