Skip to content

Correct the expectation of _SwiftValue isEqual to properly handle the Any case #582

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
Aug 23, 2016
Merged

Correct the expectation of _SwiftValue isEqual to properly handle the Any case #582

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
24 changes: 12 additions & 12 deletions Foundation/Bridging.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,19 @@ internal final class _SwiftValue : NSObject, NSCopying {
return ObjectIdentifier(self).hashValue
}

override func isEqual(_ object: Any?) -> Bool {
guard let other = object as? NSObject else {
return false
}
if let box = other as? _SwiftValue {
if let otherHashable = box.value as? AnyHashable,
let hashable = value as? AnyHashable {
return hashable == otherHashable
override func isEqual(_ value: Any?) -> Bool {
if let other = value as? _SwiftValue {
if self === other {
return true
}
}
if let otherHashable = other as? AnyHashable,
let hashable = value as? AnyHashable {
return hashable == otherHashable
if let otherHashable = other.value as? AnyHashable,
let hashable = self.value as? AnyHashable {
return otherHashable == hashable
}

} else if let otherHashable = value as? AnyHashable,
let hashable = self.value as? AnyHashable {
return otherHashable == hashable
}
return false
}
Expand Down