From 0a532c6ba5df245aef4f2a127bd0e3ae40048334 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Wed, 28 Mar 2012 16:11:34 +0100 Subject: Do not re-encode correctly encoded inputs and arguments (#5795) --- ghc/InteractiveUI.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'ghc') diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index b7e6241033..8d6e23c678 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -446,10 +446,8 @@ runGHCi paths maybe_exprs = do when (not (null paths)) $ do ok <- ghciHandle (\e -> do showException e; return Failed) $ -- TODO: this is a hack. - runInputTWithPrefs defaultPrefs defaultSettings $ do - let (filePaths, phases) = unzip paths - filePaths' <- mapM (Encoding.decode . BS.pack) filePaths - loadModule (zip filePaths' phases) + runInputTWithPrefs defaultPrefs defaultSettings $ + loadModule paths when (isJust maybe_exprs && failed ok) $ liftIO (exitWith (ExitFailure 1)) @@ -2884,10 +2882,7 @@ isHomeModule m = GHC.modulePackageId m == mainPackageId -- TODO: won't work if home dir is encoded. -- (changeDirectory may not work either in that case.) expandPath :: MonadIO m => String -> InputT m String -expandPath p = do - exp_path <- liftIO $ expandPathIO p - e <- fmap BS.unpack $ Encoding.encode exp_path - return e +expandPath = liftIO . expandPathIO expandPathIO :: String -> IO String expandPathIO p = -- cgit v1.2.1