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

nuitka/code_generation/templates_c/HelperOperationComparisonUnicode.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,19 +9,19 @@ 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;
     }
 
-{% if operand in ("==", "!=") %}
+{% if operator in ("==", "!=") %}
 #if PYTHON_VERSION >= 0x300
     bool r;
 
@@ -45,20 +30,24 @@ static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()
         r = false;
     } else {
         int kind1 = PyUnicode_KIND(a);
+#if PYTHON_VERSION < 0x3c0
         if (unlikely(kind1 == 0)) {
-            int res = _PyUnicode_Ready((PyObject *)a);
+            NUITKA_MAY_BE_UNUSED int res = _PyUnicode_Ready((PyObject *)a);
             assert(res != -1);
             kind1 = PyUnicode_KIND(a);
             assert(kind1 != 0);
         }
+#endif
 
         int kind2 = PyUnicode_KIND(b);
+#if PYTHON_VERSION < 0x3c0
         if (unlikely(kind2 == 0)) {
-            int res = _PyUnicode_Ready((PyObject *)b);
+            NUITKA_MAY_BE_UNUSED int res = _PyUnicode_Ready((PyObject *)b);
             assert(res != -1);
             kind2 = PyUnicode_KIND(b);
             assert(kind2 != 0);
         }
+#endif
 
         if (kind1 != kind2) {
             r = false;
@@ -71,8 +60,8 @@ static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()
         }
     }
 
-    {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operand == "==" else "false"))}};
-    {{target.getTakeReferenceStatement("result")}}
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operator == "==" else "false"))}};
+    {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 #else
     bool r;
@@ -88,8 +77,8 @@ static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()
         r = (cmp == 0);
     }
 
-    {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operand == "==" else "false"))}};
-    {{target.getTakeReferenceStatement("result")}}
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operator == "==" else "false"))}};
+    {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 #endif
 {% else %}
@@ -102,10 +91,25 @@ static {{target.getTypeDecl()}} COMPARE_{{op_code}}_{{target.getHelperCodeName()
     return r;
 {% else %}
     // Convert to target type if necessary
-    {{target.getTypeDecl()}} result = {{target.getToValueFromBoolExpression("r == Py_True")}};
-    Py_DECREF(r);
-    {{target.getTakeReferenceStatement("result")}}
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == Py_True")}};
+    Py_DECREF_IMMORTAL(r);
+    {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 {% endif %}
 {% 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/HelperOperationInplace.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 'HelperSlotsBinary.c.j2' import binary_operation, call_binary_slot with context %}
 {% macro inplace_fallback_operation(props, left, right, type1, type2) %}
@@ -38,14 +23,14 @@
             {{ goto_exit(props, "exit_inplace_result_object", "x") }}
         }
 
-        Py_DECREF(x);
+        Py_DECREF_IMMORTAL(x);
     }
 {% else %}
     // No inplace number slot {{ nb_inplace_slot }} available for this type.
 {% endif %}
 
     {
-        {{ binary_operation(props, operator, nb_slot, left, right, "type1", "type2", "*operand1", "operand2", "exit_inplace_result_object", "exit_inplace_result_cbool_ok", "exit_inplace_result_nbool", "exit_inplace_exception") }}
+        {{ binary_operation(props, operator, True, nb_slot, left, right, "type1", "type2", "*operand1", "operand2", "exit_inplace_result_object", "exit_inplace_result_cbool_ok", "exit_inplace_result_nbool", "exit_inplace_exception") }}
     }
 
 {% if "exit_inplace_result_object" in props["exits"] %}
@@ -116,7 +101,7 @@ static inline bool _INPLACE_OPERATION_{{op_code}}_{{left.getHelperCodeName()}}_{
 
 {% if operator == "+" and (left.mayBothHaveType(right, "str") or left.mayBothHaveType(right, "unicode") or left.hasOneOrBothType(right, "bytes")) %}
     if (Py_REFCNT(*operand1) == 1) {
-        // We more or less own the operand, so we might re-use its storage and
+        // We more or less own the operand, so we might reuse its storage and
         // execute stuff in-place.
 {% if operator == "+" and left.mayBothHaveType(right, "str") %}
 #if PYTHON_VERSION < 0x300
@@ -279,3 +264,18 @@ static inline bool _INPLACE_OPERATION_{{op_code}}_{{left.getHelperCodeName()}}_{
 bool INPLACE_OPERATION_{{op_code}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("*operand1")}}, {{right.getVariableDecl("operand2")}}) {
     return _INPLACE_OPERATION_{{op_code}}_{{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/HelperSlotsBinary.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 'HelperSlotsLong.c.j2' import long_slot with context %}
@@ -25,7 +10,7 @@
 {% from 'HelperSlotsTuple.c.j2' import tuple_slot %}
 {% from 'HelperSlotsList.c.j2' import list_slot %}
 {% from 'HelperSlotsSet.c.j2' import set_slot %}
-{% macro operation_unsupported_error_exit(props, operator, left, right, type1, type2, exit_result_exception) %}
+{% macro operation_unsupported_error_exit(props, operator, inplace, left, right, type1, type2, exit_result_exception) %}
 {% set args = [] %}
 {% if left == object_desc %}
 {% do args.append("%s->tp_name" % type1) %}
@@ -39,15 +24,15 @@
 {% set right_name_3 = "'%s'" % ("%s" if right == object_desc else right.getTypeName3()) %}
 {% if (left_name_2 == left_name_3 and right_name_2 == right_name_3) or left.python_requirement or right.python_requirement %}
 {% if left.python_requirement == "PYTHON_VERSION < 0x300" or right.python_requirement == "PYTHON_VERSION < 0x300" %}
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
 {% else %}
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
 {% endif %}
 {% else %}
 #if PYTHON_VERSION < 0x300
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
 #else
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
 #endif
 {% endif %}
     {{ goto_exit(props, exit_result_exception) }}
@@ -144,7 +129,7 @@
         }
     }
 {% endmacro %}
-{% macro binary_operation(props, operator, nb_slot, left, right, type1, type2, operand1, operand2, exit_result_object, exit_result_cbool_ok, exit_result_nbool, exit_result_exception) %}
+{% macro binary_operation(props, operator, inplace, nb_slot, left, right, type1, type2, operand1, operand2, exit_result_object, exit_result_cbool_ok, exit_result_nbool, exit_result_exception) %}
 {% set slot1_relevant = left == object_desc or left.hasSlot(nb_slot) %}
 {% set slot2_relevant = right == object_desc or (left != right and right.hasSlot(nb_slot)) %}
 {% set error_needed = 1 %}
@@ -186,7 +171,7 @@
                     {{ goto_exit(props, exit_result_object, "x") }}
                 }
 
-                Py_DECREF(x);
+                Py_DECREF_IMMORTAL(x);
                 slot2 = NULL;
             }
         }
@@ -198,7 +183,7 @@
             {{ goto_exit(props, exit_result_object, "x") }}
         }
 
-        Py_DECREF(x);
+        Py_DECREF_IMMORTAL(x);
     }
 {% endif %}
 
@@ -210,7 +195,7 @@
             {{ goto_exit(props, exit_result_object, "x") }}
         }
 
-        Py_DECREF(x);
+        Py_DECREF_IMMORTAL(x);
     }
 {% endif %}
 
@@ -390,13 +375,13 @@
 {% endif %}
 
 {% if error_needed == 1 %}
-    {{ operation_unsupported_error_exit(props, operator, left, right, type1, type2, exit_result_exception) }}
+    {{ operation_unsupported_error_exit(props, operator, inplace, left, right, type1, type2, exit_result_exception) }}
 {% else %}
     NUITKA_CANNOT_GET_HERE("missing error exit annotation");
 {% endif %}
 {% endmacro %}
 {% macro call_binary_slot(props, operator, nb_slot, nb_inplace_slot, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
-{% if left.isSimilarOrSameTypesAsOneOf(int_desc) or right.isSimilarOrSameTypesAsOneOf(int_desc) %}
+{% if (left.isSimilarOrSameTypesAsOneOf(int_desc) or right.isSimilarOrSameTypesAsOneOf(int_desc)) and left != long_desc and right != long_desc %}
     {{ int_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) }}
 {% elif left.isSimilarOrSameTypesAsOneOf(long_desc) or right.isSimilarOrSameTypesAsOneOf(long_desc) %}
     {{ long_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) }}
@@ -418,3 +403,18 @@
     {{ 0/0 }}
 {% endif %}
 {% endmacro %}
+
+{#     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/HelperSlotsBytes.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 %}
 
 {% macro bytes_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -49,3 +34,18 @@ exit_result_object:
     {{ goto_exit(props, exit_result_ok) }}
 
 {% endmacro %}
+
+{#     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/HelperSlotsCommon.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 #}
+
 {# This contains macros that are used for all slot helper macros #}
 {% macro goto_exit(props, target, result, qual="all") %}
 {% if target.endswith(("_exception", "_left", "_right")) or "_const_" in target or target == "exit_result_ok" %}
@@ -69,3 +54,18 @@
 {% endif %}
     {{ goto_exit(props, exit_result_ok) }}
 {% endmacro %}
+
+{#     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/HelperSlotsFloat.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, constant_int_exit_target, constant_float_exit_target %}
 
 {% macro float_core(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_object, exit_result_exception, exit_result_ok_cfloat, exit_result_ok_left, exit_result_ok_right, exit_result_ok_const_float_1_0, exit_result_ok_const_float_0_0, exit_result_ok_const_float_minus_1_0) %}
@@ -325,3 +310,18 @@ exit_result_ok_right:
 {% endif %}
 
 {% endmacro %}
+
+{#     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/HelperSlotsInt.c.j2

@@ -1,24 +1,9 @@
-{#     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, constant_int_exit_target, constant_float_exit_target %}
 
 {% macro 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) %}
-    {% set fall_through_needed = 1 %}
+    {% do props.update(fall_through_needed = 1) %}
 
     {{ left.getCheckValueCode(operand1) }}
     {{ right.getCheckValueCode(operand2) }}
@@ -34,7 +19,7 @@
     bool t = !no_overflow || x != 0;
 
     {{ goto_exit(props, exit_result_ok_cbool, "t") }}
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% else %}
     if (likely(no_overflow)) {
         {{ goto_exit(props, exit_result_ok_clong, "x") }}
@@ -91,7 +76,7 @@
 
 {% if bool_mode %}
     {{ goto_exit(props, exit_result_ok_cbool, "a == 0") }}
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% else %}
     if (a == 0) {
         if (b < 0) {
@@ -135,7 +120,7 @@
     const long r = a {{operator}} b;
 
     {{ goto_exit(props, exit_result_ok_clong, "r") }}
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == "<<" %}
     if (unlikely(b < 0)) {
         PyThreadState *tstate = PyThreadState_GET();
@@ -147,8 +132,8 @@
     if (a == 0 || b == 0) {
         {{ goto_exit(props, exit_result_ok_left) }}
     } else if (b >= LONG_BIT) {
-        PyObject *operand1_long = PyLong_FromLong(a);
-        PyObject *operand2_long = PyLong_FromLong(b);
+        PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+        PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
         // TODO: Change this to using CLONG once we specialize that too.
         PyObject *r = _BINARY_OPERATION_LSHIFT_OBJECT_LONG_LONG(operand1_long, operand2_long);
@@ -161,8 +146,8 @@
         long c = a << b;
 
         if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) {
-            PyObject *operand1_long = PyLong_FromLong(a);
-            PyObject *operand2_long = PyLong_FromLong(b);
+            PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+            PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
             // TODO: Change this to using CLONG once we specialize that too.
             PyObject *r = _BINARY_OPERATION_LSHIFT_OBJECT_LONG_LONG(operand1_long, operand2_long);
@@ -175,7 +160,7 @@
             {{ goto_exit(props, exit_result_ok_clong, "c") }}
         }
     }
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == ">>" %}
     if (unlikely(b < 0)) {
         PyThreadState *tstate = PyThreadState_GET();
@@ -198,7 +183,7 @@
 
         {{ goto_exit(props, exit_result_ok_clong, "r") }}
     }
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == "**" %}
     if (b < 0) {
         // TODO: Use CFLOAT once available.
@@ -224,8 +209,8 @@
                     break;
                 }
                 if (ix / temp != prev) {
-                    PyObject *operand1_long = PyLong_FromLong(a);
-                    PyObject *operand2_long = PyLong_FromLong(b);
+                    PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+                    PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
                     PyObject *r = _BINARY_OPERATION_POW_OBJECT_LONG_LONG(operand1_long, operand2_long);
 
@@ -243,8 +228,8 @@
             temp = (unsigned long)temp * temp;
 
             if (prev != 0 && temp / prev != prev) {
-                PyObject *operand1_long = PyLong_FromLong(a);
-                PyObject *operand2_long = PyLong_FromLong(b);
+                PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+                PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
                 PyObject *r = _BINARY_OPERATION_POW_OBJECT_LONG_LONG(operand1_long, operand2_long);
 
@@ -257,7 +242,7 @@
 
         {{ goto_exit(props, exit_result_ok_clong, "ix") }}
     }
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == "divmod" %}
     if (unlikely(b == 0)) {
         PyThreadState *tstate = PyThreadState_GET();
@@ -281,20 +266,6 @@
 {% else %}
 #error Operator {{operator}} not implemented
 {% endif %}
-{% if fall_through_needed %}
-    {
-        PyObject *operand1_object = {{ left.getAsObjectValueExpression(operand1) }};
-        PyObject *operand2_object = {{ right.getAsObjectValueExpression(operand2) }};
-
-        PyObject *r = {{ left.getSlotCallExpression(nb_slot, "PyLong_Type.tp_as_number->"+nb_slot, "operand1_object", "operand2_object") }};
-        assert(r != Py_NotImplemented);
-
-        {{ left.releaseAsObjectValueStatement("operand1_object") }}
-        {{ right.releaseAsObjectValueStatement("operand2_object") }}
-
-        {{ goto_exit(props, exit_result_object, "r") }}
-    }
-{% endif %}
 {% endmacro %}
 
 {% macro int_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -314,6 +285,20 @@
 #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"] %}
+    {
+        PyObject *operand1_object = {{ left.getAsObjectValueExpression(operand1) }};
+        PyObject *operand2_object = {{ right.getAsObjectValueExpression(operand2) }};
+
+        PyObject *r = {{ left.getSlotCallExpression(nb_slot, "PyLong_Type.tp_as_number->"+nb_slot, "operand1_object", "operand2_object") }};
+        assert(r != Py_NotImplemented);
+
+        {{ left.releaseAsObjectValueStatement("operand1_object") }}
+        {{ right.releaseAsObjectValueStatement("operand2_object") }}
+
+        {{ goto_exit(props, "exit_result_object", "r") }}
+    }
+{% endif %}
 
 {# // {{ props }} #}
 
@@ -329,7 +314,7 @@ exit_result_ok_cbool:
 
     // That's our return value then. As we use a dedicated variable, it's
     // OK that way.
-    {{ operand1 }} = PyInt_FromLong(cbool_result);
+    {{ operand1 }} = Nuitka_PyInt_FromLong(cbool_result);
 {% endif %}
     {{ goto_exit(props, exit_result_ok) }}
 {% endif %}
@@ -346,7 +331,7 @@ exit_result_ok_clong:
 
     // That's our return value then. As we use a dedicated variable, it's
     // OK that way.
-    {{ operand1 }} = PyInt_FromLong(clong_result);
+    {{ operand1 }} = Nuitka_PyInt_FromLong(clong_result);
 {% endif %}
     {{ goto_exit(props, exit_result_ok) }}
 {% endif %}
@@ -409,3 +394,18 @@ exit_result_object:
 {% endif %}
 
 {% endmacro %}
+
+{#     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.                                           #}