some bugs fixed

Author: jdegoes

examples/src/Examples.purs

@@ -38,8 +38,8 @@ module Examples where
     apathize $ throwError (error "Oh noes!")
     liftEff $ trace "Success: Exceptions don't stop the apathetic"
 
-  test_putTakeQueue :: TestAVar
-  test_putTakeQueue = do
+  test_putTakeVar :: TestAVar
+  test_putTakeVar = do
     v <- makeVar
     forkAff (later $ putVar v 1.0)
     a <- takeVar v 
@@ -52,8 +52,8 @@ module Examples where
     liftEff $ trace (if b then "Success: Killed first forked" else "Failure: Couldn't kill first forked")
 
 
-  test_killQueue :: TestAVar
-  test_killQueue = do
+  test_killVar :: TestAVar
+  test_killVar = do
     v <- makeVar
     killVar v (error "DOA")
     e <- attempt $ takeVar v
@@ -77,6 +77,31 @@ module Examples where
                            Par (later' 200 $ throwError (error ("Oh noes!"))))
     liftEff $ either (const $ trace "Success: Killing both kills it dead") (const $ trace "Failure: It's alive!!!") e
 
+  test_semigroupCanceler :: Test
+  test_semigroupCanceler = 
+    let 
+      c = Canceler (const (pure true)) <> Canceler (const (pure true))
+    in do 
+      v <- cancel c (error "CANCEL")
+      liftEff $ trace (if v then "Success: Canceled semigroup composite canceler" 
+                       else "Failure: Could not cancel semigroup composite canceler")
+
+  test_cancelLater :: TestAVar
+  test_cancelLater = do
+    c <- forkAff $ (do pure "Binding"
+                       _ <- later' 100 $ liftEff $ trace ("Failure: Later was not canceled!")
+                       pure "Binding")
+    v <- cancel c (error "Cause")
+    liftEff $ trace (if v then "Success: Canceled later" else "Failure: Did not cancel later")
+
+  test_cancelPar :: TestAVar
+  test_cancelPar = do
+    c  <- forkAff <<< runPar $ Par (later' 100 $ liftEff $ trace "Failure: #1 should not get through") <|>
+                               Par (later' 100 $ liftEff $ trace "Failure: #2 should not get through")
+    v  <- c `cancel` (error "Must cancel")
+    liftEff $ trace (if v then "Success: Canceling composite of two Par succeeded" 
+                     else "Failure: Canceling composite of two Par failed")
+
   main = launchAff $ do
     liftEff $ trace "Testing sequencing"
     test_sequencing 3
@@ -90,17 +115,23 @@ module Examples where
     liftEff $ trace "Testing later"
     later $ liftEff $ trace "Success: It happened later"
 
+    liftEff $ trace "Testing kill of later"
+    test_cancelLater
+
     liftEff $ trace "Testing kill of first forked"
     test_killFirstForked
 
     liftEff $ trace "Testing apathize"
     test_apathize
 
-    liftEff $ trace "Testing Queue - putVar, takeVar"
-    test_putTakeQueue
+    liftEff $ trace "Testing semigroup canceler"
+    test_semigroupCanceler
 
-    liftEff $ trace "Testing killVar"
-    test_killQueue
+    liftEff $ trace "Testing AVar - putVar, takeVar"
+    test_putTakeVar
+
+    liftEff $ trace "Testing AVar killVar"
+    test_killVar
 
     liftEff $ trace "Testing Par (<|>)"
     test_parRace
@@ -111,4 +142,7 @@ module Examples where
     liftEff $ trace "Testing Par (<|>) - kill two"
     test_parRaceKill2
 
+    liftEff $ trace "Testing cancel of Par (<|>)"
+    test_cancelPar
+
     liftEff $ trace "Done testing"