git.iko.soy/Idris-dev
on master help sign in
Completely replace ErrorT with ExceptT
commit684a578fceaed4270216fe4d6d7706d35daa27c1 authorbmsherman <bmsherman@users.noreply.github.com> dateWed 17 Dec 2014, 23:21 (12 years ago) parent00f1cd5
6 files changed+4−7
compare with master
unifiedsplit
main/Main.hs−1 src/Idris/AbsSyntax.hs+1−2 src/Idris/Core/Constraints.hs−1 src/Idris/Core/Execute.hs+1−1 src/Idris/Error.hs+1−1 src/Idris/Parser.hs+1−1
main/Main.hs−1
@@ -8,7 +8,6 @@ import System.FilePath ((</>), addTrailingPathSeparator)
88
99import Data.Maybe
1010import Data.Version
11−import Control.Monad.Trans.Error ( ErrorT(..) )
1211import Control.Monad.Trans.State.Strict ( execStateT, get, put )
1312import Control.Monad ( when )
1413
src/Idris/AbsSyntax.hs+1−2
@@ -19,7 +19,7 @@ import System.IO
1919
2020import Control.Applicative
2121import Control.Monad.State
22−import Control.Monad.Error(throwError)
22+import Control.Monad.Except (throwError, catchError)
2323
2424import Data.List hiding (insert,union)
2525import Data.Char
@@ -32,7 +32,6 @@ import Data.Word (Word)
3232
3333import Debug.Trace
3434
35−import Control.Monad.Error (throwError, catchError)
3635import System.IO.Error(isUserError, ioeGetErrorString, tryIOError)
3736
3837import Util.Pretty
src/Idris/Core/Constraints.hs−1
@@ -6,7 +6,6 @@ import Idris.Core.Typecheck
66
77import Control.Applicative
88import Control.Arrow
9−import Control.Monad.Error
109import Control.Monad.RWS
1110import Control.Monad.State
1211import Data.List
src/Idris/Core/Execute.hs+1−1
@@ -22,7 +22,7 @@ import Control.Applicative hiding (Const)
2222import Control.Exception
2323import Control.Monad.Trans
2424import Control.Monad.Trans.State.Strict
25−import Control.Monad.Trans.Except
25+import Control.Monad.Except
2626import Control.Monad hiding (forM)
2727import Data.Maybe
2828import Data.Bits
src/Idris/Error.hs+1−1
@@ -17,7 +17,7 @@ import System.Console.Haskeline
1717import System.Console.Haskeline.MonadException
1818import Control.Monad (when)
1919import Control.Monad.State.Strict
20−import Control.Monad.Error (throwError, catchError)
20+import Control.Monad.Except (throwError, catchError)
2121import System.IO.Error(isUserError, ioeGetErrorString)
2222import Data.Char
2323import Data.List (intercalate, isPrefixOf)
src/Idris/Parser.hs+1−1
@@ -49,7 +49,7 @@ import Idris.Core.Evaluate
4949
5050import Control.Applicative hiding (Const)
5151import Control.Monad
52−import Control.Monad.Error (throwError, catchError)
52+import Control.Monad.Except (throwError, catchError)
5353import Control.Monad.State.Strict
5454
5555import Data.Function