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 "heist".
The branch, master has been updated
via b00641a4756c864b909a7b8d15af7ea29f672a86 (commit)
via abe0a18674d097d5517fa6da6e9cc20682974c6d (commit)
via 8bd9fb3cfe523dd998e260864d746df3804b8092 (commit)
from 76f1737f23a87e36e6965f981dcb63f65df9a98c (commit)
Summary of changes:
src/Text/Templating/Heist/Types.hs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 b00641a4756c864b909a7b8d15af7ea29f672a86
Author: Carl Howells <[email protected]>
Date: Sat Jun 12 23:45:41 2010 -0700
Change the Typeable instance for TemplateMonad to Typeable1, with
improvement suggestions from Edward Kmett
diff --git a/src/Text/Templating/Heist/Types.hs
b/src/Text/Templating/Heist/Types.hs
index a614197..a734954 100644
--- a/src/Text/Templating/Heist/Types.hs
+++ b/src/Text/Templating/Heist/Types.hs
@@ -290,13 +290,12 @@ instance (MonadCont m) => MonadCont (TemplateMonad m)
where
------------------------------------------------------------------------------
-- | The Typeable instance is here so Heist can be dynamically executed with
-- Hint.
-instance (Typeable1 m, Typeable a) => Typeable (TemplateMonad m a) where
- typeOf _ = mkTyConApp tCon [mRep, aRep]
- where
- tCon = mkTyCon "TemplateMonad"
- maRep = typeOf (undefined :: m a)
- (mCon, [aRep]) = splitTyConApp maRep
- mRep = mkTyConApp mCon []
+templateMonadTyCon :: TyCon
+templateMonadTyCon = mkTyCon "Text.Templating.Heist.Types.TemplateMonad"
+{-# NOINLINE templateMonadTyCon #-}
+
+instance (Typeable1 m) => Typeable1 (TemplateMonad m) where
+ typeOf1 _ = mkTyConApp templateMonadTyCon [typeOf1 (undefined :: m ())]
------------------------------------------------------------------------------
commit abe0a18674d097d5517fa6da6e9cc20682974c6d
Author: Carl Howells <[email protected]>
Date: Sat Jun 12 23:43:43 2010 -0700
Add a Typeable instance for TemplateState
diff --git a/src/Text/Templating/Heist/Types.hs
b/src/Text/Templating/Heist/Types.hs
index 56de523..a614197 100644
--- a/src/Text/Templating/Heist/Types.hs
+++ b/src/Text/Templating/Heist/Types.hs
@@ -135,6 +135,17 @@ instance Eq (TemplateState m) where
------------------------------------------------------------------------------
+-- | The Typeable instance is here so Heist can be dynamically executed with
+-- Hint.
+templateStateTyCon :: TyCon
+templateStateTyCon = mkTyCon "Text.Templating.Heist.Types.TemplateState"
+{-# NOINLINE templateStateTyCon #-}
+
+instance (Typeable1 m) => Typeable (TemplateState m) where
+ typeOf _ = mkTyConApp templateStateTyCon [typeOf1 (undefined :: m ())]
+
+
+------------------------------------------------------------------------------
-- | TemplateMonad is the monad used for 'Splice' processing. TemplateMonad
-- provides \"passthrough\" instances for many of the monads you might use in
-- the inner monad.
commit 8bd9fb3cfe523dd998e260864d746df3804b8092
Author: Carl Howells <[email protected]>
Date: Sat Jun 12 23:39:02 2010 -0700
whitespace cleanup
diff --git a/src/Text/Templating/Heist/Types.hs
b/src/Text/Templating/Heist/Types.hs
index b612429..56de523 100644
--- a/src/Text/Templating/Heist/Types.hs
+++ b/src/Text/Templating/Heist/Types.hs
@@ -137,7 +137,7 @@ instance Eq (TemplateState m) where
------------------------------------------------------------------------------
-- | TemplateMonad is the monad used for 'Splice' processing. TemplateMonad
-- provides \"passthrough\" instances for many of the monads you might use in
--- the inner monad.
+-- the inner monad.
newtype TemplateMonad m a = TemplateMonad {
runTemplateMonad :: Node
-> TemplateState m
@@ -155,7 +155,7 @@ evalTemplateMonad :: Monad m
evalTemplateMonad m r s = do
(a, _) <- runTemplateMonad m r s
return a
-
+
------------------------------------------------------------------------------
-- | Helper function for the functor instance
first :: (a -> b) -> (a, c) -> (b, c)
-----------------------------------------------------------------------
hooks/post-receive
--
heist
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
