f1e726b · hakyll · git.iko.soy

git.iko.soy/hakyll

Renaming for consistency

commitf1e726be69b7ed78f7b8f7eed4b41305b125a3bb authorJasper Van der Jeugt <jaspervdj@gmail.com> dateFri 7 Jan 2011, 14:34 (16 years ago) parent9e88440

3 files changed+6−6

compare with master

unifiedsplit

src/Hakyll/Core/Compiler.hs+1−1 src/Hakyll/Core/Rules.hs+4−4 src/Hakyll/Core/Run.hs+1−1

src/Hakyll/Core/Compiler.hs+1−1

@@ -52,7 +52,7 @@ runCompiler compiler identifier provider route' store modified = do

5252 -- In case we compiled an item, we will store a copy in the cache first,

5353 -- before we return control. This makes sure the compiled item can later

5454 -- be accessed by e.g. require.

55− ItemRule (CompiledItem x) ->

55+ CompileRule (CompiledItem x) ->

5656 storeSet store "Hakyll.Core.Compiler.runCompiler" identifier x

5757

5858 -- Otherwise, we do nothing here

src/Hakyll/Core/Rules.hs+4−4

@@ -37,8 +37,8 @@ import Hakyll.Core.Writable

3737-- * The compiler will produce more compilers. These new compilers need to be

3838-- added to the runtime if possible, since other items might depend upon them.

3939--

40−data CompileRule = ItemRule CompiledItem

41− | AddCompilersRule [(Identifier, Compiler () CompiledItem)]

40+data CompileRule = CompileRule CompiledItem

41+ | MetaCompileRule [(Identifier, Compiler () CompiledItem)]

4242

4343-- | A collection of rules for the compilation process

4444--

@@ -81,7 +81,7 @@ tellCompilers :: (Binary a, Typeable a, Writable a)

8181tellCompilers compilers = RulesM $ tell $ RuleSet mempty $

8282 map (second boxCompiler) compilers

8383 where

84− boxCompiler = (>>> arr compiledItem >>> arr ItemRule)

84+ boxCompiler = (>>> arr compiledItem >>> arr CompileRule)

8585

8686-- | Add a compilation rule

8787--

@@ -119,4 +119,4 @@ addCompilers :: (Binary a, Typeable a, Writable a)

119119addCompilers identifier compiler = RulesM $ tell $ RuleSet mempty $

120120 [(identifier, compiler >>^ makeRule)]

121121 where

122− makeRule = AddCompilersRule . map (second (>>^ compiledItem))

122+ makeRule = MetaCompileRule . map (second (>>^ compiledItem))

src/Hakyll/Core/Run.hs+1−1

@@ -141,7 +141,7 @@ runCompilers ((id', compiler) : compilers) = Hakyll $ do

141141 result <- liftIO $ runCompiler compiler id' provider url store isModified

142142 liftIO $ putStrLn $ "Generated target: " ++ show id'

143143

144− let ItemRule compiled = result

144+ let CompileRule compiled = result

145145

146146 case url of

147147 Nothing -> return ()