diff --git a/Setup.hs b/Setup.hs index fea8a6938..97d755007 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,6 +1,6 @@ import Distribution.Simple import Distribution.Simple.LocalBuildInfo -import Distribution.Simple.BuildPaths +import Distribution.Simple.BuildPaths(exeExtension) import Distribution.Simple.Utils import Distribution.Simple.Setup import Distribution.PackageDescription hiding (Flag) @@ -12,7 +12,7 @@ import Data.Maybe(listToMaybe) import qualified Control.Exception as E import System.Process(readProcess) import System.FilePath -import System.Directory +import System.Directory(createDirectoryIfMissing,copyFile,doesDirectoryExist,getDirectoryContents) --import System.Exit --import Control.Concurrent(forkIO) --import Control.Concurrent.Chan(newChan,writeChan,readChan) diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs index feaeb0f33..cf1262f35 100644 --- a/src/compiler/GF/Command/Commands.hs +++ b/src/compiler/GF/Command/Commands.hs @@ -44,7 +44,7 @@ pgfEnv pgf = Env pgf mos class (Functor m,Monad m,MonadSIO m) => HasPGFEnv m where getPGFEnv :: m PGFEnv -instance HasPGFEnv m => TypeCheckArg m where +instance (Monad m,HasPGFEnv m) => TypeCheckArg m where typeCheckArg e = (either (fail . render . ppTcError) (return . fst) . flip inferExpr e . pgf) =<< getPGFEnv