@@ -224,9 +224,7 @@ ideslave orig mods
224 do clearErr
224 do clearErr
225 putIState (orig { idris_options = idris_options i,
225 putIState (orig { idris_options = idris_options i,
226 idris_outputmode = (IdeSlave id) })
226 idris_outputmode = (IdeSlave id) })
227− idrisCatch (do mod <- loadModule' stdout filename
227+ loadInputs stdout [filename]
230 isetPrompt (mkPrompt [filename])
228 isetPrompt (mkPrompt [filename])
231 -- Report either success or failure
229 -- Report either success or failure
232 i <- getIState
230 i <- getIState
@@ -346,7 +344,7 @@ processInput stvar cmd orig inputs
346 , idris_colourTheme = idris_colourTheme i
344 , idris_colourTheme = idris_colourTheme i
349− mod <- loadModule stdout f
347+ mod <- loadInputs stdout [f]
350 return (Just [f])
348 return (Just [f])
351 Success (ModImport f) ->
349 Success (ModImport f) ->
352 do clearErr
350 do clearErr
@@ -1186,10 +1184,11 @@ idrisMain opts =
1187 historyFile <- fmap (</> "repl" </> "history") getIdrisUserDataDir
1185 historyFile <- fmap (</> "repl" </> "history") getIdrisUserDataDir
1189− when (runrepl && not idesl) $ initScript
1187+ when (runrepl && not idesl) $ do
1190− stvar <- runIO $ newMVar ist
1189+ stvar <- runIO $ newMVar ist
1191− when (runrepl && not idesl) $ startServer ist stvar inputs
1190+ startServer ist stvar inputs
1192− when (runrepl && not idesl) $ runInputT (replSettings (Just historyFile)) $ repl ist stvar inputs
1191+ runInputT (replSettings (Just historyFile)) $ repl ist stvar inputs
1193 when (idesl) $ ideslaveStart ist inputs
1192 when (idesl) $ ideslaveStart ist inputs
1194 ok <- noErrors
1193 ok <- noErrors
1195 when (not ok) $ runIO (exitWith (ExitFailure 1))
1194 when (not ok) $ runIO (exitWith (ExitFailure 1))