Skip to content

Cleanup Conditional Bridge Behavior of NSNumber to Bool #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2018
Merged

Cleanup Conditional Bridge Behavior of NSNumber to Bool #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Foundation/NSNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,13 +541,16 @@ extension Bool : _ObjectiveCBridgeable {
}

public static func _conditionallyBridgeFromObjectiveC(_ x: NSNumber, result: inout Bool?) -> Bool {
if x.intValue == 0 || x.intValue == 1 {
result = x.boolValue
if x === kCFBooleanTrue || NSNumber(value: 1) == x {
result = true
return true
} else if x === kCFBooleanFalse || NSNumber(value: 0) == x {
result = false
return true
} else {
result = nil
return false
}

result = nil
return false
}

public static func _unconditionallyBridgeFromObjectiveC(_ source: NSNumber?) -> Bool {
Expand Down
10 changes: 10 additions & 0 deletions TestFoundation/TestNSNumberBridging.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,16 @@ class TestNSNumberBridging : XCTestCase {
XCTAssertNotNil(b3)
XCTAssertEqual(b3, true)

let b4 = NSNumber(value: 0.0) as? Bool
XCTAssertNotNil(b4)
XCTAssertEqual(b4, false)

let b5 = NSNumber(value: 1.0) as? Bool
XCTAssertNotNil(b5)
XCTAssertEqual(b5, true)

XCTAssertNil(NSNumber(value: 0.25) as? Bool)
XCTAssertNil(NSNumber(value: 1.25) as? Bool)
XCTAssertNil(NSNumber(value: -1) as? Bool)
XCTAssertNil(NSNumber(value: 2) as? Bool)
XCTAssertNil(NSNumber(value: Int8.min) as? Bool)
Expand Down