1bc5734037
This goes all the way up to Yesod, but everything above Wai is a real hack job, removing TH left and right.
102 lines
3.7 KiB
Diff
102 lines
3.7 KiB
Diff
From 8ff7908799eb69d440168ff3df1fe3187879df33 Mon Sep 17 00:00:00 2001
|
|
From: Joey Hess <joey@kitenet.net>
|
|
Date: Thu, 28 Feb 2013 23:39:57 -0400
|
|
Subject: [PATCH] remove TH
|
|
|
|
---
|
|
Yesod/Default/Util.hs | 61 +------------------------------------------------
|
|
1 file changed, 1 insertion(+), 60 deletions(-)
|
|
|
|
diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs
|
|
index 578b9bc..178e342 100644
|
|
--- a/Yesod/Default/Util.hs
|
|
+++ b/Yesod/Default/Util.hs
|
|
@@ -5,8 +5,6 @@
|
|
module Yesod.Default.Util
|
|
( addStaticContentExternal
|
|
, globFile
|
|
- , widgetFileNoReload
|
|
- , widgetFileReload
|
|
, TemplateLanguage (..)
|
|
, defaultTemplateLanguages
|
|
, WidgetFileSettings
|
|
@@ -21,9 +19,6 @@ import Yesod.Core -- purposely using complete import so that Haddock will see ad
|
|
import Control.Monad (when, unless)
|
|
import System.Directory (doesFileExist, createDirectoryIfMissing)
|
|
import Language.Haskell.TH.Syntax
|
|
-import Text.Lucius (luciusFile, luciusFileReload)
|
|
-import Text.Julius (juliusFile, juliusFileReload)
|
|
-import Text.Cassius (cassiusFile, cassiusFileReload)
|
|
import Text.Hamlet (HamletSettings, defaultHamletSettings)
|
|
import Data.Maybe (catMaybes)
|
|
import Data.Default (Default (def))
|
|
@@ -72,13 +67,7 @@ data TemplateLanguage = TemplateLanguage
|
|
|
|
defaultTemplateLanguages :: HamletSettings -> [TemplateLanguage]
|
|
defaultTemplateLanguages hset =
|
|
- [ TemplateLanguage False "hamlet" whamletFile' whamletFile'
|
|
- , TemplateLanguage True "cassius" cassiusFile cassiusFileReload
|
|
- , TemplateLanguage True "julius" juliusFile juliusFileReload
|
|
- , TemplateLanguage True "lucius" luciusFile luciusFileReload
|
|
- ]
|
|
- where
|
|
- whamletFile' = whamletFileWithSettings hset
|
|
+ [ ]
|
|
|
|
data WidgetFileSettings = WidgetFileSettings
|
|
{ wfsLanguages :: HamletSettings -> [TemplateLanguage]
|
|
@@ -87,51 +76,3 @@ data WidgetFileSettings = WidgetFileSettings
|
|
|
|
instance Default WidgetFileSettings where
|
|
def = WidgetFileSettings defaultTemplateLanguages defaultHamletSettings
|
|
-
|
|
-widgetFileNoReload :: WidgetFileSettings -> FilePath -> Q Exp
|
|
-widgetFileNoReload wfs x = combine "widgetFileNoReload" x False $ wfsLanguages wfs $ wfsHamletSettings wfs
|
|
-
|
|
-widgetFileReload :: WidgetFileSettings -> FilePath -> Q Exp
|
|
-widgetFileReload wfs x = combine "widgetFileReload" x True $ wfsLanguages wfs $ wfsHamletSettings wfs
|
|
-
|
|
-combine :: String -> String -> Bool -> [TemplateLanguage] -> Q Exp
|
|
-combine func file isReload tls = do
|
|
- mexps <- qmexps
|
|
- case catMaybes mexps of
|
|
- [] -> error $ concat
|
|
- [ "Called "
|
|
- , func
|
|
- , " on "
|
|
- , show file
|
|
- , ", but no template were found."
|
|
- ]
|
|
- exps -> return $ DoE $ map NoBindS exps
|
|
- where
|
|
- qmexps :: Q [Maybe Exp]
|
|
- qmexps = mapM go tls
|
|
-
|
|
- go :: TemplateLanguage -> Q (Maybe Exp)
|
|
- go tl = whenExists file (tlRequiresToWidget tl) (tlExtension tl) ((if isReload then tlReload else tlNoReload) tl)
|
|
-
|
|
-whenExists :: String
|
|
- -> Bool -- ^ requires toWidget wrap
|
|
- -> String -> (FilePath -> Q Exp) -> Q (Maybe Exp)
|
|
-whenExists = warnUnlessExists False
|
|
-
|
|
-warnUnlessExists :: Bool
|
|
- -> String
|
|
- -> Bool -- ^ requires toWidget wrap
|
|
- -> String -> (FilePath -> Q Exp) -> Q (Maybe Exp)
|
|
-warnUnlessExists shouldWarn x wrap glob f = do
|
|
- let fn = globFile glob x
|
|
- e <- qRunIO $ doesFileExist fn
|
|
- when (shouldWarn && not e) $ qRunIO $ putStrLn $ "widget file not found: " ++ fn
|
|
- if e
|
|
- then do
|
|
- ex <- f fn
|
|
- if wrap
|
|
- then do
|
|
- tw <- [|toWidget|]
|
|
- return $ Just $ tw `AppE` ex
|
|
- else return $ Just ex
|
|
- else return Nothing
|
|
--
|
|
1.7.10.4
|
|
|