summaryrefslogtreecommitdiff
path: root/src/Hakyll/Core
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2011-01-07 14:34:31 +0100
committerJasper Van der Jeugt <jaspervdj@gmail.com>2011-01-07 14:34:31 +0100
commitf1e726be69b7ed78f7b8f7eed4b41305b125a3bb (patch)
tree08b293c5200e414af7d8178df70e880f95059242 /src/Hakyll/Core
parent9e88440102842ca7fbed342e7f29ab9ea1dfea6f (diff)
downloadhakyll-f1e726be69b7ed78f7b8f7eed4b41305b125a3bb.tar.gz
Renaming for consistency
Diffstat (limited to 'src/Hakyll/Core')
-rw-r--r--src/Hakyll/Core/Compiler.hs2
-rw-r--r--src/Hakyll/Core/Rules.hs8
-rw-r--r--src/Hakyll/Core/Run.hs2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Hakyll/Core/Compiler.hs b/src/Hakyll/Core/Compiler.hs
index 73ee359..f754860 100644
--- a/src/Hakyll/Core/Compiler.hs
+++ b/src/Hakyll/Core/Compiler.hs
@@ -52,7 +52,7 @@ runCompiler compiler identifier provider route' store modified = do
-- In case we compiled an item, we will store a copy in the cache first,
-- before we return control. This makes sure the compiled item can later
-- be accessed by e.g. require.
- ItemRule (CompiledItem x) ->
+ CompileRule (CompiledItem x) ->
storeSet store "Hakyll.Core.Compiler.runCompiler" identifier x
-- Otherwise, we do nothing here
diff --git a/src/Hakyll/Core/Rules.hs b/src/Hakyll/Core/Rules.hs
index ea3eadc..ccfde53 100644
--- a/src/Hakyll/Core/Rules.hs
+++ b/src/Hakyll/Core/Rules.hs
@@ -37,8 +37,8 @@ import Hakyll.Core.Writable
-- * The compiler will produce more compilers. These new compilers need to be
-- added to the runtime if possible, since other items might depend upon them.
--
-data CompileRule = ItemRule CompiledItem
- | AddCompilersRule [(Identifier, Compiler () CompiledItem)]
+data CompileRule = CompileRule CompiledItem
+ | MetaCompileRule [(Identifier, Compiler () CompiledItem)]
-- | A collection of rules for the compilation process
--
@@ -81,7 +81,7 @@ tellCompilers :: (Binary a, Typeable a, Writable a)
tellCompilers compilers = RulesM $ tell $ RuleSet mempty $
map (second boxCompiler) compilers
where
- boxCompiler = (>>> arr compiledItem >>> arr ItemRule)
+ boxCompiler = (>>> arr compiledItem >>> arr CompileRule)
-- | Add a compilation rule
--
@@ -119,4 +119,4 @@ addCompilers :: (Binary a, Typeable a, Writable a)
addCompilers identifier compiler = RulesM $ tell $ RuleSet mempty $
[(identifier, compiler >>^ makeRule)]
where
- makeRule = AddCompilersRule . map (second (>>^ compiledItem))
+ makeRule = MetaCompileRule . map (second (>>^ compiledItem))
diff --git a/src/Hakyll/Core/Run.hs b/src/Hakyll/Core/Run.hs
index ed9cea6..31280db 100644
--- a/src/Hakyll/Core/Run.hs
+++ b/src/Hakyll/Core/Run.hs
@@ -141,7 +141,7 @@ runCompilers ((id', compiler) : compilers) = Hakyll $ do
result <- liftIO $ runCompiler compiler id' provider url store isModified
liftIO $ putStrLn $ "Generated target: " ++ show id'
- let ItemRule compiled = result
+ let CompileRule compiled = result
case url of
Nothing -> return ()