54641ad...master · typeable/transformers-lift

git.iko.soy/typeable/transformers-lift

10 files changed+61−19

since splitsnapshots

unifiedsplit

.travis.yml+9−11 src/Control/Monad/Trans/Lift/CallCC.hs+5 src/Control/Monad/Trans/Lift/Catch.hs+5 src/Control/Monad/Trans/Lift/Listen.hs+5 src/Control/Monad/Trans/Lift/Local.hs+5 src/Control/Monad/Trans/Lift/Pass.hs+6 src/Control/Monad/Trans/Lift/StT.hs+8 stack-7.8.3.yaml+7 stack.yaml+1−2 transformers-lift.cabal+10−6

.travis.yml+9−11

@@ -1,11 +1,11 @@

11sudo: false

33env:

4− - CABALVER=1.18 GHCVER=7.6.3

5− - CABALVER=1.18 GHCVER=7.8.4

6− - CABALVER=1.22 GHCVER=7.10.3

7− - CABALVER=1.24 GHCVER=8.0.2

8− - CABALVER=1.24 GHCVER=8.2.1

4+ - CABALVER=3.0 GHCVER=7.10.3

5+ - CABALVER=3.0 GHCVER=8.0.2

6+ - CABALVER=3.0 GHCVER=8.2.2

7+ - CABALVER=3.0 GHCVER=8.4.4

8+ - CABALVER=3.0 GHCVER=8.6.1

99 - CABALVER=head GHCVER=head

1010

1111before_install:

@@ -25,13 +25,11 @@ addons:

2525 sources:

2626 - hvr-ghc

2727 packages:

28− - ghc-7.6.3

29− - ghc-7.8.4

3028 - ghc-7.10.3

3129 - ghc-8.0.2

32− - ghc-8.2.1

30+ - ghc-8.2.2

31+ - ghc-8.4.4

32+ - ghc-8.6.1

3333 - ghc-head

34− - cabal-install-1.18

35− - cabal-install-1.22

36− - cabal-install-1.24

34+ - cabal-install-3.0

3735 - cabal-install-head

src/Control/Monad/Trans/Lift/CallCC.hs+5

@@ -29,7 +29,10 @@ import qualified Control.Monad.Trans.State.Strict as S.Strict

2929import qualified Control.Monad.Trans.Writer.Lazy as W.Lazy

3030import qualified Control.Monad.Trans.Writer.Strict as W.Strict

3131import qualified Control.Monad.Trans.Writer.CPS as W.CPS

32+

33+#if MIN_VERSION_transformers(0,5,3)

3234import qualified Control.Monad.Trans.Accum as Acc

35+#endif

3336

3437import Control.Monad.Trans.Lift.StT

3538

@@ -136,6 +139,8 @@ instance LiftCallCC (S.Strict.StateT s) where

136139 liftCallCC' = S.Strict.liftCallCC'

137140 {-# INLINE liftCallCC' #-}

138141

142+#if MIN_VERSION_transformers(0,5,3)

139143instance Monoid w => LiftCallCC (Acc.AccumT w) where

140144 liftCallCC = Acc.liftCallCC

141145 {-# INLINE liftCallCC #-}

146+#endif

src/Control/Monad/Trans/Lift/Catch.hs+5

@@ -28,7 +28,10 @@ import qualified Control.Monad.Trans.State.Strict as S.Strict

2828import qualified Control.Monad.Trans.Writer.Lazy as W.Lazy

2929import qualified Control.Monad.Trans.Writer.Strict as W.Strict

3030import qualified Control.Monad.Trans.Writer.CPS as W.CPS

31+

32+#if MIN_VERSION_transformers(0,5,3)

3133import qualified Control.Monad.Trans.Accum as Acc

34+#endif

3235

3336import Control.Monad.Trans.Lift.StT

3437

@@ -103,6 +106,8 @@ instance Monoid w => LiftCatch (W.CPS.WriterT w) where

103106 liftCatch = W.CPS.liftCatch

104107 {-# INLINE liftCatch #-}

105108

109+#if MIN_VERSION_transformers(0,5,3)

106110instance Monoid w => LiftCatch (Acc.AccumT w) where

107111 liftCatch = Acc.liftCatch

108112 {-# INLINE liftCatch #-}

113+#endif

src/Control/Monad/Trans/Lift/Listen.hs+5

@@ -27,7 +27,10 @@ import qualified Control.Monad.Trans.State.Strict as S.Strict

2727import qualified Control.Monad.Trans.Writer.Lazy as W.Lazy

2828import qualified Control.Monad.Trans.Writer.Strict as W.Strict

2929import qualified Control.Monad.Trans.Writer.CPS.Internal as W.CPS

30+

31+#if MIN_VERSION_transformers(0,5,3)

3032import qualified Control.Monad.Trans.Accum as Acc

33+#endif

3134

3235import Control.Monad.Trans.Lift.StT

3336

@@ -110,6 +113,8 @@ instance Monoid w' => LiftListen (W.CPS.WriterT w') where

110113 return ((a, w), w')

111114 {-# INLINE liftListen #-}

112115

116+#if MIN_VERSION_transformers(0,5,3)

113117instance Monoid w' => LiftListen (Acc.AccumT w') where

114118 liftListen = Acc.liftListen

115119 {-# INLINE liftListen #-}

120+#endif

src/Control/Monad/Trans/Lift/Local.hs+5

@@ -28,7 +28,10 @@ import qualified Control.Monad.Trans.State.Strict as S.Strict

2828import qualified Control.Monad.Trans.Writer.Lazy as W.Lazy

2929import qualified Control.Monad.Trans.Writer.Strict as W.Strict

3030import qualified Control.Monad.Trans.Writer.CPS as W.CPS

31+

32+#if MIN_VERSION_transformers(0,5,3)

3133import qualified Control.Monad.Trans.Accum as Acc

34+#endif

3235

3336-- | Signature of the @local@ operation,

3437-- introduced in "Control.Monad.Trans.Reader".

@@ -108,6 +111,8 @@ instance Monoid w => LiftLocal (W.CPS.WriterT w) where

108111 liftLocal _ l f = W.CPS.mapWriterT (l f)

109112 {-# INLINE liftLocal #-}

110113

114+#if MIN_VERSION_transformers(0,5,3)

111115instance Monoid w => LiftLocal (Acc.AccumT w) where

112116 liftLocal _ l f = Acc.mapAccumT (l f)

113117 {-# INLINE liftLocal #-}

118+#endif

src/Control/Monad/Trans/Lift/Pass.hs+6

@@ -1,5 +1,6 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE RankNTypes #-}

34-- | Lifting the 'pass' operation.

45module Control.Monad.Trans.Lift.Pass

56 ( LiftPass(..)

@@ -27,7 +28,10 @@ import qualified Control.Monad.Trans.State.Strict as S.Strict

2728import qualified Control.Monad.Trans.Writer.Lazy as W.Lazy

2829import qualified Control.Monad.Trans.Writer.Strict as W.Strict

2930import qualified Control.Monad.Trans.Writer.CPS.Internal as W.CPS

31+

32+#if MIN_VERSION_transformers(0,5,3)

3033import qualified Control.Monad.Trans.Accum as Acc

34+#endif

3135

3236import Control.Monad.Trans.Lift.StT

3337

@@ -111,6 +115,8 @@ instance Monoid w' => LiftPass (W.CPS.WriterT w') where

111115 return ((a, w'), f)

112116 {-# INLINE liftPass #-}

113117

118+#if MIN_VERSION_transformers(0,5,3)

114119instance Monoid w' => LiftPass (Acc.AccumT w') where

115120 liftPass = Acc.liftPass

116121 {-# INLINE liftPass #-}

122+#endif

src/Control/Monad/Trans/Lift/StT.hs+8

@@ -1,5 +1,7 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE TypeFamilies #-}

23{-# LANGUAGE KindSignatures #-}

35-- | The 'StT' type family.

46module Control.Monad.Trans.Lift.StT (StT) where

@@ -16,7 +18,10 @@ import qualified Control.Monad.Trans.State.Strict as S.Strict

1618import qualified Control.Monad.Trans.Writer.Lazy as W.Lazy

1719import qualified Control.Monad.Trans.Writer.Strict as W.Strict

1820import qualified Control.Monad.Trans.Writer.CPS as W.CPS

21+

22+#if MIN_VERSION_transformers(0,5,3)

1923import qualified Control.Monad.Trans.Accum as Acc

24+#endif

2025

2126-- | Internal state of a monad transformer.

2227-- Same as @StT@ from the @monad-control@ package.

@@ -35,4 +40,7 @@ type instance StT (S.Strict.StateT s) a = (a, s)

3540type instance StT (W.Lazy.WriterT w) a = (a, w)

3641type instance StT (W.Strict.WriterT w) a = (a, w)

3742type instance StT (W.CPS.WriterT w) a = (a, w)

43+

44+#if MIN_VERSION_transformers(0,5,3)

3845type instance StT (Acc.AccumT w) a = (a, w)

46+#endif

stack-7.8.3.yamlnew file+7

@@ -0,0 +1,7 @@

1+flags: {}

2+packages:

3+- '.'

4+resolver: lts-2.22

5+extra-deps:

6+- transformers-0.4.2.0

7+- writer-cps-transformers-0.1.1.3

stack.yaml+1−2

@@ -1,5 +1,4 @@

11flags: {}

22packages:

33- '.'

4−extra-deps: []

5−resolver: nightly-2015-07-15

4+resolver: nightly-2018-03-17

transformers-lift.cabal+10−6

@@ -1,18 +1,19 @@

1+cabal-version: 2.2

12name: transformers-lift

2−version: 0.2.0.0

3+version: 0.2.0.2

34synopsis: Ad-hoc type classes for lifting

45description:

56 This simple and lightweight library provides type classes

67 for lifting monad transformer operations.

8−license: BSD3

9+-- license: BSD3

10+-- ^ unfortunately have to comment this line because of cabal2nix

911license-file: LICENSE

1012author: Vladislav Zavialov

1113maintainer: Vladislav Zavialov <vlad.z.4096@gmail.com>

1214category: Control

1315bug-reports: https://github.com/int-index/transformers-lift/issues

1416build-type: Simple

15−cabal-version: >=1.10

1617

1718library

1819 exposed-modules: Control.Monad.Trans.Lift.Local

@@ -22,9 +23,12 @@ library

2223 Control.Monad.Trans.Lift.Pass

2324 Control.Monad.Trans.Lift.StT

2425

25− build-depends: base >=4.6 && <4.11

26− , transformers >= 0.5.4.0

27− , writer-cps-transformers >= 0.1.1.3

26+ build-depends: base >=4.8 && <4.13

27+ , transformers >= 0.4.2.0 && <0.6

28+ , writer-cps-transformers == 0.1.1.4

29+

30+ mixins: transformers hiding

31+ (Control.Monad.Trans.RWS.CPS, Control.Monad.Trans.Writer.CPS)

2832

2933 default-language: Haskell2010

3034 other-extensions: CPP