interpreter: make operator functions binary

In preparation for moving them to the class, make the operator functions
binary.  Adjust the lambdas for trivial operators, and store unbound
methods for non-trivial ones.

Note that this requires adding operators manually for every override,
even subclasses.  It's decidedly ugly at this temporary stage; later
it will result in just an extra @InterpreterObject.operator decorator
on the subclasses.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/mesonbuild/interpreter/primitives/integer.py b/mesonbuild/interpreter/primitives/integer.py
index cdf2355f0..2d0915f7b 100644
--- a/mesonbuild/interpreter/primitives/integer.py
+++ b/mesonbuild/interpreter/primitives/integer.py
@@ -25,24 +25,24 @@ class IntegerHolder(ObjectHolder[int]):
 
         self.trivial_operators.update({
             # Arithmetic
-            MesonOperator.UMINUS: (None, lambda x: -self.held_object),
-            MesonOperator.PLUS: (int, lambda x: self.held_object + x),
-            MesonOperator.MINUS: (int, lambda x: self.held_object - x),
-            MesonOperator.TIMES: (int, lambda x: self.held_object * x),
+            MesonOperator.UMINUS: (None, lambda obj, x: -obj.held_object),
+            MesonOperator.PLUS: (int, lambda obj, x: obj.held_object + x),
+            MesonOperator.MINUS: (int, lambda obj, x: obj.held_object - x),
+            MesonOperator.TIMES: (int, lambda obj, x: obj.held_object * x),
 
             # Comparison
-            MesonOperator.EQUALS: (int, lambda x: self.held_object == x),
-            MesonOperator.NOT_EQUALS: (int, lambda x: self.held_object != x),
-            MesonOperator.GREATER: (int, lambda x: self.held_object > x),
-            MesonOperator.LESS: (int, lambda x: self.held_object < x),
-            MesonOperator.GREATER_EQUALS: (int, lambda x: self.held_object >= x),
-            MesonOperator.LESS_EQUALS: (int, lambda x: self.held_object <= x),
+            MesonOperator.EQUALS: (int, lambda obj, x: obj.held_object == x),
+            MesonOperator.NOT_EQUALS: (int, lambda obj, x: obj.held_object != x),
+            MesonOperator.GREATER: (int, lambda obj, x: obj.held_object > x),
+            MesonOperator.LESS: (int, lambda obj, x: obj.held_object < x),
+            MesonOperator.GREATER_EQUALS: (int, lambda obj, x: obj.held_object >= x),
+            MesonOperator.LESS_EQUALS: (int, lambda obj, x: obj.held_object <= x),
         })
 
         # Use actual methods for functions that require additional checks
         self.operators.update({
-            MesonOperator.DIV: self.op_div,
-            MesonOperator.MOD: self.op_mod,
+            MesonOperator.DIV: IntegerHolder.op_div,
+            MesonOperator.MOD: IntegerHolder.op_mod,
         })
 
     def display_name(self) -> str: