git.iko.soy/Idris-dev
on master help sign in
Completely replace ErrorT with ExceptT
684a578bmsherman
main/Main.hs−1
compare with master
unifiedsplit
@@ -8,7 +8,6 @@ import System.FilePath ((</>), addTrailingPathSeparator)
8
8
9import Data.Maybe
9import Data.Maybe
10import Data.Version
10import Data.Version
11−import Control.Monad.Trans.Error ( ErrorT(..) )
12import Control.Monad.Trans.State.Strict ( execStateT, get, put )
11import Control.Monad.Trans.State.Strict ( execStateT, get, put )
13import Control.Monad ( when )
12import Control.Monad ( when )
14
13
src/Idris/AbsSyntax.hs+1−2
@@ -19,7 +19,7 @@ import System.IO
19
19
20import Control.Applicative
20import Control.Applicative
21import Control.Monad.State
21import Control.Monad.State
22−import Control.Monad.Error(throwError)
22+import Control.Monad.Except (throwError, catchError)
23
23
24import Data.List hiding (insert,union)
24import Data.List hiding (insert,union)
25import Data.Char
25import Data.Char
@@ -32,7 +32,6 @@ import Data.Word (Word)
32
32
33import Debug.Trace
33import Debug.Trace
34
34
35−import Control.Monad.Error (throwError, catchError)
36import System.IO.Error(isUserError, ioeGetErrorString, tryIOError)
35import System.IO.Error(isUserError, ioeGetErrorString, tryIOError)
37
36
38import Util.Pretty
37import Util.Pretty
src/Idris/Core/Constraints.hs−1
@@ -6,7 +6,6 @@ import Idris.Core.Typecheck
6
6
7import Control.Applicative
7import Control.Applicative
8import Control.Arrow
8import Control.Arrow
9−import Control.Monad.Error
10import Control.Monad.RWS
9import Control.Monad.RWS
11import Control.Monad.State
10import Control.Monad.State
12import Data.List
11import Data.List
src/Idris/Core/Execute.hs+1−1
@@ -22,7 +22,7 @@ import Control.Applicative hiding (Const)
22import Control.Exception
22import Control.Exception
23import Control.Monad.Trans
23import Control.Monad.Trans
24import Control.Monad.Trans.State.Strict
24import Control.Monad.Trans.State.Strict
25−import Control.Monad.Trans.Except
25+import Control.Monad.Except
26import Control.Monad hiding (forM)
26import Control.Monad hiding (forM)
27import Data.Maybe
27import Data.Maybe
28import Data.Bits
28import Data.Bits
src/Idris/Error.hs+1−1
@@ -17,7 +17,7 @@ import System.Console.Haskeline
17import System.Console.Haskeline.MonadException
17import System.Console.Haskeline.MonadException
18import Control.Monad (when)
18import Control.Monad (when)
19import Control.Monad.State.Strict
19import Control.Monad.State.Strict
20−import Control.Monad.Error (throwError, catchError)
20+import Control.Monad.Except (throwError, catchError)
21import System.IO.Error(isUserError, ioeGetErrorString)
21import System.IO.Error(isUserError, ioeGetErrorString)
22import Data.Char
22import Data.Char
23import Data.List (intercalate, isPrefixOf)
23import Data.List (intercalate, isPrefixOf)
src/Idris/Parser.hs+1−1
@@ -49,7 +49,7 @@ import Idris.Core.Evaluate
49
49
50import Control.Applicative hiding (Const)
50import Control.Applicative hiding (Const)
51import Control.Monad
51import Control.Monad
52−import Control.Monad.Error (throwError, catchError)
52+import Control.Monad.Except (throwError, catchError)
53import Control.Monad.State.Strict
53import Control.Monad.State.Strict
54
54
55import Data.Function
55import Data.Function