@@ -9,7 +9,11 @@ module Control.Has
99 ) where
1010
1111import Control.Lens
12+-- reexport all from Reader except Control.Monad etc
13+-- to correspond mtl-2.3+
1214import Control.Monad.Reader as X
15+ ( MonadReader(..), asks, Reader, runReader, mapReader, withReader
16+ , ReaderT(ReaderT), runReaderT, mapReaderT, withReaderT )
1317import Data.Kind
1418import GHC.Generics as G
1519
@@ -20,11 +24,11 @@ class Has x r where
2024instance {-# OVERLAPS #-} Has r r where
2125 part = id
2226
23−type family HasAll (xs :: [*]) r :: Constraint where
27+type family HasAll (xs :: [Type]) r :: Constraint where
2428 HasAll '[] r = ()
2529 HasAll (x ': xs) r = (Has x r, HasAll xs r)
2630
27−data LensList (r :: *) (es :: [*]) where
31+data LensList (r :: Type) (es :: [Type]) where
2832 LLNil :: LensList r '[]
2933 LLCons :: Lens r r e e -> LensList r es -> LensList r (e ': es)
3034
@@ -32,7 +36,7 @@ mapLL :: Lens s s r r -> LensList r es -> LensList s es
3236mapLL _ LLNil = LLNil
3337mapLL m (LLCons l ls) = LLCons (m . l) (mapLL m ls)
3438
35−type family (xs :: [*]) ++ (ys :: [*]) :: [*] where
39+type family (xs :: [Type]) ++ (ys :: [Type]) :: [Type] where
3640 '[] ++ ys = ys
3741 (x ': xs) ++ ys = x ': (xs ++ ys)
3842
@@ -43,7 +47,7 @@ concatLL (LLCons l ls) ys = LLCons l (concatLL ls ys)
4347-- borrowed from Data.HSet.Get
4448data N = Z | S N
4549
46−type family IndexOf (x :: *) (xs :: [*]) :: N where
50+type family IndexOf (x :: Type) (xs :: [Type]) :: N where
4751 IndexOf x (x ': _) = 'Z
4852 IndexOf x (_ ': xs) = 'S (IndexOf x xs)
4953
@@ -52,8 +56,8 @@ class (i ~ IndexOf e es) => GetLens e es i | i es -> e where
5256
5357type Elem e es = GetLens e es (IndexOf e es)
5458
55−class Fieldy (r :: *) where
56− type Fields r :: [*]
59+class Fieldy (r :: Type) where
60+ type Fields r :: [Type]
5761 type Fields r = GFields (Rep r)
5862 lensList :: LensList r (Fields r)
5963 default lensList
@@ -73,16 +77,16 @@ instance (GetLens e' es n, 'S n ~ IndexOf e' (e ': es))
7377 => GetLens e' (e ': es) ('S n) where
7478 getLens (LLCons _ ls) = getLens ls
7579
76−class GFieldy (r :: * -> *) where
77− type GFields r :: [*]
80+class GFieldy (r :: Type -> Type) where
81+ type GFields r :: [Type]
7882 glensList :: LensList (r x) (GFields r)
7983
8084instance GFieldyProduct r => GFieldy (D1 d (C1 c r)) where
8185 type GFields (D1 d (C1 c r)) = GFieldsProduct r
8286 glensList = mapLL (iso unM1 M1 . iso unM1 M1) glensListProduct
8387
84−class GFieldyProduct (r :: * -> *) where
85− type GFieldsProduct r :: [*]
88+class GFieldyProduct (r :: Type -> Type) where
89+ type GFieldsProduct r :: [Type]
8690 glensListProduct :: LensList (r x) (GFieldsProduct r)
8791
8892instance (GFieldyProduct r, GFieldyProduct s) => GFieldyProduct (r :*: s) where
@@ -101,7 +105,7 @@ instance GFieldyProduct (S1 s (K1 k r)) where
101105 type GFieldsProduct (S1 s (K1 k r)) = '[r]
102106 glensListProduct = LLCons (iso unM1 M1 . iso unK1 K1) LLNil
103107
104−type family AllElem (xs :: [*]) (es :: [*]) :: Constraint where
108+type family AllElem (xs :: [Type]) (es :: [Type]) :: Constraint where
105109 AllElem '[] _ = ()
106110 AllElem (x ': xs) es = (Elem x es, AllElem xs es)
107111