on master help sign in
Readability improvements.
commitea1bb417268692a0e005ec331fb938eb445d01d1 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateSat 27 Feb 2010, 17:32 (17 years ago) parent9591142
2 files changed+10−8
src/Text/Hakyll/Context.hs+8−7 src/Text/Hakyll/Regex.hs+2−1
src/Text/Hakyll/Context.hs+8−7
@@ -59,13 +59,14 @@ renderDate :: String -- ^ Key in which the rendered date should be placed.
5959renderDate key format defaultValue context = M.insert key value context
6060 where
6161 value = fromMaybe defaultValue pretty
62− pretty = do filePath <- M.lookup "path" context
63− let dateString = substituteRegex "^([0-9]*-[0-9]*-[0-9]*).*" "\\1"
64− (takeFileName filePath)
65− time <- parseTime defaultTimeLocale
66− "%Y-%m-%d"
67− dateString :: Maybe UTCTime
68− return $ formatTime defaultTimeLocale format time
62+ pretty = do
63+ filePath <- M.lookup "path" context
64+ let dateString = substituteRegex "^([0-9]*-[0-9]*-[0-9]*).*" "\\1"
65+ (takeFileName filePath)
66+ time <- parseTime defaultTimeLocale
67+ "%Y-%m-%d"
68+ dateString :: Maybe UTCTime
69+ return $ formatTime defaultTimeLocale format time
6970
7071-- | Change the extension of a file. This is only needed when you want to
7172-- render, for example, mardown to @.php@ files instead of @.html@ files.
src/Text/Hakyll/Regex.hs+2−1
@@ -41,7 +41,8 @@ subRegex regexp inp replacement =
4141 in case matchRegexAll regexp inp of
4242 Nothing -> inp
4343 Just (lead, match', trail, groups) ->
44− lead ++ lookup' match' replacement groups ++ subRegex regexp trail replacement
44+ lead ++ lookup' match' replacement groups
45+ ++ subRegex regexp trail replacement
4546
4647-- | Splits a string based on a regular expression. The regular expression
4748-- should identify one delimiter.