return true from canceling if anything was actually canceling (vs: 'e…

…verything' semantic)
purescript-contrib · Apr 18, 2015 · 519bcfd · 519bcfd
1 parent a66a88e
commit 519bcfd
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/output/examples.js b/output/examples.js
diff --git a/src/Control/Monad/Aff.purs b/src/Control/Monad/Aff.purs
@@ -151,7 +151,7 @@ module Control.Monad.Aff
   instance monadPlusAff :: MonadPlus (Aff e)
 
   instance semigroupCanceler :: Semigroup (Canceler e) where
-    (<>) (Canceler f1) (Canceler f2) = Canceler (\e -> (&&) <$> f1 e <*> f2 e)
+    (<>) (Canceler f1) (Canceler f2) = Canceler (\e -> (||) <$> f1 e <*> f2 e)
 
   instance monoidCanceler :: Monoid (Canceler e) where
     mempty = Canceler (const (pure true))
@@ -164,12 +164,12 @@ module Control.Monad.Aff
         return function(e) {
           return function(success, error) {
             var cancellations = 0;
-            var result        = true;
+            var result        = false;
             var errored       = false;
 
             var s = function(bool) {
               cancellations = cancellations + 1;
-              result        = result && bool;
+              result        = result || bool;
 
               if (cancellations === 2 && !errored) {
                 try {

diff --git a/src/Control/Monad/Aff/AVar.purs b/src/Control/Monad/Aff/AVar.purs
@@ -50,7 +50,7 @@ module Control.Monad.Aff.AVar
   killVar q e = runFn3 _killVar nonCanceler q e
 
   foreign import _makeVar """
-    function _makeVar(canceler) {
+    function _makeVar(nonCanceler) {
       return function(success, error) {
         try {
           success({
@@ -62,13 +62,13 @@ module Control.Monad.Aff.AVar
           error(e);
         }
 
-        return canceler;
+        return nonCanceler;
       }
     }
   """ :: forall e a. Canceler e -> AffAVar e (AVar a)
 
   foreign import _takeVar """
-    function _takeVar(canceler, avar) {
+    function _takeVar(nonCanceler, avar) {
       return function(success, error) {
         if (avar.error !== undefined) {
           error(avar.error);
@@ -80,13 +80,13 @@ module Control.Monad.Aff.AVar
           avar.consumers.push({success: success, error: error});
         }
 
-        return canceler;
+        return nonCanceler;
       } 
     }
   """ :: forall e a. Fn2 (Canceler e) (AVar a) (AffAVar e a)
 
   foreign import _putVar """
-    function _putVar(canceler, avar, a) {
+    function _putVar(nonCanceler, avar, a) {
       return function(success, error) {
         if (avar.error !== undefined) {
           error(avar.error);
@@ -114,13 +114,13 @@ module Control.Monad.Aff.AVar
           success({});
         }
 
-        return canceler;
+        return nonCanceler;
       }
     }
   """ :: forall e a. Fn3 (Canceler e) (AVar a) a (AffAVar e Unit)
 
   foreign import _killVar """
-    function _killVar(canceler, avar, e) {
+    function _killVar(nonCanceler, avar, e) {
       return function(success, error) {
         if (avar.error !== undefined) {
           error(avar.error);
@@ -143,7 +143,7 @@ module Control.Monad.Aff.AVar
           else success({});
         }
 
-        return canceler;
+        return nonCanceler;
       }
     }
   """ :: forall e a. Fn3 (Canceler e) (AVar a) Error (AffAVar e Unit)