diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-11-25 10:45:55 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-11-25 10:45:55 +0100 |
| commit | 25b8c8b199082ebbc41d1af03fc19202b798f156 (patch) | |
| tree | 93fe71723ce3f7288b465037fb6c9a1198514e22 /src/Hakyll/Core/Rules | |
| parent | cae87891543babe1a0ec989546cfabcb451bd890 (diff) | |
| download | hakyll-25b8c8b199082ebbc41d1af03fc19202b798f156.tar.gz | |
A bit of cleanup
Diffstat (limited to 'src/Hakyll/Core/Rules')
| -rw-r--r-- | src/Hakyll/Core/Rules/Internal.hs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs index df42d11..4f44bd6 100644 --- a/src/Hakyll/Core/Rules/Internal.hs +++ b/src/Hakyll/Core/Rules/Internal.hs @@ -1,10 +1,9 @@ -------------------------------------------------------------------------------- --- | Internal rules module for types which are not exposed to the user {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE Rank2Types #-} module Hakyll.Core.Rules.Internal ( RuleSet (..) - , RuleEnvironment (..) + , RulesRead (..) , Rules (..) , runRules ) where @@ -31,11 +30,10 @@ import Hakyll.Core.Routes -------------------------------------------------------------------------------- --- | A collection of rules for the compilation process data RuleSet = RuleSet - { -- | Routes used in the compilation structure + { -- | Accumulated routes rulesRoutes :: Routes - , -- | Compilation rules + , -- | Accumulated compilers rulesCompilers :: [(Identifier, Compiler SomeItem)] , -- | A set of the actually used files rulesResources :: Set Identifier @@ -50,8 +48,7 @@ instance Monoid RuleSet where -------------------------------------------------------------------------------- --- | Rule environment -data RuleEnvironment = RuleEnvironment +data RulesRead = RulesRead { rulesProvider :: Provider , rulesPattern :: Pattern , rulesVersion :: Maybe String @@ -61,7 +58,7 @@ data RuleEnvironment = RuleEnvironment -------------------------------------------------------------------------------- -- | The monad used to compose rules newtype Rules a = Rules - { unRules :: RWST RuleEnvironment RuleSet () IO a + { unRules :: RWST RulesRead RuleSet () IO a } deriving (Monad, Functor, Applicative) @@ -83,7 +80,7 @@ runRules rules provider = do (_, _, ruleSet) <- runRWST (unRules rules) env () return $ nubCompilers ruleSet where - env = RuleEnvironment + env = RulesRead { rulesProvider = provider , rulesPattern = mempty , rulesVersion = Nothing |
