Swift 5 support

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode10.1
+osx_image: xcode10.2
 language: objective-c
 cache: cocoapods
 podfile: Example/Podfile

Example/Podfile

@@ -2,8 +2,8 @@ use_frameworks!
 target 'LASwift-Tests' do
   pod 'LASwift', :path => '../'
 
-  pod 'Quick', '~> 1.3.2'
-  pod 'Nimble', '~> 7.3.1'
+  pod 'Quick', '~> 2.0.0'
+  pod 'Nimble', '~> 8.0.1'
 
   platform :osx, '10.10'
 end

Example/Tests/MatrixTests.swift

@@ -358,13 +358,13 @@ class MatrixSpec: QuickSpec {
                 let m1 = Matrix([[1.0, 2.0], [3.0, 4.0]])
                 let res = Matrix([[1.0, 4.0], [9.0, 16.0]])
                 expect(square(m1)) == res
-                expect(square(m1)) == m1 .^ 2
+                expect(m1 .^ 2.0) == res
             }
             it("sqrt") {
                 let m1 = Matrix([[1.0, 2.0], [3.0, 4.0]])
                 let res = Matrix([[sqrt(1.0), sqrt(2.0)], [sqrt(3.0), sqrt(4.0)]])
                 expect(sqrt(m1)) == res
-                expect(sqrt(m1)) == m1 .^ 0.5
+                expect(m1 .^ 0.5) == res
             }
             it("exp") {
                 let m1 = Matrix([[1.0, 2.0], [3.0, 4.0]])
@@ -536,8 +536,12 @@ class MatrixSpec: QuickSpec {
                 expect(mpower(m1, -1)) == res
                 expect(m1 ^ -1) == res
                 let m2 = Matrix([[1.0, 0.0, 2.0], [-1.0, 5.0, 0.0]])
-                expect { () -> Void in _ = inv(m2) }.to(throwAssertion())
-                expect { () -> Void in _ = inv(ones(3, 3)) }.to(throwAssertion())
+
+                #if !SWIFT_PACKAGE
+                    expect { () -> Void in _ = inv(m2) }.to(throwAssertion())
+                    expect { () -> Void in _ = inv(ones(3, 3)) }.to(throwAssertion())
+                #endif
+
                 expect(inv(m1) * m1) == eye(3, 3)
             }
             it("eigen") {
@@ -549,7 +553,10 @@ class MatrixSpec: QuickSpec {
                 expect(m1 * e1.V) == e1.V * e1.D
                 let m2 = Matrix([[1.0, 0.0, 2.0],
                                  [-1.0, 5.0, 0.0]])
-                expect { () -> Void in _ = eig(m2) }.to(throwAssertion())
+
+                #if !SWIFT_PACKAGE
+                    expect { () -> Void in _ = eig(m2) }.to(throwAssertion())
+                #endif
                 let m3 = Matrix([[0, 1],
                                  [-2, -3]])
                 let e2 = eig(m3)
@@ -750,22 +757,24 @@ class MatrixSpec: QuickSpec {
                 expect(m1 ?? (.All, .Pos([2, 1]))) == res4
                 expect(m1 ?? (.PosCyc([-7, 80]), .Range(4, -2, 0))) == res5
                 expect(m1 ?? (.Range(3, -2, 0), .PosCyc([-7, 80]))) == res6
-                expect { () -> Void in _ = m1 ?? (.Range(4, -2, 0), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Range(3, -2, -1), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Range(5, -2, 0)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Range(3, -2, -1)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Range(0, -2, 4), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Range(-1, -2, 3), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Range(0, -2, 5)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Range(-1, -2, 3)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Take(5), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Take(-1), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Take(6)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Take(-1)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Drop(5), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.Drop(-1), .All) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Drop(6)) }.to(throwAssertion())
-                expect { () -> Void in _ = m1 ?? (.All, .Drop(-1)) }.to(throwAssertion())
+                #if !SWIFT_PACKAGE
+                    expect { () -> Void in _ = m1 ?? (.Range(4, -2, 0), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Range(3, -2, -1), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Range(5, -2, 0)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Range(3, -2, -1)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Range(0, -2, 4), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Range(-1, -2, 3), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Range(0, -2, 5)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Range(-1, -2, 3)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Take(5), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Take(-1), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Take(6)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Take(-1)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Drop(5), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.Drop(-1), .All) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Drop(6)) }.to(throwAssertion())
+                    expect { () -> Void in _ = m1 ?? (.All, .Drop(-1)) }.to(throwAssertion())
+                #endif
             }
         }
     }

Package.swift

@@ -11,11 +11,11 @@ import PackageDescription
 let package = Package(
     name: "LASwift",
     products: [
-    .library(name: "LASwift", targets: ["LASwift"])
+        .library(name: "LASwift", targets: ["LASwift"])
     ],
     dependencies: [
-        .package(url: "https://github.com/Quick/Quick.git", from: "1.2.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "7.0.3")
+        .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1")
     ],
     targets: [
         .target(

Sources/Operators.swift

@@ -9,7 +9,6 @@
 infix operator .* : MultiplicationPrecedence
 infix operator ./ : MultiplicationPrecedence
 infix operator ./. : MultiplicationPrecedence
-infix operator .^ : MultiplicationPrecedence
 
 postfix operator ′