X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fghci%2FInteractiveUI.hs;h=e64323cda51614235d75592d6f5983e89caa1ef3;hb=ee43954806848ffbe78f7cb8cf6732c2d86306d2;hp=83061acf063354f65ace01d4ed6e96013f486917;hpb=04be746b439b8c470a4c12a3ea5b63d6e81a0241;p=ghc-hetmet.git

diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs
index 83061ac..e64323c 100644
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/ghc/compiler/ghci/InteractiveUI.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.47 2001/02/13 17:13:39 sewardj Exp $
+-- $Id: InteractiveUI.hs,v 1.77 2001/06/18 09:09:28 simonmar Exp $
 --
 -- GHC Interactive User Interface
 --
@@ -10,28 +10,33 @@
 {-# OPTIONS -#include "Linker.h" #-}
 module InteractiveUI ( interactiveUI, ghciWelcomeMsg ) where
 
+#include "../includes/config.h"
 #include "HsVersions.h"
 
+import Packages
 import CompManager
-import CmStaticInfo
+import HscTypes		( GhciMode(..) )
 import ByteCodeLink
 import DriverFlags
 import DriverState
 import DriverUtil
-import Type
 import Linker
-import Finder
-import Module
-import Outputable
+import Finder		( flushPackageCache )
 import Util
-import PprType		{- instance Outputable Type; do not delete -}
+import Name		( Name )
+import Outputable
+import CmdLineOpts	( DynFlag(..), getDynFlags, saveDynFlags, restoreDynFlags, dopt_unset )
 import Panic		( GhcException(..) )
 import Config
 
+#ifndef mingw32_TARGET_OS
+import Posix
+#endif
+
 import Exception
 import Dynamic
-#ifndef NO_READLINE
-import Readline
+#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
+import Readline 
 #endif
 import IOExts
 
@@ -45,16 +50,15 @@ import Char
 import Monad 		( when )
 
 import PrelGHC 		( unsafeCoerce# )
-import PrelPack 	( packString )
-import PrelByteArr
-import Foreign		( Ptr, nullPtr )
+import Foreign		( nullPtr )
+import CString		( peekCString )
 
 -----------------------------------------------------------------------------
 
 ghciWelcomeMsg = "\ 
 \   ___         ___ _\n\ 
 \  / _ \\ /\\  /\\/ __(_)\n\ 
-\ / /_\\// /_/ / /  | |      GHC Interactive, version " ++ cProjectVersion ++ ", For Haskell 98.\n\ 
+\ / /_\\// /_/ / /  | |      GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n\ 
 \/ /_\\\\/ __  / /___| |      http://www.haskell.org/ghc/\n\ 
 \\\____/\\/ /_/\\____/|_|      Type :? for help.\n"
 
@@ -85,29 +89,31 @@ shortHelpText = "use :? for help.\n"
 helpText = "\ 
 \ Commands available from the prompt:\n\ 
 \\  
-\   <expr>		evaluate <expr>\n\ 
-\   :add <filename>     add a module to the current set\n\ 
-\   :cd <dir>		change directory to <dir>\n\ 
-\   :help, :?		display this list of commands\n\ 
-\   :load <filename>    load a module (and it 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\ 
-\   :unset <option> ...	unset options\n\ 
-\   :type <expr>	show the type of <expr>\n\ 
-\   :quit		exit GHCi\n\ 
-\   :!<command>		run the shell command <command>\n\ 
+\   <stmt>		   evaluate/run <stmt>\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\ 
+\   :module <mod>	   set the context for expression evaluation to <mod>\n\ 
+\   :reload		   reload the current module set\n\ 
+\   :set <option> ...	   set options\n\ 
+\   :undef <cmd> 	   undefine user-defined command :<cmd>\n\ 
+\   :type <expr>	   show the type of <expr>\n\ 
+\   :unset <option> ...	   unset options\n\ 
+\   :quit		   exit GHCi\n\ 
+\   :!<command>		   run the shell command <command>\n\ 
 \\ 
 \ Options for `:set' and `:unset':\n\ 
 \\ 
+\    +r			revert top-level expressions after each evaluation\n\ 
 \    +s                 print timing/memory stats after each evaluation\n\ 
 \    +t			print type after evaluation\n\ 
-\    +r			revert top-level expressions after each evaluation\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 -> [String] -> IO ()
+interactiveUI :: CmState -> Maybe FilePath -> [LibrarySpec] -> IO ()
 interactiveUI cmstate mod cmdline_libs = do
    hFlush stdout
    hSetBuffering stdout NoBuffering
@@ -115,67 +121,67 @@ interactiveUI cmstate mod cmdline_libs = do
    -- link in the available packages
    pkgs <- getPackageInfo
    initLinker
-   linkPackages cmdline_libs (reverse pkgs)
+   linkPackages cmdline_libs pkgs
 
    (cmstate, ok, mods) <-
    	case mod of
 	     Nothing  -> return (cmstate, True, [])
 	     Just m -> cmLoadModule cmstate m
 
-#ifndef NO_READLINE
+#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
    Readline.initialize
 #endif
 
-   prel <- moduleNameToModule defaultCurrentModuleName
-   writeIORef defaultCurrentModule prel
-
    dflags <- getDynFlags
 
-   (cmstate, maybe_stuff) <- cmGetExpr cmstate dflags False prel 
-		  		"PrelHandle.hFlush PrelHandle.stdout"
-   case maybe_stuff of
-	Nothing -> return ()
-	Just (hv,_,_) -> writeIORef flush_stdout hv
-   
-   (cmstate, maybe_stuff) <- cmGetExpr cmstate dflags False prel 
-		  		"PrelHandle.hFlush PrelHandle.stdout"
-   case maybe_stuff of
-	Nothing -> return ()
-	Just (hv,_,_) -> writeIORef flush_stderr hv
-   
-   let this_mod = case mods of 
-	  	      []   -> prel
-  	  	      m:ms -> m
-
-   (unGHCi runGHCi) GHCiState{ modules = mods,
-			      current_module = this_mod,
-	  	              target = mod,
-			      cmstate = cmstate,
-			      options = [ShowTiming],
-                              last_expr = Nothing}
+   (cmstate, maybe_hval) 
+	<- cmCompileExpr cmstate dflags "IO.hFlush PrelHandle.stderr"
+   case maybe_hval of
+	Just hval -> writeIORef flush_stderr (unsafeCoerce# hval :: IO ())
+	_ -> panic "interactiveUI:stderr"
+
+   (cmstate, maybe_hval) 
+	<- cmCompileExpr cmstate dflags "IO.hFlush PrelHandle.stdout"
+   case maybe_hval of
+	Just hval -> writeIORef flush_stdout (unsafeCoerce# hval :: IO ())
+	_ -> panic "interactiveUI:stdout"
+
+   startGHCi runGHCi GHCiState{ target = mod,
+			        cmstate = cmstate,
+			        options = [] }
    return ()
 
 
 runGHCi :: GHCi ()
 runGHCi = do
-  -- read in ./.ghci
-  dot_ghci <- io (IO.try (openFile "./.ghci" ReadMode))
-  case dot_ghci of
-	Left e -> return ()
-	Right hdl -> fileLoop hdl False
+  -- Read in ./.ghci.
+  let file = "./.ghci"
+  exists <- io (doesFileExist file)
+  when exists $ do
+     dir_ok  <- io (checkPerms ".")
+     file_ok <- io (checkPerms file)
+     when (dir_ok && file_ok) $ do
+   	either_hdl <- io (IO.try (openFile "./.ghci" ReadMode))
+   	case either_hdl of
+   	   Left e    -> return ()
+   	   Right hdl -> fileLoop hdl False
   
-  -- read in ~/.ghci
-  home <- io (IO.try (getEnv "HOME"))
-  case home of
-   Left e  -> return ()
-   Right dir -> do
-  	dot_ghci <- io (IO.try (openFile (dir ++ "/.ghci") ReadMode))
-	case dot_ghci of
-	   Left e -> return ()
-	   Right hdl -> fileLoop hdl False
+  -- Read in $HOME/.ghci
+  either_dir <- io (IO.try (getEnv "HOME"))
+  case either_dir of
+     Left e -> return ()
+     Right dir -> do
+	cwd <- io (getCurrentDirectory)
+    	when (dir /= cwd) $ do
+	   let file = dir ++ "/.ghci"
+	   ok <- io (checkPerms file)
+       	   either_hdl <- io (IO.try (openFile file ReadMode))
+	   case either_hdl of
+		Left e    -> return ()
+		Right hdl -> fileLoop hdl False
 
   -- read commands from stdin
-#ifndef NO_READLINE
+#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
   readlineLoop
 #else
   fileLoop stdin True
@@ -185,10 +191,43 @@ runGHCi = do
   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 
+-- running code planted by a malicious third party.
+
+-- Furthermore, We only read ./.ghci if both . and ./.ghci are
+-- owned by the current user and aren't writable by anyone else.  I
+-- think this is sufficient: we don't need to check .. and
+-- ../.. etc. because "."  always refers to the same directory while a
+-- process is running.
+
+checkPerms :: String -> IO Bool
+checkPerms name =
+  handle (\_ -> return False) $ do
+#ifdef mingw32_TARGET_OS
+     doesFileExist name
+#else
+     st <- getFileStatus name
+     me <- getRealUserID
+     if fileOwner st /= me then do
+   	putStrLn $ "WARNING: " ++ name ++ " is owned by someone else, IGNORING!"
+   	return False
+      else do
+   	let mode =  fileMode st
+   	if (groupWriteMode == (mode `intersectFileModes` groupWriteMode))
+   	   || (otherWriteMode == (mode `intersectFileModes` otherWriteMode)) 
+   	   then do
+   	       putStrLn $ "*** WARNING: " ++ name ++ 
+   			  " is writable by someone else, IGNORING!"
+   	       return False
+   	  else return True
+#endif
+
 fileLoop :: Handle -> Bool -> GHCi ()
 fileLoop hdl prompt = do
    st <- getGHCiState
-   when prompt (io (hPutStr hdl (moduleUserString (current_module st) ++ "> ")))
+   mod <- io (cmGetContext (cmstate st))
+   when prompt (io (putStr (mod ++ "> ")))
    l <- io (IO.try (hGetLine hdl))
    case l of
 	Left e | isEOFError e -> return ()
@@ -208,11 +247,12 @@ stringLoop (s:ss) = do
 	l  -> do quit <- runCommand l
                  if quit then return () else stringLoop ss
 
-#ifndef NO_READLINE
+#if HAVE_READLINE_HEADERS && HAVE_READLINE_LIBS
 readlineLoop :: GHCi ()
 readlineLoop = do
    st <- getGHCiState
-   l <- io (readline (moduleUserString (current_module st) ++ "> "))
+   mod <- io (cmGetContext (cmstate st))
+   l <- io (readline (mod ++ "> "))
    case l of
 	Nothing -> return ()
 	Just l  ->
@@ -228,69 +268,74 @@ readlineLoop = do
 -- 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.")
-		    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 ('-':'-':_) = return False	-- comments, useful in scripts
-doCommand expr
-   = do expr_expanded <- expandExpr expr
-        -- io (putStrLn ( "Before: " ++ expr ++ "\nAfter:  " ++ expr_expanded))
-        expr_ok <- timeIt (do stuff <- evalExpr expr_expanded
-			      finishEvalExpr stuff)
-        when expr_ok (rememberExpr expr_expanded)
+doCommand stmt
+   = do timeIt (do stuff <- runStmt stmt; finishEvalExpr stuff)
         return False
 
+-- Returns True if the expr was successfully parsed, renamed and
+-- typechecked.
+runStmt :: String -> GHCi (Maybe [Name])
+runStmt stmt
+ | null (filter (not.isSpace) stmt)
+ = return Nothing
+ | otherwise
+ = do st <- getGHCiState
+      dflags <- io getDynFlags
+      let dflags' = dopt_unset dflags Opt_WarnUnusedBinds
+      (new_cmstate, names) <- io (cmRunStmt (cmstate st) dflags' stmt)
+      setGHCiState st{cmstate = new_cmstate}
+      return (Just names)
+
 -- possibly print the type and revert CAFs after evaluating an expression
 finishEvalExpr Nothing = return False
-finishEvalExpr (Just (unqual,ty))
+finishEvalExpr (Just names)
  = do b <- isOptionSet ShowType
-      io (when b (printForUser stdout unqual (text "::" <+> ppr ty)))
+      st <- getGHCiState
+      when b (mapM_ (showTypeOfName (cmstate st)) names)
+
       b <- isOptionSet RevertCAFs
       io (when b revertCAFs)
+      flushEverything
       return True
 
--- Returned Maybe indicates whether or not the expr was successfully
--- parsed, renamed and typechecked.
-evalExpr :: String -> GHCi (Maybe (PrintUnqualified,Type))
-evalExpr expr
- | null (filter (not.isSpace) expr)
- = return Nothing
- | otherwise
- = do st <- getGHCiState
-      dflags <- io (getDynFlags)
-      (new_cmstate, maybe_stuff) <- 
-      	 io (cmGetExpr (cmstate st) dflags True (current_module st) expr)
-      setGHCiState st{cmstate = new_cmstate}
-      case maybe_stuff of
-      	 Nothing -> return Nothing
-      	 Just (hv, unqual, ty) -> do io (cmRunExpr hv)
-		 		     flushEverything
-		 		     return (Just (unqual,ty))
+showTypeOfName :: CmState -> Name -> GHCi ()
+showTypeOfName cmstate n
+   = do maybe_str <- io (cmTypeOfName cmstate n)
+	case maybe_str of
+	  Nothing  -> return ()
+	  Just str -> io (putStrLn (showSDoc (ppr n) ++ " :: " ++ str))
 
 flushEverything :: GHCi ()
 flushEverything
    = io $ do flush_so <- readIORef flush_stdout
-     	     cmRunExpr flush_so
+     	     flush_so
      	     flush_se <- readIORef flush_stdout
-     	     cmRunExpr flush_se
+     	     flush_se
+             return ()
 
 specialCommand :: String -> GHCi Bool
 specialCommand ('!':str) = shellEscape (dropWhile isSpace str)
@@ -306,7 +351,7 @@ specialCommand str = do
 	         	     	       foldr1 (\a b -> a ++ ',':b) (map fst cs)
 					 ++ ")") >> return False)
 
-noArgs c = io (hPutStrLn stdout ("command `:" ++ c ++ "' takes no arguments"))
+noArgs c = throwDyn (CmdLineError ("command `" ++ c ++ "' takes no arguments"))
 
 -----------------------------------------------------------------------------
 -- Commands
@@ -315,30 +360,24 @@ help :: String -> GHCi ()
 help _ = io (putStr helpText)
 
 addModule :: String -> GHCi ()
-addModule _ = throwDyn (OtherError ":add not implemented")
+addModule _ = throwDyn (InstallationError ":add not implemented")
 
 setContext :: String -> GHCi ()
 setContext ""
-  = throwDyn (OtherError "syntax: `:m <module>'")
-setContext m | not (isUpper (head m)) || not (all isAlphaNum (tail m))
-  = throwDyn (OtherError ("strange looking module name: `" ++ m ++ "'"))
-setContext mn
-  = do m <- io (moduleNameToModule (mkModuleName mn))
-       st <- getGHCiState
-       if (isHomeModule m && m `notElem` modules st)
-	  then throwDyn (OtherError (showSDoc (quotes (ppr (moduleName m))
-				<+> text "is not currently loaded, use :load")))
-	  else setGHCiState st{current_module = m}
-
-moduleNameToModule :: ModuleName -> IO Module
-moduleNameToModule mn
- = do maybe_stuff <- findModule mn
-      case maybe_stuff of
-	 Nothing -> throwDyn (OtherError ("can't find module `"
-					    ++ moduleNameUserString mn ++ "'"))
-   	 Just (m,_) -> return m
+  = throwDyn (CmdLineError "syntax: `:m <module>'")
+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)
+       setGHCiState st{cmstate=new_cmstate}
 
 changeDirectory :: String -> GHCi ()
+changeDirectory ('~':d) = do
+   tilde <- io (getEnv "HOME")	-- will fail if HOME not defined
+   io (setCurrentDirectory (tilde ++ '/':d))
 changeDirectory d = io (setCurrentDirectory d)
 
 defineMacro :: String -> GHCi ()
@@ -346,11 +385,11 @@ defineMacro s = do
   let (macro_name, definition) = break isSpace s
   cmds <- io (readIORef commands)
   if (null macro_name) 
-	then throwDyn (OtherError "invalid macro name") 
+	then throwDyn (CmdLineError "invalid macro name") 
 	else do
   if (macro_name `elem` map fst cmds) 
-	then throwDyn (OtherError 
-		("command `" ++ macro_name ++ "' already defined"))
+	then throwDyn (CmdLineError 
+		("command `" ++ macro_name ++ "' is already defined"))
 	else do
 
   -- give the expression a type signature, so we can be sure we're getting
@@ -359,15 +398,13 @@ defineMacro s = do
 
   -- compile the expression
   st <- getGHCiState
-  dflags <- io (getDynFlags)
-  (new_cmstate, maybe_stuff) <- 
-      	 io (cmGetExpr (cmstate st) dflags False (current_module st) new_expr)
+  dflags <- io getDynFlags
+  (new_cmstate, maybe_hv) <- io (cmCompileExpr (cmstate st) dflags new_expr)
   setGHCiState st{cmstate = new_cmstate}
-  case maybe_stuff of
+  case maybe_hv of
      Nothing -> return ()
-     Just (hv, unqual, ty) 
-	-> io (writeIORef commands 
-		 ((macro_name, keepGoing (runMacro hv)) : cmds))
+     Just hv -> io (writeIORef commands --
+		    ((macro_name, keepGoing (runMacro hv)) : cmds))
 
 runMacro :: HValue{-String -> IO String-} -> String -> GHCi ()
 runMacro fun s = do
@@ -378,11 +415,11 @@ undefineMacro :: String -> GHCi ()
 undefineMacro macro_name = do
   cmds <- io (readIORef commands)
   if (macro_name `elem` map fst builtin_commands) 
-	then throwDyn (OtherError
+	then throwDyn (CmdLineError
 		("command `" ++ macro_name ++ "' cannot be undefined"))
 	else do
   if (macro_name `notElem` map fst cmds) 
-	then throwDyn (OtherError 
+	then throwDyn (CmdLineError 
 		("command `" ++ macro_name ++ "' not defined"))
 	else do
   io (writeIORef commands (filter ((/= macro_name) . fst) cmds))
@@ -392,61 +429,49 @@ loadModule path = timeIt (loadModule' path)
 
 loadModule' path = do
   state <- getGHCiState
-  cmstate1 <- io (cmUnload (cmstate state))
+  dflags <- io getDynFlags
+  cmstate1 <- io (cmUnload (cmstate state) dflags)
+  setGHCiState state{ cmstate = cmstate1, target = Nothing }
   io (revertCAFs)			-- always revert CAFs on load.
   (cmstate2, ok, mods) <- io (cmLoadModule cmstate1 path)
+  setGHCiState state{ cmstate = cmstate2, target = Just path }
+  modulesLoadedMsg ok mods
+
+reloadModule :: String -> GHCi ()
+reloadModule "" = do
+  state <- getGHCiState
+  case target state of
+   Nothing -> io (putStr "no current target\n")
+   Just path
+      -> do io (revertCAFs)		-- always revert CAFs on reload.
+	    (new_cmstate, ok, mods) <- io (cmLoadModule (cmstate state) path)
+            setGHCiState state{ cmstate=new_cmstate }
+	    modulesLoadedMsg ok mods
 
-  def_mod <- io (readIORef defaultCurrentModule)
+reloadModule _ = noArgs ":reload"
 
-  let new_state = state{
-  			cmstate = cmstate2,
-			modules = mods,
-			current_module = case mods of 
-					   [] -> def_mod
-					   xs -> head xs,
-			target = Just path
-		   }
-  setGHCiState new_state
 
+modulesLoadedMsg ok mods = do
   let mod_commas 
 	| null mods = text "none."
 	| otherwise = hsep (
-	    punctuate comma (map (text.moduleUserString) mods)) <> text "."
+	    punctuate comma (map text mods)) <> text "."
   case ok of
     False -> 
        io (putStrLn (showSDoc (text "Failed, modules loaded: " <> mod_commas)))
     True  -> 
        io (putStrLn (showSDoc (text "Ok, modules loaded: " <> mod_commas)))
 
-reloadModule :: String -> GHCi ()
-reloadModule "" = do
-  state <- getGHCiState
-  case target state of
-   Nothing -> io (putStr "no current target\n")
-   Just path
-      -> do io (revertCAFs)		-- always revert CAFs on reload.
-	    (new_cmstate, ok, mods) <- io (cmLoadModule (cmstate state) path)
-	    def_mod <- io (readIORef defaultCurrentModule)
-            setGHCiState 
-               state{cmstate=new_cmstate,
-                     modules = mods,
-                     current_module = case mods of 
-                                         [] -> def_mod
-                                         xs -> head xs
-                    }
-
-reloadModule _ = noArgs ":reload"
 
 typeOfExpr :: String -> GHCi ()
 typeOfExpr str 
   = do st <- getGHCiState
-       dflags <- io (getDynFlags)
-       (new_cmstate, maybe_ty) <- io (cmGetExpr (cmstate st) dflags False
-					 (current_module st) str)
+       dflags <- io getDynFlags
+       (new_cmstate, maybe_tystr) <- io (cmTypeOfExpr (cmstate st) dflags str)
        setGHCiState st{cmstate = new_cmstate}
-       case maybe_ty of
-	 Nothing -> return ()
-	 Just (_, unqual, ty) -> io (printForUser stdout unqual (ppr ty)) 
+       case maybe_tystr of
+	  Nothing    -> return ()
+	  Just tystr -> io (putStrLn tystr)
 
 quit :: String -> GHCi Bool
 quit _ = return True
@@ -476,32 +501,29 @@ setOptions ""
    	   ))
 setOptions str
   = do -- first, deal with the GHCi opts (+s, +t, etc.)
-       let opts = words str
-	   (minus_opts, rest1) = partition isMinus opts
-	   (plus_opts, rest2)  = partition isPlus rest1
-
-       if (not (null rest2)) 
-	  then io (putStrLn ("unknown option: `" ++ head rest2 ++ "'"))
-	  else do
-
-       mapM setOpt plus_opts
-
-       -- now, the GHC flags
-       io (do -- first, static flags
-	      leftovers <- processArgs static_flags minus_opts []
-
-	      -- then, dynamic flags
-	      dyn_flags <- readIORef v_InitDynFlags
-	      writeIORef v_DynFlags dyn_flags
-	      leftovers <- processArgs dynamic_flags leftovers []
-	      dyn_flags <- readIORef v_DynFlags
-	      writeIORef v_InitDynFlags dyn_flags
-
-              if (not (null leftovers))
-		 then throwDyn (OtherError ("unrecognised flags: " ++ 
+      let (plus_opts, minus_opts)  = partition isPlus (words str)
+      mapM setOpt plus_opts
+
+      -- now, the GHC flags
+      pkgs_before <- io (readIORef v_Packages)
+      leftovers   <- io (processArgs static_flags minus_opts [])
+      pkgs_after  <- io (readIORef v_Packages)
+
+      -- update things if the users wants more packages
+      when (pkgs_before /= pkgs_after) $
+	 newPackages (pkgs_after \\ pkgs_before)
+
+      -- then, dynamic flags
+      io $ do 
+	restoreDynFlags
+        leftovers <- processArgs dynamic_flags leftovers []
+	saveDynFlags
+
+        if (not (null leftovers))
+		then throwDyn (CmdLineError ("unrecognised flags: " ++ 
 						unwords leftovers))
-		 else return ()
-         )
+		else return ()
+
 
 unsetOptions :: String -> GHCi ()
 unsetOptions str
@@ -518,7 +540,7 @@ unsetOptions str
  
        -- can't do GHC flags for now
        if (not (null minus_opts))
-	  then throwDyn (OtherError "can't unset GHC command-line flags")
+	  then throwDyn (CmdLineError "can't unset GHC command-line flags")
 	  else return ()
 
 isMinus ('-':s) = True
@@ -548,55 +570,27 @@ optToStr ShowTiming = "s"
 optToStr ShowType   = "t"
 optToStr RevertCAFs = "r"
 
------------------------------------------------------------------------------
--- Code to do last-expression-entered stuff.  (a.k.a the $$ facility)
-
--- Take a string and replace $$s in it with the last expr, if any.
-expandExpr :: String -> GHCi String
-expandExpr str
-   = do mle <- getLastExpr
-        return (outside mle str)
-     where
-        outside mle ('$':'$':cs)
-           = case mle of
-                Just le -> " (" ++ le ++ ") " ++ outside mle cs
-                Nothing -> outside mle cs
-
-        outside mle []           = []
-        outside mle ('"':str)    = '"' : inside2 mle str   -- "
-        outside mle ('\'':str)   = '\'' : inside1 mle str   -- '
-        outside mle (c:cs)       = c : outside mle cs
-
-        inside2 mle ('"':cs)  = '"' : outside mle cs   -- "
-        inside2 mle (c:cs)    = c : inside2 mle cs
-        inside2 mle []        = []
-
-        inside1 mle ('\'':cs) = '\'': outside mle cs
-        inside1 mle (c:cs)    = c : inside1 mle cs
-        inside1 mle []        = []
-
-
-rememberExpr :: String -> GHCi ()
-rememberExpr str
-   = do let cleaned = (clean . reverse . clean . reverse) str
-        let forget_me_not | null cleaned = Nothing
-                          | otherwise    = Just cleaned
-        setLastExpr forget_me_not
-     where
-        clean = dropWhile isSpace
+newPackages new_pkgs = do
+  state <- getGHCiState
+  dflags <- io getDynFlags
+  cmstate1 <- io (cmUnload (cmstate state) dflags)
+  setGHCiState state{ cmstate = cmstate1, target = Nothing }
 
+  io $ do
+    pkgs <- getPackageInfo
+    flushPackageCache pkgs
+   
+    new_pkg_info <- getPackageDetails new_pkgs
+    mapM_ (linkPackage False) (reverse new_pkg_info)
 
 -----------------------------------------------------------------------------
 -- GHCi monad
 
 data GHCiState = GHCiState
      { 
-	modules	       :: [Module],
-	current_module :: Module,
 	target         :: Maybe FilePath,
 	cmstate        :: CmState,
-	options        :: [GHCiOption],
-        last_expr      :: Maybe String
+	options        :: [GHCiOption]
      }
 
 data GHCiOption 
@@ -605,20 +599,20 @@ data GHCiOption
 	| RevertCAFs		-- revert CAFs after every evaluation
 	deriving Eq
 
-defaultCurrentModuleName = mkModuleName "Prelude"
-GLOBAL_VAR(defaultCurrentModule, error "no defaultCurrentModule", Module)
+GLOBAL_VAR(flush_stdout, error "no flush_stdout", IO ())
+GLOBAL_VAR(flush_stderr, error "no flush_stdout", IO ())
 
-GLOBAL_VAR(flush_stdout, error "no flush_stdout", HValue)
-GLOBAL_VAR(flush_stderr, error "no flush_stdout", HValue)
+newtype GHCi a = GHCi { unGHCi :: IORef GHCiState -> IO a }
 
-newtype GHCi a = GHCi { unGHCi :: GHCiState -> IO (GHCiState, a) }
+startGHCi :: GHCi a -> GHCiState -> IO a
+startGHCi g state = do ref <- newIORef state; unGHCi g ref
 
 instance Monad GHCi where
-  (GHCi m) >>= k  =  GHCi $ \s -> m s >>= \(s,a) -> unGHCi (k a) s
-  return a  = GHCi $ \s -> return (s,a)
+  (GHCi m) >>= k  =  GHCi $ \s -> m s >>= \a -> unGHCi (k a) s
+  return a  = GHCi $ \s -> return a
 
-getGHCiState   = GHCi $ \s -> return (s,s)
-setGHCiState s = GHCi $ \_ -> return (s,())
+getGHCiState   = GHCi $ \r -> readIORef r
+setGHCiState s = GHCi $ \r -> writeIORef r s
 
 isOptionSet :: GHCiOption -> GHCi Bool
 isOptionSet opt
@@ -635,15 +629,7 @@ unsetOption opt
  = do st <- getGHCiState
       setGHCiState (st{ options = filter (/= opt) (options st) })
 
-getLastExpr :: GHCi (Maybe String)
-getLastExpr
- = do st <- getGHCiState ; return (last_expr st)
-
-setLastExpr :: Maybe String -> GHCi ()
-setLastExpr last_expr
- = do st <- getGHCiState ; setGHCiState (st{last_expr = last_expr})
-
-io m = GHCi $ \s -> m >>= \a -> return (s,a)
+io m = GHCi $ \s -> m >>= \a -> return a
 
 -----------------------------------------------------------------------------
 -- recursive exception handlers
@@ -663,52 +649,75 @@ ghciUnblock (GHCi a) = GHCi $ \s -> Exception.unblock (a s)
 -----------------------------------------------------------------------------
 -- package loader
 
-linkPackages :: [String] -> [Package] -> IO ()
-linkPackages cmdline_libs pkgs
-   = do mapM preloadLib cmdline_libs
-        mapM_ linkPackage pkgs
+-- Left: full path name of a .o file, including trailing .o
+-- Right: "unadorned" name of a .DLL/.so
+--        e.g.    On unix     "qt"  denotes "libqt.so"
+--                On WinDoze  "burble"  denotes "burble.DLL"
+--        addDLL is platform-specific and adds the lib/.so/.DLL
+--        suffixes platform-dependently; we don't do that here.
+-- 
+-- For dynamic objects only, try to find the object file in all the 
+-- directories specified in v_Library_Paths before giving up.
+
+type LibrarySpec
+   = Either FilePath String
+
+showLS (Left nm)  = "(static) " ++ nm
+showLS (Right nm) = "(dynamic) " ++ nm
+
+linkPackages :: [LibrarySpec] -> [PackageConfig] -> IO ()
+linkPackages cmdline_lib_specs pkgs
+   = do sequence_ [ linkPackage (name p `elem` loaded) p | p <- reverse pkgs ]
+        lib_paths <- readIORef v_Library_paths
+        mapM_ (preloadLib lib_paths) cmdline_lib_specs
      where
-        preloadLib orig_name
-           = do putStr ("Loading object " ++ orig_name ++ " ... ")
-                case classify orig_name of
+	-- packages that are already linked into GHCi
+	loaded = [ "gmp", "rts", "std", "concurrent", "posix", "text", "util" ]
+
+        preloadLib :: [String] -> LibrarySpec -> IO ()
+        preloadLib lib_paths lib_spec
+           = do putStr ("Loading object " ++ showLS lib_spec ++ " ... ")
+                case lib_spec of
                    Left static_ish
-                      -> do b <- doesFileExist static_ish
-                            if    not b
-                             then do putStr "not found.\n"
-                                     croak
-                             else do loadObj static_ish
-                                     putStr "done.\n"
+                      -> do b <- preload_static lib_paths static_ish
+                            putStrLn (if b then "done" else "not found")
                    Right dll_unadorned
-                      -> do dll_ok <- ocAddDLL (packString dll_unadorned)
-                            if    dll_ok == 1
-                             then putStr "done.\n"
-                             else do putStr "not found.\n"
-                                     croak
-
-        croak = throwDyn (OtherError "user specified .o/.so/.DLL cannot be found.")
-
-        classify a_lib
-           = let a_libr = reverse a_lib
-             in  
-             case map toLower a_libr of
-                ('o':'.':_) 
-                   -> Left a_lib
-                ('o':'s':'.':_) 
-                   -> (Right . zap_leading_lib
-                             . reverse . drop 3 . reverse) a_lib
-                ('l':'l':'d':'.':_) 
-                   -> (Right . reverse . drop 4 . reverse) a_lib
-                other 
-                   -> -- Main.beginInteractive should not have let this through
-                      pprPanic "linkPackages" (text (show a_lib))
-                      
-        zap_leading_lib str
-           = if take 3 str == "lib" then drop 3 str else str
-
-
-linkPackage :: Package -> IO ()
+                      -> -- 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"
+
+        cantFind :: [String] -> LibrarySpec -> IO ()
+        cantFind paths spec
+           = do putStr ("failed.\nCan't find " ++ showLS spec
+                        ++ " in directories:\n"
+                        ++ unlines (map ("   "++) paths) )
+                give_up
+
+        -- not interested in the paths in the static case.
+        preload_static paths name
+           = do b <- doesFileExist name
+                if not b then return False
+                         else loadObj name >> return True
+
+        preload_dynamic [] name
+           = return False
+        preload_dynamic (path:paths) rootname
+           = do maybe_errmsg <- addDLL path rootname
+                if    maybe_errmsg /= nullPtr
+                 then preload_dynamic paths rootname
+                 else return True
+
+        give_up 
+           = (throwDyn . CmdLineError)
+                "user specified .o/.so/.DLL could not be loaded."
+
+
+linkPackage :: Bool -> PackageConfig -> IO ()
 -- ignore rts and gmp for now (ToDo; better?)
-linkPackage pkg 
+linkPackage loaded_in_ghci pkg
    | name pkg `elem` ["rts", "gmp"] 
    = return ()
    | otherwise
@@ -718,8 +727,13 @@ linkPackage pkg
         let dirs      =  library_dirs pkg
         let objs      =  hs_libraries pkg ++ extra_libraries pkg
         classifieds   <- mapM (locateOneObj dirs) objs
-        let sos_first = filter isRight classifieds 
-                        ++ filter (not.isRight) classifieds
+
+	-- 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
+
         mapM loadClassified sos_first
         putStr "linking ... "
         resolveObjs
@@ -728,17 +742,18 @@ linkPackage pkg
         isRight (Right _) = True
         isRight (Left _)  = False
 
-loadClassified :: Either FilePath String -> IO ()
+loadClassified :: LibrarySpec -> IO ()
 loadClassified (Left obj_absolute_filename)
    = do loadObj obj_absolute_filename
 loadClassified (Right dll_unadorned)
-   = do dll_ok <- ocAddDLL (packString dll_unadorned)
-        if    dll_ok == 1
+   = do maybe_errmsg <- addDLL "" dll_unadorned -- doesn't seem right to me
+        if    maybe_errmsg == nullPtr
          then return ()
-         else throwDyn (OtherError ("can't find .o or .so/.DLL for: " 
-                                    ++ dll_unadorned))
+         else do str <- peekCString maybe_errmsg
+                 throwDyn (CmdLineError ("can't find .o or .so/.DLL for: " 
+                                       ++ dll_unadorned ++ " (" ++ str ++ ")" ))
 
-locateOneObj :: [FilePath] -> String -> IO (Either FilePath String)
+locateOneObj :: [FilePath] -> String -> IO LibrarySpec
 locateOneObj []     obj 
    = return (Right obj) -- we assume
 locateOneObj (d:ds) obj 
@@ -746,10 +761,6 @@ locateOneObj (d:ds) obj
         b <- doesFileExist path
         if b then return (Left path) else locateOneObj ds obj
 
-
-type PackedString = ByteArray Int
-foreign import "ocAddDLL" unsafe ocAddDLL :: PackedString -> IO Int
-
 -----------------------------------------------------------------------------
 -- timing & statistics