-----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.71 2001/06/06 14:02:50 sewardj Exp $
+-- $Id: InteractiveUI.hs,v 1.80 2001/06/28 11:29:26 simonmar Exp $
--
-- GHC Interactive User Interface
--
#include "../includes/config.h"
#include "HsVersions.h"
+import Packages
import CompManager
-import CmStaticInfo
+import HscTypes ( GhciMode(..) )
import ByteCodeLink
import DriverFlags
import DriverState
import Util
import Name ( Name )
import Outputable
-import CmdLineOpts ( DynFlag(..), dopt_unset )
+import CmdLineOpts ( DynFlag(..), getDynFlags, saveDynFlags, restoreDynFlags, dopt_unset )
import Panic ( GhcException(..) )
import Config
\ Commands available from the prompt:\n\
\\
\ <stmt> evaluate/run <stmt>\n\
+\ :add <filename> ... add module(s) to the current target set\n\
\ :cd <dir> change directory to <dir>\n\
\ :def <cmd> <expr> define a command :<cmd>\n\
\ :help, :? display this list of commands\n\
-\ :load <filename> load a module (and its dependents)\n\
+\ :load <filename> ... load module(s) and their dependents\n\
\ :module <mod> set the context for expression evaluation to <mod>\n\
\ :reload reload the current module set\n\
\ :set <option> ... set options\n\
\ -<flags> most GHC command line flags can also be set here\n\
\ (eg. -v2, -fglasgow-exts, etc.)\n\
\"
- --ToDo :add <filename> add a module to the current set\n\
-interactiveUI :: CmState -> Maybe FilePath -> [LibrarySpec] -> IO ()
-interactiveUI cmstate mod cmdline_libs = do
+interactiveUI :: CmState -> [FilePath] -> [LibrarySpec] -> IO ()
+interactiveUI cmstate paths cmdline_libs = do
hFlush stdout
hSetBuffering stdout NoBuffering
linkPackages cmdline_libs pkgs
(cmstate, ok, mods) <-
- case mod of
- Nothing -> return (cmstate, True, [])
- Just m -> cmLoadModule cmstate m
+ case paths of
+ [] -> return (cmstate, True, [])
+ _ -> cmLoadModule cmstate paths
#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
Readline.initialize
Just hval -> writeIORef flush_stdout (unsafeCoerce# hval :: IO ())
_ -> panic "interactiveUI:stdout"
- startGHCi runGHCi GHCiState{ target = mod,
+ startGHCi runGHCi GHCiState{ targets = paths,
cmstate = cmstate,
options = [] }
return ()
-- and carries on.
runCommand :: String -> GHCi Bool
runCommand c =
- ghciHandle ( \exception ->
- (case exception of
- DynException dyn ->
- case fromDynamic dyn of
- Nothing -> io (putStrLn ("*** Exception: (unknown)"))
- Just ghc_ex ->
- case ghc_ex of
- PhaseFailed phase code ->
- io ( putStrLn ("Phase " ++ phase ++ " failed (code "
- ++ show code ++ ")"))
- Interrupted -> io (putStrLn "Interrupted.")
- -- omit the location for CmdLineError
- CmdLineError s -> io (putStrLn s)
- other -> io (putStrLn (show (ghc_ex :: GhcException)))
-
- other -> io (putStrLn ("*** Exception: " ++ show exception))
-
- ) >> return False
- ) $
-
- doCommand c
+ ghciHandle ( \exception -> do
+ flushEverything
+ showException exception
+ return False
+ ) $
+ doCommand c
+
+showException (DynException dyn) =
+ case fromDynamic dyn of
+ Nothing ->
+ io (putStrLn ("*** Exception: (unknown)"))
+ Just (PhaseFailed phase code) ->
+ io (putStrLn ("Phase " ++ phase ++ " failed (code "
+ ++ show code ++ ")"))
+ Just Interrupted ->
+ io (putStrLn "Interrupted.")
+ Just (CmdLineError s) ->
+ io (putStrLn s) -- omit the location for CmdLineError
+ Just other_ghc_ex ->
+ io (putStrLn (show other_ghc_ex))
+showException other_exception
+ = io (putStrLn ("*** Exception: " ++ show other_exception))
doCommand (':' : command) = specialCommand command
doCommand stmt
= return Nothing
| otherwise
= do st <- getGHCiState
- dflags <- io (getDynFlags)
+ dflags <- io getDynFlags
let dflags' = dopt_unset dflags Opt_WarnUnusedBinds
(new_cmstate, names) <- io (cmRunStmt (cmstate st) dflags' stmt)
setGHCiState st{cmstate = new_cmstate}
help _ = io (putStr helpText)
addModule :: String -> GHCi ()
-addModule _ = throwDyn (InstallationError ":add not implemented")
+addModule str = do
+ let files = words str
+ state <- getGHCiState
+ dflags <- io (getDynFlags)
+ io (revertCAFs) -- always revert CAFs on load/add.
+ let new_targets = files ++ targets state
+ (cmstate1, ok, mods) <- io (cmLoadModule (cmstate state) new_targets)
+ setGHCiState state{ cmstate = cmstate1, targets = new_targets }
+ modulesLoadedMsg ok mods
setContext :: String -> GHCi ()
setContext ""
= throwDyn (CmdLineError "syntax: `:m <module>'")
-setContext m | not (isUpper (head m)) || not (all isAlphaNum (tail m))
+setContext m | not (isUpper (head m)) || not (all isAlphaNumEx (tail m))
= throwDyn (CmdLineError ("strange looking module name: `" ++ m ++ "'"))
+ where
+ isAlphaNumEx c = isAlphaNum c || c == '_'
setContext str
= do st <- getGHCiState
new_cmstate <- io (cmSetContext (cmstate st) str)
-- compile the expression
st <- getGHCiState
- dflags <- io (getDynFlags)
+ dflags <- io getDynFlags
(new_cmstate, maybe_hv) <- io (cmCompileExpr (cmstate st) dflags new_expr)
setGHCiState st{cmstate = new_cmstate}
case maybe_hv of
io (writeIORef commands (filter ((/= macro_name) . fst) cmds))
loadModule :: String -> GHCi ()
-loadModule path = timeIt (loadModule' path)
+loadModule str = timeIt (loadModule' str)
-loadModule' path = do
+loadModule' str = do
+ let files = words str
state <- getGHCiState
- dflags <- io (getDynFlags)
+ dflags <- io getDynFlags
cmstate1 <- io (cmUnload (cmstate state) dflags)
- setGHCiState state{ cmstate = cmstate1, target = Nothing }
+ setGHCiState state{ cmstate = cmstate1, targets = [] }
io (revertCAFs) -- always revert CAFs on load.
- (cmstate2, ok, mods) <- io (cmLoadModule cmstate1 path)
- setGHCiState state{ cmstate = cmstate2, target = Just path }
+ (cmstate2, ok, mods) <- io (cmLoadModule cmstate1 files)
+ setGHCiState state{ cmstate = cmstate2, targets = files }
modulesLoadedMsg ok mods
reloadModule :: String -> GHCi ()
reloadModule "" = do
state <- getGHCiState
- case target state of
- Nothing -> io (putStr "no current target\n")
- Just path
+ case targets state of
+ [] -> io (putStr "no current target\n")
+ paths
-> do io (revertCAFs) -- always revert CAFs on reload.
- (new_cmstate, ok, mods) <- io (cmLoadModule (cmstate state) path)
+ (new_cmstate, ok, mods) <- io (cmLoadModule (cmstate state) paths)
setGHCiState state{ cmstate=new_cmstate }
modulesLoadedMsg ok mods
typeOfExpr :: String -> GHCi ()
typeOfExpr str
= do st <- getGHCiState
- dflags <- io (getDynFlags)
+ dflags <- io getDynFlags
(new_cmstate, maybe_tystr) <- io (cmTypeOfExpr (cmstate st) dflags str)
setGHCiState st{cmstate = new_cmstate}
case maybe_tystr of
-- then, dynamic flags
io $ do
- dyn_flags <- readIORef v_InitDynFlags
- writeIORef v_DynFlags dyn_flags
+ restoreDynFlags
leftovers <- processArgs dynamic_flags leftovers []
- dyn_flags <- readIORef v_DynFlags
- writeIORef v_InitDynFlags dyn_flags
+ saveDynFlags
if (not (null leftovers))
then throwDyn (CmdLineError ("unrecognised flags: " ++
newPackages new_pkgs = do
state <- getGHCiState
- dflags <- io (getDynFlags)
+ dflags <- io getDynFlags
cmstate1 <- io (cmUnload (cmstate state) dflags)
- setGHCiState state{ cmstate = cmstate1, target = Nothing }
+ setGHCiState state{ cmstate = cmstate1, targets = [] }
io $ do
pkgs <- getPackageInfo
data GHCiState = GHCiState
{
- target :: Maybe FilePath,
+ targets :: [FilePath],
cmstate :: CmState,
options :: [GHCiOption]
}
lib_paths <- readIORef v_Library_paths
mapM_ (preloadLib lib_paths) cmdline_lib_specs
where
- -- packages that are already linked into GHCi
- loaded = [ "concurrent", "posix", "text", "util" ]
+ -- 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 b <- preload_static lib_paths static_ish
putStrLn (if b then "done" else "not found")
Right dll_unadorned
- -> do b <- preload_dynamic lib_paths dll_unadorned
+ -> -- We add "" to the set of paths to try, so that
+ -- if none of the real paths match, we force addDLL
+ -- to look in the default dynamic-link search paths.
+ do b <- preload_dynamic (lib_paths++[""]) dll_unadorned
when (not b) (cantFind lib_paths lib_spec)
putStrLn "done"
if maybe_errmsg == nullPtr
then return ()
else do str <- peekCString maybe_errmsg
- throwDyn (CmdLineError ("can't find .o or .so/.DLL for: "
+ throwDyn (CmdLineError ("can't load .so/.DLL for: "
++ dll_unadorned ++ " (" ++ str ++ ")" ))
locateOneObj :: [FilePath] -> String -> IO LibrarySpec
projects / ghc-hetmet.git / blobdiff