diff options
author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2016-07-23 16:04:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-23 16:04:17 +0200 |
commit | 68e9c7704216f88b73162963c06ef80616ff318a (patch) | |
tree | 20decb44be8efa9dcdf3d708c23e621c9c5d008f /src/Hakyll/Web/Template/Internal.hs | |
parent | 363571f2677809973a8a48eafa37232126c78507 (diff) | |
parent | 871cfd36ddd143f8fad14657e1c1fd80a9e6c66f (diff) | |
download | hakyll-68e9c7704216f88b73162963c06ef80616ff318a.tar.gz |
Merge pull request #451 from lortabac/master
Include file name in error messages
Diffstat (limited to 'src/Hakyll/Web/Template/Internal.hs')
-rw-r--r-- | src/Hakyll/Web/Template/Internal.hs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Hakyll/Web/Template/Internal.hs b/src/Hakyll/Web/Template/Internal.hs index aa8e080..a63c40d 100644 --- a/src/Hakyll/Web/Template/Internal.hs +++ b/src/Hakyll/Web/Template/Internal.hs @@ -8,6 +8,7 @@ module Hakyll.Web.Template.Internal , TemplateExpr (..) , TemplateElement (..) , readTemplate + , readTemplateFile ) where @@ -120,10 +121,16 @@ instance Binary TemplateExpr where -------------------------------------------------------------------------------- readTemplate :: String -> Template -readTemplate input = case P.parse topLevelTemplate "" input of +readTemplate = readTemplateFile "{literal}" + + +-------------------------------------------------------------------------------- +readTemplateFile :: FilePath -> String -> Template +readTemplateFile file input = case P.parse topLevelTemplate file input of Left err -> error $ "Cannot parse template: " ++ show err Right t -> t + -------------------------------------------------------------------------------- topLevelTemplate :: P.Parser Template topLevelTemplate = Template <$> |