X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FhsSyn%2FHsSyn.lhs;h=1365e1dbae23f33233335427737ea4a85d79dfa4;hp=45d1ec05a24233e303ad28b5c0e20ed54e42ac76;hb=63489d40bdee972656ff115ab2309b809c0e39fc;hpb=8a25c54e2df36b3fb40436e5b887dddc3c64ab54

diff --git a/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index 45d1ec0..1365e1d 100644
--- a/compiler/hsSyn/HsSyn.lhs
+++ b/compiler/hsSyn/HsSyn.lhs
@@ -22,9 +22,6 @@ module HsSyn (
 	Fixity,
 
 	HsModule(..), HsExtCore(..),
-
-	HaddockModInfo(..),
-	emptyHaddockModInfo,
 ) where
 
 -- friends:
@@ -71,26 +68,10 @@ data HsModule name
         -- ^ Type, class, value, and interface signature decls
       hsmodDeprecMessage :: Maybe WarningTxt,
         -- ^ reason\/explanation for warning/deprecation of this module
-      hsmodHaddockModInfo :: HaddockModInfo name,
-        -- ^ Haddock module info
-      hsmodHaddockModDescr :: Maybe (HsDoc name)
-        -- ^ Haddock module description
+      hsmodHaddockModHeader :: Maybe LHsDocString
+        -- ^ Haddock module info and description, unparsed
    }
 
-data HaddockModInfo name = HaddockModInfo { 
-	hmi_description :: Maybe (HsDoc name),
-	hmi_portability :: Maybe String,
-	hmi_stability   :: Maybe String,
-	hmi_maintainer  :: Maybe String
-}
-
-emptyHaddockModInfo :: HaddockModInfo a                                                  
-emptyHaddockModInfo = HaddockModInfo {                                                  
-	hmi_description = Nothing,
-	hmi_portability = Nothing,
-	hmi_stability   = Nothing,
-	hmi_maintainer  = Nothing
-}       
 
 data HsExtCore name	-- Read from Foo.hcr
   = HsExtCore
@@ -108,10 +89,10 @@ instance Outputable Char where
 instance (OutputableBndr name)
 	=> Outputable (HsModule name) where
 
-    ppr (HsModule Nothing _ imports decls _ _ mbDoc)
+    ppr (HsModule Nothing _ imports decls _ mbDoc)
       = pp_mb mbDoc $$ pp_nonnull imports $$ pp_nonnull decls
 
-    ppr (HsModule (Just name) exports imports decls deprec _ mbDoc)
+    ppr (HsModule (Just name) exports imports decls deprec mbDoc)
       = vcat [
 	    pp_mb mbDoc,
 	    case exports of