Merge pull request #129 from jpsim/update-hashable

Update `Hashable` conformance
jpsim · Jun 17, 2018 · c64a5f2 · c64a5f2
2 parents 64bceaa + 7f9eff9
commit c64a5f2
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 0 deletions.
diff --git a/Sources/Yams/Node.Mapping.swift b/Sources/Yams/Node.Mapping.swift
@@ -73,6 +73,16 @@ extension Node.Mapping: Equatable {
     }
 }
 
+#if swift(>=4.1.50)
+extension Node.Mapping: Hashable {
+    /// :nodoc:
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(pairs)
+        hasher.combine(resolvedTag)
+    }
+}
+#endif
+
 extension Node.Mapping: ExpressibleByDictionaryLiteral {
     /// :nodoc:
     public init(dictionaryLiteral elements: (Node, Node)...) {
@@ -187,9 +197,11 @@ private struct Pair<Value: Comparable & Equatable>: Comparable, Equatable {
         self.value = value
     }
 
+#if !swift(>=4.1.50)
     static func == (lhs: Pair, rhs: Pair) -> Bool {
         return lhs.key == rhs.key && lhs.value == rhs.value
     }
+#endif
 
     static func < (lhs: Pair<Value>, rhs: Pair<Value>) -> Bool {
         return lhs.key < rhs.key
@@ -199,3 +211,7 @@ private struct Pair<Value: Comparable & Equatable>: Comparable, Equatable {
         return (key: pair.key, value: pair.value)
     }
 }
+
+#if swift(>=4.1.50)
+extension Pair: Hashable where Value: Hashable {}
+#endif
diff --git a/Sources/Yams/Node.Scalar.swift b/Sources/Yams/Node.Scalar.swift
@@ -88,6 +88,16 @@ extension Node.Scalar: Equatable {
     }
 }
 
+#if swift(>=4.1.50)
+extension Node.Scalar: Hashable {
+    /// :nodoc:
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(string)
+        hasher.combine(resolvedTag)
+    }
+}
+#endif
+
 extension Node.Scalar: TagResolvable {
     static let defaultTagName = Tag.Name.str
     func resolveTag(using resolver: Resolver) -> Tag.Name {

diff --git a/Sources/Yams/Node.Sequence.swift b/Sources/Yams/Node.Sequence.swift
@@ -77,6 +77,16 @@ extension Node.Sequence: Equatable {
     }
 }
 
+#if swift(>=4.1.50)
+extension Node.Sequence: Hashable {
+    /// :nodoc:
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(nodes)
+        hasher.combine(resolvedTag)
+    }
+}
+#endif
+
 extension Node.Sequence: ExpressibleByArrayLiteral {
     /// :nodoc:
     public init(arrayLiteral elements: Node...) {

diff --git a/Sources/Yams/Node.swift b/Sources/Yams/Node.swift
@@ -186,6 +186,7 @@ extension Node {
 // MARK: Hashable
 
 extension Node: Hashable {
+#if !swift(>=4.1.50)
     /// This `Node`'s Hashable `hashValue`.
     public var hashValue: Int {
         switch self {
@@ -216,6 +217,7 @@ extension Node: Hashable {
             return false
         }
     }
+#endif
 }
 
 // MARK: Comparable

diff --git a/Sources/Yams/Tag.swift b/Sources/Yams/Tag.swift
@@ -79,10 +79,17 @@ extension Tag: CustomStringConvertible {
 }
 
 extension Tag: Hashable {
+#if swift(>=4.1.50)
+    /// :nodoc:
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(name)
+    }
+#else
     /// :nodoc:
     public var hashValue: Int {
         return name.hashValue
     }
+#endif
 
     /// :nodoc:
     public static func == (lhs: Tag, rhs: Tag) -> Bool {
@@ -98,6 +105,7 @@ extension Tag.Name: ExpressibleByStringLiteral {
 }
 
 extension Tag.Name: Hashable {
+#if !swift(>=4.1.50)
     /// :nodoc:
     public var hashValue: Int {
         return rawValue.hashValue
@@ -107,6 +115,7 @@ extension Tag.Name: Hashable {
     public static func == (lhs: Tag.Name, rhs: Tag.Name) -> Bool {
         return lhs.rawValue == rhs.rawValue
     }
+#endif
 }
 
 // http://www.yaml.org/spec/1.2/spec.html#Schema