haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiler error if no templates found (#289)

Browse Source
This commit is contained in:
Michael Snoyman 2012-03-15 18:48:27 +02:00
parent 0257c9a0de
commit f11656f73a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yesod-default/Yesod/Default/Util.hs
View File

@ -58,7 +58,7 @@ globFile :: String -> String -> FilePath
globFile kind x = "templates/" ++ x ++ "." ++ kind globFile kind x = "templates/" ++ x ++ "." ++ kind
widgetFileNoReload :: FilePath -> Q Exp widgetFileNoReload :: FilePath -> Q Exp
widgetFileNoReload x = combine widgetFileNoReload x = combine "widgetFileNoReload" x
[ whenExists x False "hamlet" whamletFile [ whenExists x False "hamlet" whamletFile
, whenExists x True "cassius" cassiusFile , whenExists x True "cassius" cassiusFile
, whenExists x True "julius" juliusFile , whenExists x True "julius" juliusFile
@ -66,7 +66,7 @@ widgetFileNoReload x = combine
] ]
widgetFileReload :: FilePath -> Q Exp widgetFileReload :: FilePath -> Q Exp
widgetFileReload x = combine widgetFileReload x = combine "widgetFileReload" x
[ whenExists x False "hamlet" whamletFile [ whenExists x False "hamlet" whamletFile
, whenExists x True "cassius" cassiusFileReload , whenExists x True "cassius" cassiusFileReload
, whenExists x True "julius" juliusFileReload , whenExists x True "julius" juliusFileReload
@ -76,17 +76,23 @@ widgetFileReload x = combine
widgetFileJsCss :: (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("cassius", cassiusFileReload) widgetFileJsCss :: (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("cassius", cassiusFileReload)
-> (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("julius", juliusFileReload) -> (String, FilePath -> Q Exp) -- ^ Css file extenstion and loading function. example: ("julius", juliusFileReload)
-> FilePath -> Q Exp -> FilePath -> Q Exp
widgetFileJsCss (jsExt, jsLoad) (csExt, csLoad) x = combine widgetFileJsCss (jsExt, jsLoad) (csExt, csLoad) x = combine "widgetFileJsCss" x
[ whenExists x False "hamlet" whamletFile [ whenExists x False "hamlet" whamletFile
, whenExists x True csExt csLoad , whenExists x True csExt csLoad
, whenExists x True jsExt jsLoad , whenExists x True jsExt jsLoad
] ]
combine :: [Q (Maybe Exp)] -> Q Exp combine :: String -> String -> [Q (Maybe Exp)] -> Q Exp
combine qmexps = do combine func file qmexps = do
mexps <- sequence qmexps mexps <- sequence qmexps
case catMaybes mexps of case catMaybes mexps of
[] -> [|return ()|] [] -> error $ concat
[ "Called "
, func
, " on "
, show file
, ", but no template were found."
]
exps -> return $ DoE $ map NoBindS exps exps -> return $ DoE $ map NoBindS exps
whenExists :: String whenExists :: String