bug fix and cleanup

Author: jdegoes

examples/src/Examples.purs

@@ -43,6 +43,13 @@ module Examples where
     liftEff $ trace (show n ++ " seconds left")
     test_sequencing (n - 1)
 
+  test_pure :: Test
+  test_pure = do
+    pure unit 
+    pure unit
+    pure unit
+    liftEff $ trace "Success: Got all the way past 4 pures"
+
   test_attempt :: Test
   test_attempt = do
     e <- attempt (throwError (error "Oh noes!"))
@@ -73,11 +80,13 @@ module Examples where
                    Par (timeout 1000 *> pure "Failure: Late bird got the worm"))
     liftEff $ trace s
 
-
   main = launchAff $ do
     liftEff $ trace "Testing sequencing"
     test_sequencing 3
 
+    liftEff $ trace "Testing pure"
+    test_pure
+
     liftEff $ trace "Testing attempt"
     test_attempt
 

output/examples.js

@@ -23,11 +23,6 @@ module Control.Monad.Aff.Par
   runPar :: forall e a. Par e a -> AffVar e a
   runPar (Par aff) = aff
 
-  -- | Races two parallel computations for the one that finishes first.
-  -- | A synonym for (<|>).
-  race :: forall e a. Par e a -> Par e a -> Par e a
-  race p1 p2 = p1 <|> p2
-
   instance semigroupPar :: (Semigroup a) => Semigroup (Par e a) where
     (<>) a b = (<>) <$> a <*> b
 
@@ -48,6 +43,7 @@ module Control.Monad.Aff.Par
   instance applicativePar :: Applicative (Par e) where
     pure v = Par (pure v)
 
+  -- | Returns the first value, or the first error if both error.
   instance altPar :: Alt (Par e) where
     (<|>) (Par a1) (Par a2) = 
       let maybeKill va ve err = 

src/Control/Monad/Aff/Par.purs

@@ -1,6 +1,20 @@
 module Control.Monad.Aff.Unsafe where
   import Control.Monad.Aff
 
+  foreign import unsafeTrace """
+    function unsafeTrace(v) {
+      return function(error) {
+        return function(success) {
+          return function() {
+            console.log(v);
+
+            success({})();
+          }
+        }
+      }
+    }
+  """ :: forall e a. a -> Aff e Unit
+
   foreign import unsafeInterleaveAff """
     function unsafeInterleaveAff(aff) {
       return aff;

src/Control/Monad/Aff/Unsafe.purs

@@ -71,15 +71,14 @@ module Control.Monad.Aff.Var
         return function(error) {
           return function(success) {
             return function() {
-              console.log("putting " + a + " into var: ");
-              console.log(avar);
-              
               if (avar.error !== undefined) {
                 error(avar.error)();
-              } else if (avar.consumers.length == 0) {
+              } else if (avar.consumers.length === 0) {
                 avar.producers.push(function(error, success) {
                   success(a)();
                 });
+
+                success({})();
               } else {
                 var consumer = avar.consumers.shift();