change operator precedence

nghialv · Jun 1, 2015 · 51aad15 · 51aad15
1 parent 08ef460
commit 51aad15
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/Future/Future.swift b/Future/Future.swift
@@ -222,17 +222,19 @@ infix operator <^> {
     // Left associativity
     associativity left
 
-    // Using the same `precedence` value with Swiftz's operator
-    precedence 140
+    // precedence
+    precedence 150
 }
 
+/*
 infix operator >>- {
     // Left associativity
     associativity left
 
-    // Using the same `precedence` value with Swiftz's operator
-    precedence 140
+    // Using the same `precedence` value in antitypical/Result
+    precedence 100
 }
+*/
 
 // Operator for `map`
 public func <^> <T, U, Error> (future: Future<T, Error>, transform: T -> U) -> Future<U, Error> {

diff --git a/FutureTests/FutureFunctionalTests.swift b/FutureTests/FutureFunctionalTests.swift
@@ -73,6 +73,32 @@ extension FutureFunctionalTests {
         }
     }
 
+    func testMapFlatMapOperators() {
+        let f = requestString("12345") <^> { count($0) } >>- requestStringFromNumber
+
+        checkFutureShouldNotBeCompleted(f)
+
+        f.onComplete { result in
+            switch result {
+            case .Success(let bv): XCTAssertEqual(bv.value, "5", "Future should return 5 as a String")
+            case .Failure(let be): XCTAssertFalse(true, "Future should not be failed")
+            }
+        }
+    }
+
+    func testFlatMapMapOperators() {
+        let f = requestString("12345") >>- requestStringLenght <^> { "\($0)" }
+
+        checkFutureShouldNotBeCompleted(f)
+
+        f.onComplete { result in
+            switch result {
+            case .Success(let bv): XCTAssertEqual(bv.value, "5", "Future should return 5 as a String")
+            case .Failure(let be): XCTAssertFalse(true, "Future should not be failed")
+            }
+        }
+    }
+
     func testFilter() {
         let noSuchElementError = NSError(domain: "noSuchElement", code: 1, userInfo: nil)