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 9cf1a6796eff6e386b0528e10c71a5e2ed087e4a (commit)
from 3ac7c14482240f4fd74711b14b6bb11980893050 (commit)
Summary of changes:
snap-core.cabal | 1 +
src/Snap/Internal/Instances.hs | 82 ++++++++++++++++++++++++++
src/Snap/Internal/Types.hs | 123 ++++++++++-----------------------------
src/Snap/Iteratee.hs | 4 +-
src/Snap/Types.hs | 1 +
5 files changed, 119 insertions(+), 92 deletions(-)
create mode 100644 src/Snap/Internal/Instances.hs
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 9cf1a6796eff6e386b0528e10c71a5e2ed087e4a
Author: Gregory Collins <[email protected]>
Date: Tue Jul 6 19:23:03 2010 -0400
Move MonadSnap instances out into a new module
diff --git a/snap-core.cabal b/snap-core.cabal
index c935b80..4696421 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -132,6 +132,7 @@ Library
Snap.Util.GZip
other-modules:
+ Snap.Internal.Instances,
Snap.Internal.Routing,
Snap.Internal.Types
diff --git a/src/Snap/Internal/Instances.hs b/src/Snap/Internal/Instances.hs
new file mode 100644
index 0000000..b3a69f5
--- /dev/null
+++ b/src/Snap/Internal/Instances.hs
@@ -0,0 +1,82 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# LANGUAGE PackageImports #-}
+
+module Snap.Internal.Instances where
+
+import Control.Applicative
+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 Prelude hiding (catch)
+
+------------------------------------------------------------------------------
+import Snap.Internal.Types
+
+
+------------------------------------------------------------------------------
+instance MonadPlus m => MonadPlus (ContT c m) where
+ mzero = lift mzero
+ m `mplus` n = ContT $ \ f -> runContT m f `mplus` runContT n f
+
+
+------------------------------------------------------------------------------
+instance MonadPlus m => Alternative (ContT c m) where
+ empty = mzero
+ (<|>) = mplus
+
+
+------------------------------------------------------------------------------
+instance MonadSnap m => MonadSnap (ContT c m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance (MonadSnap m, Error e) => MonadSnap (ErrorT e m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance MonadSnap m => MonadSnap (ListT m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance (MonadSnap m, Monoid w) => MonadSnap (RWST r w s m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance (MonadSnap m, Monoid w) => MonadSnap (LRWS.RWST r w s m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance MonadSnap m => MonadSnap (ReaderT r m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance MonadSnap m => MonadSnap (StateT s m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance MonadSnap m => MonadSnap (LState.StateT s m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance (MonadSnap m, Monoid w) => MonadSnap (WriterT w m) where
+ liftSnap = lift . liftSnap
+
+
+------------------------------------------------------------------------------
+instance (MonadSnap m, Monoid w) => MonadSnap (LWriter.WriterT w m) where
+ liftSnap = lift . liftSnap
diff --git a/src/Snap/Internal/Types.hs b/src/Snap/Internal/Types.hs
index 95d8ecc..63add4f 100644
--- a/src/Snap/Internal/Types.hs
+++ b/src/Snap/Internal/Types.hs
@@ -1,43 +1,45 @@
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE EmptyDataDecls #-}
+{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PackageImports #-}
{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE FlexibleInstances #-}
module Snap.Internal.Types where
------------------------------------------------------------------------------
-import Control.Applicative
-import Control.Exception (throwIO, ErrorCall(..))
-import Control.Monad.CatchIO
-import Control.Monad.Cont
-import Control.Monad.Error
-import Control.Monad.List
-import Control.Monad.RWS.Strict hiding (pass)
-import qualified Control.Monad.RWS.Lazy as LRWS
-import Control.Monad.Reader
-import Control.Monad.State.Strict
-import qualified Control.Monad.State.Lazy as LState
-import Control.Monad.Writer.Strict hiding (pass)
-import qualified Control.Monad.Writer.Lazy as LWriter
-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 Prelude hiding (catch)
-
-import Data.Typeable
-
-------------------------------------------------------------------------------
-import Snap.Iteratee hiding (Enumerator)
-import Snap.Internal.Http.Types
+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 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 Snap.Internal.Http.Types
+import Snap.Iteratee hiding (Enumerator)
------------------------------------------------------------------------------
@@ -175,67 +177,6 @@ instance MonadSnap Snap where
liftSnap = id
-------------------------------------------------------------------------------
-instance MonadPlus m => MonadPlus (ContT c m) where
- mzero = lift mzero
- m `mplus` n = ContT $ \ f -> runContT m f `mplus` runContT n f
-
-
-------------------------------------------------------------------------------
-instance MonadPlus m => Alternative (ContT c m) where
- empty = mzero
- (<|>) = mplus
-
-
-------------------------------------------------------------------------------
-instance MonadSnap m => MonadSnap (ContT c m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance (MonadSnap m, Error e) => MonadSnap (ErrorT e m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance MonadSnap m => MonadSnap (ListT m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance (MonadSnap m, Monoid w) => MonadSnap (RWST r w s m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance (MonadSnap m, Monoid w) => MonadSnap (LRWS.RWST r w s m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance MonadSnap m => MonadSnap (ReaderT r m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance MonadSnap m => MonadSnap (StateT s m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance MonadSnap m => MonadSnap (LState.StateT s m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance (MonadSnap m, Monoid w) => MonadSnap (WriterT w m) where
- liftSnap = lift . liftSnap
-
-
-------------------------------------------------------------------------------
-instance (MonadSnap m, Monoid w) => MonadSnap (LWriter.WriterT w m) where
- liftSnap = lift . liftSnap
-
------------------------------------------------------------------------------
-- | The Typeable instance is here so Snap can be dynamically executed with
diff --git a/src/Snap/Iteratee.hs b/src/Snap/Iteratee.hs
index dc04a6a..908c221 100644
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@ -1,6 +1,8 @@
+{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PackageImports #-}
{-# LANGUAGE TypeSynonymInstances #-}
-- | Snap Framework type aliases and utilities for iteratees. Note that as a
@@ -45,7 +47,7 @@ module Snap.Iteratee
------------------------------------------------------------------------------
import Control.Monad
-import Control.Monad.CatchIO
+import "MonadCatchIO-transformers" Control.Monad.CatchIO
import Data.ByteString (ByteString)
import qualified Data.ByteString as S
import qualified Data.ByteString.Unsafe as S
diff --git a/src/Snap/Types.hs b/src/Snap/Types.hs
index 25e153e..091470a 100644
--- a/src/Snap/Types.hs
+++ b/src/Snap/Types.hs
@@ -116,6 +116,7 @@ module Snap.Types
------------------------------------------------------------------------------
import Snap.Internal.Http.Types
+import Snap.Internal.Instances ()
import Snap.Internal.Routing
import Snap.Internal.Types
------------------------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
