@@ -120,15 +120,22 @@ instance Binary TemplateExpr where
121--------------------------------------------------------------------------------
121--------------------------------------------------------------------------------
122readTemplate :: String -> Template
122readTemplate :: String -> Template
123−readTemplate input = case P.parse template "" input of
123+readTemplate input = case P.parse topLevelTemplate "" input of
124 Left err -> error $ "Cannot parse template: " ++ show err
124 Left err -> error $ "Cannot parse template: " ++ show err
125 Right t -> t
125 Right t -> t
127+--------------------------------------------------------------------------------
128+topLevelTemplate :: P.Parser Template
129+topLevelTemplate = Template <$>
130+ P.manyTill templateElement P.eof
128--------------------------------------------------------------------------------
132--------------------------------------------------------------------------------
129template :: P.Parser Template
133template :: P.Parser Template
130−template = Template <$>
134+template = Template <$> P.many templateElement
136+--------------------------------------------------------------------------------
137+templateElement :: P.Parser TemplateElement
131− (P.many $ chunk <|> escaped <|> conditional <|> for <|> partial <|> expr)
138+templateElement = chunk <|> escaped <|> conditional <|> for <|> partial <|> expr
134--------------------------------------------------------------------------------
141--------------------------------------------------------------------------------