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-core".
The branch, 0.3 has been updated
via ec5a96bbe134bd7e64570ac8b39f25de498a1651 (commit)
via ec9eba8576f356def7d8fbf6b2c8c665c74f1355 (commit)
via f6617a4814573f06bd031f133fe3706a1a8db89b (commit)
via 0a5b831d78c2d727a107e6659b20cd86d9b34364 (commit)
via dc4fec02812b88810791de9f023e2a8ace19c559 (commit)
via 52e4c692763d28cc97aea0956e1c8fb4135b4d78 (commit)
via 20c272b8be99a20838d184cfe6f4774b240fdab3 (commit)
via 9c111a02521c4985b7a13d8a36c32f4b9424a939 (commit)
via 9cd871e4ffcb137c6fff863057234175df41627e (commit)
via 2b9c9ec1a5b000654ff1d2dec7b6cc881c8ddd52 (commit)
via 0a293ae9e681ae5dcb179839a929a1e816b910c5 (commit)
via cdb3f05214a415e32b0fb38ae14097908cfe3db9 (commit)
via fec61228361171a00e03484b7aebc2d1f0f4ff3d (commit)
via 596c514ccabe01e955806a232342aef3ac5d5daa (commit)
via 05b453a22736ab4d79acbf09cbaac947c990c35a (commit)
via 4e83df6378dd3e74242078bf33d99c5661a70ef2 (commit)
via a77fc64fada3c5b0eeb8e39bb8e077939bfdf665 (commit)
via 46311d3eaa4925d36875ea2dbd570d8b4d3e9597 (commit)
from fcf439700ac239cfac2c1f95023bb8e905ba850f (commit)
Summary of changes:
snap-core.cabal | 32 +++++-----
src/Snap/Internal/Debug.hs | 110 +++++++++++++++++++++++++----------
src/Snap/Internal/Http/Types.hs | 20 ++++--
src/Snap/Internal/Iteratee/Debug.hs | 7 ++-
src/Snap/Internal/Types.hs | 60 +++++++++++--------
src/Snap/Iteratee.hs | 24 +------
src/Snap/Types.hs | 6 +-
src/Snap/Util/GZip.hs | 2 +
test/runTestsAndCoverage.sh | 1 +
test/snap-core-testsuite.cabal | 15 -----
test/suite/Snap/Iteratee/Tests.hs | 14 ++--
test/suite/Snap/Types/Tests.hs | 15 +----
12 files changed, 168 insertions(+), 138 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 ec5a96bbe134bd7e64570ac8b39f25de498a1651
Merge: fcf4397 ec9eba8
Author: Shane <[email protected]>
Date: Fri Sep 24 17:34:19 2010 +0100
Merge branch 'master' of git.snapframework.com:snap-core into 0.3
Conflicts:
snap-core.cabal
src/Snap/Internal/Types.hs
src/Snap/Starter.hs
diff --cc snap-core.cabal
index 10729b7,cea34b3..00fef66
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@@ -167,7 -174,48 +168,6 @@@ Librar
else
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
--
-Executable snap
- hs-source-dirs: src
- main-is: Snap/Starter.hs
-
- other-modules: Snap.StarterTH
-
- if flag(no-debug)
- cpp-options: -DNODEBUG
-
- build-depends:
- attoparsec >= 0.8.1 && < 0.9,
- base >= 4 && < 5,
- bytestring,
- bytestring-nums,
- cereal >= 0.3 && < 0.4,
- containers,
- deepseq >= 1.1 && <1.2,
- directory,
- directory-tree,
- dlist >= 0.5 && < 0.6,
- filepath,
- haskell98,
- iteratee >= 0.3.1 && <0.4,
- monads-fd,
- old-locale,
- old-time,
- template-haskell,
- text >= 0.7.1 && <0.8,
- time,
- transformers,
- unix-compat,
- zlib
-
- ghc-prof-options: -prof -auto-all
-
- if impl(ghc >= 6.12.0)
- ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
- -fno-warn-unused-do-bind
- else
- ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
-
source-repository head
type: git
location: http://git.snapframework.com/snap-core.git
diff --cc src/Snap/Internal/Debug.hs
index aeaf875,54845ac..5ae4a53
--- a/src/Snap/Internal/Debug.hs
+++ b/src/Snap/Internal/Debug.hs
@@@ -34,6 -29,49 +29,49 @@@ import System.IO.Unsaf
import Text.Printf
------------------------------------------------------------------------------
+ debug, debugErrno :: forall m . (MonadIO m => String -> m ())
+
+
+ #ifndef NODEBUG
+
+ {-# NOINLINE debug #-}
+ debug = let !x = unsafePerformIO $! do
+ !e <- try $ getEnv "DEBUG"
+
+ !f <- either (\(_::SomeException) -> return debugIgnore)
- (\x -> if x == "1" || x == "on"
++ (\x' -> if x' == "1" || x' == "on"
+ then return debugOn
- else if x == "testsuite"
++ else if x' == "testsuite"
+ then return debugSeq
+ else return debugIgnore)
+ (fmap (map toLower) e)
+ return $! f
+ in x
+
+
+ {-# NOINLINE debugErrno #-}
+ debugErrno = let !x = unsafePerformIO $ do
+ e <- try $ getEnv "DEBUG"
+
+ !f <- either (\(_::SomeException) -> return debugErrnoIgnore)
- (\x -> if x == "1" || x == "on"
++ (\x' -> if x' == "1" || x' == "on"
+ then return debugErrnoOn
- else if x == "testsuite"
++ else if x' == "testsuite"
+ then return debugErrnoSeq
+ else return debugErrnoIgnore)
+ (fmap (map toLower) e)
+ return $! f
+ in x
+
+
+ ------------------------------------------------------------------------------
+ debugSeq :: (MonadIO m) => String -> m ()
+ debugSeq !s = let !s' = rnf s in return $! s' `deepseq` ()
+ {-# NOINLINE debugSeq #-}
+
+ debugErrnoSeq :: (MonadIO m) => String -> m ()
+ debugErrnoSeq !s = let !s' = rnf s in return $! s' `deepseq` ()
+ {-# NOINLINE debugErrnoSeq #-}
------------------------------------------------------------------------------
_debugMVar :: MVar ()
diff --cc src/Snap/Internal/Iteratee/Debug.hs
index 759bc0f,c2c6981..c39d2ea
--- a/src/Snap/Internal/Iteratee/Debug.hs
+++ b/src/Snap/Internal/Iteratee/Debug.hs
@@@ -18,7 -18,7 +18,6 @@@ import Data.Iteratee.WrappedB
import Data.Word (Word8)
import System.IO
------------------------------------------------------------------------------
--import Snap.Internal.Debug
import Snap.Iteratee
------------------------------------------------------------------------------
diff --cc src/Snap/Internal/Types.hs
index 54b6873,37429c0..0128e1b
--- a/src/Snap/Internal/Types.hs
+++ b/src/Snap/Internal/Types.hs
@@@ -8,38 -6,29 +8,31 @@@
module Snap.Internal.Types where
------------------------------------------------------------------------------
-import Control.Applicative
-import Control.Exception (throwIO, ErrorCall(..))
-import Control.Monad.CatchIO
-import Control.Monad.State.Strict
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as S
-import qualified Data.ByteString.Lazy.Char8 as L
-import qualified Data.CIByteString as CIB
-import Data.IORef
-import qualified Data.Iteratee as Iter
-import Data.Maybe
-import qualified Data.Text as T
-import qualified Data.Text.Encoding as T
-import qualified Data.Text.Lazy as LT
-import qualified Data.Text.Lazy.Encoding as LT
+import "MonadCatchIO-transformers" Control.Monad.CatchIO
+
+import Control.Applicative
+import Control.Exception (throwIO, ErrorCall(..))
- import "monads-fd" Control.Monad.Cont
- import "monads-fd" Control.Monad.Error
- import "monads-fd" Control.Monad.List
- import "monads-fd" Control.Monad.RWS.Strict hiding (pass)
- import qualified "monads-fd" Control.Monad.RWS.Lazy as LRWS
- import "monads-fd" Control.Monad.Reader
- import "monads-fd" Control.Monad.State.Strict
- import qualified "monads-fd" Control.Monad.State.Lazy as LState
- import "monads-fd" Control.Monad.Writer.Strict hiding (pass)
- import qualified "monads-fd" Control.Monad.Writer.Lazy as LWriter
++import Control.Monad
++import "monads-fd" Control.Monad.State
+import Data.ByteString.Char8 (ByteString)
+import qualified Data.ByteString.Char8 as S
+import qualified Data.ByteString.Lazy.Char8 as L
+import qualified Data.CIByteString as CIB
+import Data.IORef
+import qualified Data.Iteratee as Iter
+import Data.Maybe
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
+import qualified Data.Text.Lazy as LT
+import qualified Data.Text.Lazy.Encoding as LT
+import Data.Typeable
+import Prelude hiding (catch)
-import Data.Typeable
------------------------------------------------------------------------------
- import Snap.Internal.Http.Types
-import Snap.Iteratee hiding (Enumerator)
-import Snap.Internal.Http.Types
-import Snap.Internal.Debug
-import Snap.Internal.Iteratee.Debug
+import Snap.Iteratee hiding (Enumerator, filter)
++import Snap.Internal.Http.Types
++import Snap.Internal.Iteratee.Debug
------------------------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
