X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fghci%2FInteractiveUI.hs;h=1e98d0c2b7ca48a8bf39f901546076034b77732c;hb=2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc;hp=11d41c7ab576980f5de4487a9ee0e8405cd18bb5;hpb=92cdc09e48d3410182581f5bd687d1ee7cbe476b;p=ghc-hetmet.git diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs index 11d41c7..1e98d0c 100644 --- a/ghc/compiler/ghci/InteractiveUI.hs +++ b/ghc/compiler/ghci/InteractiveUI.hs @@ -1,6 +1,6 @@ {-# OPTIONS -#include "Linker.h" -#include "SchedAPI.h" #-} ----------------------------------------------------------------------------- --- $Id: InteractiveUI.hs,v 1.109 2002/01/23 16:50:49 simonmar Exp $ +-- $Id: InteractiveUI.hs,v 1.113 2002/02/12 15:17:15 simonmar Exp $ -- -- GHC Interactive User Interface -- @@ -19,6 +19,7 @@ import CmTypes ( Linkable, isObjectLinkable, ModSummary(..) ) import CmLink ( findModuleLinkable_maybe ) import HscTypes ( TyThing(..), showModMsg, InteractiveContext(..) ) +import HsSyn ( TyClDecl(..), ConDecl(..), Sig(..) ) import MkIface ( ifaceTyThing ) import DriverFlags import DriverState @@ -27,7 +28,7 @@ import Linker import Finder ( flushPackageCache ) import Util import Id ( isRecordSelector, recordSelectorFieldLabel, - isDataConWrapId, idName ) + isDataConWrapId, isDataConId, idName ) import Class ( className ) import TyCon ( tyConName, tyConClass_maybe, isPrimTyCon ) import FieldLabel ( fieldLabelTyCon ) @@ -39,7 +40,7 @@ import Name ( Name, isHomePackageName, nameSrcLoc, nameOccName, import OccName ( isSymOcc ) import BasicTypes ( defaultFixity ) import Outputable -import CmdLineOpts ( DynFlag(..), getDynFlags, saveDynFlags, +import CmdLineOpts ( DynFlag(..), DynFlags(..), getDynFlags, saveDynFlags, restoreDynFlags, dopt_unset ) import Panic ( GhcException(..), showGhcException ) import Config @@ -66,7 +67,8 @@ import IO import Char import Monad -import PrelGHC ( unsafeCoerce# ) +import GlaExts ( unsafeCoerce# ) + import Foreign ( nullPtr ) import CString ( peekCString ) @@ -84,6 +86,7 @@ GLOBAL_VAR(commands, builtin_commands, [(String, String -> GHCi Bool)]) builtin_commands :: [(String, String -> GHCi Bool)] builtin_commands = [ ("add", keepGoing addModule), + ("browse", keepGoing browseCmd), ("cd", keepGoing changeDirectory), ("def", keepGoing defineMacro), ("help", keepGoing help), @@ -110,6 +113,7 @@ helpText = "\ \\ \ evaluate/run \n\ \ :add ... add module(s) to the current target set\n\ +\ :browse [*] display the names defined by \n\ \ :cd change directory to \n\ \ :def define a command :\n\ \ :help, :? display this list of commands\n\ @@ -145,12 +149,12 @@ interactiveUI cmstate paths cmdline_libs = do hFlush stdout hSetBuffering stdout NoBuffering + dflags <- getDynFlags + -- link in the available packages pkgs <- getPackageInfo initLinker - linkPackages cmdline_libs pkgs - - dflags <- getDynFlags + linkPackages dflags cmdline_libs pkgs (cmstate, maybe_hval) <- cmCompileExpr cmstate dflags "IO.hSetBuffering IO.stdout IO.NoBuffering Prelude.>> IO.hSetBuffering IO.stderr IO.NoBuffering" @@ -170,6 +174,10 @@ interactiveUI cmstate paths cmdline_libs = do Just hval -> writeIORef flush_stdout (unsafeCoerce# hval :: IO ()) _ -> panic "interactiveUI:stdout" + -- We don't want the cmd line to buffer any input that might be + -- intended for the program, so unbuffer stdin. + hSetBuffering stdin NoBuffering + -- initial context is just the Prelude cmstate <- cmSetContext cmstate dflags [] ["Prelude"] @@ -177,7 +185,7 @@ interactiveUI cmstate paths cmdline_libs = do Readline.initialize #endif - startGHCi (runGHCi paths) + startGHCi (runGHCi paths dflags) GHCiState{ progname = "", args = [], targets = paths, @@ -191,8 +199,8 @@ interactiveUI cmstate paths cmdline_libs = do return () -runGHCi :: [FilePath] -> GHCi () -runGHCi paths = do +runGHCi :: [FilePath] -> DynFlags -> GHCi () +runGHCi paths dflags = do read_dot_files <- io (readIORef v_Read_DotGHCi) when (read_dot_files) $ do @@ -230,20 +238,24 @@ runGHCi paths = do loadModule (unwords paths) -- enter the interactive loop - interactiveLoop + is_tty <- io (hIsTerminalDevice stdin) + interactiveLoop is_tty -- and finally, exit - io $ do putStrLn "Leaving GHCi." + io $ do when (verbosity dflags > 0) $ putStrLn "Leaving GHCi." -interactiveLoop = do +interactiveLoop is_tty = do -- ignore ^C exceptions caught here - ghciHandleDyn (\e -> case e of Interrupted -> ghciUnblock interactiveLoop - _other -> return ()) $ do + ghciHandleDyn (\e -> case e of + Interrupted -> ghciUnblock (interactiveLoop is_tty) + _other -> return ()) $ do -- read commands from stdin #if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS - readlineLoop + if (is_tty) + then readlineLoop + else fileLoop stdin False -- turn off prompt for non-TTY input #else fileLoop stdin True #endif @@ -260,7 +272,7 @@ interactiveLoop = do checkPerms :: String -> IO Bool checkPerms name = - handle (\_ -> return False) $ do + DriverUtil.handle (\_ -> return False) $ do #ifdef mingw32_TARGET_OS doesFileExist name #else @@ -484,7 +496,7 @@ addModule str = do (cmstate1, ok, mods) <- io (cmLoadModules (cmstate state) dflags graph) setGHCiState state{ cmstate = cmstate1, targets = new_targets } setContextAfterLoad mods - modulesLoadedMsg ok mods + modulesLoadedMsg ok mods dflags changeDirectory :: String -> GHCi () changeDirectory ('~':d) = do @@ -558,7 +570,7 @@ loadModule' str = do setGHCiState state{ cmstate = cmstate2, targets = files } setContextAfterLoad mods - modulesLoadedMsg ok mods + modulesLoadedMsg ok mods dflags reloadModule :: String -> GHCi () @@ -577,7 +589,7 @@ reloadModule "" = do <- io (cmLoadModules (cmstate state) dflags graph) setGHCiState state{ cmstate=cmstate1 } setContextAfterLoad mods - modulesLoadedMsg ok mods + modulesLoadedMsg ok mods dflags reloadModule _ = noArgs ":reload" @@ -587,12 +599,13 @@ setContextAfterLoad (m:_) = do b <- io (cmModuleIsInterpreted cmstate m) if b then setContext m else setContext ('*':m) -modulesLoadedMsg ok mods = do - let mod_commas +modulesLoadedMsg ok mods dflags = + when (verbosity dflags > 0) $ do + let mod_commas | null mods = text "none." | otherwise = hsep ( punctuate comma (map text mods)) <> text "." - case ok of + case ok of False -> io (putStrLn (showSDoc (text "Failed, modules loaded: " <> mod_commas))) True -> @@ -616,6 +629,70 @@ shellEscape :: String -> GHCi Bool shellEscape str = io (system str >> return False) ----------------------------------------------------------------------------- +-- Browing a module's contents + +browseCmd :: String -> GHCi () +browseCmd m = + case words m of + ['*':m] | looksLikeModuleName m -> browseModule m True + [m] | looksLikeModuleName m -> browseModule m False + _ -> throwDyn (CmdLineError "syntax: :browse ") + +browseModule m exports_only = do + cms <- getCmState + dflags <- io getDynFlags + + is_interpreted <- io (cmModuleIsInterpreted cms m) + when (not is_interpreted && not exports_only) $ + throwDyn (CmdLineError ("module `" ++ m ++ "' is not interpreted")) + + -- temporarily set the context to the module we're interested in, + -- just so we can get an appropriate PrintUnqualified + (as,bs) <- io (cmGetContext cms) + cms1 <- io (if exports_only then cmSetContext cms dflags [] [prel,m] + else cmSetContext cms dflags [m] []) + cms2 <- io (cmSetContext cms1 dflags as bs) + + (cms3, things) <- io (cmBrowseModule cms2 dflags m exports_only) + + setCmState cms3 + + let unqual = cmGetPrintUnqual cms1 -- NOTE: cms1 with the new context + + things' = filter wantToSee things + + wantToSee (AnId id) = not (isDataConId id || isDataConWrapId id) + wantToSee _ = True + + thing_names = map getName things + + thingDecl thing@(AnId id) = ifaceTyThing thing + + thingDecl thing@(AClass c) = + let rn_decl = ifaceTyThing thing in + case rn_decl of + ClassDecl { tcdSigs = cons } -> + rn_decl{ tcdSigs = filter methodIsVisible cons } + other -> other + where + methodIsVisible (ClassOpSig n _ _ _) = n `elem` thing_names + + thingDecl thing@(ATyCon t) = + let rn_decl = ifaceTyThing thing in + case rn_decl of + TyData { tcdCons = cons } -> + rn_decl{ tcdCons = filter conIsVisible cons } + other -> other + where + conIsVisible (ConDecl n _ _ _ _ _) = n `elem` thing_names + + io (putStrLn (showSDocForUser unqual ( + vcat (map (ppr . thingDecl) things'))) + ) + + where + +----------------------------------------------------------------------------- -- Setting the module context setContext str @@ -627,9 +704,8 @@ setContext str '-':stuff -> (removeFromContext, words stuff) stuff -> (newContext, words stuff) - sensible ('*':c:cs) = isUpper c && all isAlphaNumEx cs - sensible (c:cs) = isUpper c && all isAlphaNumEx cs - isAlphaNumEx c = isAlphaNum c || c == '_' + sensible ('*':m) = looksLikeModuleName m + sensible m = looksLikeModuleName m newContext mods = do cms <- getCmState @@ -795,7 +871,7 @@ newPackages new_pkgs = do flushPackageCache pkgs new_pkg_info <- getPackageDetails new_pkgs - mapM_ linkPackage (reverse new_pkg_info) + mapM_ (linkPackage dflags) (reverse new_pkg_info) ----------------------------------------------------------------------------- -- code for `:show' @@ -922,26 +998,27 @@ type LibrarySpec showLS (Left nm) = "(static) " ++ nm showLS (Right nm) = "(dynamic) " ++ nm -linkPackages :: [LibrarySpec] -> [PackageConfig] -> IO () -linkPackages cmdline_lib_specs pkgs - = do mapM_ linkPackage (reverse pkgs) +linkPackages :: DynFlags -> [LibrarySpec] -> [PackageConfig] -> IO () +linkPackages dflags cmdline_lib_specs pkgs + = do mapM_ (linkPackage dflags) (reverse pkgs) lib_paths <- readIORef v_Library_paths - mapM_ (preloadLib lib_paths) cmdline_lib_specs + mapM_ (preloadLib dflags lib_paths) cmdline_lib_specs if (null cmdline_lib_specs) then return () - else do putStr "final link ... " + else do maybePutStr dflags "final link ... " ok <- resolveObjs - if ok then putStrLn "done." + if ok then maybePutStrLn dflags "done." else throwDyn (InstallationError "linking extra libraries/objects failed") where - preloadLib :: [String] -> LibrarySpec -> IO () - preloadLib lib_paths lib_spec - = do putStr ("Loading object " ++ showLS lib_spec ++ " ... ") + preloadLib :: DynFlags -> [String] -> LibrarySpec -> IO () + preloadLib dflags lib_paths lib_spec + = do maybePutStr dflags ("Loading object " ++ showLS lib_spec ++ " ... ") case lib_spec of Left static_ish -> do b <- preload_static lib_paths static_ish - putStrLn (if b then "done." else "not found") + maybePutStrLn dflags (if b then "done." + else "not found") Right dll_unadorned -> -- We add "" to the set of paths to try, so that -- if none of the real paths match, we force addDLL @@ -951,11 +1028,12 @@ linkPackages cmdline_lib_specs pkgs case maybe_errstr of Nothing -> return () Just mm -> preloadFailed mm lib_paths lib_spec - putStrLn "done" + maybePutStrLn dflags "done" preloadFailed :: String -> [String] -> LibrarySpec -> IO () preloadFailed sys_errmsg paths spec - = do putStr ("failed.\nDynamic linker error message was:\n " + = do maybePutStr dflags + ("failed.\nDynamic linker error message was:\n " ++ sys_errmsg ++ "\nWhilst trying to load: " ++ showLS spec ++ "\nDirectories to search are:\n" ++ unlines (map (" "++) paths) ) @@ -996,8 +1074,8 @@ loaded_in_ghci = [ ] # endif -linkPackage :: PackageConfig -> IO () -linkPackage pkg +linkPackage :: DynFlags -> PackageConfig -> IO () +linkPackage dflags pkg | name pkg `elem` dont_load_these = return () | otherwise = do @@ -1013,11 +1091,11 @@ linkPackage pkg let sos_first | name pkg `elem` loaded_in_ghci = obj_libs | otherwise = so_libs ++ obj_libs - putStr ("Loading package " ++ name pkg ++ " ... ") + maybePutStr dflags ("Loading package " ++ name pkg ++ " ... ") mapM loadClassified sos_first - putStr "linking ... " + maybePutStr dflags "linking ... " ok <- resolveObjs - if ok then putStrLn "done." + if ok then maybePutStrLn dflags "done." else panic ("can't load package `" ++ name pkg ++ "'") where isRight (Right _) = True @@ -1069,6 +1147,20 @@ printTimes allocs psecs int allocs <+> text "bytes"))) ----------------------------------------------------------------------------- +-- utils + +looksLikeModuleName [] = False +looksLikeModuleName (c:cs) = isUpper c && all isAlphaNumEx cs + +isAlphaNumEx c = isAlphaNum c || c == '_' + +maybePutStr dflags s | verbosity dflags > 0 = putStr s + | otherwise = return () + +maybePutStrLn dflags s | verbosity dflags > 0 = putStrLn s + | otherwise = return () + +----------------------------------------------------------------------------- -- reverting CAFs foreign import revertCAFs :: IO () -- make it "safe", just in case