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