Add deferManyElse and deferEither to Heist.Compiled

CONTRIBUTORS

@@ -4,5 +4,6 @@ Carl Howells <[email protected]>
 Edward Kmett
 Will Langstroth <[email protected]>
 Shane O'Brien <[email protected]>
+Kari Pahula <[email protected]>
 James Sanders <[email protected]>
 Mark Wright <[email protected]>

src/Heist/Compiled.hs

@@ -28,7 +28,9 @@ module Heist.Compiled
   , pureSplice
 
   , deferMany
+  , deferManyElse
   , defer
+  , deferEither
   , deferMap
   , mayDeferMap
   , bindLater

src/Heist/Compiled/Internal.hs

@@ -749,12 +749,28 @@ deferMany :: (Foldable f, Monad n)
           => (RuntimeSplice n a -> Splice n)
           -> RuntimeSplice n (f a)
           -> Splice n
-deferMany f getItems = do
+deferMany = deferManyElse $ return mempty
+
+
+------------------------------------------------------------------------------
+-- | A version of 'deferMany' which has a default splice to run in the case
+-- when there are no elements in the given list.
+deferManyElse :: (Foldable f, Monad n)
+              => Splice n
+              -> (RuntimeSplice n a -> Splice n)
+              -> RuntimeSplice n (f a)
+              -> Splice n
+deferManyElse def f getItems = do
     promise <- newEmptyPromise
     chunks <- f $ getPromise promise
+    defaultChunk <- def
     return $ yieldRuntime $ do
         items <- getItems
-        foldMapM (\item -> putPromise promise item >> codeGen chunks) items
+        -- Use this instead of null for compatibility with pre 4.8 base
+        if foldr (\_ _ -> False) True items
+          then codeGen defaultChunk
+          else foldMapM (\item -> putPromise promise item >>
+                                  codeGen chunks) items
 
 
 ------------------------------------------------------------------------------
@@ -773,6 +789,23 @@ defer pf n = do
     return $ action `mappend` res
 
 
+------------------------------------------------------------------------------
+-- | Much like 'either', takes a runtime computation and branches to the
+-- respective splice depending on the runtime value.
+deferEither :: Monad n
+            => (RuntimeSplice n a -> Splice n)
+            -> (RuntimeSplice n b -> Splice n)
+            -> RuntimeSplice n (Either a b) -> Splice n
+deferEither pfa pfb n = do
+    pa <- newEmptyPromise
+    pb <- newEmptyPromise
+    failureChunk <- pfa $ getPromise pa
+    successChunk <- pfb $ getPromise pb
+    return $ yieldRuntime $ n >>= either
+        (\x -> putPromise pa x >> codeGen failureChunk)
+        (\x -> putPromise pb x >> codeGen successChunk)
+
+
 ------------------------------------------------------------------------------
 -- | A version of defer which applies a function on the runtime value.
 deferMap :: Monad n