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 329f1443a70217e46bfd5d760710781e5cede765 (commit)
via 86639f1a4b45369ef7d233bdf125b99da9848e60 (commit)
via cc86f65ca6686ba28e943c1bd107317484774a8a (commit)
via adff0f7391304202a8491daedbf6231f5c905090 (commit)
from bdbb15011d78213b5eb814a070389f894c6221bf (commit)
Summary of changes:
snap.cabal | 2 +-
src/Snap/Loader/Hint.hs | 16 ++++++----------
2 files changed, 7 insertions(+), 11 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 329f1443a70217e46bfd5d760710781e5cede765
Author: Carl Howells <[email protected]>
Date: Tue Nov 9 15:41:57 2010 -0800
Use a released version of hint
diff --git a/snap.cabal b/snap.cabal
index e81bbbd..9ed6dd7 100644
--- a/snap.cabal
+++ b/snap.cabal
@@ -50,7 +50,7 @@ Library
monads-fd >= 0.1 && < 0.2,
snap-core == 0.3.*,
heist >= 0.2.5 && < 0.3,
- hint >= 0.3.2 && < 0.4,
+ hint >= 0.3.3.1 && < 0.4,
template-haskell >= 2.3 && < 2.5,
time >= 1.0 && < 1.3
commit 86639f1a4b45369ef7d233bdf125b99da9848e60
Merge: cc86f65 bdbb150
Author: Carl Howells <[email protected]>
Date: Tue Nov 9 15:35:46 2010 -0800
Merge branch 'master' into hint-unsafe-interpret
commit cc86f65ca6686ba28e943c1bd107317484774a8a
Author: Carl Howells <[email protected]>
Date: Thu Jul 1 16:21:32 2010 -0700
Correct broken feature branch merge
diff --git a/src/Snap/Loader/Hint.hs b/src/Snap/Loader/Hint.hs
index ddfcdb5..f8a0c7d 100644
--- a/src/Snap/Loader/Hint.hs
+++ b/src/Snap/Loader/Hint.hs
@@ -138,6 +138,8 @@ hintSnap opts modules initialization cleanup handler = do
loadInterpreter = unsafeRunInterpreterWithArgs opts interpreter
+ -- Protect the interpreter from concurrent and high-speed serial
+ -- access.
loadAction <- protectedActionEvaluator 3 loadInterpreter
return $ do
commit adff0f7391304202a8491daedbf6231f5c905090
Author: Carl Howells <[email protected]>
Date: Thu Jun 24 14:07:03 2010 -0700
Use the new unsafeRunInterpreterWithArgs action in hint
diff --git a/src/Snap/Loader/Hint.hs b/src/Snap/Loader/Hint.hs
index 9e5b8ab..ddfcdb5 100644
--- a/src/Snap/Loader/Hint.hs
+++ b/src/Snap/Loader/Hint.hs
@@ -19,7 +19,7 @@ import Data.Maybe (catMaybes)
import Data.Time.Clock
import Language.Haskell.Interpreter hiding (lift, liftIO)
-import Language.Haskell.Interpreter.Unsafe (unsafeSetGhcOption)
+import Language.Haskell.Interpreter.Unsafe
import Language.Haskell.TH
@@ -79,10 +79,7 @@ loadSnapTH initialize cleanup action = do
-- experimental datapoints regarding the structure of the command-line
-- arguments cabal produces.
getHintOpts :: [String] -> [String]
-getHintOpts args = -- These hide-packages will go away with a new
- -- version of hint
- "-hide-package=mtl" : "-hide-package=MonadCatchIO-mtl" :
- removeBad opts
+getHintOpts args = removeBad opts
where
bad = ["-threaded", "-O"]
removeBad = filter (\x -> not $ any (`isPrefixOf` x) bad)
@@ -133,19 +130,16 @@ hintSnap opts modules initialization cleanup handler = do
, handler
]
interpreter = do
- mapM_ unsafeSetGhcOption opts
loadModules . nub $ modules
-
- -- Add Prelude and Snap.Types to the imports, for the
- -- "Snap ()" signature.
let imports = "Prelude" : "Snap.Types" : modules
setImports . nub $ imports
interpret action (as :: Snap ())
- -- Protect the interpreter from concurrent and high-speed serial
- -- access.
- loadAction <- protectedActionEvaluator 3 $ runInterpreter interpreter
+ loadInterpreter = unsafeRunInterpreterWithArgs opts interpreter
+
+ loadAction <- protectedActionEvaluator 3 loadInterpreter
+
return $ do
interpreterResult <- liftIO loadAction
case interpreterResult of
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
