Minor changes for better undertanding of how the protocols Comparable…

… and Equatable are used and what functions lies in which protocol.
apple · Feb 19, 2018 · a0d48d4 · a0d48d4
1 parent d0aa41f
commit a0d48d4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/Sources/PlayingCard/PlayingCard.swift b/Sources/PlayingCard/PlayingCard.swift
@@ -20,18 +20,18 @@ public struct PlayingCard {
 
 // MARK: - Equatable
 
-extension PlayingCard: Equatable {}
-
-public func ==(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
-    return lhs.rank == rhs.rank && lhs.suit == rhs.suit
+extension PlayingCard: Equatable {
+    public static func ==(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
+      return lhs.rank == rhs.rank && lhs.suit == rhs.suit
+    }
 }
 
 // MARK: - Comparable
 
-extension PlayingCard: Comparable {}
-
-public func <(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
-    return lhs.rank == rhs.rank ? lhs.suit < rhs.suit : lhs.rank < rhs.rank
+extension PlayingCard: Comparable {
+    public static func <(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
+        return lhs.rank == rhs.rank ? lhs.suit < rhs.suit : lhs.rank < rhs.rank
+    }
 }
 
 // MARK: - CustomStringConvertible

diff --git a/Sources/PlayingCard/Rank.swift b/Sources/PlayingCard/Rank.swift
@@ -16,16 +16,16 @@ public enum Rank : Int {
 
 // MARK: - Comparable
 
-extension Rank : Comparable {}
-
-public func <(lhs: Rank, rhs: Rank) -> Bool {
-    switch (lhs, rhs) {
-    case (_, _) where lhs == rhs:
-        return false
-    case (.ace, _):
-        return false
-    default:
-        return lhs.rawValue < rhs.rawValue
+extension Rank : Comparable {
+    public static func <(lhs: Rank, rhs: Rank) -> Bool {
+        switch (lhs, rhs) {
+        case (_, _) where lhs == rhs:
+            return false
+        case (.ace, _):
+            return false
+        default:
+            return lhs.rawValue < rhs.rawValue
+        }
     }
 }
 

diff --git a/Sources/PlayingCard/Suit.swift b/Sources/PlayingCard/Suit.swift
@@ -14,18 +14,18 @@ public enum Suit: String {
 
 // MARK: - Comparable
 
-extension Suit: Comparable {}
-
-public func <(lhs: Suit, rhs: Suit) -> Bool {
-    switch (lhs, rhs) {
-    case (_, _) where lhs == rhs:
-        return false
-    case (.spades, _),
-    (.hearts, .diamonds), (.hearts, .clubs),
-    (.diamonds, .clubs):
-        return false
-    default:
-        return true
+extension Suit: Comparable {
+    public static func <(lhs: Suit, rhs: Suit) -> Bool {
+        switch (lhs, rhs) {
+        case (_, _) where lhs == rhs:
+            return false
+        case (.spades, _),
+        (.hearts, .diamonds), (.hearts, .clubs),
+        (.diamonds, .clubs):
+            return false
+        default:
+            return true
+        }
     }
 }