From 74e6ba9365cdc8fc550eef5e1dcf235a472e105e Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Wed, 26 Dec 2012 17:06:40 +0100
Subject: Further fixes to match/version/herp/derp

---
 src/Hakyll/Core/Rules/Internal.hs | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'src/Hakyll/Core/Rules')

diff --git a/src/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs
index 4f44bd6..825edf4 100644
--- a/src/Hakyll/Core/Rules/Internal.hs
+++ b/src/Hakyll/Core/Rules/Internal.hs
@@ -2,8 +2,10 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE Rank2Types                 #-}
 module Hakyll.Core.Rules.Internal
-    ( RuleSet (..)
-    , RulesRead (..)
+    ( RulesRead (..)
+    , RuleSet (..)
+    , RulesState (..)
+    , emptyRulesState
     , Rules (..)
     , runRules
     ) where
@@ -29,6 +31,14 @@ import           Hakyll.Core.Provider
 import           Hakyll.Core.Routes
 
 
+--------------------------------------------------------------------------------
+data RulesRead = RulesRead
+    { rulesProvider :: Provider
+    , rulesPattern  :: Pattern
+    , rulesVersion  :: Maybe String
+    }
+
+
 --------------------------------------------------------------------------------
 data RuleSet = RuleSet
     { -- | Accumulated routes
@@ -48,17 +58,21 @@ instance Monoid RuleSet where
 
 
 --------------------------------------------------------------------------------
-data RulesRead = RulesRead
-    { rulesProvider :: Provider
-    , rulesPattern  :: Pattern
-    , rulesVersion  :: Maybe String
+data RulesState = RulesState
+    { rulesRoute    :: Maybe Routes
+    , rulesCompiler :: Maybe (Compiler SomeItem)
     }
 
 
+--------------------------------------------------------------------------------
+emptyRulesState :: RulesState
+emptyRulesState = RulesState Nothing Nothing
+
+
 --------------------------------------------------------------------------------
 -- | The monad used to compose rules
 newtype Rules a = Rules
-    { unRules :: RWST RulesRead RuleSet () IO a
+    { unRules :: RWST RulesRead RuleSet RulesState IO a
     } deriving (Monad, Functor, Applicative)
 
 
@@ -77,7 +91,7 @@ instance MonadMetadata Rules where
 -- | Run a Rules monad, resulting in a 'RuleSet'
 runRules :: Rules a -> Provider -> IO RuleSet
 runRules rules provider = do
-    (_, _, ruleSet) <- runRWST (unRules rules) env ()
+    (_, _, ruleSet) <- runRWST (unRules rules) env emptyRulesState
     return $ nubCompilers ruleSet
   where
     env = RulesRead
-- 
cgit v1.2.3