Skip to content

Fix operator stub signatures: drop self param, detect reverse operators #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eevleevs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix operator stub signatures: drop self param, detect reverse operators #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions csharp/PythonNetStubGenerator/StubWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,20 +818,28 @@ private static bool WriteSimpleMethod(StringBuilder sb, MethodBase method, bool

var methodName = method.IsConstructor ? "__init__" : method.Name;
if (methodName == "<Clone>$") return false;
int skipIndex = -1;
if (isOperator)
{
methodName = ConvertOperatorName(method.Name);
var methodParams = method.GetParameters();
var isReverse = methodParams.Length == 2
&& methodParams[0].ParameterType != method.DeclaringType
&& methodParams[1].ParameterType == method.DeclaringType;

methodName = ConvertOperatorName(method.Name, isReverse);
if (methodName == null)
{
var signature = method.GetParameters().Select(it => it.Name + ": " + it.ParameterType.Name).CommaJoin();
sb.Indent().AppendLine($"# Operator not supported {method.Name}({signature})");
return false;
}

skipIndex = isReverse ? 1 : 0;
}

var returnType = method is MethodInfo mi ? mi.ReturnType.ToPythonType() : "None";

var parameters = GetParameters(method, !isStatic);
var parameters = GetParameters(method, !isStatic, skipIndex: skipIndex);


// ReSharper disable StringLiteralTypo - python decorator
Expand All @@ -844,7 +852,7 @@ private static bool WriteSimpleMethod(StringBuilder sb, MethodBase method, bool
return true;
}

private static string ConvertOperatorName(string methodName)
private static string ConvertOperatorName(string methodName, bool isReverse = false)
{
switch (methodName)
{
Expand All @@ -854,16 +862,16 @@ private static string ConvertOperatorName(string methodName)
case "op_LessThan": return "__lt__";
case "op_GreaterThanOrEqual": return "__ge__";
case "op_LessThanOrEqual": return "__le__";
case "op_BitwiseAnd": return "__and__";
case "op_BitwiseOr": return "__or__";
case "op_Addition": return "__add__";
case "op_Subtraction": return "__sub__";
case "op_Division": return "__truediv__";
case "op_Modulus": return "__mod__";
case "op_Multiply": return "__mul__";
case "op_LeftShift": return "__lshift__";
case "op_RightShift": return "__rshift__";
case "op_ExclusiveOr": return "__xor__";
case "op_BitwiseAnd": return isReverse ? "__rand__" : "__and__";
case "op_BitwiseOr": return isReverse ? "__ror__" : "__or__";
case "op_Addition": return isReverse ? "__radd__" : "__add__";
case "op_Subtraction": return isReverse ? "__rsub__" : "__sub__";
case "op_Division": return isReverse ? "__rtruediv__" : "__truediv__";
case "op_Modulus": return isReverse ? "__rmod__" : "__mod__";
case "op_Multiply": return isReverse ? "__rmul__" : "__mul__";
case "op_LeftShift": return isReverse ? "__rlshift__" : "__lshift__";
case "op_RightShift": return isReverse ? "__rrshift__" : "__rshift__";
case "op_ExclusiveOr": return isReverse ? "__rxor__" : "__xor__";
case "op_UnaryNegation": return "__neg__";
case "op_UnaryPlus": return "__pos__";
case "op_OnesComplement": return "__invert__";
Expand All @@ -877,7 +885,7 @@ private static string ConvertOperatorName(string methodName)
return null;
}

private static string GetParameters(MethodBase method, bool includeSelf)
private static string GetParameters(MethodBase method, bool includeSelf, int skipIndex = -1)
{
string GetParameter(ParameterInfo it)
{
Expand All @@ -888,6 +896,9 @@ string GetParameter(ParameterInfo it)
}

var parameters = method.GetParameters();
if (skipIndex >= 0)
parameters = parameters.Where((_, i) => i != skipIndex).ToArray();

var pythonParams = parameters.Select(GetParameter);
if (includeSelf) pythonParams = pythonParams.Prepend("self");
return pythonParams.CommaJoin();
Expand Down