Allow newer versions of template-haskell

src/Routes/Routes.hs

@@ -25,7 +25,10 @@ module Routes.Routes
 
     -- * Template Haskell methods
     , mkRoute
+    , mkRouteData
+    , mkRouteDispatch
     , mkRouteSub
+    , mkRouteSubDispatch
 
     -- * Dispatch
     , routeDispatch

src/Routes/TH/Dispatch.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE RecordWildCards, TemplateHaskell, ViewPatterns #-}
+{-# LANGUAGE RecordWildCards, TemplateHaskell, ViewPatterns, CPP #-}
 module Routes.TH.Dispatch
     ( MkDispatchSettings (..)
     , mkDispatchClause
@@ -73,7 +73,11 @@ mkDispatchClause MkDispatchSettings {..} resources = do
     handlePiece (Static str) = return (LitP $ StringL str, Nothing)
     handlePiece (Dynamic _) = do
         x <- newName "dyn"
+#if MIN_VERSION_template_haskell(2,18,0)
+        let pat = ViewP (VarE 'fromPathPiece) (ConP 'Just [] [VarP x])
+#else
         let pat = ViewP (VarE 'fromPathPiece) (ConP 'Just [VarP x])
+#endif
         return (pat, Just $ VarE x)
 
     handlePieces :: [Piece a] -> Q ([Pat], [Exp])
@@ -86,7 +90,11 @@ mkDispatchClause MkDispatchSettings {..} resources = do
     mkPathPat final =
         foldr addPat final
       where
+#if MIN_VERSION_template_haskell(2,18,0)
+        addPat x y = ConP '(:) [] [x, y]
+#else
         addPat x y = ConP '(:) [x, y]
+#endif
 
     go :: SDC -> ResourceTree a -> Q Clause
     go sdc (ResourceParent name _check pieces children) = do
@@ -124,11 +132,19 @@ mkDispatchClause MkDispatchSettings {..} resources = do
                 Methods multi methods -> do
                     (finalPat, mfinalE) <-
                         case multi of
+#if MIN_VERSION_template_haskell(2,18,0)
+                            Nothing -> return (ConP '[] [] [], Nothing)
+#else
                             Nothing -> return (ConP '[] [], Nothing)
+#endif
                             Just _ -> do
                                 multiName <- newName "multi"
                                 let pat = ViewP (VarE 'fromPathMultiPiece)
+#if MIN_VERSION_template_haskell(2,18,0)
+                                                (ConP 'Just [] [VarP multiName])
+#else
                                                 (ConP 'Just [VarP multiName])
+#endif
                                 return (pat, Just $ VarE multiName)
 
                     let dynsMulti =

src/Routes/TH/RenderRoute.hs

@@ -67,7 +67,11 @@ mkRenderRouteClauses =
         let cnt = length $ filter isDynamic pieces
         dyns <- replicateM cnt $ newName "dyn"
         child <- newName "child"
+#if MIN_VERSION_template_haskell(2,18,0)
+        let pat = ConP (mkName name) [] $ map VarP $ dyns ++ [child]
+#else
         let pat = ConP (mkName name) $ map VarP $ dyns ++ [child]
+#endif
 
         pack' <- [|pack|]
         tsp <- [|toPathPiece|]
@@ -100,7 +104,11 @@ mkRenderRouteClauses =
             case resourceDispatch res of
                 Subsite{} -> return <$> newName "sub"
                 _ -> return []
+#if MIN_VERSION_template_haskell(2,18,0)
+        let pat = ConP (mkName $ resourceName res) [] $ map VarP $ dyns ++ sub
+#else
         let pat = ConP (mkName $ resourceName res) $ map VarP $ dyns ++ sub
+#endif
 
         pack' <- [|pack|]
         tsp <- [|toPathPiece|]

src/Routes/TH/RouteAttrs.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE CPP #-}
 module Routes.TH.RouteAttrs
     ( mkRouteAttrsInstance
     ) where
@@ -26,7 +27,11 @@ goTree front (ResourceParent name _check pieces trees) =
     toIgnore = length $ filter isDynamic pieces
     isDynamic Dynamic{} = True
     isDynamic Static{} = False
+#if MIN_VERSION_template_haskell(2,18,0)
+    front' = front . ConP (mkName name) [] . ignored
+#else
     front' = front . ConP (mkName name) . ignored
+#endif
 
 goRes :: (Pat -> Pat) -> Resource a -> Q Clause
 goRes front Resource {..} =

src/Wai/Routes.hs

@@ -17,7 +17,10 @@ module Wai.Routes
     , parseRoutesFileNoCheck -- | Same as parseRoutesFile, but performs no overlap checking.
 
     , mkRoute
+    , mkRouteData
+    , mkRouteDispatch
     , mkRouteSub
+    , mkRouteSubDispatch
 
     -- * Dispatch
     , routeDispatch

wai-routes.cabal

@@ -1,5 +1,5 @@
 name               : wai-routes
-version            : 0.10.4
+version            : 0.10.5
 cabal-version      : 1.18
 build-type         : Simple
 license            : MIT
@@ -14,14 +14,9 @@ author             : Anupam Jain
 data-dir           : ""
 extra-source-files : README.md
 
-source-repository head
-    type     : git
-    location : http://github.com/ajnsit/wai-routes
-
 source-repository this
     type     : git
-    location : http://github.com/ajnsit/wai-routes/tree/v0.10.4
-    tag      : v0.10.4
+    location : http://github.com/ajnsit/wai-routes
 
 library
     build-depends      : base