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

Methods must be upper case

Browse Source
This commit is contained in:
Michael Snoyman 2010-06-30 20:38:32 +03:00
parent 0e6f32f4a6
commit 949e3bff2f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Yesod/Dispatch.hs
View File

@ -57,7 +57,7 @@ import Control.Monad
import Data.Maybe import Data.Maybe
import Web.ClientSession import Web.ClientSession
import qualified Web.ClientSession as CS import qualified Web.ClientSession as CS
import Data.Char (isLower) import Data.Char (isLower, isUpper)
import Data.Serialize import Data.Serialize
import qualified Data.Serialize as Ser import qualified Data.Serialize as Ser
@ -175,6 +175,8 @@ fromStatic (StaticPiece s) = s
fromStatic _ = error "fromStatic" fromStatic _ = error "fromStatic"
thResourceFromResource :: Type -> Resource -> Q THResource thResourceFromResource :: Type -> Resource -> Q THResource
thResourceFromResource _ (Resource n ps attribs)
| all (all isUpper) attribs = return (n, Simple ps attribs)
thResourceFromResource master (Resource n ps atts@[stype, toSubArg]) thResourceFromResource master (Resource n ps atts@[stype, toSubArg])
| all isStatic ps && any (any isLower) atts = do | all isStatic ps && any (any isLower) atts = do
let stype' = ConT $ mkName stype let stype' = ConT $ mkName stype
@ -200,7 +202,8 @@ thResourceFromResource master (Resource n ps atts@[stype, toSubArg])
, ssToMasterArg = VarE $ mkName toSubArg , ssToMasterArg = VarE $ mkName toSubArg
, ssPieces = map fromStatic ps , ssPieces = map fromStatic ps
}) })
thResourceFromResource _ (Resource n ps attribs) = return (n, Simple ps attribs) thResourceFromResource _ (Resource n _ _) =
error $ "Invalid attributes for resource: " ++ n
compact :: [(String, [a])] -> [(String, [a])] compact :: [(String, [a])] -> [(String, [a])]
compact [] = [] compact [] = []