Skip to content

Commit

Permalink
Merge pull request #3 from fshp/ghc-7.10.x
Browse files Browse the repository at this point in the history
Fix compilation for ghc 7.10.x
  • Loading branch information
atsky committed May 19, 2015
2 parents 112a3e5 + 30301f5 commit 14ffdee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions remote-debugger.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ executable remote-debugger

hs-source-dirs: src
build-depends: base >= 3 && <5,
ghc == 7.8.3,
ghc >= 7.10,
ghc-paths,
array,
network,
json

source-repository head
type: git
location: git@github.com:octomarat/HaskellDebugger.git
location: git@github.com:octomarat/HaskellDebugger.git
2 changes: 1 addition & 1 deletion src/DebuggerImpl.hs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ handleArguments = do
SetPort p -> modifyDebugState $ \st -> st{port = Just p}
ExposePkg pkg -> do
dflags <- getSessionDynFlags
setSessionDynFlags dflags{packageFlags = ExposePackage pkg : packageFlags dflags}
setSessionDynFlags dflags{packageFlags = ExposePackage (PackageArg pkg) (ModRenaming False []) : packageFlags dflags}
return ()
CmdArgsParser.Unknown s -> printJSON [
("info", ConsStr "warning"),
Expand Down
4 changes: 4 additions & 0 deletions src/DebuggerMonad.hs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ instance Monad DebuggerMonad where
instance Functor DebuggerMonad where
fmap = liftM

instance Applicative DebuggerMonad where
pure = return
(<*>) = ap

instance HasDynFlags DebuggerMonad where
getDynFlags = getSessionDynFlags

Expand Down

0 comments on commit 14ffdee

Please sign in to comment.