master..f9bd91a · typeable/ether

.gitignore+2−17

since splitsnapshots

unifiedsplit

@@ -1,21 +1,6 @@

1−# Cabal

1+tags

2dist

3dist-newstyle

4+.stack-work

4.cabal-sandbox/

5.cabal-sandbox/

5cabal.sandbox.config

6cabal.sandbox.config

6−cabal.project.local

7−.ghc.environment*

8−

9−# Profiling

10−*.prof

11−

12−# Stack

13−.stack-work

14−

15−# Emacs

16−TAGS

17−.dir-locals.el

18−

19−# Vim

20−tags

21−*.swp

.travis.yml+18−25

@@ -1,31 +1,24 @@

1−language: nix

1+sudo: false

2

3−os:

3+cache:

4− - linux

4+ directories:

5− - osx

5+ - $HOME/.stack/

6−

7−env:

8− - HC=ghc822

9− - HC=ghc844

10− - HC=ghc861

11

6

12before_install:

7before_install:

13− - curl https://raw.githubusercontent.com/monadfix/nix-cabal/master/nix-cabal -o nix-cabal && chmod u+x nix-cabal

8+ - mkdir -p ~/.local/bin

14− - travis_retry ./nix-cabal new-update

9+ - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

10+ - export PATH=~/.local/bin:$PATH

11+ - stack --version

12+ - stack setup

15

13

16−script:

14+install:

17− - ./nix-cabal new-test ether:regression

15+ - stack install --only-dependencies --no-terminal

18− - ./nix-cabal new-bench ether:bench

19

16

20−cache:

17+script:

21− directories:

18+ - stack test ether:regression --no-terminal --ghc-options -Werror

22− - ~/.cabal

19+ - stack bench ether:bench --no-terminal --ghc-options -Werror

23− - ~/.ghc

24

20

25−matrix:

21+addons:

26− # broken at the moment

22+ apt:

27− exclude:

23+ packages:

28− - os: osx

24+ - libgmp-dev

29− env: HC=ghc822

30− - os: osx

31− env: HC=ghc861

CHANGELOG.md−5

@@ -1,8 +1,3 @@

1−0.5.1.0

2−-------

3−

4−* Disable `HasLens` for tuples via cabal flag.

5−

60.5.0.0

10.5.0.0

7-------

2-------

8

3

README.md+16

@@ -2,8 +2,24 @@

2

3[![Build Status](https://img.shields.io/travis/int-index/ether.svg)](https://travis-ci.org/int-index/ether)

4[![Hackage](https://img.shields.io/hackage/v/ether.svg)](https://hackage.haskell.org/package/ether)

5+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/int-index/ether)

5

6

7

7Ether is a Haskell library that extends [mtl](https://hackage.haskell.org/package/mtl)

8Ether is a Haskell library that extends [mtl](https://hackage.haskell.org/package/mtl)

8and [transformers](https://hackage.haskell.org/package/transformers) with tagged

9and [transformers](https://hackage.haskell.org/package/transformers) with tagged

9monad transformers and classes in a compatible way.

10monad transformers and classes in a compatible way.

11+

12+## Installation

13+

14+You can install `ether 0.4.0.0`

15+

16+1. using Cabal, from Hackage;

17+2. using Stack, from Stackage;

18+3. using Portage, from Gentoo Haskell Overlay.

19+

20+If unsure, use [Stack](https://github.com/commercialhaskell/stack).

21+

22+## Getting Started

23+

24+To get started, read the introduction on the [homepage](https://int-index.github.io/ether/).

25+If you need help with Ether or if you have any questions about it, ask me in the Gitter chat.

bench/Bench.hs−1

@@ -8,7 +8,6 @@ import qualified Control.Monad.Reader as M

8import qualified Control.Monad.State as M

9import Criterion.Main

10import Ether

11−import TupleInstances ()

12

11

13id' :: a -> a

12id' :: a -> a

14id' = id

13id' = id

bench/TupleInstances.hsdeleted−9

@@ -1,9 +0,0 @@

1−{-# OPTIONS -fno-warn-orphans #-}

2−{-# LANGUAGE CPP #-}

3−

4−module TupleInstances () where

5−

6−#ifdef DISABLE_TUP_INSTANCES

7−import Ether.Internal (makeTupleInstancesHasLens)

8−makeTupleInstancesHasLens [4,5,9]

9−#endif

ether.cabal+26−38

@@ -1,17 +1,21 @@

1−cabal-version: 2.2

2name: ether

1name: ether

3−version: 0.5.2.0

2+version: 0.5.0.0

4synopsis: Monad transformers and classes

3synopsis: Monad transformers and classes

5−description: Lib

4+description:

6−license: BSD-3-Clause

5+ Ether is a Haskell library that extends @mtl@ and @transformers@ with

7−-- ^ unfortunately have to change this line due to the issue with cabal2nix

6+ tagged monad transformers and classes in a compatible way.

8−license-file: LICENSE

7+

8+ Introduction <https://int-index.github.io/ether/>

9+

9category: Control

10category: Control

11+license: BSD3

12+license-file: LICENSE

10author: Vladislav Zavialov

13author: Vladislav Zavialov

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

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

12homepage: https://int-index.github.io/ether/

15homepage: https://int-index.github.io/ether/

13bug-reports: https://github.com/int-index/ether/issues

16bug-reports: https://github.com/int-index/ether/issues

14build-type: Simple

17build-type: Simple

18+cabal-version: >=1.18

15extra-source-files: CHANGELOG.md

19extra-source-files: CHANGELOG.md

16

20

17source-repository head

21source-repository head

@@ -20,20 +24,6 @@ source-repository head

20 location: git@github.com:int-index/ether.git

24 location: git@github.com:int-index/ether.git

21

25

22

26

23−flag disable-tup-instances

24−

25− description:

26− Disable auto-generated 'HasLens' instances for tuples. The reason one

27− might want to do this is to reduce the size of .hi-files, as well as the

28− time and memory GHC needs to build Ether. To recover flattening with

29− tuples, use 'Ether.Internal.makeTupleInstancesHasLens' at specific tuple

30− sizes you need in your application.

31−

32− This is a build-time performance hack, enable this flag at your own risk.

33−

34− default: False

35− manual: True

36−

37library

27library

38

28

39 exposed-modules:

29 exposed-modules:

@@ -51,13 +41,24 @@ library

51 Ether.Internal.HasLens

41 Ether.Internal.HasLens

52 Ether.Internal.TH_Utils

42 Ether.Internal.TH_Utils

53 Ether.Internal.TH_TupleInstances

43 Ether.Internal.TH_TupleInstances

54− Ether.Internal.TupleInstances

44+ Ether.Internal.TupleInstances_TagsK

45+ Ether.Internal.TupleInstances_Tags

46+ Ether.Internal.TupleInstances_HasLens

47+ Ether.Internal.TupleInstances_HasLens_1

48+ Ether.Internal.TupleInstances_HasLens_2

49+ Ether.Internal.TupleInstances_HasLens_3

50+ Ether.Internal.TupleInstances_HasLens_4

51+ Ether.Internal.TupleInstances_HasLens_5

52+ Ether.Internal.TupleInstances_HasLens_6

53+ Ether.Internal.TupleInstances_HasLens_7

54+ Ether.Internal.TupleInstances_HasLens_8

55+ Ether.Internal.TupleInstances_HasLens_9

55

56

56 build-depends:

57 build-depends:

57− base >=4.9 && <4.13,

58+ base >=4.9 && <4.11,

58 transformers >=0.5.2.0,

59 transformers >=0.5.2.0,

59 transformers-lift >=0.2.0.1,

60 transformers-lift >=0.2.0.1,

60− mtl >=2.2.2,

61+ mtl >=2.2.1,

61 mmorph >=1.0.4,

62 mmorph >=1.0.4,

62 monad-control >=1.0.0.4,

63 monad-control >=1.0.0.4,

63 transformers-base >=0.4.4,

64 transformers-base >=0.4.4,

@@ -101,13 +102,10 @@ library

101 ghc-options:

102 ghc-options:

102 -Wall -O2

103 -Wall -O2

103

104

104− if flag(disable-tup-instances)

105− cpp-options: -DDISABLE_TUP_INSTANCES

106−

107test-suite regression

105test-suite regression

108

106

109 build-depends:

107 build-depends:

110− base >=4.9 && <4.13,

108+ base >=4.9 && <4.11,

111 transformers >=0.4.2,

109 transformers >=0.4.2,

112 mtl >=2.2.1,

110 mtl >=2.2.1,

113 tasty >=0.10,

111 tasty >=0.10,

@@ -121,7 +119,6 @@ test-suite regression

121 Regression.hs

119 Regression.hs

122

120

123 other-modules:

121 other-modules:

124− TupleInstances

125 Regression.T1

122 Regression.T1

126 Regression.T2

123 Regression.T2

127 Regression.T3

124 Regression.T3

@@ -172,14 +169,11 @@ test-suite regression

172 ghc-options:

169 ghc-options:

173 -Wall -fno-warn-missing-signatures

170 -Wall -fno-warn-missing-signatures

174

171

175− if flag(disable-tup-instances)

176− cpp-options: -DDISABLE_TUP_INSTANCES

177−

178

172

179benchmark bench

173benchmark bench

180

174

181 build-depends:

175 build-depends:

182− base >=4.9 && <4.13,

176+ base >=4.9 && <4.11,

183 mtl >=2.2.1,

177 mtl >=2.2.1,

184 transformers >=0.4.2,

178 transformers >=0.4.2,

185 criterion >=1.1,

179 criterion >=1.1,

@@ -190,9 +184,6 @@ benchmark bench

190 main-is:

184 main-is:

191 Bench.hs

185 Bench.hs

192

186

193− other-modules:

194− TupleInstances

195−

196 type:

187 type:

197 exitcode-stdio-1.0

188 exitcode-stdio-1.0

198

189

@@ -232,6 +223,3 @@ benchmark bench

232

223

233 ghc-prof-options:

224 ghc-prof-options:

234 -fprof-auto

225 -fprof-auto

235−

236− if flag(disable-tup-instances)

237− cpp-options: -DDISABLE_TUP_INSTANCES

shell.nixdeleted−22

@@ -1,22 +0,0 @@

1−{ pkgs ? import <nixpkgs> {},

2− hc ? "ghc844"

3−}:

4−

5−pkgs.stdenv.mkDerivation rec {

6− name = "ether";

7− buildInputs = [

8− pkgs.haskell.compiler.${hc}

9− pkgs.git

10− pkgs.zlib

11− pkgs.cabal-install

12− pkgs.pkgconfig

13− ];

14− shellHook = ''

15− export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath buildInputs}:$LD_LIBRARY_PATH

16− export LANG=en_US.UTF-8

17− '';

18− LOCALE_ARCHIVE =

19− if pkgs.stdenv.isLinux

20− then "${pkgs.glibcLocales}/lib/locale/locale-archive"

21− else "";

22−}

src/Ether/Internal.hs+3−3

@@ -16,7 +16,6 @@ module Ether.Internal

16 , HandleSuper

17 , HandleConstraint

18 , Handle(..)

19− , makeTupleInstancesHasLens

20 ) where

19 ) where

21

20

22import Control.Applicative

21import Control.Applicative

@@ -28,8 +27,9 @@ import GHC.Exts (Constraint)

28

27

29import Ether.Internal.HasLens

28import Ether.Internal.HasLens

30import Ether.Internal.Tags

29import Ether.Internal.Tags

31−import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

30+import Ether.Internal.TupleInstances_Tags ()

31+import Ether.Internal.TupleInstances_TagsK ()

32−import Ether.Internal.TupleInstances ()

32+import Ether.Internal.TupleInstances_HasLens ()

33

34data TAGGED e t

35

src/Ether/Internal/TupleInstances.hsdeleted−24

@@ -1,24 +0,0 @@

1−{-# OPTIONS -fno-warn-orphans #-}

2−{-# LANGUAGE CPP #-}

3−

4−module Ether.Internal.TupleInstances () where

5−

6−import Data.Tagged

7−import Ether.Internal.Tags

8−import Ether.Internal.TH_TupleInstances

9−

10−type instance TagsK () = '[]

11−type instance TagsK (Tagged t a) = '[KindOf t]

12−type instance TagsK (Tagged t0 a, Tagged t1 b) = '[KindOf t0, KindOf t1]

13−

14−makeTupleInstancesTagsK

15−

16−type instance Tags () = 'HNil

17−type instance Tags (Tagged t a) = 'HCons t 'HNil

18−type instance Tags (Tagged t0 a, Tagged t1 b) = 'HCons t0 ('HCons t1 'HNil)

19−

20−makeTupleInstancesTags

21−

22−#ifndef DISABLE_TUP_INSTANCES

23−makeTupleInstancesHasLens [2..62]

24−#endif

src/Ether/Internal/TupleInstances_HasLens.hsnew file+11

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

1+module Ether.Internal.TupleInstances_HasLens () where

2+

3+import Ether.Internal.TupleInstances_HasLens_1 ()

4+import Ether.Internal.TupleInstances_HasLens_2 ()

5+import Ether.Internal.TupleInstances_HasLens_3 ()

6+import Ether.Internal.TupleInstances_HasLens_4 ()

7+import Ether.Internal.TupleInstances_HasLens_5 ()

8+import Ether.Internal.TupleInstances_HasLens_6 ()

9+import Ether.Internal.TupleInstances_HasLens_7 ()

10+import Ether.Internal.TupleInstances_HasLens_8 ()

11+import Ether.Internal.TupleInstances_HasLens_9 ()

src/Ether/Internal/TupleInstances_HasLens_1.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_1 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [2..20]

src/Ether/Internal/TupleInstances_HasLens_2.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_2 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [21..29]

src/Ether/Internal/TupleInstances_HasLens_3.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_3 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [30..36]

src/Ether/Internal/TupleInstances_HasLens_4.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_4 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [37..42]

src/Ether/Internal/TupleInstances_HasLens_5.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_5 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [43..47]

src/Ether/Internal/TupleInstances_HasLens_6.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_6 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [48..52]

src/Ether/Internal/TupleInstances_HasLens_7.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_7 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [53..56]

src/Ether/Internal/TupleInstances_HasLens_8.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_8 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [57..60]

src/Ether/Internal/TupleInstances_HasLens_9.hsnew file+7

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

1+{-# OPTIONS -fno-warn-orphans #-}

2+

3+module Ether.Internal.TupleInstances_HasLens_9 () where

4+

5+import Ether.Internal.TH_TupleInstances (makeTupleInstancesHasLens)

6+

7+makeTupleInstancesHasLens [61..62]

src/Ether/Internal/TupleInstances_Tags.hsnew file+13

@@ -0,0 +1,13 @@

1+module Ether.Internal.TupleInstances_Tags () where

2+

3+import Data.Tagged

4+

5+import Ether.Internal.Tags

6+import Ether.Internal.TupleInstances_TagsK ()

7+import Ether.Internal.TH_TupleInstances (makeTupleInstancesTags)

8+

9+type instance Tags () = 'HNil

10+type instance Tags (Tagged t a) = 'HCons t 'HNil

11+type instance Tags (Tagged t0 a, Tagged t1 b) = 'HCons t0 ('HCons t1 'HNil)

12+

13+makeTupleInstancesTags

src/Ether/Internal/TupleInstances_TagsK.hsnew file+12

@@ -0,0 +1,12 @@

1+module Ether.Internal.TupleInstances_TagsK () where

2+

3+import Data.Tagged

4+

5+import Ether.Internal.Tags

6+import Ether.Internal.TH_TupleInstances (makeTupleInstancesTagsK)

7+

8+type instance TagsK () = '[]

9+type instance TagsK (Tagged t a) = '[KindOf t]

10+type instance TagsK (Tagged t0 a, Tagged t1 b) = '[KindOf t0, KindOf t1]

11+

12+makeTupleInstancesTagsK

src/Ether/Reader.hs+2−2

@@ -139,7 +139,7 @@ readerT = coerce (T.ReaderT @r @m @a)

139-- | Runs a 'ReaderT' with the given environment

140-- and returns the final value.

141runReaderT :: forall tag r m a . ReaderT tag r m a -> r -> m a

142−runReaderT = coerce (T.runReaderT @r @m @a)

142+runReaderT = coerce (T.runReaderT @r @_ @m @a)

143

144-- | Runs a 'ReaderT' with the given environment

145-- and returns the final value.

@@ -203,7 +203,7 @@ type ReadersT r = TaggedTrans (READERS (Tags r)) (T.ReaderT r)

203type Readers r = ReadersT r Identity

204

205runReadersT :: forall p m a . ReadersT p m a -> p -> m a

206−runReadersT = coerce (T.runReaderT @p @m @a)

206+runReadersT = coerce (T.runReaderT @p @_ @m @a)

207

208runReaders :: forall p a . Readers p a -> p -> a

209runReaders = coerce (T.runReader @p @a)

stack.yamlnew file+5

@@ -0,0 +1,5 @@

1+resolver: lts-7.23

2+packages: ['.']

3+extra-deps:

4+- transformers-lift-0.2.0.1

5+- mmorph-1.1.0

test/Regression/T1.hs−1

@@ -1,7 +1,6 @@

1module Regression.T1 (test1) where

2

3import Ether

4−import TupleInstances ()

5import Data.List (group)

4import Data.List (group)

6

5

7import Test.Tasty

6import Test.Tasty

test/TupleInstances.hsdeleted−9

@@ -1,9 +0,0 @@

1−{-# OPTIONS -fno-warn-orphans #-}

2−{-# LANGUAGE CPP #-}

3−

4−module TupleInstances () where

5−

6−#ifdef DISABLE_TUP_INSTANCES

7−import Ether.Internal (makeTupleInstancesHasLens)

8−makeTupleInstancesHasLens [2]

9−#endif