[project @ 2001-03-28 11:01:19 by simonmar]

[ghc-hetmet.git] / ghc / compiler / ghci / InteractiveUI.hs

diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs
index 58266f5..dc75318 100644 (file)
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/ghc/compiler/ghci/InteractiveUI.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.56 2001/03/23 12:12:18 simonmar Exp $
+-- $Id: InteractiveUI.hs,v 1.59 2001/03/28 11:01:19 simonmar Exp $
 --
 -- GHC Interactive User Interface
 --
@@ -22,6 +22,7 @@ import Linker
 import Util
 import Name            ( Name )
 import Outputable
+import CmdLineOpts     ( DynFlag(..), dopt_unset )
 import Panic           ( GhcException(..) )
 import Config
 
@@ -83,12 +84,13 @@ helpText = "\
 \\  
 \   <stmt>             evaluate/run <stmt>\n\ 
 \   :cd <dir>          change directory to <dir>\n\ 
-\   :def <cmd> <expr>   define a macro :<cmd>\n\ 
+\   :def <cmd> <expr>   define a command :<cmd>\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\ 
+\   :undef <name>      undefine user-defined command :<name>\n\ 
 \   :type <expr>       show the type of <expr>\n\ 
 \   :unset <option> ...        unset options\n\ 
 \   :quit              exit GHCi\n\ 
@@ -156,10 +158,12 @@ runGHCi = do
   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
+       cwd <- io (getCurrentDirectory)
+       when (dir /= cwd) $ do
+         dot_ghci <- io (IO.try (openFile (dir ++ "/.ghci") ReadMode))
+         case dot_ghci of
+            Left e -> return ()
+            Right hdl -> fileLoop hdl False
 
   -- read commands from stdin
 #ifndef NO_READLINE
@@ -251,7 +255,8 @@ runStmt stmt
  | otherwise
  = do st <- getGHCiState
       dflags <- io (getDynFlags)
-      (new_cmstate, names) <- io (cmRunStmt (cmstate st) dflags stmt)
+      let dflags' = dopt_unset dflags Opt_WarnUnusedBinds
+      (new_cmstate, names) <- io (cmRunStmt (cmstate st) dflags' stmt)
       setGHCiState st{cmstate = new_cmstate}
       return (Just names)
 
@@ -296,7 +301,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 (UserError ("command `" ++ c ++ "' takes no arguments"))
 
 -----------------------------------------------------------------------------
 -- Commands
@@ -305,13 +310,13 @@ 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>'")
+  = throwDyn (UserError "syntax: `:m <module>'")
 setContext m | not (isUpper (head m)) || not (all isAlphaNum (tail m))
-  = throwDyn (OtherError ("strange looking module name: `" ++ m ++ "'"))
+  = throwDyn (UserError ("strange looking module name: `" ++ m ++ "'"))
 setContext str
   = do st <- getGHCiState
        new_cmstate <- io (cmSetContext (cmstate st) str)
@@ -328,10 +333,10 @@ 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 (UserError "invalid macro name") 
        else do
   if (macro_name `elem` map fst cmds) 
-       then throwDyn (OtherError 
+       then throwDyn (UserError 
                ("command `" ++ macro_name ++ "' is already defined"))
        else do
 
@@ -358,11 +363,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 (UserError
                ("command `" ++ macro_name ++ "' cannot be undefined"))
        else do
   if (macro_name `notElem` map fst cmds) 
-       then throwDyn (OtherError 
+       then throwDyn (UserError 
                ("command `" ++ macro_name ++ "' not defined"))
        else do
   io (writeIORef commands (filter ((/= macro_name) . fst) cmds))
@@ -467,7 +472,7 @@ setOptions str
              writeIORef v_InitDynFlags dyn_flags
 
               if (not (null leftovers))
-                then throwDyn (OtherError ("unrecognised flags: " ++ 
+                then throwDyn (UserError ("unrecognised flags: " ++ 
                                                unwords leftovers))
                 else return ()
          )
@@ -487,7 +492,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 (UserError "can't unset GHC command-line flags")
          else return ()
 
 isMinus ('-':s) = True
@@ -615,7 +620,7 @@ linkPackages cmdline_lib_specs pkgs
                                      putStr ("failed (" ++ str ++ ")\n")
                                      croak
 
-        croak = throwDyn (OtherError "user specified .o/.so/.DLL could not be loaded.")
+        croak = throwDyn (UserError "user specified .o/.so/.DLL could not be loaded.")
 
 
 linkPackage :: PackageConfig -> IO ()
@@ -648,7 +653,7 @@ loadClassified (Right dll_unadorned)
         if    maybe_errmsg == nullPtr
          then return ()
          else do str <- peekCString maybe_errmsg
-                 throwDyn (OtherError ("can't find .o or .so/.DLL for: " 
+                 throwDyn (UserError ("can't find .o or .so/.DLL for: " 
                                        ++ dll_unadorned ++ " (" ++ str ++ ")" ))
 
 locateOneObj :: [FilePath] -> String -> IO LibrarySpec