@@ -9,11 +9,7 @@ module Control.Has
99 ) where
1010
1111import Control.Lens
12−-- reexport all from Reader except Control.Monad etc
13−-- to correspond mtl-2.3+
1412import Control.Monad.Reader as X
15− ( MonadReader(..), asks, Reader, runReader, mapReader, withReader
16− , ReaderT(ReaderT), runReaderT, mapReaderT, withReaderT )
1713import Data.Kind
1814import GHC.Generics as G
1915
@@ -24,11 +20,11 @@ class Has x r where
2420instance {-# OVERLAPS #-} Has r r where
2521 part = id
2622
27−type family HasAll (xs :: [Type]) r :: Constraint where
23+type family HasAll (xs :: [*]) r :: Constraint where
2824 HasAll '[] r = ()
2925 HasAll (x ': xs) r = (Has x r, HasAll xs r)
3026
31−data LensList (r :: Type) (es :: [Type]) where
27+data LensList (r :: *) (es :: [*]) where
3228 LLNil :: LensList r '[]
3329 LLCons :: Lens r r e e -> LensList r es -> LensList r (e ': es)
3430
@@ -36,7 +32,7 @@ mapLL :: Lens s s r r -> LensList r es -> LensList s es
3632mapLL _ LLNil = LLNil
3733mapLL m (LLCons l ls) = LLCons (m . l) (mapLL m ls)
3834
39−type family (xs :: [Type]) ++ (ys :: [Type]) :: [Type] where
35+type family (xs :: [*]) ++ (ys :: [*]) :: [*] where
4036 '[] ++ ys = ys
4137 (x ': xs) ++ ys = x ': (xs ++ ys)
4238
@@ -47,7 +43,7 @@ concatLL (LLCons l ls) ys = LLCons l (concatLL ls ys)
4743-- borrowed from Data.HSet.Get
4844data N = Z | S N
4945
50−type family IndexOf (x :: Type) (xs :: [Type]) :: N where
46+type family IndexOf (x :: *) (xs :: [*]) :: N where
5147 IndexOf x (x ': _) = 'Z
5248 IndexOf x (_ ': xs) = 'S (IndexOf x xs)
5349
@@ -56,8 +52,8 @@ class (i ~ IndexOf e es) => GetLens e es i | i es -> e where
5652
5753type Elem e es = GetLens e es (IndexOf e es)
5854
59−class Fieldy (r :: Type) where
60− type Fields r :: [Type]
55+class Fieldy (r :: *) where
56+ type Fields r :: [*]
6157 type Fields r = GFields (Rep r)
6258 lensList :: LensList r (Fields r)
6359 default lensList
@@ -77,16 +73,16 @@ instance (GetLens e' es n, 'S n ~ IndexOf e' (e ': es))
7773 => GetLens e' (e ': es) ('S n) where
7874 getLens (LLCons _ ls) = getLens ls
7975
80−class GFieldy (r :: Type -> Type) where
81− type GFields r :: [Type]
76+class GFieldy (r :: * -> *) where
77+ type GFields r :: [*]
8278 glensList :: LensList (r x) (GFields r)
8379
8480instance GFieldyProduct r => GFieldy (D1 d (C1 c r)) where
8581 type GFields (D1 d (C1 c r)) = GFieldsProduct r
8682 glensList = mapLL (iso unM1 M1 . iso unM1 M1) glensListProduct
8783
88−class GFieldyProduct (r :: Type -> Type) where
89− type GFieldsProduct r :: [Type]
84+class GFieldyProduct (r :: * -> *) where
85+ type GFieldsProduct r :: [*]
9086 glensListProduct :: LensList (r x) (GFieldsProduct r)
9187
9288instance (GFieldyProduct r, GFieldyProduct s) => GFieldyProduct (r :*: s) where
@@ -105,7 +101,7 @@ instance GFieldyProduct (S1 s (K1 k r)) where
105101 type GFieldsProduct (S1 s (K1 k r)) = '[r]
106102 glensListProduct = LLCons (iso unM1 M1 . iso unK1 K1) LLNil
107103
108−type family AllElem (xs :: [Type]) (es :: [Type]) :: Constraint where
104+type family AllElem (xs :: [*]) (es :: [*]) :: Constraint where
109105 AllElem '[] _ = ()
110106 AllElem (x ': xs) es = (Elem x es, AllElem xs es)
111107