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, 6 insertions, 6 deletions

diff --git a/mesonbuild/interpreter/primitives/array.py b/mesonbuild/interpreter/primitives/array.py
index b42ddeaa4..6582d4b60 100644
--- a/mesonbuild/interpreter/primitives/array.py
+++ b/mesonbuild/interpreter/primitives/array.py
@@ -36,16 +36,16 @@ class ArrayHolder(ObjectHolder[T.List[TYPE_var]], IterableObject):
         })
 
         self.trivial_operators.update({
-            MesonOperator.EQUALS: (list, lambda x: self.held_object == x),
-            MesonOperator.NOT_EQUALS: (list, lambda x: self.held_object != x),
-            MesonOperator.IN: (object, lambda x: x in self.held_object),
-            MesonOperator.NOT_IN: (object, lambda x: x not in self.held_object),
+            MesonOperator.EQUALS: (list, lambda obj, x: obj.held_object == x),
+            MesonOperator.NOT_EQUALS: (list, lambda obj, x: obj.held_object != x),
+            MesonOperator.IN: (object, lambda obj, x: x in obj.held_object),
+            MesonOperator.NOT_IN: (object, lambda obj, x: x not in obj.held_object),
         })
 
         # Use actual methods for functions that require additional checks
         self.operators.update({
-            MesonOperator.PLUS: self.op_plus,
-            MesonOperator.INDEX: self.op_index,
+            MesonOperator.PLUS: ArrayHolder.op_plus,
+            MesonOperator.INDEX: ArrayHolder.op_index,
         })
 
     def display_name(self) -> str: