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

Routes is data family, not type family

Browse Source
This commit is contained in:
Michael Snoyman 2010-06-30 12:44:57 +03:00
parent c91a4ada56
commit 2f17cda10d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Yesod/Dispatch.hs
View File

@ -146,8 +146,8 @@ mkYesodGeneral name args clazzes isSub res = do
explode <- [|explodeHandler|] explode <- [|explodeHandler|]
let th = map thResourceFromResource res let th = map thResourceFromResource res
w' <- createRoutes th w' <- createRoutes th
let w = DataD [] (mkName $ name ++ "Routes") [] w' [] let w = DataInstD [] ''Routes [arg] w' []
let x = TySynInstD ''Routes [arg] $ ConT $ mkName $ name ++ "Routes" let x = TySynD (mkName $ name ++ "Routes") [] $ ConT ''Routes `AppT` arg
parse' <- createParse th parse' <- createParse th
parse'' <- newName "parse" parse'' <- newName "parse"

2
Yesod/Handler.hs
View File

@ -93,7 +93,7 @@ import Text.Hamlet
import Numeric (showIntAtBase) import Numeric (showIntAtBase)
import Data.Char (ord, chr) import Data.Char (ord, chr)
type family Routes a data family Routes a
data HandlerData sub master = HandlerData data HandlerData sub master = HandlerData
{ handlerRequest :: Request { handlerRequest :: Request