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

nuitka/build/static_src/HelpersComparisonLe.c

@@ -79,7 +79,7 @@ PyObject *RICH_COMPARE_LE_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_LE);
@@ -140,7 +140,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -155,7 +155,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -168,7 +168,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -273,7 +273,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -290,7 +290,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -305,7 +305,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -383,7 +383,7 @@ nuitka_bool RICH_COMPARE_LE_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_LE);
@@ -452,7 +452,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -475,7 +475,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -496,7 +496,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -609,7 +609,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -634,7 +634,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -657,7 +657,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -855,7 +855,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -990,7 +990,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -1134,7 +1134,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -1162,7 +1162,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -1267,7 +1267,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -1299,7 +1299,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -1521,7 +1521,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -1680,7 +1680,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -1848,7 +1848,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -1892,7 +1892,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -2005,7 +2005,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -2053,7 +2053,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -2228,7 +2228,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -2363,7 +2363,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -2507,7 +2507,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -2535,7 +2535,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -2640,7 +2640,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -2672,7 +2672,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -2874,7 +2874,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -3033,7 +3033,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -3201,7 +3201,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -3245,7 +3245,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -3358,7 +3358,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -3406,7 +3406,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -3605,7 +3605,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -3740,7 +3740,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -3884,7 +3884,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -3912,7 +3912,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -4017,7 +4017,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -4049,7 +4049,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -4271,7 +4271,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -4430,7 +4430,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -4598,7 +4598,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -4642,7 +4642,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -4755,7 +4755,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -4803,7 +4803,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -4955,7 +4955,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -5090,7 +5090,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -5234,7 +5234,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -5262,7 +5262,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -5367,7 +5367,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -5399,7 +5399,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -5575,7 +5575,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -5734,7 +5734,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -5902,7 +5902,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -5946,7 +5946,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -6059,7 +6059,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -6107,7 +6107,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -6297,7 +6297,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -6432,7 +6432,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -6576,7 +6576,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -6604,7 +6604,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -6709,7 +6709,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -6741,7 +6741,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -6952,7 +6952,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -7111,7 +7111,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -7279,7 +7279,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -7323,7 +7323,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -7436,7 +7436,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -7484,7 +7484,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -7652,7 +7652,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -7787,7 +7787,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -7929,7 +7929,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -7957,7 +7957,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -8062,7 +8062,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -8094,7 +8094,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -8280,7 +8280,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -8439,7 +8439,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -8605,7 +8605,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -8649,7 +8649,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -8762,7 +8762,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -8810,7 +8810,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -9007,7 +9007,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -9142,7 +9142,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -9284,7 +9284,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -9312,7 +9312,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -9417,7 +9417,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -9449,7 +9449,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -9660,7 +9660,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -9819,7 +9819,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -9985,7 +9985,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -10029,7 +10029,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -10142,7 +10142,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -10190,7 +10190,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -10394,7 +10394,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -10529,7 +10529,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -10671,7 +10671,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -10699,7 +10699,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
 
@@ -10804,7 +10804,7 @@ PyObject *RICH_COMPARE_LE_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;
@@ -10836,7 +10836,7 @@ PyObject *RICH_COMPARE_LE_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_GE);
@@ -11048,7 +11048,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -11207,7 +11207,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -11373,7 +11373,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
@@ -11417,7 +11417,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);
 
@@ -11530,7 +11530,7 @@ nuitka_bool RICH_COMPARE_LE_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;
@@ -11578,7 +11578,7 @@ nuitka_bool RICH_COMPARE_LE_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_GE);