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

nuitka/tree/ComplexCallHelperFunctions.py

@@ -1,20 +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.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ This module is providing helper functions for complex call re-formulations.
 
 One for each type of call. """
@@ -73,7 +59,6 @@ from nuitka.nodes.VariableRefNodes import (
     ExpressionTempVariableRef,
     ExpressionVariableRef,
 )
-from nuitka.nodes.VariableReleaseNodes import makeStatementsReleaseVariables
 from nuitka.PythonVersions import (
     getComplexCallSequenceErrorTemplate,
     python_version,
@@ -86,7 +71,7 @@ from .InternalModule import (
     once_decorator,
 )
 from .ReformulationTryExceptStatements import makeTryExceptSingleHandlerNode
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .TreeHelpers import (
     makeCallNode,
     makeStatementsSequenceFromStatement,
@@ -365,6 +350,7 @@ def makeStarListArgumentErrorRaise(called_variable, star_list_variable):
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -496,6 +482,7 @@ def _makeRaiseExceptionMustBeMapping(called_variable, star_dict_variable):
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -531,10 +518,18 @@ def _makeIteratingLoopStatement(tmp_iter_variable, tmp_item_variable, statements
 def _makeStarDictArgumentToDictStatement(result, called_variable, star_dict_variable):
     temp_scope = result.allocateTempScope("mapping")
 
-    tmp_dict_variable = result.allocateTempVariable(temp_scope, "dict")
-    tmp_iter_variable = result.allocateTempVariable(temp_scope, "iter")
-    tmp_keys_variable = result.allocateTempVariable(temp_scope, "keys")
-    tmp_key_variable = result.allocateTempVariable(temp_scope, "key")
+    tmp_dict_variable = result.allocateTempVariable(
+        temp_scope, "dict", temp_type="object"
+    )
+    tmp_iter_variable = result.allocateTempVariable(
+        temp_scope, "iter", temp_type="object"
+    )
+    tmp_keys_variable = result.allocateTempVariable(
+        temp_scope, "keys", temp_type="object"
+    )
+    tmp_key_variable = result.allocateTempVariable(
+        temp_scope, "key", temp_type="object"
+    )
 
     loop_body = []
 
@@ -649,17 +644,14 @@ def _makeStarDictArgumentToDictStatement(result, called_variable, star_dict_vari
         source_ref=internal_source_ref,
     )
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=result,
         tried=tried,
-        final=makeStatementsReleaseVariables(
-            variables=(
-                tmp_dict_variable,
-                tmp_iter_variable,
-                tmp_keys_variable,
-                tmp_key_variable,
-            ),
-            source_ref=internal_source_ref,
+        variables=(
+            tmp_dict_variable,
+            tmp_iter_variable,
+            tmp_keys_variable,
+            tmp_key_variable,
         ),
         source_ref=internal_source_ref,
     )
@@ -705,6 +697,7 @@ def _makeRaiseNoStringItem(called_variable):
         exception_type=ExpressionBuiltinMakeException(
             exception_name="TypeError",
             args=(raise_arg,),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -758,6 +751,7 @@ def _makeRaiseDuplicationItem(called_variable, tmp_key_variable):
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -773,9 +767,15 @@ def _makeStarDictArgumentMergeToKwStatement(
     # This is plain terribly complex
     temp_scope = result.allocateTempScope("dict")
 
-    tmp_iter_variable = result.allocateTempVariable(temp_scope, "iter")
-    tmp_keys_variable = result.allocateTempVariable(temp_scope, "keys")
-    tmp_key_variable = result.allocateTempVariable(temp_scope, "key_xxx")
+    tmp_iter_variable = result.allocateTempVariable(
+        temp_scope, "iter", temp_type="object"
+    )
+    tmp_keys_variable = result.allocateTempVariable(
+        temp_scope, "keys", temp_type="object"
+    )
+    tmp_key_variable = result.allocateTempVariable(
+        temp_scope, "key_xxx", temp_type="object"
+    )
 
     tmp_variables = [tmp_iter_variable, tmp_keys_variable, tmp_key_variable]
     mapping_loop_body = (
@@ -855,9 +855,15 @@ def _makeStarDictArgumentMergeToKwStatement(
 
     temp_scope = result.allocateTempScope("dict")
 
-    tmp_iter_variable = result.allocateTempVariable(temp_scope, "iter")
-    tmp_item_variable = result.allocateTempVariable(temp_scope, "item")
-    tmp_key_variable = result.allocateTempVariable(temp_scope, "key")
+    tmp_iter_variable = result.allocateTempVariable(
+        temp_scope, "iter", temp_type="object"
+    )
+    tmp_item_variable = result.allocateTempVariable(
+        temp_scope, "item", temp_type="object"
+    )
+    tmp_key_variable = result.allocateTempVariable(
+        temp_scope, "key", temp_type="object"
+    )
 
     tmp_variables += [tmp_iter_variable, tmp_item_variable, tmp_key_variable]
     dict_loop_body = (
@@ -969,13 +975,10 @@ def _makeStarDictArgumentMergeToKwStatement(
         source_ref=internal_source_ref,
     )
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=result,
         tried=tried,
-        final=makeStatementsReleaseVariables(
-            variables=tmp_variables,
-            source_ref=internal_source_ref,
-        ),
+        variables=tmp_variables,
         source_ref=internal_source_ref,
     )
 
@@ -1978,11 +1981,21 @@ def getFunctionCallHelperDictionaryUnpacking():
 
     temp_scope = None
 
-    tmp_result_variable = result.allocateTempVariable(temp_scope, "dict")
-    tmp_iter_variable = result.allocateTempVariable(temp_scope, "dicts_iter")
-    tmp_item_variable = result.allocateTempVariable(temp_scope, "args_item")
-    tmp_iter2_variable = result.allocateTempVariable(temp_scope, "dict_iter")
-    tmp_key_variable = result.allocateTempVariable(temp_scope, "dict_key")
+    tmp_result_variable = result.allocateTempVariable(
+        temp_scope, "dict", temp_type="object"
+    )
+    tmp_iter_variable = result.allocateTempVariable(
+        temp_scope, "dicts_iter", temp_type="object"
+    )
+    tmp_item_variable = result.allocateTempVariable(
+        temp_scope, "args_item", temp_type="object"
+    )
+    tmp_iter2_variable = result.allocateTempVariable(
+        temp_scope, "dict_iter", temp_type="object"
+    )
+    tmp_key_variable = result.allocateTempVariable(
+        temp_scope, "dict_key", temp_type="object"
+    )
 
     update_body = (
         makeStatementConditional(
@@ -2102,18 +2115,15 @@ def getFunctionCallHelperDictionaryUnpacking():
     )
 
     body = makeStatementsSequenceFromStatement(
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=result,
             tried=tried,
-            final=makeStatementsReleaseVariables(
-                variables=(
-                    tmp_result_variable,
-                    tmp_iter_variable,
-                    tmp_item_variable,
-                    tmp_iter2_variable,
-                    tmp_key_variable,
-                ),
-                source_ref=internal_source_ref,
+            variables=(
+                tmp_result_variable,
+                tmp_iter_variable,
+                tmp_item_variable,
+                tmp_iter2_variable,
+                tmp_key_variable,
             ),
             source_ref=internal_source_ref,
         )
@@ -2122,3 +2132,19 @@ def getFunctionCallHelperDictionaryUnpacking():
     result.setChildBody(body)
 
     return result
+
+
+#     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/tree/Extractions.py

@@ -1,20 +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.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Extracting visitors.
 
 This is used for lookahead supporting abstract execution. We need to e.g.
@@ -44,3 +30,19 @@ def updateVariableUsage(provider, old_variable, new_variable):
     visitor = VariableUsageUpdater(old_variable=old_variable, new_variable=new_variable)
 
     visitTree(provider, visitor)
+
+
+#     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/tree/InternalModule.py

@@ -1,20 +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.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Internal module
 
 This is a container for helper functions that are shared across modules. It
@@ -25,7 +11,6 @@ TODO: Clarify by renaming that the top module is now used, and these are
 merely helpers to do it.
 """
 
-
 from nuitka.ModuleRegistry import getRootTopModule
 from nuitka.nodes.FunctionNodes import (
     ExpressionFunctionPureBody,
@@ -42,7 +27,7 @@ def once_decorator(func):
     Used for all internal function accesses to become a singleton.
 
     Note: This doesn't much specific anymore, but we are not having
-    this often enough to warrant re-use or generalization.
+    this often enough to warrant reuse or generalization.
 
     """
 
@@ -57,14 +42,21 @@ def once_decorator(func):
     return replacement
 
 
-@once_decorator
 def getInternalModule():
     """Get the singleton internal module."""
 
     return getRootTopModule()
 
 
+_internal_helper_names = set()
+
+
 def makeInternalHelperFunctionBody(name, parameters, inline_const_args=False):
+    # Make sure names of helpers are unique, the code names we choose require
+    # that to be true.
+    assert name not in _internal_helper_names
+    _internal_helper_names.add(name)
+
     if inline_const_args:
         node_class = ExpressionFunctionPureInlineConstBody
     else:
@@ -78,6 +70,7 @@ def makeInternalHelperFunctionBody(name, parameters, inline_const_args=False):
         parameters=parameters,
         flags=None,
         auto_release=None,
+        code_prefix="helper_function",
         source_ref=internal_source_ref,
     )
 
@@ -85,3 +78,19 @@ def makeInternalHelperFunctionBody(name, parameters, inline_const_args=False):
         result.removeVariableReleases(variable)
 
     return result
+
+
+#     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/tree/Operations.py

@@ -1,20 +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.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Operations on the tree.
 
 This is mostly for the different kinds of visits that the node tree can have.
@@ -41,3 +27,19 @@ class VisitorNoopMixin(object):
 
     def onLeaveNode(self, node):
         """Overloaded for operation after the node children were done."""
+
+
+#     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/tree/ReformulationAssertStatements.py

@@ -1,30 +1,20 @@
-#     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
+
+
 """ Reformulation of assert statements.
 
 Consult the Developer Manual for information. TODO: Add ability to sync
 source code comments with Developer Manual sections.
 
 """
+
 from nuitka.nodes.BuiltinRefNodes import ExpressionBuiltinExceptionRef
 from nuitka.nodes.ConditionalNodes import makeStatementConditional
 from nuitka.nodes.ContainerMakingNodes import makeExpressionMakeTuple
-from nuitka.nodes.ExceptionNodes import StatementRaiseException
+from nuitka.nodes.ExceptionNodes import (
+    StatementRaiseException,
+    makeBuiltinMakeExceptionNode,
+)
 from nuitka.nodes.OperatorNodesUnary import ExpressionOperationNot
 from nuitka.Options import hasPythonFlagNoAsserts
 from nuitka.PythonVersions import python_version
@@ -52,20 +42,34 @@ def buildAssertNode(provider, node, source_ref):
     if hasPythonFlagNoAsserts():
         return None
 
-    if exception_value is not None and python_version >= 0x272:
-        exception_value = makeExpressionMakeTuple(
-            elements=(exception_value,), source_ref=source_ref
-        )
+    if python_version < 0x3C0:
+        if exception_value is not None and python_version >= 0x272:
+            exception_value = makeExpressionMakeTuple(
+                elements=(exception_value,), source_ref=source_ref
+            )
 
-    raise_statement = StatementRaiseException(
-        exception_type=ExpressionBuiltinExceptionRef(
-            exception_name="AssertionError", source_ref=source_ref
-        ),
-        exception_value=exception_value,
-        exception_trace=None,
-        exception_cause=None,
-        source_ref=source_ref,
-    )
+        raise_statement = StatementRaiseException(
+            exception_type=ExpressionBuiltinExceptionRef(
+                exception_name="AssertionError", source_ref=source_ref
+            ),
+            exception_value=exception_value,
+            exception_trace=None,
+            exception_cause=None,
+            source_ref=source_ref,
+        )
+    else:
+        raise_statement = StatementRaiseException(
+            exception_type=makeBuiltinMakeExceptionNode(
+                exception_name="AssertionError",
+                args=(exception_value,) if exception_value else (),
+                for_raise=False,
+                source_ref=source_ref,
+            ),
+            exception_value=None,
+            exception_cause=None,
+            exception_trace=None,
+            source_ref=source_ref,
+        )
 
     return makeStatementConditional(
         condition=ExpressionOperationNot(
@@ -75,3 +79,19 @@ def buildAssertNode(provider, node, source_ref):
         no_branch=None,
         source_ref=source_ref,
     )
+
+
+#     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.