X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FhsSyn%2FHsBinds.lhs;h=6c46fa2d13f82f444c2011eb3019375613950274;hb=022fc24719ba4b98b8d9f19bfe7f75dd0f19d585;hp=0942703312e714cb7055aec07635402dfbc5e8a9;hpb=00029a41e51fceb8aa4bfdf86170be036b35d497;p=ghc-hetmet.git

diff --git a/compiler/hsSyn/HsBinds.lhs b/compiler/hsSyn/HsBinds.lhs
index 0942703..6c46fa2 100644
--- a/compiler/hsSyn/HsBinds.lhs
+++ b/compiler/hsSyn/HsBinds.lhs
@@ -17,7 +17,7 @@ import {-# SOURCE #-} HsExpr ( HsExpr, pprExpr, LHsExpr,
 import {-# SOURCE #-} HsPat  ( LPat )
 
 import HsTypes
-import PprCore
+import PprCore ()
 import Coercion
 import Type
 import Name
@@ -52,7 +52,9 @@ data HsValBinds id	-- Value bindings (not implicit parameters)
 					-- Recursive by default
 
   | ValBindsOut				-- After renaming
-	[(RecFlag, LHsBinds id)]	-- Dependency analysed
+	[(RecFlag, LHsBinds id)]	-- Dependency analysed, later bindings 
+                                        -- in the list may depend on earlier
+                                        -- ones.
 	[LSig Name]
 
 type LHsBinds id  = Bag (LHsBind id)
@@ -93,7 +95,7 @@ data HsBind id
 				-- Before renaming, and after typechecking, 
 				-- the field is unused; it's just an error thunk
 
-        fun_tick :: Maybe Int   -- This is the (optional) module-local tick number. 
+        fun_tick :: Maybe (Int,[id])   -- This is the (optional) module-local tick number. 
     }
 
   | PatBind {	-- The pattern is never a simple variable;
@@ -112,7 +114,7 @@ data HsBind id
   | AbsBinds {					-- Binds abstraction; TRANSLATION
 	abs_tvs     :: [TyVar],  
 	abs_dicts   :: [DictId],
-	abs_exports :: [([TyVar], id, id, [Prag])],	-- (tvs, poly_id, mono_id, prags)
+	abs_exports :: [([TyVar], id, id, [LPrag])],	-- (tvs, poly_id, mono_id, prags)
 	abs_binds   :: LHsBinds id		-- The dictionary bindings and typechecked user bindings
 						-- mixed up together; you can tell the dict bindings because
 						-- they are all VarBinds
@@ -163,7 +165,7 @@ instance OutputableBndr id => Outputable (HsValBinds id) where
 pprValBindsForUser :: (OutputableBndr id1, OutputableBndr id2)
 		   => LHsBinds id1 -> [LSig id2] -> SDoc
 pprValBindsForUser binds sigs
-  = vcat (map snd (sort_by_loc decls))
+  = pprDeeperList vcat (map snd (sort_by_loc decls))
   where
 
     decls :: [(SrcSpan, SDoc)]
@@ -175,7 +177,7 @@ pprValBindsForUser binds sigs
 pprLHsBinds :: OutputableBndr id => LHsBinds id -> SDoc
 pprLHsBinds binds 
   | isEmptyLHsBinds binds = empty
-  | otherwise = lbrace <+> vcat (map ppr (bagToList binds)) <+> rbrace
+  | otherwise = lbrace <+> pprDeeperList vcat (map ppr (bagToList binds)) <+> rbrace
 
 ------------
 emptyLocalBinds :: HsLocalBinds a
@@ -290,7 +292,7 @@ data IPBind id
 	(LHsExpr id)
 
 instance (OutputableBndr id) => Outputable (HsIPBinds id) where
-  ppr (IPBinds bs ds) = vcat (map ppr bs) 
+  ppr (IPBinds bs ds) = pprDeeperList vcat (map ppr bs) 
 			$$ pprLHsBinds ds
 
 instance (OutputableBndr id) => Outputable (IPBind id) where
@@ -317,10 +319,10 @@ data HsWrapper
   | WpCo Coercion		-- A cast:  [] `cast` co
 				-- Guaranteedn not the identity coercion
 
-  | WpApp Var			-- [] x; the xi are dicts or coercions
-  | WpTyApp Type		-- [] t
-  | WpLam Id	 		-- \x. []; the xi are dicts or coercions
-  | WpTyLam TyVar 		-- \a. []
+  | WpApp Var			-- [] d		the 'd' is a type-class dictionary
+  | WpTyApp Type		-- [] t		the 't' is a type or corecion
+  | WpLam Id	 		-- \d. []	the 'd' is a type-class dictionary
+  | WpTyLam TyVar 		-- \a. []	the 'a' is a type or coercion variable
 
 	-- Non-empty bindings, so that the identity coercion
 	-- is always exactly WpHole
@@ -414,6 +416,7 @@ type LFixitySig name = Located (FixitySig name)
 data FixitySig name = FixitySig (Located name) Fixity 
 
 -- A Prag conveys pragmas from the type checker to the desugarer
+type LPrag = Located Prag
 data Prag 
   = InlinePrag 
 	InlineSpec
@@ -422,13 +425,15 @@ data Prag
 	(HsExpr Id)	-- An expression, of the given specialised type, which
 	PostTcType 	-- specialises the polymorphic function
 	[Id]		-- Dicts mentioned free in the expression
+			--   Apr07: I think this is pretty useless
+			--	    see Note [Const rule dicts] in DsBinds
 	InlineSpec 	-- Inlining spec for the specialised function
 
 isInlinePrag (InlinePrag _) = True
 isInlinePrag prag	    = False
 
-isSpecPrag (SpecPrag _ _ _ _) = True
-isSpecPrag prag		      = False
+isSpecPrag (SpecPrag {}) = True
+isSpecPrag prag		 = False
 \end{code}
 
 \begin{code}
@@ -537,7 +542,7 @@ pprVarSig var ty = sep [ppr var <+> dcolon, nest 2 (ppr ty)]
 pprSpec :: (Outputable id, Outputable ty) => id -> ty -> InlineSpec -> SDoc
 pprSpec var ty inl = sep [ptext SLIT("SPECIALIZE") <+> ppr inl <+> pprVarSig var ty]
 
-pprPrag :: Outputable id => id -> Prag -> SDoc
-pprPrag var (InlinePrag inl)         = ppr inl <+> ppr var
-pprPrag var (SpecPrag expr ty _ inl) = pprSpec var ty inl
+pprPrag :: Outputable id => id -> LPrag -> SDoc
+pprPrag var (L _ (InlinePrag inl))         = ppr inl <+> ppr var
+pprPrag var (L _ (SpecPrag expr ty _ inl)) = pprSpec var ty inl
 \end{code}