yogsototh/hakyll
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #448 from lortabac/master

Browse source 
Fail if template is not parsed until eof
This commit is contained in:
Jasper Van der Jeugt 2016-07-22 17:47:30 +02:00 committed by GitHub
commit ccced51cf4
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Hakyll/Web/Template/Internal.hs
View file

@ -120,15 +120,22 @@ instance Binary TemplateExpr where
--------------------------------------------------------------------------------
readTemplate :: String -> Template
readTemplate input = case P.parse template "" input of
readTemplate input = case P.parse topLevelTemplate "" input of
Left err -> error $ "Cannot parse template: " ++ show err
Right t -> t
--------------------------------------------------------------------------------
topLevelTemplate :: P.Parser Template
topLevelTemplate = Template <$>
P.manyTill templateElement P.eof
--------------------------------------------------------------------------------
template :: P.Parser Template
template = Template <$>
(P.many $ chunk <|> escaped <|> conditional <|> for <|> partial <|> expr)
template = Template <$> P.many templateElement
--------------------------------------------------------------------------------
templateElement :: P.Parser TemplateElement
templateElement = chunk <|> escaped <|> conditional <|> for <|> partial <|> expr
--------------------------------------------------------------------------------