Fix warnings for Xcode 10.2.1 and Swift 5. (alejandro-isaza#101)

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10.2
 
 script:
   - set -o pipefail

Sources/Upsurge/2DTensorSlice.swift

@@ -62,9 +62,11 @@ open class TwoDimensionalTensorSlice<Element: Value>: MutableQuadraticType, Equa
         assert(span.dimensions.reduce(0) { $1 > 1 ? $0 + 1 : $0 } <= 2)
         assert(span.dimensions.last! >= 1)
 
-        let rowIndex: Int = span.dimensions.index { $0 > 1 } ??
-                           (span.dimensions.count - 2)
-
+        #if swift(>=5.0)
+        let rowIndex: Int = span.dimensions.firstIndex { $0 > 1 } ?? (span.dimensions.count - 2)
+        #else
+        let rowIndex: Int = span.dimensions.index { $0 > 1 } ?? (span.dimensions.count - 2)
+        #endif
         rows = span.dimensions[rowIndex]
         columns = span.dimensions.last!
 
@@ -133,15 +135,27 @@ open class TwoDimensionalTensorSlice<Element: Value>: MutableQuadraticType, Equa
     }
 
     open var isContiguous: Bool {
+        #if swift(>=5.0)
+        let onesCount: Int = (dimensions.firstIndex { $0 != 1 }) ?? rank
+        #else
         let onesCount: Int = (dimensions.index { $0 != 1 }) ?? rank
+        #endif
 
         let diff = (0..<rank).map({ dimensions[$0] - base.dimensions[$0] }).reversed()
         let fullCount: Int
+        #if swift(>=5.0)
+        if let index = (diff.firstIndex { $0 != 0 }), index.base < count {
+            fullCount = rank - index.base
+        } else {
+            fullCount = rank
+        }
+        #else
         if let index = (diff.index { $0 != 0 }), index.base < count {
             fullCount = rank - index.base
         } else {
             fullCount = rank
         }
+        #endif
 
         return rank - fullCount - onesCount <= 1
     }

Sources/Upsurge/Complex.swift

@@ -59,8 +59,9 @@ public struct Complex<Element: Real>: Value {
         return Complex(real: x.magnitude, imag: 0.0)
     }
 
-    public var hashValue: Int {
-        return real.hashValue ^ imag.hashValue
+    public func hash(into: inout Hasher) {
+        into.combine(real)
+        into.combine(imag)
     }
 
     public var description: String {

Sources/Upsurge/LinearType.swift

@@ -34,27 +34,27 @@ public protocol LinearType: TensorType, CustomStringConvertible, CustomDebugStri
 }
 
 public extension LinearType {
-    public var dimensions: [Int] {
+    var dimensions: [Int] {
         return [count]
     }
 
-    public func index(after i: Int) -> Int {
+    func index(after i: Int) -> Int {
         return i + 1
     }
 
-    public func index(before i: Int) -> Int {
+    func index(before i: Int) -> Int {
         return i - 1
     }
 
-    public func formIndex(after i: inout Int) {
+    func formIndex(after i: inout Int) {
         i += 1
     }
 
-    public var description: String {
+    var description: String {
         return "[\(map { "\($0)" }.joined(separator: ", "))]"
     }
 
-    public var debugDescription: String {
+    var debugDescription: String {
         return description
     }
 }

Sources/Upsurge/QuadraticType.swift

@@ -46,11 +46,11 @@ public protocol QuadraticType: TensorType {
 
 public extension QuadraticType {
     /// The number of valid element in the memory block, taking into account the step size.
-    public var count: Int {
+    var count: Int {
         return rows * columns
     }
 
-    public var dimensions: [Int] {
+    var dimensions: [Int] {
         if arrangement == .rowMajor {
             return [rows, columns]
         } else {

Sources/Upsurge/TensorSlice.swift

@@ -116,10 +116,10 @@ open class TensorSlice<Element: Value>: MutableTensorType, Equatable {
     }
 
     open var isContiguous: Bool {
-        let onesCount: Int = (dimensions.index { $0 != 1 }) ?? rank
+        let onesCount: Int = (dimensions.firstIndex { $0 != 1 }) ?? rank
         let diff = (0..<rank).map { dimensions[$0] - base.dimensions[$0] }.reversed()
         let fullCount: Int
-        if let index = (diff.index { $0 != 0 }), index.base < count {
+        if let index = (diff.firstIndex { $0 != 0 }), index.base < count {
             fullCount = rank - index.base
         } else {
             fullCount = rank

Sources/Upsurge/TensorType.swift

@@ -38,17 +38,17 @@ public protocol TensorType {
 
 public extension TensorType {
     /// The size of each dimension
-    public var dimensions: [Int] {
+    var dimensions: [Int] {
         return span.dimensions
     }
 
     /// The number of dimensions
-    public var rank: Int {
+    var rank: Int {
         return span.rank
     }
 
     /// Convert a high-dimensional index into an integer index for a LinearType
-    public func linearIndex(_ indices: [Int]) -> Int {
+    func linearIndex(_ indices: [Int]) -> Int {
         precondition(indexIsValid(indices))
         var index = indices[0]
         for (i, dim) in span.dimensions[1..<rank].enumerated() {
@@ -58,7 +58,7 @@ public extension TensorType {
     }
 
     /// Check that an index falls within the span
-    public func indexIsValid(_ indices: [Int]) -> Bool {
+    func indexIsValid(_ indices: [Int]) -> Bool {
         return indices.count == rank && indices.enumerated().all { (i, index) in
             self.span[i].contains(index)
         }