06598c8 · rowtype-yoga/purescript-native

psc-make/Main.hs+3−1

compare with golang

unifiedsplit

@@ -17,7 +17,9 @@

17module Main where

18

19import Control.Applicative

20−import Control.Monad.Except

20+import Control.Monad

21+import Control.Monad.Error.Class (MonadError(..))

22+import Control.Monad.Trans.Except

21import Control.Monad.Reader

23import Control.Monad.Reader

22

24

23import Data.Version (showVersion)

25import Data.Version (showVersion)

psc/Main.hs+1−1

@@ -17,7 +17,7 @@

17module Main where

18

19import Control.Applicative

20−import Control.Monad.Except

20+import Control.Monad

21import Control.Monad.Reader

22

23import Data.Maybe (fromMaybe)

psci/PSCi.hs+2−2

@@ -30,8 +30,8 @@ import qualified Data.Map as M

30import Control.Applicative

31import Control.Monad

32import Control.Monad.IO.Class (MonadIO, liftIO)

33−import Control.Monad.Error.Class (throwError)

33+import Control.Monad.Error.Class (MonadError(..))

34−import Control.Monad.Except (ExceptT(..), MonadError, runExceptT)

34+import Control.Monad.Trans.Except (ExceptT(..), runExceptT)

35import Control.Monad.Reader (MonadReader, ReaderT, runReaderT)

36import Control.Monad.Trans.Class

37import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)

purescript.cabal+5−4

@@ -31,7 +31,8 @@ library

31 filepath -any,

32 mtl >= 2.1.0 && < 2.3.0,

33 parsec -any,

34− transformers >= 0.4.0 && < 0.5,

34+ transformers >= 0.3.0 && < 0.5,

35+ transformers-compat >= 0.3.0,

35 utf8-string >= 1 && < 2,

36 utf8-string >= 1 && < 2,

36 pattern-arrows >= 0.0.2 && < 0.1,

37 pattern-arrows >= 0.0.2 && < 0.1,

37 file-embed >= 0.0.7 && < 0.0.8,

38 file-embed >= 0.0.7 && < 0.0.8,

@@ -133,7 +134,7 @@ executable psc

133executable psc-make

134executable psc-make

134 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

135 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

135 mtl -any, optparse-applicative >= 0.10.0, parsec -any, purescript -any,

136 mtl -any, optparse-applicative >= 0.10.0, parsec -any, purescript -any,

136− transformers -any

137+ transformers -any, transformers-compat -any

137 main-is: Main.hs

138 main-is: Main.hs

138 buildable: True

139 buildable: True

139 hs-source-dirs: psc-make

140 hs-source-dirs: psc-make

@@ -144,7 +145,7 @@ executable psci

144 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

145 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

145 mtl -any, optparse-applicative >= 0.10.0, parsec -any,

146 mtl -any, optparse-applicative >= 0.10.0, parsec -any,

146 haskeline >= 0.7.0.0, purescript -any, transformers -any,

147 haskeline >= 0.7.0.0, purescript -any, transformers -any,

147− process -any

148+ transformers-compat -any, process -any

148

149

149 main-is: Main.hs

150 main-is: Main.hs

150 buildable: True

151 buildable: True

@@ -189,7 +190,7 @@ test-suite psci-tests

189 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

190 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

190 mtl -any, optparse-applicative >= 0.10.0, parsec -any,

191 mtl -any, optparse-applicative >= 0.10.0, parsec -any,

191 haskeline >= 0.7.0.0, purescript -any, transformers -any,

192 haskeline >= 0.7.0.0, purescript -any, transformers -any,

192− process -any, HUnit -any

193+ transformers-compat -any, process -any, HUnit -any

193 type: exitcode-stdio-1.0

194 type: exitcode-stdio-1.0

194 main-is: Main.hs

195 main-is: Main.hs

195 buildable: True

196 buildable: True

src/Control/Monad/Supply.hs+2−2

@@ -21,7 +21,7 @@ import Data.Functor.Identity

21

22import Control.Applicative

23import Control.Monad.State

24−import Control.Monad.Except

24+import Control.Monad.Error.Class (MonadError(..))

25import Control.Monad.Reader

26import Control.Monad.Writer

27

@@ -40,4 +40,4 @@ runSupply :: Integer -> Supply a -> (a, Integer)

40runSupply n = runIdentity . runSupplyT n

41

42evalSupply :: Integer -> Supply a -> a

43−evalSupply n = runIdentity . evalSupplyT n

43+evalSupply n = runIdentity . evalSupplyT n

src/Control/Monad/Unify.hs+1−1

@@ -27,7 +27,7 @@ import Data.Monoid

27

28import Control.Applicative

29import Control.Monad.State

30−import Control.Monad.Error.Class

30+import Control.Monad.Error.Class (MonadError(..))

31

32import Data.HashMap.Strict as M

33

src/Language/PureScript.hs+2−1

@@ -43,7 +43,8 @@ import qualified Data.Set as S

43

44import Control.Applicative

45import Control.Arrow ((&&&))

46−import Control.Monad.Except

46+import Control.Monad

47+import Control.Monad.Error.Class (MonadError(..))

47import Control.Monad.Reader

48import Control.Monad.Reader

48

49

49import System.FilePath ((</>))

50import System.FilePath ((</>))

src/Language/PureScript/Errors.hs+2−1

@@ -23,7 +23,8 @@ import Data.List (intercalate)

23import Data.Monoid

24import Data.Foldable (fold, foldMap)

25

26−import Control.Monad.Except

26+import Control.Monad

27+import Control.Monad.Error.Class (MonadError(..))

27import Control.Monad.Unify

28import Control.Monad.Unify

28import Control.Applicative ((<$>))

29import Control.Applicative ((<$>))

29

30

src/Language/PureScript/ModuleDependencies.hs+1−1

@@ -19,7 +19,7 @@ module Language.PureScript.ModuleDependencies (

19 ModuleGraph

20) where

21

22−import Control.Monad.Except

22+import Control.Monad.Error.Class (MonadError(..))

23

24import Data.Graph

25import Data.List (nub)

src/Language/PureScript/Sugar.hs+1−1

@@ -20,7 +20,7 @@ module Language.PureScript.Sugar (desugar, module S) where

20import Control.Monad

21import Control.Category ((>>>))

22import Control.Applicative

23−import Control.Monad.Error.Class

23+import Control.Monad.Error.Class (MonadError(..))

24import Control.Monad.Supply.Class

25

26import Language.PureScript.AST

src/Language/PureScript/Sugar/BindingGroups.hs+1−1

@@ -28,7 +28,7 @@ import Data.List (nub, intersect)

28import Data.Maybe (isJust, mapMaybe)

29import Control.Applicative

30import Control.Monad ((<=<))

31−import Control.Monad.Error.Class

31+import Control.Monad.Error.Class (MonadError(..))

32

33import qualified Data.Set as S

34

src/Language/PureScript/Sugar/CaseDeclarations.hs+1−2

@@ -26,8 +26,7 @@ import Data.List (nub, groupBy)

26

27import Control.Applicative

28import Control.Monad ((<=<), forM, replicateM, join, unless)

29−import Control.Monad.Except (throwError)

30−import Control.Monad.Error.Class (MonadError)

29+import Control.Monad.Error.Class (MonadError(..))

31import Control.Monad.Supply.Class

30import Control.Monad.Supply.Class

32

31

33import Language.PureScript.Names

32import Language.PureScript.Names

src/Language/PureScript/Sugar/DoNotation.hs+1−1

@@ -28,7 +28,7 @@ import Language.PureScript.Errors

28import qualified Language.PureScript.Constants as C

29

30import Control.Applicative

31−import Control.Monad.Error.Class

31+import Control.Monad.Error.Class (MonadError(..))

32import Control.Monad.Supply.Class

33

34-- |

src/Language/PureScript/Sugar/Names.hs+2−1

@@ -23,7 +23,8 @@ import Data.List (nub)

23import Data.Maybe (fromMaybe, isJust, mapMaybe)

24

25import Control.Applicative (Applicative(..), (<$>), (<*>))

26−import Control.Monad.Except

26+import Control.Monad

27+import Control.Monad.Error.Class (MonadError(..))

27

28

28import qualified Data.Map as M

29import qualified Data.Map as M

29

30

src/Language/PureScript/Sugar/ObjectWildcards.hs+1−1

@@ -21,7 +21,7 @@ module Language.PureScript.Sugar.ObjectWildcards (

21

22import Control.Applicative

23import Control.Arrow (second)

24−import Control.Monad.Error.Class

24+import Control.Monad.Error.Class (MonadError(..))

25import Control.Monad.Supply.Class

26

27import Data.List (partition)

src/Language/PureScript/Sugar/Operators.hs+1−1

@@ -33,7 +33,7 @@ import Language.PureScript.Names

33

34import Control.Applicative

35import Control.Monad.State

36−import Control.Monad.Except

36+import Control.Monad.Error.Class (MonadError(..))

37import Control.Monad.Supply.Class

38

39import Data.Function (on)

src/Language/PureScript/Sugar/TypeClasses.hs+1−1

@@ -35,7 +35,7 @@ import qualified Language.PureScript.Constants as C

35

36import Control.Applicative

37import Control.Arrow (first, second)

38−import Control.Monad.Except

38+import Control.Monad.Error.Class (MonadError(..))

39import Control.Monad.State

40import Data.List ((\\), find, sortBy)

41import Data.Maybe (catMaybes, mapMaybe, isJust)

src/Language/PureScript/Sugar/TypeDeclarations.hs+1−2

@@ -23,8 +23,7 @@ module Language.PureScript.Sugar.TypeDeclarations (

23

24import Control.Applicative

25import Control.Monad (forM)

26−import Control.Monad.Except (throwError)

27−import Control.Monad.Error.Class (MonadError)

26+import Control.Monad.Error.Class (MonadError(..))

28

27

29import Language.PureScript.AST

28import Language.PureScript.AST

30import Language.PureScript.Names

29import Language.PureScript.Names

src/Language/PureScript/TypeChecker.hs+1−1

@@ -32,7 +32,7 @@ import Data.Foldable (for_)

32import qualified Data.Map as M

33

34import Control.Monad.State

35−import Control.Monad.Except

35+import Control.Monad.Error.Class (MonadError(..))

36

37import Language.PureScript.Types

38import Language.PureScript.Names

src/Language/PureScript/TypeChecker/Entailment.hs+2−1

@@ -25,7 +25,8 @@ import qualified Data.Map as M

25

26import Control.Applicative

27import Control.Arrow (Arrow(..))

28−import Control.Monad.Except

28+import Control.Monad

29+import Control.Monad.Error.Class (MonadError(..))

29

30

30import Language.PureScript.AST

31import Language.PureScript.AST

31import Language.PureScript.Errors

32import Language.PureScript.Errors

src/Language/PureScript/TypeChecker/Kinds.hs+2−1

@@ -30,7 +30,8 @@ import qualified Data.Map as M

30

31import Control.Arrow (second)

32import Control.Applicative

33−import Control.Monad.Except

33+import Control.Monad

34+import Control.Monad.Error.Class (MonadError(..))

34import Control.Monad.State

35import Control.Monad.State

35import Control.Monad.Unify

36import Control.Monad.Unify

36

37

src/Language/PureScript/TypeChecker/Monad.hs+1−1

@@ -22,7 +22,7 @@ import Data.Maybe

22import qualified Data.Map as M

23

24import Control.Applicative

25−import Control.Monad.Except

25+import Control.Monad.Error.Class (MonadError(..))

26import Control.Monad.State

27import Control.Monad.Unify

28

src/Language/PureScript/TypeChecker/Rows.hs+2−1

@@ -19,7 +19,8 @@ module Language.PureScript.TypeChecker.Rows (

19

20import Data.List

21

22−import Control.Monad.Except

22+import Control.Monad

23+import Control.Monad.Error.Class (MonadError(..))

23

24

24import Language.PureScript.AST

25import Language.PureScript.AST

25import Language.PureScript.Errors

26import Language.PureScript.Errors

src/Language/PureScript/TypeChecker/Skolems.hs+1−1

@@ -26,7 +26,7 @@ import Data.List (nub, (\\))

26import Data.Monoid

27

28import Control.Applicative

29−import Control.Monad.Except

29+import Control.Monad.Error.Class (MonadError(..))

30import Control.Monad.Unify

31

32import Language.PureScript.AST

src/Language/PureScript/TypeChecker/Subsumption.hs+2−1

@@ -20,7 +20,8 @@ module Language.PureScript.TypeChecker.Subsumption (

20import Data.List (sortBy)

21import Data.Ord (comparing)

22

23−import Control.Monad.Except

23+import Control.Monad

24+import Control.Monad.Error.Class (MonadError(..))

24import Control.Monad.Unify

25import Control.Monad.Unify

25

26

26import Language.PureScript.AST

27import Language.PureScript.AST

src/Language/PureScript/TypeChecker/Synonyms.hs+2−1

@@ -28,7 +28,8 @@ import Data.Maybe (fromMaybe)

28import qualified Data.Map as M

29

30import Control.Applicative

31−import Control.Monad.Except

31+import Control.Monad

32+import Control.Monad.Error.Class (MonadError(..))

32import Control.Monad.State

33import Control.Monad.State

33

34

34import Language.PureScript.Environment

35import Language.PureScript.Environment

src/Language/PureScript/TypeChecker/Types.hs+2−1

@@ -41,7 +41,8 @@ import Data.Maybe (fromMaybe)

41import qualified Data.Map as M

42

43import Control.Applicative

44−import Control.Monad.Except

44+import Control.Monad

45+import Control.Monad.Error.Class (MonadError(..))

45import Control.Monad.State

46import Control.Monad.State

46import Control.Monad.Unify

47import Control.Monad.Unify

47

48

src/Language/PureScript/TypeChecker/Unify.hs+2−1

@@ -29,7 +29,8 @@ import Data.List (nub, sort)

29import Data.Maybe (fromMaybe)

30import qualified Data.HashMap.Strict as H

31

32−import Control.Monad.Except

32+import Control.Monad

33+import Control.Monad.Error.Class (MonadError(..))

33import Control.Monad.Unify

34import Control.Monad.Unify

34

35

35import Language.PureScript.Environment

36import Language.PureScript.Environment