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
lostmsu merged 12 commits into from
Jan 12, 2021
Merged

Support comparison operators #1347

Show file tree
Hide file tree
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
Add eq and ineq operators, disallow reverse for comp
  • Loading branch information
@christabella
christabella committed Jan 12, 2021
commit ae7e774c4564de86b69c9f46ac6767db199eae80
26 changes: 26 additions & 0 deletions src/embed_tests/TestOperator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,32 @@ public OperableObject(int num)
return new OperableObject(a.Num ^ b);
}

public static bool operator ==(int a, OperableObject b)
{
return (a == b.Num);
}
public static bool operator ==(OperableObject a, OperableObject b)
{
return (a.Num == b.Num);
}
public static bool operator ==(OperableObject a, int b)
{
return (a.Num == b);
}

public static bool operator !=(int a, OperableObject b)
{
return (a != b.Num);
}
public static bool operator !=(OperableObject a, OperableObject b)
{
return (a.Num != b.Num);
}
public static bool operator !=(OperableObject a, int b)
{
return (a.Num != b);
}

public static bool operator <=(int a, OperableObject b)
{
return (a <= b.Num);
Expand Down
7 changes: 4 additions & 3 deletions src/runtime/methodbinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,17 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
int kwargsMatched;
int defaultsNeeded;
bool isOperator = OperatorMethod.IsOperatorMethod(mi);
int clrnargs = pi.Length;
// Binary operator methods will have 2 CLR args but only one Python arg
// (unary operators will have 1 less each), since Python operator methods are bound.
isOperator = isOperator && pynargs == clrnargs - 1;
isOperator = isOperator && pynargs == pi.Length - 1;
bool isReverse = isOperator && OperatorMethod.IsReverse((MethodInfo)mi); // Only cast if isOperator.
if (isReverse && OperatorMethod.IsComparisonOp((MethodInfo)mi))
continue; // Comparison operators in Python have no reverse mode.
if (!MatchesArgumentCount(pynargs, pi, kwargDict, out paramsArray, out defaultArgList, out kwargsMatched, out defaultsNeeded) && !isOperator)
{
continue;
}
// Preprocessing pi to remove either the first or second argument.
bool isReverse = isOperator && OperatorMethod.IsReverse((MethodInfo)mi); // Only cast if isOperator.
if (isOperator && !isReverse) {
// The first Python arg is the right operand, while the bound instance is the left.
// We need to skip the first (left operand) CLR argument.
Expand Down