X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FIdInfo.lhs;h=07cc1813492c2616e70e5dcf384f45392c00c4e6;hb=bd78c94a3b41f8d2097efc0415fa26e0cd1140ef;hp=aa989b9a66f4764ddaf9d3c23ac24f9869fa6ecc;hpb=8e2cb328ca9f2303e7e11874e50421aa18914101;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/IdInfo.lhs b/compiler/basicTypes/IdInfo.lhs
index aa989b9..07cc181 100644
--- a/compiler/basicTypes/IdInfo.lhs
+++ b/compiler/basicTypes/IdInfo.lhs
@@ -9,8 +9,8 @@ Haskell. [WDP 94/11])
 
 \begin{code}
 module IdInfo (
-        -- * The GlobalIdDetails type
-	GlobalIdDetails(..), notGlobalId, 	-- Not abstract
+        -- * The IdDetails type
+	IdDetails(..), pprIdDetails,
 
         -- * The IdInfo type
 	IdInfo,		-- Abstract
@@ -89,7 +89,7 @@ module IdInfo (
         TickBoxOp(..), TickBoxId,
     ) where
 
-import {-# SOURCE #-} CoreSyn ( CoreRule, setRuleIdName, seqRules, Unfolding, noUnfolding )
+import CoreSyn ( CoreRule, setRuleIdName, seqRules, Unfolding, noUnfolding )
 
 import Class
 import PrimOp
@@ -234,31 +234,23 @@ seqNewDemandInfo (Just dmd) = seqDemand dmd
 
 %************************************************************************
 %*									*
-\subsection{GlobalIdDetails}
+                     IdDetails
 %*									*
 %************************************************************************
 
-This type is here (rather than in Id.lhs) mainly because there's 
-an IdInfo.hi-boot, but no Id.hi-boot, and GlobalIdDetails is imported
-(recursively) by Var.lhs.
-
 \begin{code}
--- | Information pertaining to global 'Id's. See "Var#globalvslocal" for the distinction 
--- between global and local in this context
-data GlobalIdDetails
-  = VanillaGlobal		-- ^ The 'Id' is imported from elsewhere or is a default method 'Id'
+-- | The 'IdDetails' of an 'Id' give stable, and necessary, 
+-- information about the Id. 
+data IdDetails
+  = VanillaId	
 
   -- | The 'Id' for a record selector
-  | RecordSelId                 
+  | RecSelId                 
     { sel_tycon   :: TyCon	-- ^ For a data type family, this is the /instance/ 'TyCon'
 				--   not the family 'TyCon'
-    , sel_label   :: FieldLabel
     , sel_naughty :: Bool       -- True <=> a "naughty" selector which can't actually exist, for example @x@ in:
-                                -- 
-                                -- > data T = forall a. MkT { x :: a }
-    }				
-				-- See Note [Naughty record selectors]
-				-- with MkId.mkRecordSelectorId
+                                --    data T = forall a. MkT { x :: a }
+    }				-- See Note [Naughty record selectors] in TcTyClsDecls
 
   | DataConWorkId DataCon	-- ^ The 'Id' is for a data constructor /worker/
   | DataConWrapId DataCon	-- ^ The 'Id' is for a data constructor /wrapper/
@@ -275,25 +267,29 @@ data GlobalIdDetails
 
   | TickBoxOpId TickBoxOp	-- ^ The 'Id' is for a HPC tick box (both traditional and binary)
 
-  | NotGlobalId			-- ^ Used as a convenient extra return value from 'globalIdDetails'
-
--- | An entirely unhelpful 'GlobalIdDetails'
-notGlobalId :: GlobalIdDetails
-notGlobalId = NotGlobalId
-
-instance Outputable GlobalIdDetails where
-    ppr NotGlobalId       = ptext (sLit "[***NotGlobalId***]")
-    ppr VanillaGlobal     = ptext (sLit "[GlobalId]")
-    ppr (DataConWorkId _) = ptext (sLit "[DataCon]")
-    ppr (DataConWrapId _) = ptext (sLit "[DataConWrapper]")
-    ppr (ClassOpId _)     = ptext (sLit "[ClassOp]")
-    ppr (PrimOpId _)      = ptext (sLit "[PrimOp]")
-    ppr (FCallId _)       = ptext (sLit "[ForeignCall]")
-    ppr (TickBoxOpId _)   = ptext (sLit "[TickBoxOp]")
-    ppr (RecordSelId {})  = ptext (sLit "[RecSel]")
+  | DFunId			-- ^ A dictionary function.  We don't use this in an essential way,
+    				-- currently, but it's kind of nice that we can keep track of
+				-- which Ids are DFuns, across module boundaries too
+
+
+instance Outputable IdDetails where
+    ppr = pprIdDetails
+
+pprIdDetails :: IdDetails -> SDoc
+pprIdDetails VanillaId         = empty
+pprIdDetails (RecSelId {})  = ptext (sLit "[RecSel]")
+pprIdDetails (DataConWorkId _) = ptext (sLit "[DataCon]")
+pprIdDetails (DataConWrapId _) = ptext (sLit "[DataConWrapper]")
+pprIdDetails (ClassOpId _)     = ptext (sLit "[ClassOp]")
+pprIdDetails (PrimOpId _)      = ptext (sLit "[PrimOp]")
+pprIdDetails (FCallId _)       = ptext (sLit "[ForeignCall]")
+pprIdDetails (TickBoxOpId _)   = ptext (sLit "[TickBoxOp]")
+pprIdDetails DFunId            = ptext (sLit "[DFunId]")
 \end{code}
 
 
+
+
 %************************************************************************
 %*									*
 \subsection{The main IdInfo type}
@@ -573,11 +569,11 @@ this to".
 \begin{code}
 
 -- | If this Id has a worker then we store a reference to it. Worker
--- functions are generated by the worker/wrapper pass, using information
+-- functions are generated by the worker\/wrapper pass, using information
 -- information from strictness analysis.
 data WorkerInfo = NoWorker              -- ^ No known worker function
 		| HasWorker Id Arity    -- ^ The 'Arity' is the arity of the /wrapper/ at the moment of the
-	                                -- worker/wrapper split, which may be different from the current 'Id' 'Aritiy'
+	                                -- worker\/wrapper split, which may be different from the current 'Id' 'Aritiy'
 
 seqWorker :: WorkerInfo -> ()
 seqWorker (HasWorker id a) = id `seq` a `seq` ()
@@ -623,6 +619,7 @@ data CafInfo
 
 	| NoCafRefs			-- ^ A function or static constructor
 				        -- that refers to no CAFs.
+        deriving (Eq, Ord)
 
 -- | Assumes that the 'Id' has CAF references: definitely safe
 vanillaCafInfo :: CafInfo
@@ -667,7 +664,7 @@ data CprInfo
   | ReturnsCPR	-- ^ Yes, this function returns a constructed product
 		
 		-- Implicitly, this means "after the function has been applied
-		-- to all its arguments", so the worker/wrapper builder in 
+		-- to all its arguments", so the worker\/wrapper builder in 
 		-- WwLib.mkWWcpr checks that that it is indeed saturated before
 		-- making use of the CPR info