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

git.iko.soy/Idris-dev

Merge pull request #62 from dagit/master

Use strict StateT so we can build against the latest haskeline

commit53eb55246548d5e4f356562b442397b5c2fe3bf6 authorEdwin Brady <edwin.brady@gmail.com> dateSun 28 Oct 2012, 16:53 (14 years ago) parent71a3efa e11da78

6 files changed+10−4

compare with master

unifiedsplit

.gitignore+2 .travis.yml+1 idris.cabal+1−1 src/Idris/AbsSyntaxTree.hs+1−1 src/Idris/REPL.hs+2−1 src/Main.hs+3−1

.gitignore+2

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

11dist

2+cabal-dev/

23*.ibc

34*.o

45*.a

6+*.swp

57test/output

68test/test???/output

.travis.ymlnew file+1

@@ -0,0 +1 @@

1+language: Haskell

idris.cabal+1−1

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

8181

8282 Paths_idris

8383

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

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

8585 containers, process, transformers, filepath, directory,

8686 binary, bytestring, pretty

8787

src/Idris/AbsSyntaxTree.hs+1−1

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

1414

1515import System.Console.Haskeline

1616

17−import Control.Monad.State

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

1818

1919import Data.List

2020import Data.Char

src/Idris/REPL.hs+2−1

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

4040import System.Directory

4141import System.IO

4242import 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 )

4445import Data.Maybe

4546import Data.List

4647import Data.Char

src/Main.hs+3−1

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

88import Data.Maybe

99import 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 )

1113

1214import Core.CoreParser

1315import Core.ShellParser