down to one failure

Author: jdegoes

examples/src/Examples.purs

@@ -142,7 +142,7 @@ module Examples where
     liftEff $ trace "Testing Par (<|>) - kill two"
     test_parRaceKill2
 
-    -- liftEff $ trace "Testing cancel of Par (<|>)"
-    -- test_cancelPar
+    liftEff $ trace "Testing cancel of Par (<|>)"
+    test_cancelPar
 
     liftEff $ trace "Done testing"

output/examples.js

@@ -318,15 +318,17 @@ module Control.Monad.Aff
         var onCanceler = function(){};
 
         canceler1 = aff(function(v) {
-          if (!requestCancel) {
+          if (requestCancel) {
+            isCanceled = true;
+
+            return alwaysCanceler;
+          } else {
             canceler2 = f(v)(success, error);
 
             onCanceler(canceler2);
-          } else {
-            isCanceled = true;
-          }
 
-          return canceler;
+            return canceler2;
+          }
         }, error);
 
         return function(e) {

src/Control/Monad/Aff.purs

@@ -56,7 +56,7 @@ module Control.Monad.Aff.Par
         ve <- makeVar' 0  -- the error count (starts at 0)
         c1 <- forkAff $ attempt a1 >>= either (maybeKill va ve) (putVar va)
         c2 <- forkAff $ attempt a2 >>= either (maybeKill va ve) (putVar va)
-        (takeVar va) `cancelWith` (c1 <> c2)
+        (takeVar va) -- `cancelWith` (c1 <> c2)
 
   instance plusPar :: Plus (Par e) where
     empty = Par empty