git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Use Control.Monad.{Error => Except} where possible
4538687Harry Garrood
psc/Main.hs+1−1
@@ -17,7 +17,7 @@
17module Main where
17module Main where
18
18
19import Control.Applicative
19import Control.Applicative
20−import Control.Monad.Error
20+import Control.Monad.Except
21import Control.Monad.Reader
21import Control.Monad.Reader
22
22
23import Data.Maybe (fromMaybe)
23import Data.Maybe (fromMaybe)
src/Language/PureScript.hs+1−1
@@ -29,7 +29,7 @@ import qualified Data.Set as S
29
29
30import Control.Applicative
30import Control.Applicative
31import Control.Arrow ((&&&))
31import Control.Arrow ((&&&))
32−import Control.Monad.Error
32+import Control.Monad.Except
33import Control.Monad.Reader
33import Control.Monad.Reader
34
34
35import System.FilePath ((</>))
35import System.FilePath ((</>))
src/Language/PureScript/Errors.hs+2−1
@@ -20,7 +20,8 @@ import Data.Either (lefts, rights)
20import Data.List (intersperse, intercalate)
20import Data.List (intersperse, intercalate)
21import Data.Monoid
21import Data.Monoid
22
22
23−import Control.Monad.Error
23+import Control.Monad.Except
24+import Control.Monad.Error (Error(..))
24import Control.Applicative ((<$>))
25import Control.Applicative ((<$>))
25
26
26import Language.PureScript.AST
27import Language.PureScript.AST
src/Language/PureScript/ModuleDependencies.hs+1−1
@@ -19,7 +19,7 @@ module Language.PureScript.ModuleDependencies (
19 ModuleGraph
19 ModuleGraph
20) where
20) where
21
21
22−import Control.Monad.Error.Class
22+import Control.Monad.Except
23
23
24import Data.Graph
24import Data.Graph
25import Data.List (nub)
25import Data.List (nub)
src/Language/PureScript/Sugar/CaseDeclarations.hs+2−1
@@ -24,7 +24,8 @@ import Data.List (nub, groupBy)
24
24
25import Control.Applicative
25import Control.Applicative
26import Control.Monad ((<=<), forM, join, unless, replicateM)
26import Control.Monad ((<=<), forM, join, unless, replicateM)
27−import Control.Monad.Error.Class
27+import Control.Monad.Except
28+import Control.Monad.Error (Error(..))
28
29
29import Language.PureScript.Names
30import Language.PureScript.Names
30import Language.PureScript.AST
31import Language.PureScript.AST
src/Language/PureScript/Sugar/Names.hs+2−1
@@ -21,7 +21,8 @@ import Data.Maybe (fromMaybe, isJust, mapMaybe)
21import Data.Monoid ((<>))
21import Data.Monoid ((<>))
22
22
23import Control.Applicative (Applicative(..), (<$>), (<*>))
23import Control.Applicative (Applicative(..), (<$>), (<*>))
24−import Control.Monad.Error
24+import Control.Monad.Except
25+import Control.Monad.Error (Error(..))
25
26
26import qualified Data.Map as M
27import qualified Data.Map as M
27
28
src/Language/PureScript/Sugar/Operators.hs+2−1
@@ -32,7 +32,8 @@ import Language.PureScript.Supply
32
32
33import Control.Applicative
33import Control.Applicative
34import Control.Monad.State
34import Control.Monad.State
35−import Control.Monad.Error.Class
35+import Control.Monad.Except
36+import Control.Monad.Error (Error(..))
36
37
37import Data.Monoid ((<>))
38import Data.Monoid ((<>))
38import Data.Function (on)
39import Data.Function (on)
src/Language/PureScript/Sugar/TypeClasses.hs+2−1
@@ -34,7 +34,8 @@ import qualified Language.PureScript.Constants as C
34
34
35import Control.Applicative
35import Control.Applicative
36import Control.Arrow (first, second)
36import Control.Arrow (first, second)
37−import Control.Monad.Error
37+import Control.Monad.Except
38+import Control.Monad.Error (Error(..))
38import Control.Monad.State
39import Control.Monad.State
39import Data.List ((\\), find)
40import Data.List ((\\), find)
40import Data.Maybe (catMaybes, mapMaybe, isJust)
41import Data.Maybe (catMaybes, mapMaybe, isJust)
src/Language/PureScript/Sugar/TypeDeclarations.hs+2−1
@@ -22,7 +22,8 @@ module Language.PureScript.Sugar.TypeDeclarations (
22import Data.Monoid ((<>))
22import Data.Monoid ((<>))
23
23
24import Control.Applicative
24import Control.Applicative
25−import Control.Monad.Error.Class
25+import Control.Monad.Except
26+import Control.Monad.Error (Error(..))
26import Control.Monad (forM)
27import Control.Monad (forM)
27
28
28import Language.PureScript.AST
29import Language.PureScript.AST
src/Language/PureScript/Supply.hs+1−1
@@ -24,7 +24,7 @@ import Data.Functor.Identity
24
24
25import Control.Applicative
25import Control.Applicative
26import Control.Monad.State
26import Control.Monad.State
27−import Control.Monad.Error.Class
27+import Control.Monad.Except
28
28
29newtype SupplyT m a = SupplyT { unSupplyT :: StateT Integer m a } deriving (Functor, Applicative, Monad, MonadTrans)
29newtype SupplyT m a = SupplyT { unSupplyT :: StateT Integer m a } deriving (Functor, Applicative, Monad, MonadTrans)
30
30
src/Language/PureScript/TypeChecker.hs+2−1
@@ -32,7 +32,8 @@ import Data.Foldable (for_)
32import qualified Data.Map as M
32import qualified Data.Map as M
33
33
34import Control.Monad.State
34import Control.Monad.State
35−import Control.Monad.Error
35+import Control.Monad.Except
36+import Control.Monad.Error (Error(..))
36
37
37import Language.PureScript.Types
38import Language.PureScript.Types
38import Language.PureScript.Names
39import Language.PureScript.Names
src/Language/PureScript/TypeChecker/Entailment.hs+2−1
@@ -25,7 +25,8 @@ import qualified Data.Map as M
25
25
26import Control.Applicative
26import Control.Applicative
27import Control.Arrow (Arrow(..))
27import Control.Arrow (Arrow(..))
28−import Control.Monad.Error
28+import Control.Monad.Except
29+import Control.Monad.Error (Error(..))
29
30
30import Language.PureScript.AST
31import Language.PureScript.AST
31import Language.PureScript.Environment
32import Language.PureScript.Environment
src/Language/PureScript/TypeChecker/Kinds.hs+2−1
@@ -31,7 +31,8 @@ import qualified Data.Map as M
31
31
32import Control.Arrow (second)
32import Control.Arrow (second)
33import Control.Applicative
33import Control.Applicative
34−import Control.Monad.Error
34+import Control.Monad.Except
35+import Control.Monad.Error (Error(..))
35import Control.Monad.State
36import Control.Monad.State
36import Control.Monad.Unify
37import Control.Monad.Unify
37
38
src/Language/PureScript/TypeChecker/Monad.hs+2−1
@@ -22,7 +22,8 @@ import Data.Maybe
22import qualified Data.Map as M
22import qualified Data.Map as M
23
23
24import Control.Applicative
24import Control.Applicative
25−import Control.Monad.Error
25+import Control.Monad.Except
26+import Control.Monad.Error (Error(..))
26import Control.Monad.Reader.Class
27import Control.Monad.Reader.Class
27import Control.Monad.State
28import Control.Monad.State
28import Control.Monad.Unify
29import Control.Monad.Unify
src/Language/PureScript/TypeChecker/Rows.hs+1−1
@@ -19,7 +19,7 @@ module Language.PureScript.TypeChecker.Rows (
19
19
20import Data.List
20import Data.List
21
21
22−import Control.Monad.Error
22+import Control.Monad.Except
23
23
24import Language.PureScript.AST
24import Language.PureScript.AST
25import Language.PureScript.Errors
25import Language.PureScript.Errors
src/Language/PureScript/TypeChecker/Skolems.hs+1−1
@@ -26,7 +26,7 @@ import Data.List (nub, (\\))
26import Data.Monoid
26import Data.Monoid
27
27
28import Control.Applicative
28import Control.Applicative
29−import Control.Monad.Error
29+import Control.Monad.Except
30import Control.Monad.Unify
30import Control.Monad.Unify
31
31
32import Language.PureScript.AST
32import Language.PureScript.AST
src/Language/PureScript/TypeChecker/Subsumption.hs+2−1
@@ -22,7 +22,8 @@ import Data.Monoid
22import Data.Ord (comparing)
22import Data.Ord (comparing)
23
23
24import Control.Applicative
24import Control.Applicative
25−import Control.Monad.Error
25+import Control.Monad.Except
26+import Control.Monad.Error (Error(..))
26import Control.Monad.Unify
27import Control.Monad.Unify
27
28
28import Language.PureScript.AST
29import 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
28import qualified Data.Map as M
29
29
30import Control.Applicative
30import Control.Applicative
31−import Control.Monad.Error
31+import Control.Monad.Except
32+import Control.Monad.Error (Error(..))
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
@@ -42,7 +42,8 @@ import Data.Monoid
42import qualified Data.Map as M
42import qualified Data.Map as M
43
43
44import Control.Applicative
44import Control.Applicative
45−import Control.Monad.Error
45+import Control.Monad.Except
46+import Control.Monad.Error (Error(..))
46import Control.Monad.State
47import Control.Monad.State
47import Control.Monad.Unify
48import Control.Monad.Unify
48
49
src/Language/PureScript/TypeChecker/Unify.hs+2−1
@@ -30,7 +30,8 @@ import Data.Maybe (fromMaybe)
30import Data.Monoid
30import Data.Monoid
31import qualified Data.HashMap.Strict as H
31import qualified Data.HashMap.Strict as H
32
32
33−import Control.Monad.Error
33+import Control.Monad.Except
34+import Control.Monad.Error (Error(..))
34import Control.Monad.Unify
35import Control.Monad.Unify
35
36
36import Language.PureScript.Environment
37import Language.PureScript.Environment