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

nuitka/code_generation/Emission.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
+
+
 """ Emission of source code.
 
 Code generation is driven via "emit", which is to receive lines of code and
@@ -22,6 +8,7 @@ this is to collect them, providing the emit implementation. Sometimes nested
 use of these will occur.
 
 """
+
 import contextlib
 
 from .Indentation import indented
@@ -63,10 +50,26 @@ def withSubCollector(emit, context):
             for local_declaration in local_declarations:
                 emit(indented(local_declaration))
 
-            sub_emit.emitTo(emit, level=1)
+            sub_emit.emitTo(emit, level=4)
 
             emit("}")
         else:
             sub_emit.emitTo(emit, level=0)
 
         context.popCleanupScope()
+
+
+#     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/ErrorCodes.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
+
+
 """ Error codes
 
 These are the helper functions that will emit the error exit codes. They
@@ -30,12 +16,11 @@ And releasing of values, as this is what the error case commonly does.
 
 from nuitka.PythonVersions import python_version
 
-from .ExceptionCodes import getExceptionIdentifier
 from .Indentation import indented
 from .LineNumberCodes import getErrorLineNumberUpdateCode
 from .templates.CodeTemplatesExceptions import (
     template_error_catch_exception,
-    template_error_catch_quick_exception,
+    template_error_catch_fetched_exception,
     template_error_format_name_error_exception,
     template_error_format_string_exception,
 )
@@ -46,12 +31,15 @@ def getErrorExitReleaseCode(context):
         "Py_DECREF(%s);" % tmp_name for tmp_name in context.getCleanupTempNames()
     )
 
-    keeper_variables = context.getExceptionKeeperVariables()
+    (
+        keeper_exception_state_name,
+        _keeper_lineno,
+    ) = context.getExceptionKeeperVariables()
 
-    if keeper_variables[0] is not None:
-        temp_release += "\nPy_DECREF(%s);" % keeper_variables[0]
-        temp_release += "\nPy_XDECREF(%s);" % keeper_variables[1]
-        temp_release += "\nPy_XDECREF(%s);" % keeper_variables[2]
+    if keeper_exception_state_name is not None:
+        temp_release += (
+            "\nRELEASE_ERROR_OCCURRED_STATE(&%s);" % keeper_exception_state_name
+        )
 
     return temp_release
 
@@ -74,8 +62,8 @@ def getErrorExitBoolCode(
     context,
     release_names=(),
     release_name=None,
+    fetched_exception=False,
     needs_check=True,
-    quick_exception=None,
 ):
     assert not condition.endswith(";")
 
@@ -93,23 +81,18 @@ def getErrorExitBoolCode(
         return
 
     (
-        exception_type,
-        exception_value,
-        exception_tb,
+        exception_state_name,
         _exception_lineno,
     ) = context.variable_storage.getExceptionVariableDescriptions()
 
-    if quick_exception:
+    if fetched_exception:
         emit(
             indented(
-                template_error_catch_quick_exception
+                template_error_catch_fetched_exception
                 % {
                     "condition": condition,
-                    "exception_type": exception_type,
-                    "exception_value": exception_value,
-                    "exception_tb": exception_tb,
+                    "exception_state_name": exception_state_name,
                     "exception_exit": context.getExceptionEscape(),
-                    "quick_exception": getExceptionIdentifier(quick_exception),
                     "release_temps": indented(getErrorExitReleaseCode(context)),
                     "var_description_code": indented(
                         getFrameVariableTypeDescriptionCode(context)
@@ -125,9 +108,7 @@ def getErrorExitBoolCode(
                 template_error_catch_exception
                 % {
                     "condition": condition,
-                    "exception_type": exception_type,
-                    "exception_value": exception_value,
-                    "exception_tb": exception_tb,
+                    "exception_state_name": exception_state_name,
                     "exception_exit": context.getExceptionEscape(),
                     "release_temps": indented(getErrorExitReleaseCode(context)),
                     "var_description_code": indented(
@@ -146,7 +127,7 @@ def getErrorExitCode(
     context,
     release_names=(),
     release_name=None,
-    quick_exception=None,
+    fetched_exception=False,
     needs_check=True,
 ):
     getErrorExitBoolCode(
@@ -154,7 +135,7 @@ def getErrorExitCode(
         release_names=release_names,
         release_name=release_name,
         needs_check=needs_check,
-        quick_exception=quick_exception,
+        fetched_exception=fetched_exception,
         emit=emit,
         context=context,
     )
@@ -162,25 +143,22 @@ def getErrorExitCode(
 
 def _getExceptionChainingCode(context):
     (
-        exception_type,
-        exception_value,
-        exception_tb,
+        exception_state_name,
         _exception_lineno,
     ) = context.variable_storage.getExceptionVariableDescriptions()
 
-    keeper_vars = context.getExceptionKeeperVariables()
+    (
+        keeper_exception_state_name,
+        _keeper_lineno,
+    ) = context.getExceptionKeeperVariables()
 
-    if keeper_vars[0] is not None:
-        return (
-            "ADD_EXCEPTION_CONTEXT(tstate, &%s, &%s);"
-            % (keeper_vars[0], keeper_vars[1]),
-        )
+    if keeper_exception_state_name is not None:
+        yield "ADD_EXCEPTION_CONTEXT(tstate, &%s);" % keeper_exception_state_name
     else:
-        return (
-            "NORMALIZE_EXCEPTION(tstate, &%s, &%s, &%s);"
-            % (exception_type, exception_value, exception_tb),
-            "CHAIN_EXCEPTION(tstate, %s);" % exception_value,
-        )
+        if python_version < 0x3C0:
+            yield "NORMALIZE_EXCEPTION_STATE(tstate, &%s);" % exception_state_name
+
+        yield "CHAIN_EXCEPTION(tstate, %s.exception_value);" % exception_state_name
 
 
 def getTakeReferenceCode(value_name, emit):
@@ -218,9 +196,7 @@ def getLocalVariableReferenceErrorCode(variable, condition, emit, context):
     variable_name = variable.getName()
 
     (
-        exception_type,
-        exception_value,
-        exception_tb,
+        exception_state_name,
         _exception_lineno,
     ) = context.variable_storage.getExceptionVariableDescriptions()
 
@@ -230,14 +206,12 @@ def getLocalVariableReferenceErrorCode(variable, condition, emit, context):
         helper_code = "FORMAT_UNBOUND_LOCAL_ERROR"
 
     set_exception = [
-        "%s(&%s, &%s, %s);"
+        "%s(tstate, &%s, %s);"
         % (
             helper_code,
-            exception_type,
-            exception_value,
+            exception_state_name,
             context.getConstantCode(variable_name),
         ),
-        "%s = NULL;" % exception_tb,
     ]
 
     # TODO: Move this into the helper code.
@@ -261,43 +235,47 @@ def getLocalVariableReferenceErrorCode(variable, condition, emit, context):
 
 # TODO: Get rid of this function entirely.
 def getNameReferenceErrorCode(variable_name, condition, emit, context):
-    helper_code = "FORMAT_NAME_ERROR"
+    helper_code = "RAISE_CURRENT_EXCEPTION_NAME_ERROR"
 
-    if python_version < 0x340:
+    if python_version < 0x300:
         owner = context.getOwner()
 
         if not owner.isCompiledPythonModule() and not owner.isExpressionClassBodyBase():
-            helper_code = "FORMAT_GLOBAL_NAME_ERROR"
+            helper_code = "RAISE_CURRENT_EXCEPTION_GLOBAL_NAME_ERROR"
 
     (
-        exception_type,
-        exception_value,
-        _exception_tb,
+        exception_state_name,
         _exception_lineno,
     ) = context.variable_storage.getExceptionVariableDescriptions()
 
-    set_exception = "%s(&%s, &%s, %s);" % (
-        helper_code,
-        exception_type,
-        exception_value,
-        context.getConstantCode(variable_name),
-    )
-
-    # TODO: Make this part of the helper code as well.
-    if python_version >= 0x300:
-        set_exception = [set_exception]
-        set_exception.extend(_getExceptionChainingCode(context))
-
     emit(
         template_error_format_name_error_exception
         % {
             "condition": condition,
             "exception_exit": context.getExceptionEscape(),
-            "set_exception": indented(set_exception),
+            "raise_name_error_helper": helper_code,
+            "variable_name": context.getConstantCode(variable_name),
             "release_temps": indented(getErrorExitReleaseCode(context)),
             "var_description_code": indented(
                 getFrameVariableTypeDescriptionCode(context)
             ),
             "line_number_code": indented(getErrorLineNumberUpdateCode(context)),
+            "exception_state_name": exception_state_name,
         }
     )
+
+
+#     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/EvalCodes.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
+
+
 """ Eval/exec/execfile/compile built-in related codes. """
 
 from nuitka import Options
@@ -268,9 +254,11 @@ def generateExecCode(statement, emit, context):
     # Default filename with origin in improved mode.
     filename_name.getCType().emitAssignmentCodeFromConstant(
         to_name=filename_name,
-        constant="<string>"
-        if Options.is_full_compat
-        else "<string at %s>" % source_ref.getAsString(),
+        constant=(
+            "<string>"
+            if Options.is_full_compat
+            else "<string at %s>" % source_ref.getAsString()
+        ),
         may_escape=False,
         emit=emit,
         context=context,
@@ -438,3 +426,19 @@ def generateLocalsDictSyncCode(statement, emit, context):
             emit=emit,
             context=context,
         )
+
+
+#     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.