implement tp_* function pointers for set object

Author: aisk

src/runtime/set.cpp

@@ -357,6 +357,15 @@ Box* setIOr(BoxedSet* lhs, BoxedSet* rhs) {
     return incref(lhs);
 }
 
+static PyObject* set_ior(PySetObject* so, PyObject* other) {
+    try {
+        return setIOr((BoxedSet*)so, (BoxedSet*)other);
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setOr(BoxedSet* lhs, BoxedSet* rhs) {
     RELEASE_ASSERT(PyAnySet_Check(lhs), "");
     if (!PyAnySet_Check(rhs))
@@ -367,6 +376,15 @@ Box* setOr(BoxedSet* lhs, BoxedSet* rhs) {
     return setIOr(rtn, rhs);
 }
 
+static PyObject* set_or(PySetObject* so, PyObject* other) noexcept {
+    try {
+        return setOr((BoxedSet*)so, (BoxedSet*)other);
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setIAnd(BoxedSet* lhs, BoxedSet* rhs) {
     RELEASE_ASSERT(PyAnySet_Check(lhs), "");
     if (!PyAnySet_Check(rhs))
@@ -377,6 +395,15 @@ Box* setIAnd(BoxedSet* lhs, BoxedSet* rhs) {
     return incref(lhs);
 }
 
+static PyObject* set_iand(PyObject* so, PyObject* other) noexcept {
+    try {
+        return setIAnd(static_cast<BoxedSet*>(so), static_cast<BoxedSet*>(other));
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setAnd(BoxedSet* lhs, BoxedSet* rhs) {
     RELEASE_ASSERT(PyAnySet_Check(lhs), "");
     if (!PyAnySet_Check(rhs))
@@ -385,6 +412,15 @@ Box* setAnd(BoxedSet* lhs, BoxedSet* rhs) {
     return setIntersection2(lhs, rhs);
 }
 
+static PyObject* set_and(PyObject* so, PyObject* other) noexcept {
+    try {
+        return setAnd(static_cast<BoxedSet*>(so), static_cast<BoxedSet*>(other));
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setISub(BoxedSet* lhs, BoxedSet* rhs) {
     RELEASE_ASSERT(PyAnySet_Check(lhs), "");
     if (!PyAnySet_Check(rhs))
@@ -397,6 +433,15 @@ Box* setISub(BoxedSet* lhs, BoxedSet* rhs) {
     return incref(lhs);
 }
 
+static PyObject* set_isub(PyObject* so, PyObject* other) noexcept {
+    try {
+        return setISub(static_cast<BoxedSet*>(so), static_cast<BoxedSet*>(other));
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setSub(BoxedSet* lhs, BoxedSet* rhs) {
     RELEASE_ASSERT(PyAnySet_Check(lhs), "");
     if (!PyAnySet_Check(rhs))
@@ -407,6 +452,15 @@ Box* setSub(BoxedSet* lhs, BoxedSet* rhs) {
     return setISub(rtn, rhs);
 }
 
+static PyObject* set_sub(PyObject* so, PyObject* other) noexcept {
+    try {
+        return setSub(static_cast<BoxedSet*>(so), static_cast<BoxedSet*>(other));
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setIXor(BoxedSet* lhs, BoxedSet* rhs) {
     RELEASE_ASSERT(PyAnySet_Check(lhs), "");
     if (!PyAnySet_Check(rhs))
@@ -427,6 +481,15 @@ Box* setXor(BoxedSet* lhs, BoxedSet* rhs) {
     return setIXor(rtn, rhs);
 }
 
+static PyObject* set_xor(PyObject* so, PyObject* other) noexcept {
+    try {
+        return setXor(static_cast<BoxedSet*>(so), static_cast<BoxedSet*>(other));
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return NULL;
+    }
+}
+
 Box* setIter(BoxedSet* self) noexcept {
     RELEASE_ASSERT(PyAnySet_Check(self), "");
     return new BoxedSetIterator(self);
@@ -437,6 +500,10 @@ Box* setLen(BoxedSet* self) {
     return boxInt(self->s.size());
 }
 
+static Py_ssize_t set_length(Box* self) noexcept {
+    return static_cast<BoxedSet*>(self)->s.size();
+}
+
 Box* setAdd(BoxedSet* self, Box* v) {
     RELEASE_ASSERT(isSubclass(self->cls, set_cls), "%s", self->cls->tp_name);
 
@@ -741,13 +808,13 @@ Box* setGt(BoxedSet* self, BoxedSet* rhs) {
     return setIssuperset(self, rhs);
 }
 
-Box* setContains(BoxedSet* self, Box* key) {
+static inline int setContainsShared(BoxedSet* self, Box* key) {
     RELEASE_ASSERT(PyAnySet_Check(self), "");
 
     if (PySet_Check(key)) {
         try {
             BoxAndHash k_hash(key);
-            return boxBool(self->s.find(k_hash) != self->s.end());
+            return self->s.find(k_hash) != self->s.end();
         } catch (ExcInfo e) {
             if (!e.matches(TypeError))
                 throw e;
@@ -756,11 +823,24 @@ Box* setContains(BoxedSet* self, Box* key) {
 
             BoxedSet* tmpKey = makeNewSet(frozenset_cls, key);
             AUTO_DECREF(tmpKey);
-            return boxBool(self->s.find(tmpKey) != self->s.end());
+            return self->s.find(tmpKey) != self->s.end();
         }
     }
 
-    return boxBool(self->s.find(key) != self->s.end());
+    return self->s.find(key) != self->s.end();
+}
+
+Box* setContains(BoxedSet* self, Box* key) {
+    return boxBool(setContainsShared(self, key));
+}
+
+static int set_contains(PyObject* self, PyObject* key) noexcept {
+    try {
+        return setContainsShared((BoxedSet*)self, key);
+    } catch (ExcInfo e) {
+        setCAPIException(e);
+        return -1;
+    }
 }
 
 Box* setRemove(BoxedSet* self, Box* key) {
@@ -1098,6 +1178,17 @@ void setupSet() {
     set_cls->freeze();
     frozenset_cls->freeze();
 
+    frozenset_cls->tp_as_sequence->sq_length = set_cls->tp_as_sequence->sq_length = set_length;
+    frozenset_cls->tp_as_sequence->sq_contains = set_cls->tp_as_sequence->sq_contains = (objobjproc)set_contains;
+
+    set_cls->tp_as_number->nb_and = (binaryfunc)set_and;
+    set_cls->tp_as_number->nb_inplace_and = (binaryfunc)set_iand;
+    set_cls->tp_as_number->nb_or = (binaryfunc)set_or;
+    set_cls->tp_as_number->nb_inplace_or = (binaryfunc)set_ior;
+    set_cls->tp_as_number->nb_xor = (binaryfunc)set_xor;
+    set_cls->tp_as_number->nb_subtract = (binaryfunc)set_sub;
+    set_cls->tp_as_number->nb_inplace_subtract = (binaryfunc)set_isub;
+
     frozenset_cls->tp_repr = set_cls->tp_repr = set_repr;
     frozenset_cls->tp_iter = set_cls->tp_iter = (decltype(set_cls->tp_iter))setIter;
 }