This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap".
The branch, master has been updated
via de5d53760c854b93d01e3fa94923e829d84a780c (commit)
via c923a1303a44759b2298116f37ff34f659018b25 (commit)
from 94df694dceeb20deca2e1d6e36e6355aab5e62a4 (commit)
Summary of changes:
src/Snap/Loader/Hint.hs | 4 ++--
src/Snap/StarterTH.hs | 9 +++------
2 files changed, 5 insertions(+), 8 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit de5d53760c854b93d01e3fa94923e829d84a780c
Author: Carl Howells <[email protected]>
Date: Thu Jul 1 14:04:00 2010 -0700
simplify StarterTH.hs mildly
diff --git a/src/Snap/StarterTH.hs b/src/Snap/StarterTH.hs
index cbda1af..96d55cb 100644
--- a/src/Snap/StarterTH.hs
+++ b/src/Snap/StarterTH.hs
@@ -5,6 +5,7 @@ module Snap.StarterTH where
import qualified Data.Foldable as F
import Data.List
import Language.Haskell.TH
+import Language.Haskell.TH.Syntax
import System.Directory.Tree
------------------------------------------------------------------------------
@@ -41,7 +42,7 @@ readTree dir = do
dirQ :: FilePath -> Q Exp
dirQ tplDir = do
d <- runIO . readTree $ "project_template/" ++ tplDir
- runQ [| d |]
+ lift d
------------------------------------------------------------------------------
@@ -50,11 +51,7 @@ dirQ tplDir = do
buildData :: String -> FilePath -> Q [Dec]
buildData dirName tplDir = do
let dir = mkName dirName
- typeSig = SigD dir typ
- typ = tup2 (listOf str) (listOf $ tup2 str str)
- tup2 x y = foldl AppT (TupleT 2) [x, y]
- listOf = AppT ListT
- str = ConT ''String
+ typeSig <- SigD dir `fmap` [t| ([String], [(String, String)]) |]
v <- valD (varP dir) (normalB $ dirQ tplDir) []
return [typeSig, v]
commit c923a1303a44759b2298116f37ff34f659018b25
Author: Carl Howells <[email protected]>
Date: Thu Jul 1 13:55:32 2010 -0700
minor tweaks to Hint.hs
diff --git a/src/Snap/Loader/Hint.hs b/src/Snap/Loader/Hint.hs
index 036e2e9..7de400a 100644
--- a/src/Snap/Loader/Hint.hs
+++ b/src/Snap/Loader/Hint.hs
@@ -138,7 +138,7 @@ hintSnap opts modules initialization cleanup handler = do
interpreterResult <- liftIO loadAction
case interpreterResult of
Left err -> internalError $ format err
- Right action -> catch500 action
+ Right handlerAction -> catch500 handlerAction
------------------------------------------------------------------------------
@@ -210,7 +210,7 @@ protectedActionEvaluator minReEval action = do
-- Some strictness is employed to ensure the MVar
-- isn't holding on to a chain of unevaluated thunks.
let pair = (tid, reader)
- newReaders = pair `seq` (pair : readers)
+ newReaders = readers `seq` pair `seq` (pair : readers)
putMVar readerContainer $! newReaders
-- If this is the first reader, kick off evaluation of
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
