hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move interactive handlers to ghcCommands

Browse Source
This commit is contained in:
Nikolay Yakimov 2015-12-20 15:14:17 +03:00
parent 23416e9aeb
commit adc712f7ad
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GHCMod.hs
View File

@ -79,15 +79,6 @@ legacyInteractiveLoop symdbreq world = do
case pargs of case pargs of
CmdFind symbol -> CmdFind symbol ->
lookupSymbol symbol =<< checkDb symdbreq =<< getDb symdbreq lookupSymbol symbol =<< checkDb symdbreq =<< getDb symdbreq
CmdMapFile f -> liftIO getFileSourceFromStdin
>>= loadMappedFileSource f
>> return ""
CmdUnmapFile f -> unloadMappedFile f
>> return ""
CmdQuit -> liftIO exitSuccess
-- other commands are handled here -- other commands are handled here
x -> ghcCommands x x -> ghcCommands x
@ -161,6 +152,13 @@ ghcCommands (CmdSplit file (line, col)) = splits file line col
ghcCommands (CmdSig file (line, col)) = sig file line col ghcCommands (CmdSig file (line, col)) = sig file line col
ghcCommands (CmdAuto file (line, col)) = auto file line col ghcCommands (CmdAuto file (line, col)) = auto file line col
ghcCommands (CmdRefine file (line, col) expr) = refine file line col $ Expression expr ghcCommands (CmdRefine file (line, col) expr) = refine file line col $ Expression expr
-- interactive-only commands
ghcCommands (CmdMapFile f) =
liftIO getFileSourceFromStdin
>>= loadMappedFileSource f
>> return ""
ghcCommands (CmdUnmapFile f) = unloadMappedFile f >> return ""
ghcCommands (CmdQuit) = liftIO exitSuccess
ghcCommands cmd = throw $ InvalidCommandLine $ Left $ show cmd ghcCommands cmd = throw $ InvalidCommandLine $ Left $ show cmd
newtype InvalidCommandLine = InvalidCommandLine (Either String String) newtype InvalidCommandLine = InvalidCommandLine (Either String String)