diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-02 17:29:50 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-02 17:29:50 +0100 |
| commit | bcfa64ac0d3167f765a632a721d6f6b741cd1c8a (patch) | |
| tree | 4c0c8856d1ed272372ca86c329f342293ed92221 /ghc/InteractiveUI.hs | |
| parent | 7897623599db0a2b0e9b8870fdb8b2401396b3a9 (diff) | |
| download | haskell-bcfa64ac0d3167f765a632a721d6f6b741cd1c8a.tar.gz | |
Wibble to main "Refactor the imports of InteractiveContext" patch
Diffstat (limited to 'ghc/InteractiveUI.hs')
| -rw-r--r-- | ghc/InteractiveUI.hs | 26 |
1 files changed, 17 insertions, 9 deletions
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 |