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

Fix fromMultiPiece call

Browse Source
This commit is contained in:
Michael Snoyman 2011-04-05 00:52:25 +03:00
parent 372bcf52d8
commit 5e5125a5ac
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/CleanPath.hs
View File

@ -3,7 +3,7 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
module Test.CleanPath (cleanPathTest) where module Test.CleanPath (cleanPathTest) where
import Yesod.Core import Yesod.Core hiding (Request)
import Yesod.Content import Yesod.Content
import Yesod.Dispatch import Yesod.Dispatch
import Yesod.Handler (Route) import Yesod.Handler (Route)

2
Test/Exceptions.hs
View File

@ -3,7 +3,7 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
module Test.Exceptions (exceptionsTest) where module Test.Exceptions (exceptionsTest) where
import Yesod.Core import Yesod.Core hiding (Request)
import Yesod.Content import Yesod.Content
import Yesod.Dispatch import Yesod.Dispatch
import Yesod.Handler (Route, ErrorResponse (InternalError)) import Yesod.Handler (Route, ErrorResponse (InternalError))

4
Test/Widget.hs
View File

@ -3,7 +3,7 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
module Test.Widget (widgetTest) where module Test.Widget (widgetTest) where
import Yesod.Core import Yesod.Core hiding (Request)
import Yesod.Content import Yesod.Content
import Yesod.Dispatch import Yesod.Dispatch
import Yesod.Widget import Yesod.Widget
@ -20,12 +20,14 @@ import qualified Data.ByteString.Lazy.Char8 as L8
data Y = Y data Y = Y
mkYesod "Y" [$parseRoutes| mkYesod "Y" [$parseRoutes|
/ RootR GET / RootR GET
/foo/*Strings MultiR GET
|] |]
instance Yesod Y where instance Yesod Y where
approot _ = "http://test" approot _ = "http://test"
getRootR = defaultLayout $ addJuliusBody [$julius|<not escaped>|] getRootR = defaultLayout $ addJuliusBody [$julius|<not escaped>|]
getMultiR _ = return ()
widgetTest :: Test widgetTest :: Test
widgetTest = testGroup "Test.Exceptions" widgetTest = testGroup "Test.Exceptions"

4
Yesod/Internal/Dispatch.hs
View File

@ -228,11 +228,11 @@ mkSimpleExp segments [MultiPiece _] frontVars x = do
fmp <- [|fromMultiPiece|] fmp <- [|fromMultiPiece|]
let exp = CaseE (fmp `AppE` segments) let exp = CaseE (fmp `AppE` segments)
[ Match [ Match
(ConP (mkName "Left") [WildP]) (ConP (mkName "Nothing") [])
(NormalB nothing) (NormalB nothing)
[] []
, Match , Match
(ConP (mkName "Right") [VarP next']) (ConP (mkName "Just") [VarP next'])
(NormalB innerExp) (NormalB innerExp)
[] []
] ]