Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support comparison operators #1347

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

Merged
merged 12 commits into from
Jan 12, 2021
Merged

Support comparison operators #1347

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9a8cb96
Add comparison operators
christabella Dec 29, 2020
bcbace3
Add tests for logical (bool) comparison operators
christabella Dec 29, 2020
31f3ed1
Finish comparison operator impl and add tests
christabella Jan 6, 2021
ae7e774
Add eq and ineq operators, disallow reverse for comp
christabella Jan 7, 2021
5685727
Minor formatting (whitespace, ordering)
christabella Jan 7, 2021
03a73c0
Minor: use `out var` instead of declaring separately.
christabella Jan 7, 2021
67928e1
Implement .Equals and .GetHashCode to fix warning
christabella Jan 7, 2021
6a64678
Style (TryGetValue), formatting, and minor changes
christabella Jan 8, 2021
9dd9162
Use a separate map for comparison operators
christabella Jan 8, 2021
a8c6591
Add tuple comparison operator tests (2/6)
christabella Jan 11, 2021
6d4dec7
Add reverse case for tuple comparison op test
christabella Jan 11, 2021
7a2b5e2
Simplify PyObj casting, logic of if blocks.
christabella Jan 12, 2021
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
Prev Previous commit
Next Next commit
Use a separate map for comparison operators
  • Loading branch information
@christabella
christabella committed Jan 12, 2021
commit 9dd9162d89bddb8106563fa775a0c3439e95a876
30 changes: 20 additions & 10 deletions src/runtime/operatormethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ internal static class OperatorMethod
/// that identifies that operator's slot (e.g. nb_add) in heap space.
/// </summary>
public static Dictionary<string, SlotDefinition> OpMethodMap { get; private set; }
public static Dictionary<string, string> ComparisonOpMap { get; private set; }
public readonly struct SlotDefinition
{
public SlotDefinition(string methodName, int typeOffset)
Expand All @@ -24,6 +25,7 @@ public SlotDefinition(string methodName, int typeOffset)
}
public string MethodName { get; }
public int TypeOffset { get; }

}
private static PyObject _opType;

Expand All @@ -50,12 +52,15 @@ static OperatorMethod()
["op_UnaryNegation"] = new SlotDefinition("__neg__", TypeOffset.nb_negative),
["op_UnaryPlus"] = new SlotDefinition("__pos__", TypeOffset.nb_positive),
["op_OneComplement"] = new SlotDefinition("__invert__", TypeOffset.nb_invert),
["op_Equality"] = new SlotDefinition("__eq__", TypeOffset.tp_richcompare),
["op_Inequality"] = new SlotDefinition("__ne__", TypeOffset.tp_richcompare),
["op_LessThanOrEqual"] = new SlotDefinition("__le__", TypeOffset.tp_richcompare),
["op_GreaterThanOrEqual"] = new SlotDefinition("__ge__", TypeOffset.tp_richcompare),
["op_LessThan"] = new SlotDefinition("__lt__", TypeOffset.tp_richcompare),
["op_GreaterThan"] = new SlotDefinition("__gt__", TypeOffset.tp_richcompare),
};
ComparisonOpMap = new Dictionary<string, string>
{
["op_Equality"] = "__eq__",
["op_Inequality"] = "__ne__",
["op_LessThanOrEqual"] = "__le__",
["op_GreaterThanOrEqual"] = "__ge__",
["op_LessThan"] = "__lt__",
["op_GreaterThan"] = "__gt__",
};
}

Expand All @@ -79,12 +84,12 @@ public static bool IsOperatorMethod(MethodBase method)
{
return false;
}
return OpMethodMap.ContainsKey(method.Name);
return OpMethodMap.ContainsKey(method.Name) || ComparisonOpMap.ContainsKey(method.Name);
}

public static bool IsComparisonOp(MethodInfo method)
{
return OpMethodMap[method.Name].TypeOffset == TypeOffset.tp_richcompare;
return ComparisonOpMap.ContainsKey(method.Name);
}

/// <summary>
Expand Down Expand Up @@ -114,13 +119,18 @@ public static void FixupSlots(IntPtr pyType, Type clrType)
// when used with a Python operator.
// https://tenthousandmeters.com/blog/python-behind-the-scenes-6-how-python-object-system-works/
Marshal.WriteIntPtr(pyType, offset, func);

}
}

public static string GetPyMethodName(string clrName)
{
return OpMethodMap[clrName].MethodName;
if (OpMethodMap.ContainsKey(clrName))
{
return OpMethodMap[clrName].MethodName;
} else
{
return ComparisonOpMap[clrName];
}
}

private static string GenerateDummyCode()
Expand Down