@@ -219,7 +219,7 @@ handleDeclaration value st = do
219 Left err -> outputStrLn err
219 Left err -> outputStrLn err
220 Right (js, _, _) -> do
220 Right (js, _, _) -> do
221 process <- lift . lift $ findNodeProcess
221 process <- lift . lift $ findNodeProcess
222− result <- lift . lift $ traverse (\node -> readProcessWithExitCode node [] js) process
222+ result <- lift . lift $ traverse (\node -> readProcessWithExitCode node [] js) process
223 case result of
223 case result of
224 Just (ExitSuccess, out, _) -> outputStrLn out
224 Just (ExitSuccess, out, _) -> outputStrLn out
225 Just (ExitFailure _, _, err) -> outputStrLn err
225 Just (ExitFailure _, _, err) -> outputStrLn err
@@ -259,9 +259,9 @@ getCommand = do
260handleCommand :: Command -> InputT (StateT PSCiState IO) ()
260handleCommand :: Command -> InputT (StateT PSCiState IO) ()
261handleCommand (Expression val) = lift get >>= handleDeclaration val
261handleCommand (Expression val) = lift get >>= handleDeclaration val
262−handleCommand (Let l) = lift $ modify (updateLets l)
263handleCommand Help = outputStrLn helpMessage
262handleCommand Help = outputStrLn helpMessage
264handleCommand (Import moduleName) = lift $ modify (updateImports moduleName)
263handleCommand (Import moduleName) = lift $ modify (updateImports moduleName)
264+handleCommand (Let l) = lift $ modify (updateLets l)
265handleCommand (LoadFile filePath) = do
265handleCommand (LoadFile filePath) = do
266 absPath <- lift . lift $ expandTilde filePath
266 absPath <- lift . lift $ expandTilde filePath
267 exists <- lift . lift $ doesFileExist absPath
267 exists <- lift . lift $ doesFileExist absPath
@@ -271,12 +271,11 @@ handleCommand (LoadFile filePath) = do
272 outputStrLn $ "Couldn't locate: " ++ filePath
272 outputStrLn $ "Couldn't locate: " ++ filePath
273handleCommand Reset = do
273handleCommand Reset = do
274− preludeFilename <- lift . lift $ getPreludeFilename
275 files <- psciImportedFilenames <$> lift get
274 files <- psciImportedFilenames <$> lift get
276− modulesOrFirstError <- fmap concat . sequence <$> mapM (lift . lift . loadModule) (preludeFilename : files)
275+ modulesOrFirstError <- fmap concat . sequence <$> mapM (lift . lift . loadModule) files
277 case modulesOrFirstError of
276 case modulesOrFirstError of
278 Left err -> lift . lift $ putStrLn err >> exitFailure
277 Left err -> lift . lift $ putStrLn err >> exitFailure
279− Right modules -> lift $ put (PSCiState (preludeFilename : files) defaultImports modules [])
278+ Right modules -> lift $ put (PSCiState files defaultImports modules [])
280handleCommand (TypeOf val) = lift get >>= handleTypeOf val
279handleCommand (TypeOf val) = lift get >>= handleTypeOf val
281handleCommand _ = outputStrLn "Unknown command"
280handleCommand _ = outputStrLn "Unknown command"