diff --git a/app/Main.hs b/app/Main.hs index bf9abf8bb4c46340a5828b9d3c914ba7d2a042f4..3a1ea88a7fdc2851d3221d8506f11527eca88310 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -6,7 +6,7 @@ import Data.Semigroup import Options.Applicative hiding (ParseError) import System.Console.Shell import System.Console.Shell.ShellMonad -import System.Console.Shell.Backend.Readline (readlineBackend) +import System.Console.Shell.Backend.Haskeline (haskelineBackend) import qualified Paths_lambda_calculator as P @@ -73,7 +73,7 @@ cliParser = CliOptions runShell' :: CliOptions -> IO () runShell' CliOptions{version=True} = putStrLn version' runShell' CliOptions{language=Eval lang eval} - = runShell (mkShellDesc lang eval) readlineBackend () + = runShell (mkShellDesc lang eval) haskelineBackend () mkShellDesc :: Language -> (String -> Result String) diff --git a/lambda-calculator.cabal b/lambda-calculator.cabal index 311ede2a9f60d824f5015f5669cc9692d0977087..21391ff0018cd4fe65134eb4c520f42eaf0a96f6 100644 --- a/lambda-calculator.cabal +++ b/lambda-calculator.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 9a56fe4c7e5a1adfc4da3434edc5d4540a51680a8c8023849d39866eb7602ccb +-- hash: 797b677552c81b80399ac8b69e2e398479887a332862d9878a7c508a259975ee name: lambda-calculator version: 2.0.0 @@ -53,7 +53,7 @@ executable lambda-calculator ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: Shellac - , Shellac-readline + , Shellac-haskeline , base >=4.9 && <5 , lambda-calculator , optparse-applicative >=0.13 diff --git a/package.yaml b/package.yaml index 3929ffaf523b91044b0082ea876ea740dff59bcc..f935f548c941d0013be5ca8b5dfb72f2ad3a9955 100644 --- a/package.yaml +++ b/package.yaml @@ -40,7 +40,7 @@ executables: - lambda-calculator - optparse-applicative >=0.13 - Shellac - - Shellac-readline + - Shellac-haskeline tests: lambda-calculus-test: diff --git a/stack.yaml b/stack.yaml index 0639b744146dd16259280a22e4f7bdb5065a3fc5..d78ebf990ee4d6bd0fd34ca3f3be5cb1106f88e5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,6 @@ -flags: {} -extra-package-dbs: [] +resolver: lts-10.3 packages: -- '.' + - '.' extra-deps: -- Shellac-0.9.9 -- Shellac-readline-0.9.9 -- readline-1.0.3.0 -resolver: lts-10.0 + - Shellac-0.9.9 + - Shellac-haskeline-0.2.1