From: simonmar <unknown>
Date: Wed, 15 Aug 2001 15:50:41 +0000 (+0000)
Subject: [project @ 2001-08-15 15:50:41 by simonmar]
X-Git-Tag: Approximately_9120_patches~1222
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=99b4825c2a570767e9fa4ceab786476b07c7ac59;hp=a27ef0b1541999fb02da450df4c09702a99ef3f3;p=ghc-hetmet.git

[project @ 2001-08-15 15:50:41 by simonmar]
Aha!  I discovered how to distinguish ordinary record selectors from
class methods.

Prelude> :i +
-- + is a method in class Num
+ :: forall a. (Num a) => a -> a -> a
---

diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs
index a2225ff..31cae90 100644
--- a/ghc/compiler/ghci/InteractiveUI.hs
+++ b/ghc/compiler/ghci/InteractiveUI.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: InteractiveUI.hs,v 1.88 2001/08/15 15:39:59 simonmar Exp $
+-- $Id: InteractiveUI.hs,v 1.89 2001/08/15 15:50:41 simonmar Exp $
 --
 -- GHC Interactive User Interface
 --
@@ -25,9 +25,11 @@ import DriverUtil
 import Linker
 import Finder		( flushPackageCache )
 import Util
-import Id		( isRecordSelector, isDataConWrapId, idName )
+import Id		( isRecordSelector, recordSelectorFieldLabel, 
+			  isDataConWrapId, idName )
 import Class		( className )
-import TyCon		( tyConName )
+import TyCon		( tyConName, tyConClass_maybe )
+import FieldLabel	( fieldLabelTyCon )
 import SrcLoc		( isGoodSrcLoc )
 import Name		( Name, isHomePackageName, nameSrcLoc )
 import Outputable
@@ -399,12 +401,16 @@ info s = do
     showTyThing (ATyCon ty)
        = hcat [ppr ty, text " is a type constructor", showSrcLoc (tyConName ty)]
     showTyThing (AnId   id)
-       = hcat [ppr id, text " is a ", text (idDescr id), showSrcLoc (idName id)]
+       = hcat [ppr id, text " is a ", idDescr id, showSrcLoc (idName id)]
 
     idDescr id
-       | isRecordSelector id  = "record selector"
-       | isDataConWrapId id   = "data constructor"
-       | otherwise            = "variable"
+       | isRecordSelector id = 
+		case tyConClass_maybe (fieldLabelTyCon (
+				recordSelectorFieldLabel id)) of
+			Nothing -> text "record selector"
+			Just c  -> text "method in class " <> ppr c
+       | isDataConWrapId id  = text "data constructor"
+       | otherwise           = text "variable"
 
 	-- also print out the source location for home things
     showSrcLoc name