Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.5.1__cp311-cp311-win_amd64.whl

nuitka/code_generation/templates_c/HelperObjectTools.c.j2

@@ -1,5 +1,9 @@
-{#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com                    #}
-{#                                                                              #}
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
+{% macro CHECK_OBJECTS(args, args_count) %}
+{% if args_count != 0 %} CHECK_OBJECTS(args, {{args_count}}); {% endif %}
+{% endmacro %}
+
 {#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
 {#     integrates with CPython, but also works on its own.                      #}
 {#                                                                              #}
@@ -14,7 +18,3 @@
 {#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
 {#     See the License for the specific language governing permissions and      #}
 {#     limitations under the License.                                           #}
-{#                                                                              #}
-{% macro CHECK_OBJECTS(args, args_count) %}
-{% if args_count != 0 %} CHECK_OBJECTS(args, {{args_count}}); {% endif %}
-{% endmacro %}

nuitka/code_generation/templates_c/HelperOperationBinary.c.j2

@@ -1,20 +1,5 @@
-{#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com                    #}
-{#                                                                              #}
-{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
-{#     integrates with CPython, but also works on its own.                      #}
-{#                                                                              #}
-{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
-{#     you may not use this file except in compliance with the License.         #}
-{#     You may obtain a copy of the License at                                  #}
-{#                                                                              #}
-{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
-{#                                                                              #}
-{#     Unless required by applicable law or agreed to in writing, software      #}
-{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
-{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
-{#     See the License for the specific language governing permissions and      #}
-{#     limitations under the License.                                           #}
-{#                                                                              #}
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
 {% from 'HelperSlotsCommon.c.j2' import goto_exit %}
 {% from 'HelperSlotsInt.c.j2' import int_slot with context %}
 {% from 'HelperSlotsBinary.c.j2' import binary_operation, call_binary_slot with context %}
@@ -30,7 +15,7 @@
 #endif
 
     {% set props = {"exits": {}} %}
-    {{ binary_operation(props, operator, nb_slot, left, right, "type1", "type2", "operand1", "operand2", "exit_binary_result_object", "exit_binary_result_cbool_ok", "exit_binary_result_nbool", "exit_binary_exception") }}
+    {{ binary_operation(props, operator, False, nb_slot, left, right, "type1", "type2", "operand1", "operand2", "exit_binary_result_object", "exit_binary_result_cbool_ok", "exit_binary_result_nbool", "exit_binary_exception") }}
 
 {% if "exit_binary_result_object" in props["exits"] %}
 exit_binary_result_object:
@@ -54,7 +39,7 @@ exit_binary_exception:
 {% endif %}
 {% endmacro %}
 {% if not left.hasTypeSpecializationCode(right, nb_slot, sq_slot) and left.getSameTypeType(right).hasSameTypeOperationSpecializationCode(right.getSameTypeType(left), nb_slot, sq_slot) %}
-static HEDLEY_NEVER_INLINE {{target.getTypeDecl()}} __BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+static HEDLEY_NEVER_INLINE {{ target.getTypeDecl() }} __BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
 {% set props = {"exits": {}} %}
 {% if left == object_desc %}
     PyTypeObject *type1 = {{ left.getTypeValueExpression("operand1") }};
@@ -66,7 +51,7 @@ static HEDLEY_NEVER_INLINE {{target.getTypeDecl()}} __BINARY_OPERATION_{{op_code
     {{ binary_fallback_operation(props, target, left, right, "type1", "type2") }}
 }
 {% endif %}
-static {{target.getTypeDecl()}} _BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+static {{ target.getTypeDecl() }} _BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
     {{ left.getCheckValueCode("operand1") }}
     {{ right.getCheckValueCode("operand2") }}
 
@@ -74,7 +59,7 @@ static {{target.getTypeDecl()}} _BINARY_OPERATION_{{op_code}}_{{target.getHelper
     {# CPython2 treats integer values with fast path. #}
 #if PYTHON_VERSION < 0x300
     if ({{ left.getIntCheckExpression("operand1") }} && {{ right.getIntCheckExpression("operand2") }}) {
-        {{target.getTypeDecl()}} result;
+        {{ target.getTypeDecl() }} result;
 
         {% set props = {"exits": {}} %}
         {{ int_slot(props, operator, nb_slot, target, int_desc, int_desc, "result", "operand1", "operand2", "exit_result_ok", "exit_result_exception") }}
@@ -113,7 +98,7 @@ static {{target.getTypeDecl()}} _BINARY_OPERATION_{{op_code}}_{{target.getHelper
 {% endif %}
 
     if ({{ left.getTypeIdenticalCheckExpression(right, "type1", "type2") }}) {
-        {{target.getTypeDecl()}} result;
+        {{ target.getTypeDecl() }} result;
 
         {# There is special code for same types. #}
         // return _BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getSameTypeType(right).getHelperCodeName()}}_{{right.getSameTypeType(left).getHelperCodeName()}}(operand1, operand2);
@@ -143,6 +128,21 @@ static {{target.getTypeDecl()}} _BINARY_OPERATION_{{op_code}}_{{target.getHelper
 {% endif %}
 }
 
-{{target.getTypeDecl()}} BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+{{ target.getTypeDecl() }} BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
     return _BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}(operand1, operand2);
 }
+
+{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
+{#     integrates with CPython, but also works on its own.                      #}
+{#                                                                              #}
+{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
+{#     you may not use this file except in compliance with the License.         #}
+{#     You may obtain a copy of the License at                                  #}
+{#                                                                              #}
+{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
+{#                                                                              #}
+{#     Unless required by applicable law or agreed to in writing, software      #}
+{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
+{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
+{#     See the License for the specific language governing permissions and      #}
+{#     limitations under the License.                                           #}

nuitka/code_generation/templates_c/HelperOperationBinaryDual.c.j2

@@ -0,0 +1,115 @@
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
+{% set props = {"exits": {}} %}
+{% from 'HelperSlotsInt.c.j2' import int_core with context %}
+{% set bool_mode = target and target.type_name in ("nuitka_bool", "nbool") %}
+bool BINARY_OPERATION_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{ target.getVariableDecl("result") }}, {{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+    {{ left.getCheckValueCode("operand1") }}
+    {{ right.getCheckValueCode("operand2") }}
+
+    bool left_c_usable = {{left.getDualValidityCheckCode("C", "operand1")}};
+    bool right_c_usable = {{right.getDualValidityCheckCode("C", "operand2")}};
+
+    if (left_c_usable && right_c_usable) {
+{% if target.isSimilarOrSameTypesAsOneOf(n_ilong_desc) %}
+    // Not every code path will make use of all possible results.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4101)
+#endif
+        NUITKA_MAY_BE_UNUSED bool cbool_result;
+        NUITKA_MAY_BE_UNUSED PyObject *obj_result;
+        NUITKA_MAY_BE_UNUSED long clong_result;
+        NUITKA_MAY_BE_UNUSED double cfloat_result;
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+        {{int_core(props, operator, nb_slot, bool_mode, left, right, result, "operand1", "operand2", "exit_result_ok", "exit_result_exception", "exit_result_ok_cbool", "exit_result_ok_clong", "exit_result_ok_cfloat", "exit_result_object", "exit_result_ok_left", "exit_result_ok_const_int_0", "exit_result_ok_const_int_neg_1", "exit_result_ok_const_float_0_0", "exit_result_ok_const_float_minus_0_0")}}
+
+{% if props["fall_through_needed"] %}
+{% if left.isDualType() %}
+        {{left.getDualTypeEnsurePythonObjectCode("operand1")}}
+        obj_result = BINARY_OPERATION_{{op_code}}_OBJECT_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getDualType("C").getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{right.getDualTypeAccessCode("C", "operand2")}});
+{% else %}
+        {{right.getDualTypeEnsurePythonObjectCode("operand2")}}
+        obj_result = BINARY_OPERATION_{{op_code}}_OBJECT_{{left.getDualType("C").getHelperCodeName()}}_{{right.getDualType("Python").getHelperCodeName()}}({{left.getDualTypeAccessCode("C", "operand1")}}, {{right.getDualTypeAccessCode("Python", "operand2")}});
+{% endif %}
+
+        if (unlikely(result == NULL)) {
+            return false;
+        }
+
+        {{ target.getAssignFromObjectExpressionCode("result", "obj_result") }}
+        return true;
+
+{% else %}
+        {{ 0/0 }}
+{% endif %}
+{% endif %}
+
+{% if "exit_result_ok_clong" in props["exits"] %}
+exit_result_ok_clong:
+        {{target.getAssignFromLongExpressionCode("result", "clong_result")}}
+        return true;
+{% endif %}
+
+{% if left.isDualType() %}
+    } else if (left_c_usable == false && right_c_usable) {
+        PyObject *python_result = BINARY_OPERATION_{{op_code}}_OBJECT_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getDualType("C").getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{right.getDualTypeAccessCode("C", "operand2")}});
+
+        if (unlikely(python_result == NULL)) {
+            return false;
+        }
+
+        {{ target.getSetDualValueCode("Python", "result", "python_result") }}
+        return true;
+{% endif %}
+{% if right.isDualType() %}
+    } else if (left_c_usable && right_c_usable == false) {
+{% if left.isCommutativeType() and right.isCommutativeType() and isCommutativeOperation(op_code) %}
+        PyObject *python_result = BINARY_OPERATION_{{op_code}}_OBJECT_{{right.getDualType("Python").getHelperCodeName()}}_{{left.getDualType("C").getHelperCodeName()}}({{right.getDualTypeAccessCode("Python", "operand2")}}, {{left.getDualTypeAccessCode("C", "operand1")}});
+{% else %}
+        PyObject *python_result = BINARY_OPERATION_{{op_code}}_OBJECT_{{left.getDualType("C").getHelperCodeName()}}_{{right.getDualType("Python").getHelperCodeName()}}({{left.getDualTypeAccessCode("C", "operand1")}}, {{right.getDualTypeAccessCode("Python", "operand2")}});
+{% endif %}
+
+        if (unlikely(python_result == NULL)) {
+            return false;
+        }
+
+        {{ target.getSetDualValueCode("Python", "result", "python_result") }}
+
+        return true;
+{% endif %}
+    } else {
+{% if left.isDualType() and right.isDualType() %}
+        PyObject *python_result = BINARY_OPERATION_{{op_code}}_OBJECT_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getDualType("Python").getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{right.getDualTypeAccessCode("Python", "operand1")}});
+
+        if (unlikely(python_result == NULL)) {
+            return false;
+        }
+
+        {{ target.getSetDualValueCode("Python", "result", "python_result") }}
+
+        return true;
+{% else %}
+        NUITKA_CANNOT_GET_HERE("cannot happen with types {{left.getHelperCodeName()}} {{right.getHelperCodeName()}}");
+        return false;
+{% endif %}
+    }
+}
+
+{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
+{#     integrates with CPython, but also works on its own.                      #}
+{#                                                                              #}
+{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
+{#     you may not use this file except in compliance with the License.         #}
+{#     You may obtain a copy of the License at                                  #}
+{#                                                                              #}
+{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
+{#                                                                              #}
+{#     Unless required by applicable law or agreed to in writing, software      #}
+{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
+{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
+{#     See the License for the specific language governing permissions and      #}
+{#     limitations under the License.                                           #}

nuitka/code_generation/templates_c/HelperOperationComparison.c.j2

@@ -1,20 +1,5 @@
-{#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com                    #}
-{#                                                                              #}
-{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
-{#     integrates with CPython, but also works on its own.                      #}
-{#                                                                              #}
-{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
-{#     you may not use this file except in compliance with the License.         #}
-{#     You may obtain a copy of the License at                                  #}
-{#                                                                              #}
-{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
-{#                                                                              #}
-{#     Unless required by applicable law or agreed to in writing, software      #}
-{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
-{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
-{#     See the License for the specific language governing permissions and      #}
-{#     limitations under the License.                                           #}
-{#                                                                              #}
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
 {% macro comparison_fallback(op_code, target, left, right, type1, type2, operand1, operand2) %}
 {# For non-identical types, or for "OBJECT_OBJECT", do the full work. #}
 {% if left != right or left.type_name == "object" %}
@@ -31,8 +16,8 @@
     // Quick path for avoidable checks, compatible with CPython.
     if (operand1 == operand2 && {{left.getMostSpecificType(right).getSaneTypeCheckCode("operand1")}}) {
         bool r = {% if op_code == "NE" %} false {% else %} true {%endif %};
-        {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-        {{target.getTakeReferenceStatement("result")}}
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
         return result;
     }
 {% endif %}
@@ -76,7 +61,7 @@
                 {{ target.getReturnFromObjectExpressionCode("result") }}
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -120,8 +105,8 @@
             }
 
             bool r = c != 0;
-            {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-            {{target.getTakeReferenceStatement("result")}}
+            {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+            {{ target.getTakeReferenceStatement("result", immortal=True) }}
             return result;
         }
     }
@@ -141,7 +126,7 @@
                 {{ target.getReturnFromObjectExpressionCode("result") }}
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -155,7 +140,7 @@
             {{ target.getReturnFromObjectExpressionCode("result") }}
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = {{right.getSlotValueExpression("type2", "tp_richcompare")}};
@@ -168,7 +153,7 @@
             {{ target.getReturnFromObjectExpressionCode("result") }}
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -255,8 +240,8 @@
     }
 
     bool r = c != 0;
-    {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-    {{target.getTakeReferenceStatement("result")}}
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+    {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 #else
     bool checked_reverse_op = false;
@@ -276,7 +261,7 @@
                 {{ target.getReturnFromObjectExpressionCode("result") }}
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -291,7 +276,7 @@
             {{ target.getReturnFromObjectExpressionCode("result") }}
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -306,7 +291,7 @@
                 {{ target.getReturnFromObjectExpressionCode("result") }}
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -317,14 +302,14 @@
     switch(Py_{{op_code}}) {
     case Py_EQ: {
         bool r = operand1 == operand2;
-        {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-        {{target.getTakeReferenceStatement("result")}}
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
-        {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-        {{target.getTakeReferenceStatement("result")}}
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
         return result;
     }
     default:
@@ -333,7 +318,7 @@
 #endif
 {% endif %}
 {% endmacro %}
-{{target.getTypeDecl()}} RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+{{ target.getTypeDecl() }} RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
 
 {# Divert to more special implementation immediately if possible. #}
 {% if left.getTypeComparisonSpecializationCode(right, op_code, target, "operand1", "operand2") %}
@@ -350,3 +335,18 @@
 {{ comparison_fallback(op_code, target, left, right, type1, type2, operand1, operand2) }}
 {% endif %}
 }
+
+{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
+{#     integrates with CPython, but also works on its own.                      #}
+{#                                                                              #}
+{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
+{#     you may not use this file except in compliance with the License.         #}
+{#     You may obtain a copy of the License at                                  #}
+{#                                                                              #}
+{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
+{#                                                                              #}
+{#     Unless required by applicable law or agreed to in writing, software      #}
+{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
+{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
+{#     See the License for the specific language governing permissions and      #}
+{#     limitations under the License.                                           #}

nuitka/code_generation/templates_c/HelperOperationComparisonBytes.c.j2

@@ -1,21 +1,6 @@
-{#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com                    #}
-{#                                                                              #}
-{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
-{#     integrates with CPython, but also works on its own.                      #}
-{#                                                                              #}
-{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
-{#     you may not use this file except in compliance with the License.         #}
-{#     You may obtain a copy of the License at                                  #}
-{#                                                                              #}
-{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
-{#                                                                              #}
-{#     Unless required by applicable law or agreed to in writing, software      #}
-{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
-{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
-{#     See the License for the specific language governing permissions and      #}
-{#     limitations under the License.                                           #}
-{#                                                                              #}
-static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
+static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
     {{left.getCheckValueCode("operand1")}}
     {{right.getCheckValueCode("operand2")}}
 
@@ -24,56 +9,56 @@ static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()
 
     // Same object has fast path for all operations.
     if (operand1 == operand2) {
-{% if operand in ("==", ">=", "<=") %}
+{% if operator in ("==", ">=", "<=") %}
         bool r = true;
 {% else %}
         bool r = false;
 {% endif %}
 
         // Convert to target type.
-        {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-        {{target.getTakeReferenceStatement("result")}}
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
         return result;
     }
 
     Py_ssize_t len_a = Py_SIZE(operand1);
     Py_ssize_t len_b = Py_SIZE(operand2);
 
-{% if operand in ("==", "!=") %}
+{% if operator in ("==", "!=") %}
     if (len_a != len_b) {
         {# Shortcut for equality/inequality, driven by length divergence. #}
-{% if operand == "==" %}
+{% if operator == "==" %}
         bool r = false;
 {% else %}
         bool r = true;
 {% endif %}
 
         // Convert to target type.
-        {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-        {{target.getTakeReferenceStatement("result")}}
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
         return result;
     } else {
         if ((a->ob_sval[0] == b->ob_sval[0]) && (memcmp(a->ob_sval, b->ob_sval, len_a) == 0)) {
-{% if operand == "==" %}
+{% if operator == "==" %}
             bool r = true;
 {% else %}
             bool r = false;
 {% endif %}
 
             // Convert to target type.
-            {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-            {{target.getTakeReferenceStatement("result")}}
+            {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+            {{ target.getTakeReferenceStatement("result", immortal=True) }}
             return result;
         } else {
-{% if operand == "==" %}
+{% if operator == "==" %}
             bool r = false;
 {% else %}
             bool r = true;
 {% endif %}
 
             // Convert to target type.
-            {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r")}};
-            {{target.getTakeReferenceStatement("result")}}
+            {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+            {{ target.getTakeReferenceStatement("result", immortal=True) }}
             return result;
         }
     }
@@ -96,20 +81,35 @@ static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()
         c = (len_a < len_b) ? -1 : (len_a > len_b) ? 1 : 0;
     }
 
-{% if operand == "<" %}
+{% if operator == "<" %}
     c = c < 0;
-{% elif operand == "<=" %}
+{% elif operator == "<=" %}
     c = c <= 0;
-{% elif operand == ">" %}
+{% elif operator == ">" %}
     c = c > 0;
-{% elif operand == ">=" %}
+{% elif operator == ">=" %}
     c = c >= 0;
 {% endif %}
 
     // Convert to target type.
-    {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("c != 0")}};
-    {{target.getTakeReferenceStatement("result")}}
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("c != 0")}};
+    {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 
 {% endif %}
 }
+
+{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
+{#     integrates with CPython, but also works on its own.                      #}
+{#                                                                              #}
+{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
+{#     you may not use this file except in compliance with the License.         #}
+{#     You may obtain a copy of the License at                                  #}
+{#                                                                              #}
+{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
+{#                                                                              #}
+{#     Unless required by applicable law or agreed to in writing, software      #}
+{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
+{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
+{#     See the License for the specific language governing permissions and      #}
+{#     limitations under the License.                                           #}

nuitka/code_generation/templates_c/HelperOperationComparisonDual.c.j2

@@ -0,0 +1,86 @@
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
+{% macro compare_call(op_code, target, left, right, left_choice, right_choice, operand1, operand2) %}
+{% if left.getDualType(left_choice) == c_long_desc and right.getDualType(right_choice) == c_digit_desc %}
+{% set right = c_long_desc %}
+{% endif %}
+{% if left.getDualType(left_choice) == c_digit_desc and right.getDualType(right_choice) == c_long_desc %}
+{% set left = c_long_desc %}
+{% endif %}
+COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getDualType(left_choice).getHelperCodeName()}}_{{right.getDualType(right_choice).getHelperCodeName()}}({{left.getDualTypeAccessCode(left_choice, "operand1")}}, {{right.getDualTypeAccessCode(right_choice, "operand2")}})
+{% endmacro %}
+{{ target.getTypeDecl() }} RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+    {{ left.getCheckValueCode("operand1") }}
+    {{ right.getCheckValueCode("operand2") }}
+
+    bool left_c_usable = {{left.getDualValidityCheckCode("C", "operand1")}};
+    bool right_c_usable = {{right.getDualValidityCheckCode("C", "operand2")}};
+
+    if (left_c_usable && right_c_usable) {
+{% if left.isSimilarOrSameTypesAsOneOf(n_ilong_desc) or right.isSimilarOrSameTypesAsOneOf(n_ilong_desc) %}
+{% if op_code in ("LT", "LE", "EQ") %}
+        return {{ compare_call(op_code, target, left, right, "C", "C", "operand1", "operand2") }};
+{% else %}
+        bool r = {{ compare_call(inverse_compare_op_code, c_bool_desc, left, right, "C", "C", "operand1", "operand2") }};
+
+        // Convert to target type.
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("!r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
+        return result;
+{% endif %}
+{% else %}
+        {{ 0/0 }}
+{% endif %}
+    } else if (!left_c_usable && !right_c_usable) {
+{% if left.isDualType() and right.isDualType() %}
+        return RICH_{{ compare_call(op_code, target, left, right, "Python", "Python", "operand1", "operand2") }};
+{% elif left.isDualType()  %}
+        {{left.getDualTypeEnsurePythonObjectCode("operand1")}}
+
+        return COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{right.getDualTypeAccessCode("C", "operand2")}});
+{% elif right.isDualType()  %}
+        {{right.getDualTypeEnsurePythonObjectCode("operand1")}}
+
+        return RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getDualType("Python").getHelperCodeName()}}({{right.getDualTypeAccessCode("C", "operand1")}}, {{right.getDualTypeAccessCode("Python", "operand2")}});
+{% else %}
+        {{ 0/0 }}
+{% endif %}
+    } else {
+{% if left.isDualType() and right.isDualType() %}
+        bool r;
+        if (left_c_usable) {
+            r = COMPARE_{{reversed_args_op_code}}_CBOOL_{{right.getDualType("Python").getHelperCodeName()}}_{{left.getDualType("C").getHelperCodeName()}}({{right.getDualTypeAccessCode("Python", "operand2")}}, {{left.getDualTypeAccessCode("C", "operand1")}});
+            r = !r;
+        } else {
+           r = COMPARE_{{op_code}}_CBOOL_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getDualType("C").getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{left.getDualTypeAccessCode("C", "operand2")}});
+        }
+
+        // Convert to target type.
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
+        return result;
+{% elif left.isDualType() %}
+        return {{ compare_call(op_code, target, left, right, "Python", "C", "operand1", "operand2") }};
+{% elif right.isDualType() %}
+        return {{ compare_call(reversed_args_op_code, target, right, left, "Python", "C", "operand2", "operand1") }};
+{% else %}
+        {{ 0/0 }}
+{% endif %}
+    }
+
+}
+
+{#     Part of "Nuitka", an optimizing Python compiler that is compatible and   #}
+{#     integrates with CPython, but also works on its own.                      #}
+{#                                                                              #}
+{#     Licensed under the Apache License, Version 2.0 (the "License");          #}
+{#     you may not use this file except in compliance with the License.         #}
+{#     You may obtain a copy of the License at                                  #}
+{#                                                                              #}
+{#        http://www.apache.org/licenses/LICENSE-2.0                            #}
+{#                                                                              #}
+{#     Unless required by applicable law or agreed to in writing, software      #}
+{#     distributed under the License is distributed on an "AS IS" BASIS,        #}
+{#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #}
+{#     See the License for the specific language governing permissions and      #}
+{#     limitations under the License.                                           #}