Nuitka-winsvc 2.3.11__cp311-cp311-win_amd64.whl → 2.4.1__cp311-cp311-win_amd64.whl

nuitka/build/static_src/HelpersComparisonGt.c

@@ -71,7 +71,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     // If the types are equal, we may get away immediately except for instances.
     if (type1 == type2 && !PyInstance_Check(operand1)) {
 
-        richcmpfunc frich = RICHCOMPARE(type1);
+        richcmpfunc frich = TP_RICHCOMPARE(type1);
 
         if (frich != NULL) {
             PyObject *result = (*frich)(operand1, operand2, Py_GT);
@@ -132,7 +132,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -147,7 +147,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -160,7 +160,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -265,7 +265,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -282,7 +282,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -297,7 +297,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -367,7 +367,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     // If the types are equal, we may get away immediately except for instances.
     if (type1 == type2 && !PyInstance_Check(operand1)) {
 
-        richcmpfunc frich = RICHCOMPARE(type1);
+        richcmpfunc frich = TP_RICHCOMPARE(type1);
 
         if (frich != NULL) {
             PyObject *result = (*frich)(operand1, operand2, Py_GT);
@@ -436,7 +436,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -459,7 +459,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -480,7 +480,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -593,7 +593,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -618,7 +618,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -641,7 +641,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -839,7 +839,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -974,7 +974,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -1118,7 +1118,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -1146,7 +1146,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -1251,7 +1251,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -1283,7 +1283,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -1489,7 +1489,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -1648,7 +1648,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -1816,7 +1816,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -1860,7 +1860,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -1973,7 +1973,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -2021,7 +2021,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -2196,7 +2196,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -2331,7 +2331,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -2475,7 +2475,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -2503,7 +2503,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -2608,7 +2608,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -2640,7 +2640,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -2828,7 +2828,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -2987,7 +2987,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -3155,7 +3155,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -3199,7 +3199,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -3312,7 +3312,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -3360,7 +3360,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -3559,7 +3559,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -3694,7 +3694,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -3838,7 +3838,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -3866,7 +3866,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -3971,7 +3971,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -4003,7 +4003,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -4209,7 +4209,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -4368,7 +4368,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -4536,7 +4536,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -4580,7 +4580,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -4693,7 +4693,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -4741,7 +4741,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -4893,7 +4893,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -5028,7 +5028,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -5172,7 +5172,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -5200,7 +5200,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -5305,7 +5305,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -5337,7 +5337,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -5497,7 +5497,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -5656,7 +5656,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -5824,7 +5824,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -5868,7 +5868,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -5981,7 +5981,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -6029,7 +6029,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -6219,7 +6219,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -6354,7 +6354,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -6498,7 +6498,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -6526,7 +6526,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -6631,7 +6631,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -6663,7 +6663,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -6862,7 +6862,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -7021,7 +7021,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -7189,7 +7189,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -7233,7 +7233,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -7346,7 +7346,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -7394,7 +7394,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -7562,7 +7562,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -7697,7 +7697,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -7839,7 +7839,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -7867,7 +7867,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -7972,7 +7972,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -8004,7 +8004,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -8178,7 +8178,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -8337,7 +8337,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -8503,7 +8503,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -8547,7 +8547,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -8660,7 +8660,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -8708,7 +8708,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -8905,7 +8905,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -9040,7 +9040,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -9182,7 +9182,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -9210,7 +9210,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -9315,7 +9315,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -9347,7 +9347,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -9558,7 +9558,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -9717,7 +9717,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -9883,7 +9883,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -9927,7 +9927,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -10040,7 +10040,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -10088,7 +10088,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -10292,7 +10292,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -10427,7 +10427,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -10569,7 +10569,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -10597,7 +10597,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -10702,7 +10702,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -10734,7 +10734,7 @@ PyObject *RICH_COMPARE_GT_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -10946,7 +10946,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
 
@@ -11105,7 +11105,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_GT);
@@ -11271,7 +11271,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);
@@ -11315,7 +11315,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
         Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_LT);
 
@@ -11428,7 +11428,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -11476,7 +11476,7 @@ nuitka_bool RICH_COMPARE_GT_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_LT);