X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fghci%2FInteractiveUI.hs;h=9a885ab92bcccbdb8f767435bbf083fc1ca414f2;hb=578d1788ceaae231a036d74777356b633c0368f6;hp=a1ec76433b4285af3989ab3f78668bd28e8156d3;hpb=550421384b8364cdaf3135f7859c9f7d7ee1fff1;p=ghc-hetmet.git

diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs
index a1ec764..9a885ab 100644
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/ghc/compiler/ghci/InteractiveUI.hs
@@ -1,10 +1,10 @@
 {-# OPTIONS -#include "Linker.h" #-}
 -----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.162 2003/12/10 14:15:21 simonmar Exp $
+-- $Id: InteractiveUI.hs,v 1.174 2004/08/16 09:53:57 simonpj Exp $
 --
 -- GHC Interactive User Interface
 --
--- (c) The GHC Team 2000
+-- (c) The GHC Team 2004
 --
 -----------------------------------------------------------------------------
 module InteractiveUI ( 
@@ -12,13 +12,15 @@ module InteractiveUI (
 	ghciWelcomeMsg
    ) where
 
-#include "../includes/config.h"
+#include "../includes/ghcconfig.h"
 #include "HsVersions.h"
 
 import CompManager
 import HscTypes		( TyThing(..), HomeModInfo(hm_linkable), HomePackageTable,
 			  isObjectLinkable, GhciMode(..) )
-import IfaceSyn		( IfaceDecl( ifName ) )
+import IfaceSyn		( IfaceType, IfaceDecl(..), IfaceClassOp(..), IfaceConDecls(..), IfaceConDecl(..), 
+		   	  IfaceInst(..), pprIfaceDeclHead, pprParendIfaceType, pprIfaceForAllPart )
+import FunDeps		( pprFundeps )
 import DriverFlags
 import DriverState
 import DriverUtil	( remove_spaces )
@@ -27,14 +29,15 @@ import Util
 import Module		( showModMsg, lookupModuleEnv )
 import Name		( Name, isHomePackageName, nameSrcLoc, nameOccName,
 			  NamedThing(..) )
-import OccName		( isSymOcc )
-import BasicTypes	( defaultFixity, SuccessFlag(..) )
+import OccName		( OccName, isSymOcc, occNameUserString )
+import BasicTypes	( StrictnessMark(..), Fixity, defaultFixity, SuccessFlag(..) )
 import Packages
 import Outputable
 import CmdLineOpts	( DynFlag(..), DynFlags(..), getDynFlags, saveDynFlags,
 			  restoreDynFlags, dopt_unset )
 import Panic 		hiding ( showException )
 import Config
+import SrcLoc		( SrcLoc, isGoodSrcLoc )
 
 #ifndef mingw32_HOST_OS
 import DriverUtil( handle )
@@ -57,6 +60,7 @@ import Control.Concurrent
 
 import Numeric
 import Data.List
+import Data.Int		( Int64 )
 import System.Cmd
 import System.CPUTime
 import System.Environment
@@ -73,12 +77,12 @@ import System.Posix.Internals ( setNonBlockingFD )
 
 -----------------------------------------------------------------------------
 
-ghciWelcomeMsg = "\ 
-\   ___         ___ _\n\ 
-\  / _ \\ /\\  /\\/ __(_)\n\ 
-\ / /_\\// /_/ / /  | |      GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n\ 
-\/ /_\\\\/ __  / /___| |      http://www.haskell.org/ghc/\n\ 
-\\\____/\\/ /_/\\____/|_|      Type :? for help.\n"
+ghciWelcomeMsg =
+ "   ___         ___ _\n"++
+ "  / _ \\ /\\  /\\/ __(_)\n"++
+ " / /_\\// /_/ / /  | |      GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n"++
+ "/ /_\\\\/ __  / /___| |      http://www.haskell.org/ghc/\n"++
+ "\\____/\\/ /_/\\____/|_|      Type :? for help.\n"
 
 GLOBAL_VAR(commands, builtin_commands, [(String, String -> GHCi Bool)])
 
@@ -97,6 +101,7 @@ builtin_commands = [
   ("set",	keepGoing setCmd),
   ("show",	keepGoing showCmd),
   ("type",	keepGoing typeOfExpr),
+  ("kind",	keepGoing kindOfType),
   ("unset",	keepGoing unsetOptions),
   ("undef",     keepGoing undefineMacro),
   ("quit",	quit)
@@ -111,41 +116,42 @@ keepGoingPaths a str = a (toArgs str) >> return False
 shortHelpText = "use :? for help.\n"
 
 -- NOTE: spaces at the end of each line to workaround CPP/string gap bug.
-helpText = "\ 
-\ Commands available from the prompt:\n\ 
-\\n\ 
-\   <stmt>		       evaluate/run <stmt>\n\ 
-\   :add <filename> ...        add module(s) to the current target set\n\ 
-\   :browse [*]<module>	       display the names defined by <module>\n\ 
-\   :cd <dir>		       change directory to <dir>\n\ 
-\   :def <cmd> <expr>          define a command :<cmd>\n\ 
-\   :help, :?		       display this list of commands\n\ 
-\   :info [<name> ...]         display information about the given names\n\ 
-\   :load <filename> ...       load module(s) and their dependents\n\ 
-\   :module [+/-] [*]<mod> ... set the context for expression evaluation\n\ 
-\   :reload		       reload the current module set\n\ 
-\\n\ 
-\   :set <option> ...	       set options\n\ 
-\   :set args <arg> ...	       set the arguments returned by System.getArgs\n\ 
-\   :set prog <progname>       set the value returned by System.getProgName\n\ 
-\\n\ 
-\   :show modules	       show the currently loaded modules\n\ 
-\   :show bindings	       show the current bindings made at the prompt\n\ 
-\\n\ 
-\   :type <expr>	       show the type of <expr>\n\ 
-\   :undef <cmd> 	       undefine user-defined command :<cmd>\n\ 
-\   :unset <option> ...	       unset options\n\ 
-\   :quit		       exit GHCi\n\ 
-\   :!<command>		       run the shell command <command>\n\ 
-\\n\ 
-\ Options for `:set' and `:unset':\n\ 
-\\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\ 
-\    -<flags>		most GHC command line flags can also be set here\n\ 
-\                         (eg. -v2, -fglasgow-exts, etc.)\n\ 
-\"
+helpText =
+ " Commands available from the prompt:\n" ++
+ "\n" ++
+ "   <stmt>                      evaluate/run <stmt>\n" ++
+ "   :add <filename> ...         add module(s) to the current target set\n" ++
+ "   :browse [*]<module>         display the names defined by <module>\n" ++
+ "   :cd <dir>                   change directory to <dir>\n" ++
+ "   :def <cmd> <expr>           define a command :<cmd>\n" ++
+ "   :help, :?                   display this list of commands\n" ++
+ "   :info [<name> ...]          display information about the given names\n" ++
+ "   :load <filename> ...        load module(s) and their dependents\n" ++
+ "   :module [+/-] [*]<mod> ...  set the context for expression evaluation\n" ++
+ "   :reload                     reload the current module set\n" ++
+ "\n" ++
+ "   :set <option> ...           set options\n" ++
+ "   :set args <arg> ...         set the arguments returned by System.getArgs\n" ++
+ "   :set prog <progname>        set the value returned by System.getProgName\n" ++
+ "\n" ++
+ "   :show modules               show the currently loaded modules\n" ++
+ "   :show bindings              show the current bindings made at the prompt\n" ++
+ "\n" ++
+ "   :type <expr>                show the type of <expr>\n" ++
+ "   :kind <type>                show the kind of <type>\n" ++
+ "   :undef <cmd>                undefine user-defined command :<cmd>\n" ++
+ "   :unset <option> ...         unset options\n" ++
+ "   :quit                       exit GHCi\n" ++
+ "   :!<command>                 run the shell command <command>\n" ++
+ "\n" ++
+ " Options for ':set' and ':unset':\n" ++
+ "\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" ++
+ "    -<flags>      most GHC command line flags can also be set here\n" ++
+ "                         (eg. -v2, -fglasgow-exts, etc.)\n"
+
 
 interactiveUI :: [FilePath] -> Maybe String -> IO ()
 interactiveUI srcs maybe_expr = do
@@ -409,7 +415,7 @@ specialCommand str = do
   let (cmd,rest) = break isSpace str
   cmds <- io (readIORef commands)
   case [ (s,f) | (s,f) <- cmds, prefixMatch cmd s ] of
-     []      -> io (hPutStr stdout ("unknown command `:" ++ cmd ++ "'\n" 
+     []      -> io (hPutStr stdout ("unknown command ':" ++ cmd ++ "'\n" 
 		                    ++ shortHelpText) >> return False)
      [(_,f)] -> f (dropWhile isSpace rest)
      cs      -> io (hPutStrLn stdout ("prefix " ++ cmd ++ 
@@ -417,7 +423,7 @@ specialCommand str = do
 	         	     	       foldr1 (\a b -> a ++ ',':b) (map fst cs)
 					 ++ ")") >> return False)
 
-noArgs c = throwDyn (CmdLineError ("command `" ++ c ++ "' takes no arguments"))
+noArgs c = throwDyn (CmdLineError ("command '" ++ c ++ "' takes no arguments"))
 
 
 -----------------------------------------------------------------------------
@@ -466,65 +472,115 @@ help :: String -> GHCi ()
 help _ = io (putStr helpText)
 
 info :: String -> GHCi ()
-info "" = throwDyn (CmdLineError "syntax: `:i <thing-you-want-info-about>'")
-info s = do
-  let names = words s
-  init_cms <- getCmState
-  let 
-    infoThings cms [] = return cms
-    infoThings cms (name:names) = do
-      stuff <- io (cmInfoThing cms name)
-      io (putStrLn (showSDocForUser unqual (
-	    vcat (intersperse (text "") (map showThing stuff))))
-         )
-      infoThings cms names
-
-    unqual = cmGetPrintUnqual init_cms
-
-    showThing (decl, fixity) 
-	= vcat [ text "-- " <> showTyThing decl, 
-		 showFixity fixity (ifName decl),
-	         showTyThing decl ]
-
-    showFixity fix name
+info "" = throwDyn (CmdLineError "syntax: ':i <thing-you-want-info-about>'")
+info s  = do { let names = words s
+	     ; init_cms <- getCmState
+	     ; mapM_ (infoThing init_cms) names }
+  where
+    infoThing cms name
+	= do { stuff <- io (cmGetInfo cms name)
+	     ; io (putStrLn (showSDocForUser (cmGetPrintUnqual cms) $
+     		   vcat (intersperse (text "") (map showThing stuff)))) }
+
+showThing :: GetInfoResult -> SDoc
+showThing  (wanted_str, (thing, fixity, src_loc, insts)) 
+    = vcat [ showDecl want_name thing, 
+	     show_fixity fixity,
+	     show_loc src_loc,
+	     vcat (map show_inst insts)]
+  where
+    want_name occ = wanted_str == occNameUserString occ
+
+    show_fixity fix 
 	| fix == defaultFixity = empty
-	| otherwise            = ppr fix <+> 
-				 (if isSymOcc name
-				  then ppr name
-				  else char '`' <> ppr name <> char '`')
-
-    showTyThing decl = ppr decl
-
-{-
-    showTyThing (AClass cl)
-       = hcat [ppr cl, text " is a class", showSrcLoc (className cl)]
-    showTyThing (ADataCon dc)
-       = hcat [ppr dc, text " is a data constructor", showSrcLoc (dataConName dc)]
-    showTyThing (ATyCon ty)
-       | isPrimTyCon ty
-       = hcat [ppr ty, text " is a primitive type constructor"]
-       | otherwise
-       = hcat [ppr ty, text " is a type constructor", showSrcLoc (tyConName ty)]
-    showTyThing (AnId   id)
-       = hcat [ppr id, text " is a ", idDescr id, showSrcLoc (idName id)]
-
-    idDescr id
-       = case globalIdDetails id of
-	    RecordSelId lbl -> text "record selector for type" <+> ppr (fieldLabelTyCon lbl)
-	    ClassOpId cls   -> text "method in class" <+> ppr cls
-       	    otherwise       -> text "variable"
-
-	-- also print out the source location for home things
-    showSrcLoc name
-	| isHomePackageName name && isGoodSrcLoc loc
-	= hsep [ text ", defined at", ppr loc ]
-	| otherwise
-	= empty
-	where loc = nameSrcLoc name
--}
-
-  infoThings init_cms names
-  return ()
+	| otherwise            = ppr fix <+> text wanted_str
+
+    show_loc loc	-- The ppr function for SrcLocs is a bit wonky
+	| isGoodSrcLoc loc = comment <+> ptext SLIT("Defined at") <+> ppr loc
+	| otherwise	   = comment <+> ppr loc
+    comment = ptext SLIT("--")
+
+    show_inst (iface_inst, loc)
+	= hang (ptext SLIT("instance") <+> ppr (ifInstHead iface_inst))
+	     2 (char '\t' <> show_loc loc)
+		-- The tab tries to make them line up a bit
+
+-- Now there is rather a lot of goop just to print declarations in a
+-- civilised way with "..." for the parts we are less interested in.
+
+showDecl :: (OccName -> Bool) -> IfaceDecl -> SDoc
+showDecl want_name (IfaceForeign {ifName = tc})
+  = ppr tc <+> ptext SLIT("is a foreign type")
+
+showDecl want_name (IfaceId {ifName = var, ifType = ty})
+  = ppr var <+> dcolon <+> ppr ty 
+
+showDecl want_name (IfaceSyn {ifName = tycon, ifTyVars = tyvars, ifSynRhs = mono_ty})
+  = hang (ptext SLIT("type") <+> pprIfaceDeclHead [] tycon tyvars)
+       2 (equals <+> ppr mono_ty)
+
+showDecl want_name (IfaceData {ifCtxt = context, ifName = tycon, 
+		     ifTyVars = tyvars, ifCons = condecls})
+  = hang (pp_nd <+> pprIfaceDeclHead context tycon tyvars)
+       2 (add_bars (ppr_trim show_con cs))
+  where
+    show_con (IfaceConDecl con_name is_infix ex_tvs ex_cxt tys strs flds)
+	| want_name tycon || want_name con_name || any want_name flds
+	= Just (pprIfaceForAllPart ex_tvs ex_cxt (show_guts con_name is_infix tys_w_strs flds))
+	| otherwise = Nothing
+	where
+	  tys_w_strs = tys `zip` (strs ++ repeat NotMarkedStrict)
+
+    show_guts con True [ty1, ty2] flds = sep [ppr_bangty ty1, ppr con, ppr_bangty ty2]
+    show_guts con _ tys []   = ppr_bndr con <+> sep (map ppr_bangty tys)
+    show_guts con _ tys flds 
+	= ppr_bndr con <+> braces (sep (punctuate comma (ppr_trim show_fld (tys `zip` flds))))
+	where
+	  show_fld (bty, fld) | want_name tycon || want_name con || want_name fld
+			      = Just (ppr_bndr fld <+> dcolon <+> ppr_bangty bty)
+			      | otherwise = Nothing
+
+    (pp_nd, cs) = case condecls of
+		    IfAbstractTyCon -> (ptext SLIT("data"),    [])
+		    IfDataTyCon cs  -> (ptext SLIT("data"),    cs)
+		    IfNewTyCon c    -> (ptext SLIT("newtype"), [c])
+
+    add_bars []      = empty
+    add_bars [c]     = equals <+> c
+    add_bars (c:cs)  = equals <+> sep (c : map (char '|' <+>) cs)
+
+    ppr_bangty (ty, str) = ppr_str str <> pprParendIfaceType ty
+    ppr_str MarkedStrict    = char '!'
+    ppr_str MarkedUnboxed   = ptext SLIT("!!")
+    ppr_str NotMarkedStrict = empty
+
+showDecl want_name (IfaceClass {ifCtxt = context, ifName = clas, ifTyVars = tyvars, 
+		      ifFDs = fds, ifSigs = sigs})
+  = hang (ptext SLIT("class") <+> pprIfaceDeclHead context clas tyvars
+		<+> pprFundeps fds <+> ptext SLIT("where"))
+       2 (vcat (ppr_trim show_op sigs))
+  where
+    show_op (IfaceClassOp op dm ty) 
+	| want_name clas || want_name op = Just (ppr_bndr op <+> dcolon <+> ppr ty)
+	| otherwise			 = Nothing
+
+ppr_trim :: (a -> Maybe SDoc) -> [a] -> [SDoc]
+ppr_trim show xs
+  = snd (foldr go (False, []) xs)
+  where
+    go x (eliding, so_far)
+	| Just doc <- show x = (False, doc : so_far)
+	| otherwise = if eliding then (True, so_far)
+		                 else (True, ptext SLIT("...") : so_far)
+
+ppr_bndr :: OccName -> SDoc
+-- Wrap operators in ()
+ppr_bndr occ | isSymOcc occ = parens (ppr occ)
+	     | otherwise    = ppr occ
+
+
+-----------------------------------------------------------------------------
+-- Commands
 
 addModule :: [FilePath] -> GHCi ()
 addModule files = do
@@ -543,8 +599,7 @@ changeDirectory :: String -> GHCi ()
 changeDirectory dir = do
   state    <- getGHCiState
   when (targets state /= []) $
-	io $ putStr "Warning: changing directory causes all loaded modules to be unloaded, \n\ 
-	\because the search path has changed.\n"
+	io $ putStr "Warning: changing directory causes all loaded modules to be unloaded,\nbecause the search path has changed.\n"
   cmstate1 <- io (cmUnload (cmstate state))
   setGHCiState state{ cmstate = cmstate1, targets = [] }
   setContextAfterLoad []
@@ -560,7 +615,7 @@ defineMacro s = do
 	else do
   if (macro_name `elem` map fst cmds) 
 	then throwDyn (CmdLineError 
-		("command `" ++ macro_name ++ "' is already defined"))
+		("command '" ++ macro_name ++ "' is already defined"))
 	else do
 
   -- give the expression a type signature, so we can be sure we're getting
@@ -585,11 +640,11 @@ undefineMacro macro_name = do
   cmds <- io (readIORef commands)
   if (macro_name `elem` map fst builtin_commands) 
 	then throwDyn (CmdLineError
-		("command `" ++ macro_name ++ "' cannot be undefined"))
+		("command '" ++ macro_name ++ "' cannot be undefined"))
 	else do
   if (macro_name `notElem` map fst cmds) 
 	then throwDyn (CmdLineError 
-		("command `" ++ macro_name ++ "' not defined"))
+		("command '" ++ macro_name ++ "' not defined"))
 	else do
   io (writeIORef commands (filter ((/= macro_name) . fst) cmds))
 
@@ -668,6 +723,14 @@ typeOfExpr str
 	  Nothing    -> return ()
 	  Just tystr -> io (putStrLn tystr)
 
+kindOfType :: String -> GHCi ()
+kindOfType str 
+  = do cms <- getCmState
+       maybe_tystr <- io (cmKindOfType cms str)
+       case maybe_tystr of
+	  Nothing    -> return ()
+	  Just tystr -> io (putStrLn tystr)
+
 quit :: String -> GHCi Bool
 quit _ = return True
 
@@ -675,7 +738,7 @@ shellEscape :: String -> GHCi Bool
 shellEscape str = io (system str >> return False)
 
 -----------------------------------------------------------------------------
--- Browing a module's contents
+-- Browsing a module's contents
 
 browseCmd :: String -> GHCi ()
 browseCmd m = 
@@ -689,7 +752,7 @@ browseModule m exports_only = do
 
   is_interpreted <- io (cmModuleIsInterpreted cms m)
   when (not is_interpreted && not exports_only) $
-	throwDyn (CmdLineError ("module `" ++ m ++ "' is not interpreted"))
+	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
@@ -703,7 +766,7 @@ browseModule m exports_only = do
   let unqual = cmGetPrintUnqual cms1 -- NOTE: cms1 with the new context
 
   io (putStrLn (showSDocForUser unqual (
-   	 vcat (map ppr things)
+   	 vcat (map (showDecl (const True)) things)
       )))
 
 -----------------------------------------------------------------------------
@@ -732,7 +795,7 @@ separate cmstate []           as bs = return (as,bs)
 separate cmstate (('*':m):ms) as bs = do
    b <- io (cmModuleIsInterpreted cmstate m)
    if b then separate cmstate ms (m:as) bs
-   	else throwDyn (CmdLineError ("module `" ++ m ++ "' is not interpreted"))
+   	else throwDyn (CmdLineError ("module '" ++ m ++ "' is not interpreted"))
 separate cmstate (m:ms)       as bs = separate cmstate ms as (m:bs)
 
 prel = "Prelude"
@@ -841,7 +904,7 @@ unsetOptions str
 	   (plus_opts, rest2)  = partition isPlus rest1
 
        if (not (null rest2)) 
-	  then io (putStrLn ("unknown option: `" ++ head rest2 ++ "'"))
+	  then io (putStrLn ("unknown option: '" ++ head rest2 ++ "'"))
 	  else do
 
        mapM_ unsetOpt plus_opts
@@ -859,12 +922,12 @@ isPlus _ = False
 
 setOpt ('+':str)
   = case strToGHCiOpt str of
-	Nothing -> io (putStrLn ("unknown option: `" ++ str ++ "'"))
+	Nothing -> io (putStrLn ("unknown option: '" ++ str ++ "'"))
 	Just o  -> setOption o
 
 unsetOpt ('+':str)
   = case strToGHCiOpt str of
-	Nothing -> io (putStrLn ("unknown option: `" ++ str ++ "'"))
+	Nothing -> io (putStrLn ("unknown option: '" ++ str ++ "'"))
 	Just o  -> unsetOption o
 
 strToGHCiOpt :: String -> (Maybe GHCiOption)
@@ -1008,18 +1071,20 @@ timeIt action
 		  a <- action
 		  allocs2 <- io $ getAllocations
 		  time2   <- io $ getCPUTime
-		  io $ printTimes (allocs2 - allocs1) (time2 - time1)
+		  io $ printTimes (fromIntegral (allocs2 - allocs1)) 
+				  (time2 - time1)
 		  return a
 
-foreign import ccall "getAllocations" getAllocations :: IO Int
+foreign import ccall unsafe "getAllocations" getAllocations :: IO Int64
+	-- defined in ghc/rts/Stats.c
 
-printTimes :: Int -> Integer -> IO ()
+printTimes :: Integer -> Integer -> IO ()
 printTimes allocs psecs
    = do let secs = (fromIntegral psecs / (10^12)) :: Float
 	    secs_str = showFFloat (Just 2) secs
 	putStrLn (showSDoc (
 		 parens (text (secs_str "") <+> text "secs" <> comma <+> 
-			 int allocs <+> text "bytes")))
+			 text (show allocs) <+> text "bytes")))
 
 -----------------------------------------------------------------------------
 -- reverting CAFs