git.iko.soy/typeable/control-has
on 32f4a77 help sign in
8dc5474
swap
0 ahead, 6 behind
.gitignoredeleted−1
since splitsnapshots
unifiedsplit
@@ -1 +0,0 @@
1−.stack-work
control-has.cabal+36−39
@@ -1,41 +1,38 @@
1−cabal-version: 2.4
1+cabal-version: 2.4
2−name: control-has
2+name: control-has
3−version: 0.2.0.0
3+version: 0.1.0.0
4−synopsis: Typeclass for things that have parts
4+synopsis: Typeclass for things that have parts
5−license-file: LICENSE
5+license-file: LICENSE
6−build-type: Simple
6+build-type: Simple
7
7
8library
8library
9− hs-source-dirs: src
9+ hs-source-dirs: src
10− ghc-options: -Wall
10+ ghc-options: -Wall
11− exposed-modules:
11+ exposed-modules: Control.Has
12− Control.EnvT
12+ Control.EnvT
13− Control.Has
14−
15− build-depends:
13+ build-depends: base
16− , base >=4.10
17− , exceptions
14+ , exceptions
18− , lens
15+ , lens
19− , monad-control
16+ , monad-control
20− , mtl
17+ , mtl
21− , resourcet
18+ , resourcet
22− , transformers-base
19+ , transformers-base
23−
20+ if !impl(ghcjs)
21+ build-depends: katip
24− default-language: Haskell2010
22+ default-language: Haskell2010
25− default-extensions:
23+ default-extensions: ConstraintKinds
26− ConstraintKinds
27− DataKinds
24+ , DataKinds
28− DefaultSignatures
25+ , DefaultSignatures
29− DerivingStrategies
26+ , DerivingStrategies
30− FlexibleContexts
27+ , FlexibleContexts
31− FlexibleInstances
28+ , FlexibleInstances
32− FunctionalDependencies
29+ , FunctionalDependencies
33− GADTs
30+ , GADTs
34− GeneralizedNewtypeDeriving
31+ , GeneralizedNewtypeDeriving
35− KindSignatures
32+ , KindSignatures
36− RankNTypes
33+ , RankNTypes
37− StandaloneDeriving
34+ , StandaloneDeriving
38− TypeFamilies
39− TypeOperators
35+ , TypeOperators
36+ , TypeFamilies
40− UndecidableInstances
37+ , UndecidableInstances
41− UndecidableSuperClasses
38+ , UndecidableSuperClasses
src/Control/EnvT.hs+26−7
@@ -14,19 +14,16 @@ import Control.Lens
14import Control.Monad.Base
14import Control.Monad.Base
15import Control.Monad.Catch
15import Control.Monad.Catch
16import Control.Monad.Except
16import Control.Monad.Except
17+import Control.Monad.Fail
17import Control.Monad.Reader as X
18import Control.Monad.Reader as X
18import Control.Monad.Trans.Control
19import Control.Monad.Trans.Control
19import Control.Monad.Trans.Resource
20import Control.Monad.Trans.Resource
20import Control.Monad.Zip
21import Control.Monad.Zip
21−
22+#ifndef ghcjs_HOST_OS
22−#if MIN_VERSION_mtl(2,3,0)
23−import Control.Monad
23+import Katip
24−import Control.Monad.Fix
24+import Katip.Monadic
25#endif
25#endif
26
26
27−#if !MIN_VERSION_base(4,13,0)
28−import Control.Monad.Fail
29−#endif
30
27
31-- | The only reason this exists is that there are a lot of instances for
28-- | The only reason this exists is that there are a lot of instances for
32-- 'EnvT, which simply pass the implementation to the inner 'm'
29-- 'EnvT, which simply pass the implementation to the inner 'm'
@@ -66,5 +63,27 @@ execEnvT :: forall r m a. r -> EnvT r m a -> m a
66execEnvT = flip runEnvT
63execEnvT = flip runEnvT
67{-# INLINE execEnvT #-}
64{-# INLINE execEnvT #-}
68
65
66+#ifndef ghcjs_HOST_OS
67+-- FIXME: These lens should probably be moved into a separate package
68+-- or sent to upstream katip.
69+makeLensesFor
70+ [ ("ltsLogEnv", "_ltsLogEnv")
71+ , ("ltsContext", "_ltsContext")
72+ , ("ltsNamespace", "_ltsNamespace")
73+ ] ''KatipContextTState
74+
75+instance (Has KatipContextTState r, MonadIO m)
76+ => KatipContext (EnvT r m) where
77+ getKatipContext = view $ part . _ltsContext
78+ localKatipContext f = local (part . _ltsContext %~ f)
79+ getKatipNamespace = view $ part . _ltsNamespace
80+ localKatipNamespace f = local (part . _ltsNamespace %~ f)
81+
82+instance (Has KatipContextTState r, MonadIO m)
83+ => Katip (EnvT r m) where
84+ getLogEnv = view $ part . _ltsLogEnv
85+ localLogEnv f = local (part . _ltsLogEnv %~ f)
86+#endif
87+
69instance MonadResource m => MonadResource (EnvT r m) where
88instance MonadResource m => MonadResource (EnvT r m) where
70 liftResourceT = lift . liftResourceT
89 liftResourceT = lift . liftResourceT
src/Control/Has.hs+11−15
@@ -9,11 +9,7 @@ module Control.Has
9 ) where
9 ) where
10
10
11import Control.Lens
11import Control.Lens
12−-- reexport all from Reader except Control.Monad etc
13−-- to correspond mtl-2.3+
14import Control.Monad.Reader as X
12import Control.Monad.Reader as X
15− ( MonadReader(..), asks, Reader, runReader, mapReader, withReader
16− , ReaderT(ReaderT), runReaderT, mapReaderT, withReaderT )
17import Data.Kind
13import Data.Kind
18import GHC.Generics as G
14import GHC.Generics as G
19
15
@@ -24,11 +20,11 @@ class Has x r where
24instance {-# OVERLAPS #-} Has r r where
20instance {-# OVERLAPS #-} Has r r where
25 part = id
21 part = id
26
22
27−type family HasAll (xs :: [Type]) r :: Constraint where
23+type family HasAll (xs :: [*]) r :: Constraint where
28 HasAll '[] r = ()
24 HasAll '[] r = ()
29 HasAll (x ': xs) r = (Has x r, HasAll xs r)
25 HasAll (x ': xs) r = (Has x r, HasAll xs r)
30
26
31−data LensList (r :: Type) (es :: [Type]) where
27+data LensList (r :: *) (es :: [*]) where
32 LLNil :: LensList r '[]
28 LLNil :: LensList r '[]
33 LLCons :: Lens r r e e -> LensList r es -> LensList r (e ': es)
29 LLCons :: Lens r r e e -> LensList r es -> LensList r (e ': es)
34
30
@@ -36,7 +32,7 @@ mapLL :: Lens s s r r -> LensList r es -> LensList s es
36mapLL _ LLNil = LLNil
32mapLL _ LLNil = LLNil
37mapLL m (LLCons l ls) = LLCons (m . l) (mapLL m ls)
33mapLL m (LLCons l ls) = LLCons (m . l) (mapLL m ls)
38
34
39−type family (xs :: [Type]) ++ (ys :: [Type]) :: [Type] where
35+type family (xs :: [*]) ++ (ys :: [*]) :: [*] where
40 '[] ++ ys = ys
36 '[] ++ ys = ys
41 (x ': xs) ++ ys = x ': (xs ++ ys)
37 (x ': xs) ++ ys = x ': (xs ++ ys)
42
38
@@ -47,7 +43,7 @@ concatLL (LLCons l ls) ys = LLCons l (concatLL ls ys)
47-- borrowed from Data.HSet.Get
43-- borrowed from Data.HSet.Get
48data N = Z | S N
44data N = Z | S N
49
45
50−type family IndexOf (x :: Type) (xs :: [Type]) :: N where
46+type family IndexOf (x :: *) (xs :: [*]) :: N where
51 IndexOf x (x ': _) = 'Z
47 IndexOf x (x ': _) = 'Z
52 IndexOf x (_ ': xs) = 'S (IndexOf x xs)
48 IndexOf x (_ ': xs) = 'S (IndexOf x xs)
53
49
@@ -56,8 +52,8 @@ class (i ~ IndexOf e es) => GetLens e es i | i es -> e where
56
52
57type Elem e es = GetLens e es (IndexOf e es)
53type Elem e es = GetLens e es (IndexOf e es)
58
54
59−class Fieldy (r :: Type) where
55+class Fieldy (r :: *) where
60− type Fields r :: [Type]
56+ type Fields r :: [*]
61 type Fields r = GFields (Rep r)
57 type Fields r = GFields (Rep r)
62 lensList :: LensList r (Fields r)
58 lensList :: LensList r (Fields r)
63 default lensList
59 default lensList
@@ -77,16 +73,16 @@ instance (GetLens e' es n, 'S n ~ IndexOf e' (e ': es))
77 => GetLens e' (e ': es) ('S n) where
73 => GetLens e' (e ': es) ('S n) where
78 getLens (LLCons _ ls) = getLens ls
74 getLens (LLCons _ ls) = getLens ls
79
75
80−class GFieldy (r :: Type -> Type) where
76+class GFieldy (r :: * -> *) where
81− type GFields r :: [Type]
77+ type GFields r :: [*]
82 glensList :: LensList (r x) (GFields r)
78 glensList :: LensList (r x) (GFields r)
83
79
84instance GFieldyProduct r => GFieldy (D1 d (C1 c r)) where
80instance GFieldyProduct r => GFieldy (D1 d (C1 c r)) where
85 type GFields (D1 d (C1 c r)) = GFieldsProduct r
81 type GFields (D1 d (C1 c r)) = GFieldsProduct r
86 glensList = mapLL (iso unM1 M1 . iso unM1 M1) glensListProduct
82 glensList = mapLL (iso unM1 M1 . iso unM1 M1) glensListProduct
87
83
88−class GFieldyProduct (r :: Type -> Type) where
84+class GFieldyProduct (r :: * -> *) where
89− type GFieldsProduct r :: [Type]
85+ type GFieldsProduct r :: [*]
90 glensListProduct :: LensList (r x) (GFieldsProduct r)
86 glensListProduct :: LensList (r x) (GFieldsProduct r)
91
87
92instance (GFieldyProduct r, GFieldyProduct s) => GFieldyProduct (r :*: s) where
88instance (GFieldyProduct r, GFieldyProduct s) => GFieldyProduct (r :*: s) where
@@ -105,7 +101,7 @@ instance GFieldyProduct (S1 s (K1 k r)) where
105 type GFieldsProduct (S1 s (K1 k r)) = '[r]
101 type GFieldsProduct (S1 s (K1 k r)) = '[r]
106 glensListProduct = LLCons (iso unM1 M1 . iso unK1 K1) LLNil
102 glensListProduct = LLCons (iso unM1 M1 . iso unK1 K1) LLNil
107
103
108−type family AllElem (xs :: [Type]) (es :: [Type]) :: Constraint where
104+type family AllElem (xs :: [*]) (es :: [*]) :: Constraint where
109 AllElem '[] _ = ()
105 AllElem '[] _ = ()
110 AllElem (x ': xs) es = (Elem x es, AllElem xs es)
106 AllElem (x ': xs) es = (Elem x es, AllElem xs es)
111
107