From bcfa64ac0d3167f765a632a721d6f6b741cd1c8a Mon Sep 17 00:00:00 2001
From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Tue, 2 Aug 2011 17:29:50 +0100
Subject: Wibble to main "Refactor the imports of InteractiveContext" patch

---
 ghc/InteractiveUI.hs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'ghc/InteractiveUI.hs')

diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 21d6abd805..6cdce2c506 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -1398,8 +1398,10 @@ browseModule bang modl exports_only = do
 
   -- Temporarily set the context to the module we're interested in,
   -- just so we can get an appropriate PrintUnqualified
+  -- Use mySetContext so we get an implicit Prelude import 
+  -- for the PrintUnqualified
   imports <- GHC.getContext
-  lift $ mySetContext (if exports_only 
+  lift $ mySetContext (if exports_only	
                        then [IIDecl $ simpleImportDecl (GHC.moduleName modl)]
                        else [IIModule modl])
   target_unqual <- GHC.getPrintUnqual
@@ -1475,13 +1477,12 @@ browseModule bang modl exports_only = do
 
 -----------------------------------------------------------------------------
 -- Setting the module context
-
-newContextCmd :: CtxtCmd -> GHCi ()
-newContextCmd cmd = do
-  playCtxtCmds True [cmd]
-  st <- getGHCiState
-  let cmds = remembered_ctx st
-  setGHCiState st{ remembered_ctx = cmds ++ [cmd] }
+-- This handles  Command     Constructor in CtxtCmd
+--               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+--               :m X        SetContext
+--               :m +X       AddModules
+--               :m -X       RemModules    
+--               import X    Import
 
 moduleCmd :: String -> GHCi ()
 moduleCmd str
@@ -1504,11 +1505,18 @@ moduleCmd str
     starred ('*':m) = Left m
     starred m       = Right m
 
+newContextCmd :: CtxtCmd -> GHCi ()
+newContextCmd cmd = do
+  playCtxtCmds True [cmd]
+  st <- getGHCiState
+  let cmds = remembered_ctx st
+  setGHCiState st{ remembered_ctx = cmds ++ [cmd] }
+
 playCtxtCmds :: Bool -> [CtxtCmd] -> GHCi ()
 playCtxtCmds fail cmds = do
   ctx <- GHC.getContext
   ctx' <- foldM (playCtxtCmd fail) ctx cmds
-  mySetContext ctx'
+  mySetContext ctx'	-- Eliminate dups and add Prelude if not there
 
 playCtxtCmd:: Bool -> [InteractiveImport] -> CtxtCmd -> GHCi [InteractiveImport]
 playCtxtCmd fail prev cmd = do
-- 
cgit v1.2.1