Expose all operators

Author: PatrickPijnappel

PythonKit/Python.swift

@@ -1231,10 +1231,62 @@ public extension PythonObject {
     }
 }
 
-public func pow(_ lhs: PythonObject, _ rhs: PythonObject) -> PythonObject {
-    let result = PyNumber_Power(lhs.borrowedPyObject, rhs.borrowedPyObject, Python.None.borrowedPyObject)
-    try! throwPythonErrorIfPresent()
-    return PythonObject(consuming: result!)
+public enum PythonNumber {
+    private static func performBinaryOp(_ op: PythonBinaryOp, lhs: PythonObject, rhs: PythonObject) throws -> PythonObject {
+        let result = op(lhs.borrowedPyObject, rhs.borrowedPyObject)
+        // If binary operation fails (e.g. due to `TypeError`), throw an exception.
+        try throwPythonErrorIfPresent()
+        return PythonObject(consuming: result!)
+    }
+
+    private static func performUnaryOp(_ op: PythonUnaryOp, operand: PythonObject) throws -> PythonObject {
+        let result = op(operand.borrowedPyObject)
+        // If unary operation fails (e.g. due to `TypeError`), throw an exception.
+        try throwPythonErrorIfPresent()
+        return PythonObject(consuming: result!)
+    }
+
+    public static func add(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Add, lhs: lhs, rhs: rhs) }
+    public static func subtract(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Subtract, lhs: lhs, rhs: rhs) }
+    public static func multiply(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Multiply, lhs: lhs, rhs: rhs) }
+    public static func matrixMultiply(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_MatrixMultiply, lhs: lhs, rhs: rhs) }
+    public static func floorDivide(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_FloorDivide, lhs: lhs, rhs: rhs) }
+    public static func trueDivide(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_TrueDivide, lhs: lhs, rhs: rhs) }
+    public static func remainder(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Remainder, lhs: lhs, rhs: rhs) }
+    public static func negative(_ operand: PythonObject) throws -> PythonObject { try performUnaryOp(PyNumber_Negative, operand: operand) }
+    public static func positive(_ operand: PythonObject) throws -> PythonObject { try performUnaryOp(PyNumber_Positive, operand: operand) }
+    public static func invert(_ operand: PythonObject) throws -> PythonObject { try performUnaryOp(PyNumber_Invert, operand: operand) }
+    public static func lshift(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Lshift, lhs: lhs, rhs: rhs) }
+    public static func rshift(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Rshift, lhs: lhs, rhs: rhs) }
+    public static func and(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_And, lhs: lhs, rhs: rhs) }
+    public static func xor(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Xor, lhs: lhs, rhs: rhs) }
+    public static func or(_ lhs: PythonObject, _ rhs: PythonObject) throws -> PythonObject { try performBinaryOp(PyNumber_Or, lhs: lhs, rhs: rhs) }
+
+    public static func power(_ lhs: PythonObject, _ rhs: PythonObject, modulus: PythonObject = Python.None) throws -> PythonObject {
+        let result = PyNumber_Power(lhs.borrowedPyObject, rhs.borrowedPyObject, modulus.borrowedPyObject)
+        try throwPythonErrorIfPresent()
+        return PythonObject(consuming: result!)
+    }
+
+    public static func inPlaceAdd(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceAdd, lhs: lhs, rhs: rhs) }
+    public static func inPlaceSubtract(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceSubtract, lhs: lhs, rhs: rhs) }
+    public static func inPlaceMultiply(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceMultiply, lhs: lhs, rhs: rhs) }
+    public static func inPlaceMatrixMultiply(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceMatrixMultiply, lhs: lhs, rhs: rhs) }
+    public static func inPlaceFloorDivide(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceFloorDivide, lhs: lhs, rhs: rhs) }
+    public static func inPlaceTrueDivide(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceTrueDivide, lhs: lhs, rhs: rhs) }
+    public static func inPlaceRemainder(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceRemainder, lhs: lhs, rhs: rhs) }
+    public static func inPlaceLshift(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceLshift, lhs: lhs, rhs: rhs) }
+    public static func inPlaceRshift(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceRshift, lhs: lhs, rhs: rhs) }
+    public static func inPlaceAnd(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceAnd, lhs: lhs, rhs: rhs) }
+    public static func inPlaceXor(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceOr, lhs: lhs, rhs: rhs) }
+    public static func inPlaceOr(_ lhs: inout PythonObject, _ rhs: PythonObject) throws { lhs = try performBinaryOp(PyNumber_InPlaceXor, lhs: lhs, rhs: rhs) }
+
+    public static func inPlacePower(_ lhs: inout PythonObject, _ rhs: PythonObject, modulus: PythonObject = Python.None) throws {
+        let result = PyNumber_InPlacePower(lhs.borrowedPyObject, rhs.borrowedPyObject, modulus.borrowedPyObject)
+        try throwPythonErrorIfPresent()
+        lhs = PythonObject(consuming: result!)
+    }
+
 }
 
 extension PythonObject : SignedNumeric {

PythonKit/PythonLibrary+Symbols.swift

@@ -238,12 +238,45 @@ let PyNumber_Subtract: PyBinaryOperation =
 let PyNumber_Multiply: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_Multiply")
 
+let PyNumber_MatrixMultiply: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_MatrixMultiply")
+
+let PyNumber_FloorDivide: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_FloorDivide")
+
 let PyNumber_TrueDivide: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_TrueDivide")
 
+let PyNumber_Remainder: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Remainder")
+
 let PyNumber_Power: @convention(c) (PyObjectPointer?, PyObjectPointer?, PyObjectPointer?) -> PyObjectPointer? =
     PythonLibrary.loadSymbol(name: "PyNumber_Power")
 
+let PyNumber_Negative: PyUnaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Negative")
+
+let PyNumber_Positive: PyUnaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Positive")
+
+let PyNumber_Invert: PyUnaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Invert")
+
+let PyNumber_Lshift: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Lshift")
+
+let PyNumber_Rshift: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Rshift")
+
+let PyNumber_And: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_And")
+
+let PyNumber_Xor: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Xor")
+
+let PyNumber_Or: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_Or")
+
 let PyNumber_InPlaceAdd: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_InPlaceAdd")
 
@@ -253,20 +286,26 @@ let PyNumber_InPlaceSubtract: PyBinaryOperation =
 let PyNumber_InPlaceMultiply: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_InPlaceMultiply")
 
+let PyNumber_InPlaceMatrixMultiply: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_InPlaceMatrixMultiply")
+
+let PyNumber_InPlaceFloorDivide: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_InPlaceFloorDivide")
+
 let PyNumber_InPlaceTrueDivide: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_InPlaceTrueDivide")
 
-let PyNumber_Negative: PyUnaryOperation =
-    PythonLibrary.loadSymbol(name: "PyNumber_Negative")
+let PyNumber_InPlaceRemainder: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_InPlaceRemainder")
 
-let PyNumber_And: PyBinaryOperation =
-    PythonLibrary.loadSymbol(name: "PyNumber_And")
+let PyNumber_InPlacePower: @convention(c) (PyObjectPointer?, PyObjectPointer?, PyObjectPointer?) -> PyObjectPointer? =
+    PythonLibrary.loadSymbol(name: "PyNumber_InPlacePower")
 
-let PyNumber_Or: PyBinaryOperation =
-    PythonLibrary.loadSymbol(name: "PyNumber_Or")
+let PyNumber_InPlaceLshift: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_InPlaceLshift")
 
-let PyNumber_Xor: PyBinaryOperation =
-    PythonLibrary.loadSymbol(name: "PyNumber_Xor")
+let PyNumber_InPlaceRshift: PyBinaryOperation =
+    PythonLibrary.loadSymbol(name: "PyNumber_InPlaceRshift")
 
 let PyNumber_InPlaceAnd: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_InPlaceAnd")
@@ -276,6 +315,3 @@ let PyNumber_InPlaceOr: PyBinaryOperation =
 
 let PyNumber_InPlaceXor: PyBinaryOperation =
     PythonLibrary.loadSymbol(name: "PyNumber_InPlaceXor")
-
-let PyNumber_Invert: PyUnaryOperation =
-    PythonLibrary.loadSymbol(name: "PyNumber_Invert")