-----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.91 2001/08/20 16:17:17 simonmar Exp $
+-- $Id: InteractiveUI.hs,v 1.95 2001/10/16 14:44:51 simonmar Exp $
--
-- GHC Interactive User Interface
--
import Packages
import CompManager
-import HscTypes ( GhciMode(..), TyThing(..) )
-import MkIface ( ifaceTyCls )
+import HscTypes ( TyThing(..) )
+import MkIface
import ByteCodeLink
import DriverFlags
import DriverState
#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
import Readline
#endif
+import Concurrent
import IOExts
import Numeric
dflags <- getDynFlags
(cmstate, maybe_hval)
+ <- cmCompileExpr cmstate dflags "IO.hSetBuffering IO.stdout IO.NoBuffering >> IO.hSetBuffering IO.stderr IO.NoBuffering"
+ case maybe_hval of
+ Just hval -> unsafeCoerce# hval :: IO ()
+ _ -> panic "interactiveUI:buffering"
+
+ (cmstate, maybe_hval)
<- cmCompileExpr cmstate dflags "IO.hFlush PrelHandle.stderr"
case maybe_hval of
Just hval -> writeIORef flush_stderr (unsafeCoerce# hval :: IO ())
Left e -> return ()
Right hdl -> fileLoop hdl False
+ interactiveLoop
+
+ -- and finally, exit
+ io $ do putStrLn "Leaving GHCi."
+
+
+interactiveLoop = do
+ -- ignore ^C exceptions caught here
+ ghciHandleDyn (\e -> case e of Interrupted -> ghciUnblock interactiveLoop
+ _other -> return ()) $ do
-- read commands from stdin
#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
readlineLoop
fileLoop stdin True
#endif
- -- and finally, exit
- io $ do putStrLn "Leaving GHCi."
-
-- NOTE: We only read .ghci files if they are owned by the current user,
-- and aren't world writable. Otherwise, we could be accidentally
readlineLoop = do
st <- getGHCiState
mod <- io (cmGetContext (cmstate st))
+ io yield
l <- io (readline (mod ++ "> "))
case l of
Nothing -> return ()
showThing (ty_thing, fixity)
= vcat [ text "-- " <> showTyThing ty_thing,
showFixity fixity (getName ty_thing),
- ppr (ifaceTyCls ty_thing) ]
+ ppr (ifaceTyThing ty_thing) ]
showFixity fix name
| fix == defaultFixity = empty
flushPackageCache pkgs
new_pkg_info <- getPackageDetails new_pkgs
- mapM_ (linkPackage False) (reverse new_pkg_info)
+ mapM_ linkPackage (reverse new_pkg_info)
-----------------------------------------------------------------------------
-- GHCi monad
(GHCi m) >>= k = GHCi $ \s -> m s >>= \a -> unGHCi (k a) s
return a = GHCi $ \s -> return a
+ghciHandleDyn :: Typeable t => (t -> GHCi a) -> GHCi a -> GHCi a
+ghciHandleDyn h (GHCi m) = GHCi $ \s ->
+ Exception.catchDyn (m s) (\e -> unGHCi (h e) s)
+
getGHCiState = GHCi $ \r -> readIORef r
setGHCiState s = GHCi $ \r -> writeIORef r s
linkPackages :: [LibrarySpec] -> [PackageConfig] -> IO ()
linkPackages cmdline_lib_specs pkgs
- = do sequence_ [ linkPackage (name p `elem` loaded) p | p <- reverse pkgs ]
+ = do mapM_ linkPackage (reverse pkgs)
lib_paths <- readIORef v_Library_paths
mapM_ (preloadLib lib_paths) cmdline_lib_specs
if (null cmdline_lib_specs)
if ok then putStrLn "done."
else throwDyn (InstallationError "linking extra libraries/objects failed")
where
- -- Packages that are already linked into GHCi. For mingw32, we only
- -- skip gmp and rts, since std and after need to load the msvcrt.dll
- -- library which std depends on.
- loaded
-# ifndef mingw32_TARGET_OS
- = [ "gmp", "rts", "std", "concurrent", "posix", "text", "util" ]
-# else
- = [ "gmp", "rts" ]
-# endif
-
preloadLib :: [String] -> LibrarySpec -> IO ()
preloadLib lib_paths lib_spec
= do putStr ("Loading object " ++ showLS lib_spec ++ " ... ")
= (throwDyn . CmdLineError)
"user specified .o/.so/.DLL could not be loaded."
+-- Packages that are already linked into GHCi. For mingw32, we only
+-- skip gmp and rts, since std and after need to load the msvcrt.dll
+-- library which std depends on.
+loaded_in_ghci
+# ifndef mingw32_TARGET_OS
+ = [ "gmp", "rts", "std", "concurrent", "posix", "text", "util" ]
+# else
+ = [ "gmp", "rts" ]
+# endif
-linkPackage :: Bool -> PackageConfig -> IO ()
--- ignore rts and gmp for now (ToDo; better?)
-linkPackage loaded_in_ghci pkg
- | name pkg `elem` ["rts", "gmp"]
- = return ()
- | otherwise
- = do putStr ("Loading package " ++ name pkg ++ " ... ")
+linkPackage :: PackageConfig -> IO ()
+linkPackage pkg
+ = do
-- For each obj, try obj.o and if that fails, obj.so.
-- Complication: all the .so's must be loaded before any of the .o's.
let dirs = library_dirs pkg
-- Don't load the .so libs if this is a package GHCi is already
-- linked against, because we'll already have the .so linked in.
let (so_libs, obj_libs) = partition isRight classifieds
- let sos_first | loaded_in_ghci = obj_libs
- | otherwise = so_libs ++ obj_libs
+ let sos_first | name pkg `elem` loaded_in_ghci = obj_libs
+ | otherwise = so_libs ++ obj_libs
+
+ -- nothing to do?
+ if null sos_first then return () else do
+ putStr ("Loading package " ++ name pkg ++ " ... ")
mapM loadClassified sos_first
putStr "linking ... "
ok <- resolveObjs