@@ -24,14 +24,14 @@ import qualified Control.Monad.Trans.Reader as T
2424import Control.Lens
2525import Control.Ether.Flatten
2626
27−data FLATTEN (ts :: [k])
27+data READER (ts :: [k])
2828
29−type FlattenT ts r = Dispatch (FLATTEN ts) (T.ReaderT r)
29+type ReaderT ts r = Dispatch (READER ts) (T.ReaderT r)
3030
3131reflatten
3232 :: forall tagsOld tagsNew r m a
33− . FlattenT tagsOld r m a
34− -> FlattenT tagsNew r m a
33+ . ReaderT tagsOld r m a
34+ -> ReaderT tagsNew r m a
3535reflatten = repack
3636{-# INLINE reflatten #-}
3737
@@ -40,7 +40,7 @@ instance
4040 , Lift.MonadTrans trans
4141 , Lift.LiftLocal trans
4242 , C.MonadReader tag r m
43− ) => C.MonadReader tag r (Dispatch (FLATTEN '[]) trans m)
43+ ) => C.MonadReader tag r (Dispatch (READER '[]) trans m)
4444 where
4545 ask t = Lift.lift (ask t)
4646 local t = Lift.liftLocal (ask t) (local t)
@@ -48,16 +48,16 @@ instance
4848instance
4949 ( Monad m, HasLens tag payload r
5050 , trans ~ T.ReaderT payload
51− ) => C.MonadReader tag r (Dispatch (FLATTEN (tag ': tags)) trans m)
51+ ) => C.MonadReader tag r (Dispatch (READER (tag ': tags)) trans m)
5252 where
5353 ask t = pack $ view (lensOf t)
5454 local t f = pack . T.local (over (lensOf t) f) . unpack
5555
5656instance {-# OVERLAPPABLE #-}
5757 ( Monad m
58− , C.MonadReader tag r (Dispatch (FLATTEN tags) trans m)
58+ , C.MonadReader tag r (Dispatch (READER tags) trans m)
5959 , trans ~ T.ReaderT payload
60− ) => C.MonadReader tag r (Dispatch (FLATTEN (t ': tags)) trans m)
60+ ) => C.MonadReader tag r (Dispatch (READER (t ': tags)) trans m)
6161 where
6262 ask t = reflatten @tags @(t ': tags) (C.ask t)
6363 {-# INLINE ask #-}
@@ -68,13 +68,13 @@ instance {-# OVERLAPPABLE #-}
6868 {-# INLINE local #-}
6969
7070runReaderT
71− :: FlattenT tags (Product tags as) m a
71+ :: ReaderT tags (Product tags as) m a
7272 -> Product tags as
7373 -> m a
7474runReaderT m = T.runReaderT (unpack m)
7575
7676runReader
77− :: FlattenT tags (Product tags as) Identity a
77+ :: ReaderT tags (Product tags as) Identity a
7878 -> Product tags as
7979 -> a
8080runReader m = T.runReader (unpack m)