make delegates throwing

thebrowsercompany · Mar 11, 2024 · 4bf55fc · 4bf55fc
1 parent 499c448
commit 4bf55fc
Show file tree

Hide file tree

Showing 16 changed files with 414 additions and 316 deletions.
diff --git a/swiftwinrt/code_writers.h b/swiftwinrt/code_writers.h
@@ -1235,7 +1235,7 @@ vtable);
         {
             invoke_implementation = w.write_temp(R"(var result:%%
         for handler in getInvocationList() {
-            result = handler(%)
+            result = try handler(%)
         }
         return result)",
                 bind<write_type>(*delegate_method.return_type->type, write_type_params::swift),
@@ -1245,13 +1245,13 @@ vtable);
         else
         {
             invoke_implementation = w.write_temp(R"(for handler in getInvocationList() {
-            handler(%)
+            try handler(%)
         })", bind<write_comma_param_names>(delegate_method.params));
         }
 
         assert(delegate_method.def);
         w.write(R"(% extension EventSource where Handler == % {
-    %func invoke(%)% {
+    %func invoke(%) throws% {
         %
     }
 }
@@ -1477,7 +1477,7 @@ vtable);
         // parameters for the delegate signature to create the bridge. The swift compiler
         // complains if the typealias isn't placed in a tuple
         function_def delegate_method = type.functions[0];
-        w.write("public typealias % = (%) -> %\n",
+        w.write("public typealias % = (%) throws -> %\n",
             type,
             bind<write_comma_param_types>(delegate_method.params),
             bind<write_delegate_return_type>(delegate_method));
@@ -1523,7 +1523,7 @@ vtable);
                 interface_info delegate{ &type };
                 delegate.is_default = true; // so that the _default name is used
                 auto indent_guard{ w.push_indent({3}) };
-                write_class_func_body(w, invoke_method, delegate, true);
+                write_class_func_body(w, invoke_method, delegate, false);
                 }));
     }
 
@@ -2851,7 +2851,7 @@ override % func _getABI<T>() -> UnsafeMutablePointer<T>? {
             func_call += w.write_temp(format, get_swift_name(method), bind<write_consume_args>(function));
         }
 
-        bool needs_try_catch = !is_get_or_put && !is_winrt_generic_collection(type) && !is_delegate(type);
+        bool needs_try_catch = !is_get_or_put && !is_winrt_generic_collection(type);
         w.write("%: {\n", func_name);
         if (needs_try_catch) {
             w.m_indent += 1;

diff --git a/tests/test_app/WinRTInterfaceImplementations.swift b/tests/test_app/WinRTInterfaceImplementations.swift
@@ -84,7 +84,7 @@ class MyImplementableDelegate: IIAmImplementable {
 
     var id: Foundation.UUID?
     func fireEvent(_ data: String) {
-      _implementableEvent.invoke(data)
+      try! _implementableEvent.invoke(data)
     }
 
     private var object: Any?

diff --git a/tests/test_component/Sources/test_component/Windows.Foundation+ABI.swift b/tests/test_component/Sources/test_component/Windows.Foundation+ABI.swift
@@ -1347,11 +1347,13 @@ extension __ABI_Windows_Foundation {
         AddRef: { AsyncActionCompletedHandlerWrapper.addRef($0) },
         Release: { AsyncActionCompletedHandlerWrapper.release($0) },
         Invoke: {
-            guard let __unwrapped__instance = AsyncActionCompletedHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
-            let asyncInfo: test_component.AnyIAsyncAction? = __ABI_Windows_Foundation.IAsyncActionWrapper.unwrapFrom(abi: ComPtr($1))
-            let asyncStatus: test_component.AsyncStatus = $2
-            __unwrapped__instance(asyncInfo, asyncStatus)
-            return S_OK
+            do {
+                guard let __unwrapped__instance = AsyncActionCompletedHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
+                let asyncInfo: test_component.AnyIAsyncAction? = __ABI_Windows_Foundation.IAsyncActionWrapper.unwrapFrom(abi: ComPtr($1))
+                let asyncStatus: test_component.AsyncStatus = $2
+                try __unwrapped__instance(asyncInfo, asyncStatus)
+                return S_OK
+            } catch { return failWith(err: E_FAIL) } 
         }
     )
 }
@@ -1382,9 +1384,11 @@ extension __ABI_Windows_Foundation {
         AddRef: { DeferralCompletedHandlerWrapper.addRef($0) },
         Release: { DeferralCompletedHandlerWrapper.release($0) },
         Invoke: {
-            guard let __unwrapped__instance = DeferralCompletedHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
-            __unwrapped__instance()
-            return S_OK
+            do {
+                guard let __unwrapped__instance = DeferralCompletedHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
+                try __unwrapped__instance()
+                return S_OK
+            } catch { return failWith(err: E_FAIL) } 
         }
     )
 }

diff --git a/tests/test_component/Sources/test_component/Windows.Foundation+Impl.swift b/tests/test_component/Sources/test_component/Windows.Foundation+Impl.swift
@@ -405,7 +405,7 @@ public enum __IMPL_Windows_Foundation {
             guard let abi = abi else { return nil }
             let _default = SwiftABI(abi)
             let handler: Handler = { (asyncInfo, asyncStatus) in
-                try! _default.InvokeImpl(asyncInfo, asyncStatus)
+                try _default.InvokeImpl(asyncInfo, asyncStatus)
             }
             return handler
         }
@@ -419,7 +419,7 @@ public enum __IMPL_Windows_Foundation {
             guard let abi = abi else { return nil }
             let _default = SwiftABI(abi)
             let handler: Handler = { () in
-                try! _default.InvokeImpl()
+                try _default.InvokeImpl()
             }
             return handler
         }

diff --git a/tests/test_component/Sources/test_component/Windows.Foundation.Collections.swift b/tests/test_component/Sources/test_component/Windows.Foundation.Collections.swift
@@ -300,8 +300,8 @@ public final class ValueSet : WinRTClass, IObservableMap, IMap, IIterable, IProp
     }
 }
 
-public typealias MapChangedEventHandler<K,V> = (AnyIObservableMap<K, V>?, AnyIMapChangedEventArgs<K>?) -> ()
-public typealias VectorChangedEventHandler<T> = (AnyIObservableVector<T>?, AnyIVectorChangedEventArgs?) -> ()
+public typealias MapChangedEventHandler<K,V> = (AnyIObservableMap<K, V>?, AnyIMapChangedEventArgs<K>?) throws -> ()
+public typealias VectorChangedEventHandler<T> = (AnyIObservableVector<T>?, AnyIVectorChangedEventArgs?) throws -> ()
 /// [Open Microsoft documentation](https://learn.microsoft.com/uwp/api/windows.foundation.collections.iiterable-1)
 public protocol IIterable<T> : WinRTInterface {
     associatedtype T

diff --git a/tests/test_component/Sources/test_component/Windows.Foundation.swift b/tests/test_component/Sources/test_component/Windows.Foundation.swift
@@ -350,13 +350,13 @@ public final class WwwFormUrlDecoder : WinRTClass, IIterable, IVectorView {
     }
 }
 
-public typealias AsyncActionCompletedHandler = (AnyIAsyncAction?, AsyncStatus) -> ()
-public typealias AsyncOperationCompletedHandler<TResult> = (AnyIAsyncOperation<TResult>?, AsyncStatus) -> ()
-public typealias AsyncOperationProgressHandler<TResult,TProgress> = (AnyIAsyncOperationWithProgress<TResult, TProgress>?, TProgress) -> ()
-public typealias AsyncOperationWithProgressCompletedHandler<TResult,TProgress> = (AnyIAsyncOperationWithProgress<TResult, TProgress>?, AsyncStatus) -> ()
-public typealias DeferralCompletedHandler = () -> ()
-public typealias EventHandler<T> = (Any?, T) -> ()
-public typealias TypedEventHandler<TSender,TResult> = (TSender, TResult) -> ()
+public typealias AsyncActionCompletedHandler = (AnyIAsyncAction?, AsyncStatus) throws -> ()
+public typealias AsyncOperationCompletedHandler<TResult> = (AnyIAsyncOperation<TResult>?, AsyncStatus) throws -> ()
+public typealias AsyncOperationProgressHandler<TResult,TProgress> = (AnyIAsyncOperationWithProgress<TResult, TProgress>?, TProgress) throws -> ()
+public typealias AsyncOperationWithProgressCompletedHandler<TResult,TProgress> = (AnyIAsyncOperationWithProgress<TResult, TProgress>?, AsyncStatus) throws -> ()
+public typealias DeferralCompletedHandler = () throws -> ()
+public typealias EventHandler<T> = (Any?, T) throws -> ()
+public typealias TypedEventHandler<TSender,TResult> = (TSender, TResult) throws -> ()
 /// [Open Microsoft documentation](https://learn.microsoft.com/uwp/api/windows.foundation.datetime)
 public struct DateTime: Hashable, Codable {
     /// [Open Microsoft documentation](https://learn.microsoft.com/uwp/api/windows.foundation.datetime.universaltime)

diff --git a/tests/test_component/Sources/test_component/Windows.Storage+ABI.swift b/tests/test_component/Sources/test_component/Windows.Storage+ABI.swift
@@ -1899,10 +1899,12 @@ extension __ABI_Windows_Storage {
         AddRef: { StreamedFileDataRequestedHandlerWrapper.addRef($0) },
         Release: { StreamedFileDataRequestedHandlerWrapper.release($0) },
         Invoke: {
-            guard let __unwrapped__instance = StreamedFileDataRequestedHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
-            let stream: test_component.StreamedFileDataRequest? = .from(abi: ComPtr($1))
-            __unwrapped__instance(stream)
-            return S_OK
+            do {
+                guard let __unwrapped__instance = StreamedFileDataRequestedHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
+                let stream: test_component.StreamedFileDataRequest? = .from(abi: ComPtr($1))
+                try __unwrapped__instance(stream)
+                return S_OK
+            } catch { return failWith(err: E_FAIL) } 
         }
     )
 }

diff --git a/tests/test_component/Sources/test_component/Windows.Storage+Impl.swift b/tests/test_component/Sources/test_component/Windows.Storage+Impl.swift
@@ -775,7 +775,7 @@ public enum __IMPL_Windows_Storage {
             guard let abi = abi else { return nil }
             let _default = SwiftABI(abi)
             let handler: Handler = { (stream) in
-                try! _default.InvokeImpl(stream)
+                try _default.InvokeImpl(stream)
             }
             return handler
         }

diff --git a/tests/test_component/Sources/test_component/Windows.Storage.swift b/tests/test_component/Sources/test_component/Windows.Storage.swift
@@ -979,7 +979,7 @@ public final class StreamedFileDataRequest : WinRTClass, test_component.IClosabl
     }
 }
 
-public typealias StreamedFileDataRequestedHandler = (StreamedFileDataRequest?) -> ()
+public typealias StreamedFileDataRequestedHandler = (StreamedFileDataRequest?) throws -> ()
 /// [Open Microsoft documentation](https://learn.microsoft.com/uwp/api/windows.storage.istoragefile)
 public protocol IStorageFile : IStorageItem, test_component.IRandomAccessStreamReference, test_component.IInputStreamReference {
     /// [Open Microsoft documentation](https://learn.microsoft.com/uwp/api/windows.storage.istoragefile.openasync)

diff --git a/tests/test_component/Sources/test_component/test_component+ABI.swift b/tests/test_component/Sources/test_component/test_component+ABI.swift
@@ -2708,10 +2708,12 @@ extension __ABI_test_component {
         AddRef: { ObjectHandlerWrapper.addRef($0) },
         Release: { ObjectHandlerWrapper.release($0) },
         Invoke: {
-            guard let __unwrapped__instance = ObjectHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
-            let item: Any? = __ABI_.AnyWrapper.unwrapFrom(abi: ComPtr($1))
-            __unwrapped__instance(item)
-            return S_OK
+            do {
+                guard let __unwrapped__instance = ObjectHandlerWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
+                let item: Any? = __ABI_.AnyWrapper.unwrapFrom(abi: ComPtr($1))
+                try __unwrapped__instance(item)
+                return S_OK
+            } catch { return failWith(err: E_FAIL) } 
         }
     )
 }
@@ -2742,9 +2744,11 @@ extension __ABI_test_component {
         AddRef: { VoidToVoidDelegateWrapper.addRef($0) },
         Release: { VoidToVoidDelegateWrapper.release($0) },
         Invoke: {
-            guard let __unwrapped__instance = VoidToVoidDelegateWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
-            __unwrapped__instance()
-            return S_OK
+            do {
+                guard let __unwrapped__instance = VoidToVoidDelegateWrapper.tryUnwrapFrom(raw: $0) else { return E_INVALIDARG }
+                try __unwrapped__instance()
+                return S_OK
+            } catch { return failWith(err: E_FAIL) } 
         }
     )
 }