From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Wed, 20 Apr 2011 11:55:29 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into ghc-generics
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=c9d713bca9ce31fed25d7201464bad48f0dbc647

Merge remote branch 'origin/master' into ghc-generics
---

c9d713bca9ce31fed25d7201464bad48f0dbc647
diff --cc compiler/hsSyn/HsBinds.lhs
index f1cdebb,675afa2..9ebede6
--- a/compiler/hsSyn/HsBinds.lhs
+++ b/compiler/hsSyn/HsBinds.lhs
@@@ -680,18 -675,12 +680,13 @@@ okClsDclSig (SpecInstSig _) = Fals
  okClsDclSig _               = True        -- All others OK
  
  okInstDclSig :: Sig a -> Bool
 -okInstDclSig (TypeSig _ _)   = False
 -okInstDclSig (FixSig _)      = False
 -okInstDclSig _ 	             = True
 +okInstDclSig (TypeSig _ _)    = False
 +okInstDclSig (GenericSig _ _) = False
 +okInstDclSig (FixSig _)       = False
 +okInstDclSig _ 	              = True
  
- sigForThisGroup :: NameSet -> LSig Name -> Bool
- sigForThisGroup ns sig
-   = case sigName sig of
- 	Nothing -> False
- 	Just n  -> n `elemNameSet` ns
- 
  sigName :: LSig name -> Maybe name
+ -- Used only in Haddock
  sigName (L _ sig) = sigNameNoLoc sig
  
  sigNameNoLoc :: Sig name -> Maybe name