@@ -224,9 +224,7 @@ ideslave orig mods
224224 do clearErr
225225 putIState (orig { idris_options = idris_options i,
226226 idris_outputmode = (IdeSlave id) })
227− idrisCatch (do mod <- loadModule' stdout filename
228− return ())
229− (setAndReport)
227+ loadInputs stdout [filename]
230228 isetPrompt (mkPrompt [filename])
231229 -- Report either success or failure
232230 i <- getIState
@@ -346,7 +344,7 @@ processInput stvar cmd orig inputs
346344 , idris_colourTheme = idris_colourTheme i
347345 }
348346 clearErr
349− mod <- loadModule stdout f
347+ mod <- loadInputs stdout [f]
350348 return (Just [f])
351349 Success (ModImport f) ->
352350 do clearErr
@@ -1186,10 +1184,11 @@ idrisMain opts =
11861184
11871185 historyFile <- fmap (</> "repl" </> "history") getIdrisUserDataDir
11881186
1189− when (runrepl && not idesl) $ initScript
1190− stvar <- runIO $ newMVar ist
1191− when (runrepl && not idesl) $ startServer ist stvar inputs
1192− when (runrepl && not idesl) $ runInputT (replSettings (Just historyFile)) $ repl ist stvar inputs
1187+ when (runrepl && not idesl) $ do
1188+ initScript
1189+ stvar <- runIO $ newMVar ist
1190+ startServer ist stvar inputs
1191+ runInputT (replSettings (Just historyFile)) $ repl ist stvar inputs
11931192 when (idesl) $ ideslaveStart ist inputs
11941193 ok <- noErrors
11951194 when (not ok) $ runIO (exitWith (ExitFailure 1))