git.iko.soy/typeable/ether
on master help sign in
Rename 'dp' parameter to 'eff'
commit0218d60762d1310fe35bce1151f39b2d66b4978e authorVladislav Zavialov <vlad.z.4096@gmail.com> dateMon 24 Apr 2017, 02:09 (9 years ago) parent3ccb37b
8 files changed+81−81
compare with master
unifiedsplit
src/Control/Monad/Ether/Except.hs+2−2 src/Control/Monad/Ether/Reader.hs+9−9 src/Control/Monad/Ether/Reader/Class.hs+8−8 src/Control/Monad/Ether/State/Class.hs+8−8 src/Control/Monad/Ether/State/Common.hs+11−11 src/Control/Monad/Ether/State/Zoom.hs+3−3 src/Control/Monad/Ether/Writer.hs+3−3 src/Control/Monad/Trans/Ether/Handler.hs+37−37
src/Control/Monad/Ether/Except.hs+2−2
@@ -79,11 +79,11 @@ instance
7979 throw =
8080 handling @EXCEPT @e @trans @m $
8181 coerce (T.throwError @e @(trans m) @a) ::
82− forall dp a . e -> Handler dp trans m a
82+ forall eff a . e -> Handler eff trans m a
8383 {-# INLINE throw #-}
8484
8585 catch =
8686 handling @EXCEPT @e @trans @m $
8787 coerce (T.catchError @e @(trans m) @a) ::
88− forall dp a . Catch e (Handler dp trans m) a
88+ forall eff a . Catch e (Handler eff trans m) a
8989 {-# INLINE catch #-}
src/Control/Monad/Ether/Reader.hs+9−9
@@ -95,34 +95,34 @@ instance
9595 local =
9696 handling @READER @r @trans @m $
9797 coerce (T.local @r @(trans m) @a) ::
98− forall dp a . Local r (Handler dp trans m) a
98+ forall eff a . Local r (Handler eff trans m) a
9999 {-# INLINE local #-}
100100
101101 reader =
102102 handling @READER @r @trans @m $
103103 coerce (T.reader @r @(trans m) @a) ::
104− forall dp a . (r -> a) -> Handler dp trans m a
104+ forall eff a . (r -> a) -> Handler eff trans m a
105105 {-# INLINE reader #-}
106106
107107instance
108108 ( HasLens tag payload r
109109 , Handle READER payload trans
110110 , Monad m, Monad (trans m)
111− ) => MonadReader tag r (Handler (TAGGED READER tag ': dps) trans m)
111+ ) => MonadReader tag r (Handler (TAGGED READER tag ': effs) trans m)
112112 where
113113
114114 ask =
115115 handling @READER @payload @trans @m $
116− (coerce :: forall dp a .
117− trans m a ->
118− Handler dp trans m a)
116+ (coerce :: forall eff a .
117+ trans m a ->
118+ Handler eff trans m a)
119119 (T.asks (view (lensOf @tag @payload @r)))
120120 {-# INLINE ask #-}
121121
122122 local f =
123123 handling @READER @payload @trans @m $
124− (coerce :: forall dp a .
125− (trans m a -> trans m a) ->
126− (Handler dp trans m a -> Handler dp trans m a))
124+ (coerce :: forall eff a .
125+ (trans m a -> trans m a) ->
126+ (Handler eff trans m a -> Handler eff trans m a))
127127 (T.local (over (lensOf @tag @payload @r) f))
128128 {-# INLINE local #-}
src/Control/Monad/Ether/Reader/Class.hs+8−8
@@ -51,27 +51,27 @@ instance {-# OVERLAPPABLE #-}
5151
5252instance {-# OVERLAPPABLE #-}
5353 ( Monad (trans m)
54− , MonadReader tag r (Handler dps trans m)
55− ) => MonadReader tag r (Handler (dp ': dps) trans (m :: K.Type -> K.Type))
54+ , MonadReader tag r (Handler effs trans m)
55+ ) => MonadReader tag r (Handler (eff ': effs) trans (m :: K.Type -> K.Type))
5656 where
5757
5858 ask =
5959 (coerce ::
60− Handler dps trans m r ->
61− Handler (dp ': dps) trans m r)
60+ Handler effs trans m r ->
61+ Handler (eff ': effs) trans m r)
6262 (ask @tag)
6363 {-# INLINE ask #-}
6464
6565 local =
6666 (coerce :: forall a .
67− Lift.Local r (Handler dps trans m) a ->
68− Lift.Local r (Handler (dp ': dps) trans m) a)
67+ Lift.Local r (Handler effs trans m) a ->
68+ Lift.Local r (Handler (eff ': effs) trans m) a)
6969 (local @tag)
7070 {-# INLINE local #-}
7171
7272 reader =
7373 (coerce :: forall a .
74− ((r -> a) -> Handler dps trans m a) ->
75− ((r -> a) -> Handler (dp ': dps) trans m a))
74+ ((r -> a) -> Handler effs trans m a) ->
75+ ((r -> a) -> Handler (eff ': effs) trans m a))
7676 (reader @tag)
7777 {-# INLINE reader #-}
src/Control/Monad/Ether/State/Class.hs+8−8
@@ -48,27 +48,27 @@ instance {-# OVERLAPPABLE #-}
4848
4949instance {-# OVERLAPPABLE #-}
5050 ( Monad (trans m)
51− , MonadState tag s (Handler dps trans m)
52− ) => MonadState tag s (Handler (dp ': dps) trans (m :: K.Type -> K.Type))
51+ , MonadState tag s (Handler effs trans m)
52+ ) => MonadState tag s (Handler (eff ': effs) trans (m :: K.Type -> K.Type))
5353 where
5454
5555 get =
5656 (coerce ::
57− Handler dps trans m s ->
58− Handler (dp ': dps) trans m s)
57+ Handler effs trans m s ->
58+ Handler (eff ': effs) trans m s)
5959 (get @tag)
6060 {-# INLINE get #-}
6161
6262 put =
6363 (coerce ::
64− (s -> Handler dps trans m ()) ->
65− (s -> Handler (dp ': dps) trans m ()))
64+ (s -> Handler effs trans m ()) ->
65+ (s -> Handler (eff ': effs) trans m ()))
6666 (put @tag)
6767 {-# INLINE put #-}
6868
6969 state =
7070 (coerce :: forall a .
71− ((s -> (a, s)) -> Handler dps trans m a) ->
72− ((s -> (a, s)) -> Handler (dp ': dps) trans m a))
71+ ((s -> (a, s)) -> Handler effs trans m a) ->
72+ ((s -> (a, s)) -> Handler (eff ': effs) trans m a))
7373 (state @tag)
7474 {-# INLINE state #-}
src/Control/Monad/Ether/State/Common.hs+11−11
@@ -55,36 +55,36 @@ instance
5555 state =
5656 handling @STATE @s @trans @m $
5757 coerce (T.state @s @(trans m) @a) ::
58− forall dp a . (s -> (a, s)) -> Handler dp trans m a
58+ forall eff a . (s -> (a, s)) -> Handler eff trans m a
5959 {-# INLINE state #-}
6060
6161instance
6262 ( HasLens tag payload s
6363 , Handle STATE payload trans
6464 , Monad m, Monad (trans m)
65− ) => MonadState tag s (Handler (TAGGED STATE tag ': dps) trans m)
65+ ) => MonadState tag s (Handler (TAGGED STATE tag ': effs) trans m)
6666 where
6767
6868 get =
6969 handling @STATE @payload @trans @m $
70− (coerce :: forall dp a .
71− trans m a ->
72− Handler dp trans m a)
70+ (coerce :: forall eff a .
71+ trans m a ->
72+ Handler eff trans m a)
7373 (T.gets (view (lensOf @tag @payload @s)))
7474 {-# INLINE get #-}
7575
7676 put s =
7777 handling @STATE @payload @trans @m $
78− (coerce :: forall dp a .
79− trans m a ->
80− Handler dp trans m a)
78+ (coerce :: forall eff a .
79+ trans m a ->
80+ Handler eff trans m a)
8181 (T.modify (over (lensOf @tag @payload @s) (const s)))
8282 {-# INLINE put #-}
8383
8484 state f =
8585 handling @STATE @payload @trans @m $
86− (coerce :: forall dp a .
87− trans m a ->
88− Handler dp trans m a)
86+ (coerce :: forall eff a .
87+ trans m a ->
88+ Handler eff trans m a)
8989 (T.state (lensOf @tag @payload @s f))
9090 {-# INLINE state #-}
src/Control/Monad/Ether/State/Zoom.hs+3−3
@@ -39,9 +39,9 @@ instance
3939 ) => MonadState tag sInner (Handler (TAG_ZOOM tag z) trans m)
4040 where
4141 state =
42− (coerce :: forall dp r a .
43− (r -> m a) ->
44− (r -> Handler dp trans m a))
42+ (coerce :: forall eff r a .
43+ (r -> m a) ->
44+ (r -> Handler eff trans m a))
4545 (state @tag . l)
4646 where
4747 Lens l = reflect (Proxy :: Proxy z)
src/Control/Monad/Ether/Writer.hs+3−3
@@ -100,7 +100,7 @@ instance
100100 writer =
101101 handling @WRITER @w @trans @m $
102102 coerce (T.writer @w @(trans m) @a) ::
103− forall dp a . (a, w) -> Handler dp trans m a
103+ forall eff a . (a, w) -> Handler eff trans m a
104104 {-# INLINE writer #-}
105105
106106 tell =
@@ -111,11 +111,11 @@ instance
111111 listen =
112112 handling @WRITER @w @trans @m $
113113 coerce (T.listen @w @(trans m) @a) ::
114− forall dp a . Listen w (Handler dp trans m) a
114+ forall eff a . Listen w (Handler eff trans m) a
115115 {-# INLINE listen #-}
116116
117117 pass =
118118 handling @WRITER @w @trans @m $
119119 coerce (T.pass @w @(trans m) @a) ::
120− forall dp a . Pass w (Handler dp trans m) a
120+ forall eff a . Pass w (Handler eff trans m) a
121121 {-# INLINE pass #-}
src/Control/Monad/Trans/Ether/Handler.hs+37−37
@@ -29,37 +29,37 @@ import qualified Control.Monad.Error.Class as Class
2929import GHC.Generics (Generic)
3030import Data.Coerce (coerce)
3131
32−newtype Handler dp trans m a = Handler (trans m a)
32+newtype Handler eff trans m a = Handler (trans m a)
3333 deriving
3434 ( Generic
3535 , Functor, Applicative, Alternative, Monad, MonadPlus
3636 , MonadFix, MonadTrans, MonadIO, MFunctor, MMonad
3737 , MonadThrow, MonadCatch, MonadMask )
3838
39−type Pack dp trans m a = trans m a -> Handler dp trans m a
39+type Pack eff trans m a = trans m a -> Handler eff trans m a
4040
41−type Unpack dp trans m a = Handler dp trans m a -> trans m a
41+type Unpack eff trans m a = Handler eff trans m a -> trans m a
4242
4343instance
4444 ( MB.MonadBase b (trans m)
45− ) => MB.MonadBase b (Handler dp trans m)
45+ ) => MB.MonadBase b (Handler eff trans m)
4646 where
4747 liftBase =
4848 (coerce :: forall a .
4949 (b a -> trans m a) ->
50− (b a -> Handler dp trans m a))
50+ (b a -> Handler eff trans m a))
5151 MB.liftBase
5252
5353instance
5454 ( MC.MonadTransControl trans
55− ) => MC.MonadTransControl (Handler dp trans)
55+ ) => MC.MonadTransControl (Handler eff trans)
5656 where
57− type StT (Handler dp trans) a = MC.StT trans a
57+ type StT (Handler eff trans) a = MC.StT trans a
5858 liftWith = MC.defaultLiftWith
59− (coerce :: Pack dp trans m a)
60− (coerce :: Unpack dp trans m a)
59+ (coerce :: Pack eff trans m a)
60+ (coerce :: Unpack eff trans m a)
6161 restoreT = MC.defaultRestoreT
62− (coerce :: Pack dp trans m a)
62+ (coerce :: Pack eff trans m a)
6363
6464type LiftBaseWith b m a = (MC.RunInBase m b -> b a) -> m a
6565
@@ -67,16 +67,16 @@ newtype LiftBaseWith' b m a = LBW { unLBW :: LiftBaseWith b m a }
6767
6868coerceLiftBaseWith ::
6969 LiftBaseWith b (trans m) a ->
70− LiftBaseWith b (Handler dp trans m) a
70+ LiftBaseWith b (Handler eff trans m) a
7171coerceLiftBaseWith lbw =
7272 unLBW (coerce (LBW lbw))
7373{-# INLINE coerceLiftBaseWith #-}
7474
7575instance
7676 ( MC.MonadBaseControl b (trans m)
77− ) => MC.MonadBaseControl b (Handler dp trans m)
77+ ) => MC.MonadBaseControl b (Handler eff trans m)
7878 where
79− type StM (Handler dp trans m) a = MC.StM (trans m) a
79+ type StM (Handler eff trans m) a = MC.StM (trans m) a
8080
8181 liftBaseWith = coerceLiftBaseWith MC.liftBaseWith
8282 {-# INLINE liftBaseWith #-}
@@ -84,45 +84,45 @@ instance
8484 restoreM =
8585 (coerce :: forall a .
8686 (MC.StM (trans m) a -> trans m a) ->
87− (MC.StM (trans m) a -> Handler dp trans m a))
87+ (MC.StM (trans m) a -> Handler eff trans m a))
8888 MC.restoreM
8989 {-# INLINE restoreM #-}
9090
91−type instance Lift.StT (Handler dp trans) a = Lift.StT trans a
91+type instance Lift.StT (Handler eff trans) a = Lift.StT trans a
9292
93−instance Lift.LiftLocal trans => Lift.LiftLocal (Handler dp trans) where
93+instance Lift.LiftLocal trans => Lift.LiftLocal (Handler eff trans) where
9494 liftLocal =
9595 Lift.defaultLiftLocal
96− (coerce :: Pack dp trans m a)
97− (coerce :: Unpack dp trans m a)
96+ (coerce :: Pack eff trans m a)
97+ (coerce :: Unpack eff trans m a)
9898
99−instance Lift.LiftCatch trans => Lift.LiftCatch (Handler dp trans) where
99+instance Lift.LiftCatch trans => Lift.LiftCatch (Handler eff trans) where
100100 liftCatch =
101101 Lift.defaultLiftCatch
102− (coerce :: Pack dp trans m a)
103− (coerce :: Unpack dp trans m a)
102+ (coerce :: Pack eff trans m a)
103+ (coerce :: Unpack eff trans m a)
104104
105−instance Lift.LiftListen trans => Lift.LiftListen (Handler dp trans) where
105+instance Lift.LiftListen trans => Lift.LiftListen (Handler eff trans) where
106106 liftListen =
107107 Lift.defaultLiftListen
108− (coerce :: Pack dp trans m a)
109− (coerce :: Unpack dp trans m a)
108+ (coerce :: Pack eff trans m a)
109+ (coerce :: Unpack eff trans m a)
110110
111−instance Lift.LiftPass trans => Lift.LiftPass (Handler dp trans) where
111+instance Lift.LiftPass trans => Lift.LiftPass (Handler eff trans) where
112112 liftPass =
113113 Lift.defaultLiftPass
114− (coerce :: Pack dp trans m a)
115− (coerce :: Unpack dp trans m a)
114+ (coerce :: Pack eff trans m a)
115+ (coerce :: Unpack eff trans m a)
116116
117−instance Lift.LiftCallCC trans => Lift.LiftCallCC (Handler dp trans) where
117+instance Lift.LiftCallCC trans => Lift.LiftCallCC (Handler eff trans) where
118118 liftCallCC =
119119 Lift.defaultLiftCallCC
120− (coerce :: Pack dp trans m a)
121− (coerce :: Unpack dp trans m a)
120+ (coerce :: Pack eff trans m a)
121+ (coerce :: Unpack eff trans m a)
122122 liftCallCC' =
123123 Lift.defaultLiftCallCC'
124− (coerce :: Pack dp trans m a)
125− (coerce :: Unpack dp trans m a)
124+ (coerce :: Pack eff trans m a)
125+ (coerce :: Unpack eff trans m a)
126126
127127
128128-- Instances for mtl classes
@@ -131,7 +131,7 @@ instance {-# OVERLAPPABLE #-}
131131 ( Class.MonadCont m
132132 , Lift.LiftCallCC trans
133133 , Monad (trans m)
134− ) => Class.MonadCont (Handler dp trans m)
134+ ) => Class.MonadCont (Handler eff trans m)
135135 where
136136 callCC = Lift.liftCallCC' Class.callCC
137137
@@ -139,7 +139,7 @@ instance {-# OVERLAPPABLE #-}
139139 ( Class.MonadReader r m
140140 , Lift.LiftLocal trans
141141 , Monad (trans m)
142− ) => Class.MonadReader r (Handler dp trans m)
142+ ) => Class.MonadReader r (Handler eff trans m)
143143 where
144144 ask = lift Class.ask
145145 local = Lift.liftLocal Class.ask Class.local
@@ -149,7 +149,7 @@ instance {-# OVERLAPPABLE #-}
149149 ( Class.MonadState s m
150150 , MonadTrans trans
151151 , Monad (trans m)
152− ) => Class.MonadState s (Handler dp trans m)
152+ ) => Class.MonadState s (Handler eff trans m)
153153 where
154154 get = lift Class.get
155155 put = lift . Class.put
@@ -160,7 +160,7 @@ instance {-# OVERLAPPABLE #-}
160160 , Lift.LiftListen trans
161161 , Lift.LiftPass trans
162162 , Monad (trans m)
163− ) => Class.MonadWriter w (Handler dp trans m)
163+ ) => Class.MonadWriter w (Handler eff trans m)
164164 where
165165 writer = lift . Class.writer
166166 tell = lift . Class.tell
@@ -171,7 +171,7 @@ instance {-# OVERLAPPABLE #-}
171171 ( Class.MonadError e m
172172 , Lift.LiftCatch trans
173173 , Monad (trans m)
174− ) => Class.MonadError e (Handler dp trans m)
174+ ) => Class.MonadError e (Handler eff trans m)
175175 where
176176 throwError = lift . Class.throwError
177177 catchError = Lift.liftCatch Class.catchError