diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-16 22:58:02 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-16 22:58:02 +0000 |
| commit | d2d71b0e0bdfb5128d68a886a8cbec11c4cf34ee (patch) | |
| tree | b7699d67114a7865818ad09fd8822ee23cee4e52 /ghc | |
| parent | ecc1882ed458210c322d30b78801e7bc0a5c2d4d (diff) | |
| parent | ca39e777907f8b16d8ede82e040b6f17fad99c9e (diff) | |
| download | haskell-d2d71b0e0bdfb5128d68a886a8cbec11c4cf34ee.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/InteractiveUI.hs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 5b3e572650..263babeafc 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -1022,7 +1022,7 @@ infoThing allInfo str = do let pefas = gopt Opt_PrintExplicitForalls dflags names <- GHC.parseName str mb_stuffs <- mapM (GHC.getInfo allInfo) names - let filtered = filterOutChildren (\(t,_f,_i) -> t) (catMaybes mb_stuffs) + let filtered = filterOutChildren (\(t,_f,_ci,_fi) -> t) (catMaybes mb_stuffs) return $ vcat (intersperse (text "") $ map (pprInfo pefas) filtered) -- Filter out names whose parent is also there Good @@ -1037,11 +1037,13 @@ filterOutChildren get_thing xs Just p -> getName p `elemNameSet` all_names Nothing -> False -pprInfo :: PrintExplicitForalls -> (TyThing, Fixity, [GHC.ClsInst]) -> SDoc -pprInfo pefas (thing, fixity, insts) +pprInfo :: PrintExplicitForalls + -> (TyThing, Fixity, [GHC.ClsInst], [GHC.FamInst GHC.Branched]) -> SDoc +pprInfo pefas (thing, fixity, cls_insts, fam_insts) = pprTyThingInContextLoc pefas thing $$ show_fixity - $$ vcat (map GHC.pprInstance insts) + $$ vcat (map GHC.pprInstance cls_insts) + $$ vcat (map GHC.pprFamInst fam_insts) where show_fixity | fixity == GHC.defaultFixity = empty @@ -2191,8 +2193,10 @@ showBindings = do let pefas = gopt Opt_PrintExplicitForalls dflags mb_stuff <- GHC.getInfo False (getName tt) return $ maybe (text "") (pprTT pefas) mb_stuff - pprTT :: PrintExplicitForalls -> (TyThing, Fixity, [GHC.ClsInst]) -> SDoc - pprTT pefas (thing, fixity, _insts) = + + pprTT :: PrintExplicitForalls + -> (TyThing, Fixity, [GHC.ClsInst], [GHC.FamInst GHC.Branched]) -> SDoc + pprTT pefas (thing, fixity, _cls_insts, _fam_insts) = pprTyThing pefas thing $$ show_fixity where |