Fix fromMultiPiece call

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

View File

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

View File

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

View File

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

View File

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