Skip to content

Commit 52c7ac1

Browse files
lukaskubaneklukaskubanek
committed
Revert "Typed throws"
This reverts commit df74728.
1 parent df74728 commit 52c7ac1

7 files changed

Lines changed: 36 additions & 44 deletions

File tree

‎Sources/InterposeKit/Deprecated/Hook+Deprecated.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extension Hook {
1414
message: "Use 'apply()' returning Void. The overload returning 'Self' has been removed."
1515
)
1616
@_disfavoredOverload
17-
public func apply() throws(InterposeError) -> Self {
17+
public func apply() throws -> Self {
1818
try self.apply()
1919
return self
2020
}
@@ -25,7 +25,7 @@ extension Hook {
2525
message: "Use 'revert()' returning Void. The overload returning 'Self' has been removed."
2626
)
2727
@_disfavoredOverload
28-
public func revert() throws(InterposeError) -> Self {
28+
public func revert() throws -> Self {
2929
try revert()
3030
return self
3131
}

‎Sources/InterposeKit/Hooks/Hook.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public final class Hook {
1111
target: HookTarget,
1212
selector: Selector,
1313
build: @escaping HookBuilder<MethodSignature, HookSignature>
14-
) throws(InterposeError) {
14+
) throws {
1515
self.makeStrategy = { hook in
1616
let makeHookIMP: () -> IMP = { [weak hook] in
1717

@@ -91,7 +91,7 @@ public final class Hook {
9191
// ============================================================================ //
9292

9393
/// Applies the hook by interposing the method implementation.
94-
public func apply() throws(InterposeError) {
94+
public func apply() throws {
9595
guard self.state == .pending else { return }
9696

9797
do {
@@ -104,7 +104,7 @@ public final class Hook {
104104
}
105105

106106
/// Reverts the hook, restoring the original method implementation.
107-
public func revert() throws(InterposeError) {
107+
public func revert() throws {
108108
guard self.state == .active else { return }
109109

110110
do {

‎Sources/InterposeKit/Hooks/HookStrategy/ClassHookStrategy/ClassHookStrategy.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ internal final class ClassHookStrategy: HookStrategy {
3636
// MARK: Validation
3737
// ============================================================================ //
3838

39-
internal func validate() throws(InterposeError) {
39+
internal func validate() throws {
4040
guard class_getInstanceMethod(self.class, self.selector) != nil else {
41-
throw .methodNotFound(
41+
throw InterposeError.methodNotFound(
4242
class: self.class,
4343
selector: self.selector
4444
)
4545
}
4646

4747
guard class_implementsInstanceMethod(self.class, self.selector) else {
48-
throw .methodNotDirectlyImplemented(
48+
throw InterposeError.methodNotDirectlyImplemented(
4949
class: self.class,
5050
selector: self.selector
5151
)
@@ -56,11 +56,11 @@ internal final class ClassHookStrategy: HookStrategy {
5656
// MARK: Installing Implementation
5757
// ============================================================================ //
5858

59-
internal func replaceImplementation() throws(InterposeError) {
59+
internal func replaceImplementation() throws {
6060
let hookIMP = self.makeHookIMP()
6161

6262
guard let method = class_getInstanceMethod(self.class, self.selector) else {
63-
throw .methodNotFound(
63+
throw InterposeError.methodNotFound(
6464
class: self.class,
6565
selector: self.selector
6666
)
@@ -72,7 +72,7 @@ internal final class ClassHookStrategy: HookStrategy {
7272
hookIMP,
7373
method_getTypeEncoding(method)
7474
) else {
75-
throw .implementationNotFound(
75+
throw InterposeError.implementationNotFound(
7676
class: self.class,
7777
selector: self.selector
7878
)
@@ -84,7 +84,7 @@ internal final class ClassHookStrategy: HookStrategy {
8484
Interpose.log("Swizzled -[\(self.class) \(self.selector)] IMP: \(originalIMP) -> \(hookIMP)")
8585
}
8686

87-
internal func restoreImplementation() throws(InterposeError) {
87+
internal func restoreImplementation() throws {
8888
guard let hookIMP = self.appliedHookIMP else { return }
8989
guard let originalIMP = self.storedOriginalIMP else { return }
9090

@@ -95,7 +95,7 @@ internal final class ClassHookStrategy: HookStrategy {
9595
}
9696

9797
guard let method = class_getInstanceMethod(self.class, self.selector) else {
98-
throw .methodNotFound(
98+
throw InterposeError.methodNotFound(
9999
class: self.class,
100100
selector: self.selector
101101
)
@@ -109,7 +109,7 @@ internal final class ClassHookStrategy: HookStrategy {
109109
)
110110

111111
guard previousIMP == hookIMP else {
112-
throw .revertCorrupted(
112+
throw InterposeError.revertCorrupted(
113113
class: self.class,
114114
selector: self.selector,
115115
imp: previousIMP

‎Sources/InterposeKit/Hooks/HookStrategy/HookStrategy.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ internal protocol HookStrategy: AnyObject {
77
var selector: Selector { get }
88

99
/// Validates the target and throws if invalid.
10-
func validate() throws(InterposeError)
10+
func validate() throws
1111

12-
func replaceImplementation() throws(InterposeError)
13-
func restoreImplementation() throws(InterposeError)
12+
func replaceImplementation() throws
13+
func restoreImplementation() throws
1414

1515
/// The current implementation used to interpose the method, created lazily when applying
1616
/// the hook and removed when the hook is reverted.

‎Sources/InterposeKit/Hooks/HookStrategy/ObjectHookStrategy/InterposeSubclass.swift‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,12 @@ class InterposeSubclass {
1818
///
1919
/// Making KVO and Object-based hooking work at the same time is difficult.
2020
/// If we make a dynamic subclass over KVO, invalidating the token crashes in cache_getImp.
21-
init(object: AnyObject) throws(InterposeError) {
22-
let dynamicClass: AnyClass = try { () throws(InterposeError) -> AnyClass in
23-
if let dynamicClass = Self.getExistingSubclass(object: object) {
24-
return dynamicClass
25-
}
26-
27-
return try Self.createSubclass(object: object)
28-
}()
29-
21+
init(object: AnyObject) throws {
3022
self.object = object
31-
self.dynamicClass = dynamicClass
23+
self.dynamicClass = try Self.getExistingSubclass(object: object) ?? Self.createSubclass(object: object)
3224
}
3325

34-
private static func createSubclass(object: AnyObject) throws(InterposeError) -> AnyClass {
26+
private static func createSubclass(object: AnyObject) throws -> AnyClass {
3527
let perceivedClass: AnyClass = type(of: object)
3628
let actualClass: AnyClass = object_getClass(object)!
3729

@@ -53,7 +45,7 @@ class InterposeSubclass {
5345
}
5446

5547
guard let nnSubclass = subclass else {
56-
throw .failedToAllocateClassPair(class: perceivedClass, subclassName: subclassName)
48+
throw InterposeError.failedToAllocateClassPair(class: perceivedClass, subclassName: subclassName)
5749
}
5850

5951
object_setClass(object, nnSubclass)

‎Sources/InterposeKit/Hooks/HookStrategy/ObjectHookStrategy/ObjectHookStrategy.swift‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,31 @@ final class ObjectHookStrategy: HookStrategy {
3737
interposeSubclass!.dynamicClass
3838
}
3939

40-
func validate() throws(InterposeError) {
40+
func validate() throws {
4141
guard class_getInstanceMethod(self.class, self.selector) != nil else {
42-
throw .methodNotFound(class: self.class, selector: self.selector)
42+
throw InterposeError.methodNotFound(class: self.class, selector: self.selector)
4343
}
4444

4545
if let _ = checkObjectPosingAsDifferentClass(self.object) {
4646
if object_isKVOActive(self.object) {
47-
throw .kvoDetected(object)
47+
throw InterposeError.kvoDetected(object)
4848
}
4949
// TODO: Handle the case where the object is posing as different class but not the interpose subclass
5050
}
5151
}
5252

53-
func replaceImplementation() throws(InterposeError) {
53+
func replaceImplementation() throws {
5454
let hookIMP = self.makeHookIMP()
5555
self.appliedHookIMP = hookIMP
5656
ObjectHookRegistry.register(self.handle, for: hookIMP)
5757

5858
guard let method = class_getInstanceMethod(self.class, self.selector) else {
59-
throw .methodNotFound(class: self.class, selector: self.selector)
59+
throw InterposeError.methodNotFound(class: self.class, selector: self.selector)
6060
}
6161

6262
// The implementation of the call that is hooked must exist.
6363
guard self.lookUpIMP() != nil else {
64-
throw .implementationNotFound(
64+
throw InterposeError.implementationNotFound(
6565
class: self.class,
6666
selector: self.selector
6767
)
@@ -89,7 +89,7 @@ final class ObjectHookStrategy: HookStrategy {
8989
// This should not happen if the class implements the method or we have installed
9090
// the super trampoline. Instead, we should make the trampoline implementation
9191
// failable.
92-
throw .implementationNotFound(
92+
throw InterposeError.implementationNotFound(
9393
class: self.dynamicSubclass,
9494
selector: self.selector
9595
)
@@ -103,29 +103,29 @@ final class ObjectHookStrategy: HookStrategy {
103103
Interpose.log("Added -[\(self.class).\(self.selector)] IMP: \(hookIMP) via replacement")
104104
} else {
105105
Interpose.log("Unable to replace: -[\(self.class).\(self.selector)] IMP: \(hookIMP)")
106-
throw .unableToAddMethod(self.class, self.selector)
106+
throw InterposeError.unableToAddMethod(self.class, self.selector)
107107
}
108108
} else {
109109
let didAddMethod = class_addMethod(self.dynamicSubclass, self.selector, hookIMP, encoding)
110110
if didAddMethod {
111111
Interpose.log("Added -[\(self.class).\(self.selector)] IMP: \(hookIMP)")
112112
} else {
113113
Interpose.log("Unable to add: -[\(self.class).\(self.selector)] IMP: \(hookIMP)")
114-
throw .unableToAddMethod(self.class, self.selector)
114+
throw InterposeError.unableToAddMethod(self.class, self.selector)
115115
}
116116
}
117117
}
118118
}
119119

120-
func restoreImplementation() throws(InterposeError) {
120+
func restoreImplementation() throws {
121121
guard let hookIMP = self.appliedHookIMP else { return }
122122
defer {
123123
imp_removeBlock(hookIMP)
124124
self.appliedHookIMP = nil
125125
}
126126

127127
guard let method = class_getInstanceMethod(self.class, self.selector) else {
128-
throw .methodNotFound(class: self.class, selector: self.selector)
128+
throw InterposeError.methodNotFound(class: self.class, selector: self.selector)
129129
}
130130

131131
guard self.storedOriginalIMP != nil else {
@@ -136,18 +136,18 @@ final class ObjectHookStrategy: HookStrategy {
136136
// We could recreate the whole class at runtime and rebuild all hooks,
137137
// but that seems excessive when we have a trampoline at our disposal.
138138
Interpose.log("Reset of -[\(self.class).\(self.selector)] not supported. No IMP")
139-
throw .resetUnsupported("No Original IMP found. SuperBuilder missing?")
139+
throw InterposeError.resetUnsupported("No Original IMP found. SuperBuilder missing?")
140140
}
141141

142142
guard let currentIMP = class_getMethodImplementation(self.dynamicSubclass, self.selector) else {
143-
throw .unknownError("No Implementation found")
143+
throw InterposeError.unknownError("No Implementation found")
144144
}
145145

146146
// We are the topmost hook, replace method.
147147
if currentIMP == hookIMP {
148148
let previousIMP = class_replaceMethod(self.dynamicSubclass, self.selector, self.storedOriginalIMP!, method_getTypeEncoding(method))
149149
guard previousIMP == hookIMP else {
150-
throw .revertCorrupted(
150+
throw InterposeError.revertCorrupted(
151151
class: self.dynamicSubclass,
152152
selector: self.selector,
153153
imp: previousIMP

‎Sources/InterposeKit/Interpose.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public enum Interpose {
1313
methodSignature: MethodSignature.Type,
1414
hookSignature: HookSignature.Type,
1515
build: @escaping HookBuilder<MethodSignature, HookSignature>
16-
) throws(InterposeError) -> Hook {
16+
) throws -> Hook {
1717
try Hook(
1818
target: .class(`class`),
1919
selector: selector,

0 commit comments

Comments
 (0)