53eb552 · Idris-dev · git.iko.soy

.gitignore+2

compare with master

unifiedsplit

@@ -1,6 +1,8 @@

1dist

2+cabal-dev/

2*.ibc

3*.ibc

3*.o

4*.o

4*.a

5*.a

6+*.swp

5test/output

7test/output

6test/test???/output

8test/test???/output

.travis.ymlnew file+1

@@ -0,0 +1 @@

1+language: Haskell

idris.cabal+1−1

@@ -81,7 +81,7 @@ Executable idris

81

82 Paths_idris

83

84− Build-depends: base>=4 && <5, parsec, mtl, Cabal, haskeline<0.7,

84+ Build-depends: base>=4 && <5, parsec, mtl, Cabal, haskeline,

85 containers, process, transformers, filepath, directory,

86 binary, bytestring, pretty

87

src/Idris/AbsSyntaxTree.hs+1−1

@@ -14,7 +14,7 @@ import Paths_idris

14

15import System.Console.Haskeline

16

17−import Control.Monad.State

17+import Control.Monad.Trans.State.Strict

18

19import Data.List

20import Data.Char

src/Idris/REPL.hs+2−1

@@ -40,7 +40,8 @@ import System.Process

40import System.Directory

41import System.IO

42import Control.Monad

43−import Control.Monad.State

43+import Control.Monad.Trans.State.Strict ( StateT, execStateT, get, put )

44+import Control.Monad.Trans ( liftIO, lift )

44import Data.Maybe

45import Data.Maybe

45import Data.List

46import Data.List

46import Data.Char

47import Data.Char

src/Main.hs+3−1

@@ -7,7 +7,9 @@ import System.Exit

7

8import Data.Maybe

9import Data.Version

10−import Control.Monad.State

10+import Control.Monad.Trans.State.Strict ( execStateT, get, put )

11+import Control.Monad.Trans ( liftIO )

12+import Control.Monad ( when )

11

13

12import Core.CoreParser

14import Core.CoreParser

13import Core.ShellParser

15import Core.ShellParser