From 9d8cd55cd5e492ed8996fe86cc1145989f1bf51b Mon Sep 17 00:00:00 2001 From: Andreas Källberg Date: Wed, 9 Sep 2020 11:05:41 +0200 Subject: Import orphan instances of MonadFail for ghc<8 Also upgrade alex/happy so automatic install works --- src/compiler/GF/Command/Interpreter.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/compiler/GF/Command/Interpreter.hs') diff --git a/src/compiler/GF/Command/Interpreter.hs b/src/compiler/GF/Command/Interpreter.hs index bcb15d238..d1fd65a54 100644 --- a/src/compiler/GF/Command/Interpreter.hs +++ b/src/compiler/GF/Command/Interpreter.hs @@ -11,6 +11,9 @@ import GF.Infra.UseIO(putStrLnE) import Control.Monad(when) import qualified Data.Map as Map +import GF.Infra.UseIO (Output) +import qualified Control.Monad.Fail as Fail +-- import Control.Monad.State (StateT) data CommandEnv m = CommandEnv { commands :: Map.Map String (CommandInfo m), @@ -22,6 +25,7 @@ data CommandEnv m = CommandEnv { mkCommandEnv cmds = CommandEnv cmds Map.empty Map.empty --interpretCommandLine :: CommandEnv -> String -> SIO () +interpretCommandLine :: (Output m, TypeCheckArg m) => CommandEnv m -> String -> m () interpretCommandLine env line = case readCommandLine line of Just [] -> return () -- cgit v1.2.3 From 2fd1040724908943ef420480dd193e39bfc55f33 Mon Sep 17 00:00:00 2001 From: Andreas Källberg Date: Fri, 11 Sep 2020 10:58:18 +0200 Subject: Fix incorrect type and update dependencies --- src/compiler/GF/Command/Interpreter.hs | 3 +-- stack-ghc8.6.5.yaml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler/GF/Command/Interpreter.hs') diff --git a/src/compiler/GF/Command/Interpreter.hs b/src/compiler/GF/Command/Interpreter.hs index d1fd65a54..1c38edf8b 100644 --- a/src/compiler/GF/Command/Interpreter.hs +++ b/src/compiler/GF/Command/Interpreter.hs @@ -13,7 +13,6 @@ import Control.Monad(when) import qualified Data.Map as Map import GF.Infra.UseIO (Output) import qualified Control.Monad.Fail as Fail --- import Control.Monad.State (StateT) data CommandEnv m = CommandEnv { commands :: Map.Map String (CommandInfo m), @@ -25,7 +24,7 @@ data CommandEnv m = CommandEnv { mkCommandEnv cmds = CommandEnv cmds Map.empty Map.empty --interpretCommandLine :: CommandEnv -> String -> SIO () -interpretCommandLine :: (Output m, TypeCheckArg m) => CommandEnv m -> String -> m () +interpretCommandLine :: (Fail.MonadFail m, Output m, TypeCheckArg m) => CommandEnv m -> String -> m () interpretCommandLine env line = case readCommandLine line of Just [] -> return () diff --git a/stack-ghc8.6.5.yaml b/stack-ghc8.6.5.yaml index 0f98f8dfc..99496798d 100644 --- a/stack-ghc8.6.5.yaml +++ b/stack-ghc8.6.5.yaml @@ -3,3 +3,4 @@ resolver: lts-14.3 # ghc 8.6.5 extra-deps: - network-2.6.3.6 - httpd-shed-0.4.0.3 +- cgi-3001.5.0.0 -- cgit v1.2.3