Merge pull request #44 from siyusong/fix-comparison-hashvalue

Do not use hashValue in comparison
ReactKit · Feb 24, 2016 · a0bfd80 · a0bfd80
2 parents a4a5698 + 77bbf39
commit a0bfd80
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/Sources/EventType.swift b/Sources/EventType.swift
@@ -63,12 +63,22 @@ public func == <E: EventType>(lhs: Event<E>, rhs: Event<E>) -> Bool
 
 public func == <E: EventType>(lhs: Event<E>, rhs: E) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch lhs {
+    case .Some(let x):
+        return x == rhs
+    case .Any:
+        return false
+    }
 }
 
 public func == <E: EventType>(lhs: E, rhs: Event<E>) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch rhs {
+    case .Some(let x):
+        return x == lhs
+    case .Any:
+        return false
+    }
 }
 
 // MARK: NoEvent

diff --git a/Sources/StateType.swift b/Sources/StateType.swift
@@ -51,17 +51,34 @@ extension State: RawRepresentable
 
 public func == <S: StateType>(lhs: State<S>, rhs: State<S>) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch (lhs, rhs) {
+    case let (.Some(x1), .Some(x2)) where x1 == x2:
+        return true
+    case (.Any, .Any):
+        return true
+    default:
+        return false
+    }
 }
 
 public func == <S: StateType>(lhs: State<S>, rhs: S) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch lhs {
+    case .Some(let x):
+        return x == rhs
+    case .Any:
+        return false
+    }
 }
 
 public func == <S: StateType>(lhs: S, rhs: State<S>) -> Bool
 {
-    return lhs.hashValue == rhs.hashValue
+    switch rhs {
+    case .Some(let x):
+        return x == lhs
+    case .Any:
+        return false
+    }
 }
 
 // MARK: Private

diff --git a/Sources/Transition.swift b/Sources/Transition.swift
@@ -45,7 +45,7 @@ public struct Transition<S: StateType>: Hashable
 // for Transition Equatable
 public func == <S: StateType>(left: Transition<S>, right: Transition<S>) -> Bool
 {
-    return left.hashValue == right.hashValue
+    return left.fromState == right.fromState && left.toState == right.toState
 }
 
 //--------------------------------------------------