X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FhsSyn%2FHsSyn.lhs;h=be7e0036df4bf920fb9af56a83d612378b03594d;hp=45d1ec05a24233e303ad28b5c0e20ed54e42ac76;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=311df5db57b78a34d195f554cca805a057741709

diff --git a/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index 45d1ec0..be7e003 100644
--- a/compiler/hsSyn/HsSyn.lhs
+++ b/compiler/hsSyn/HsSyn.lhs
@@ -9,6 +9,8 @@ which is declared in the various \tr{Hs*} modules.  This module,
 therefore, is almost nothing but re-exporting.
 
 \begin{code}
+{-# LANGUAGE DeriveDataTypeable #-}
+
 module HsSyn (
 	module HsBinds,
 	module HsDecls,
@@ -21,10 +23,7 @@ module HsSyn (
 	module HsDoc,
 	Fixity,
 
-	HsModule(..), HsExtCore(..),
-
-	HaddockModInfo(..),
-	emptyHaddockModInfo,
+	HsModule(..), HsExtCore(..), CodeFlavor(..)
 ) where
 
 -- friends:
@@ -42,12 +41,18 @@ import HsDoc
 -- others:
 import IfaceSyn		( IfaceBinding )
 import Outputable
-import SrcLoc		( Located(..) )
+import SrcLoc
 import Module		( Module, ModuleName )
 import FastString
+
+-- libraries:
+import Data.Data hiding ( Fixity )
 \end{code}
 
 \begin{code}
+
+data CodeFlavor = LambdaFlavor | KappaFlavor
+
 -- | All we actually declare here is the top-level structure for a module.
 data HsModule name
   = HsModule {
@@ -71,26 +76,9 @@ 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
-   }
-
-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
-}       
+      hsmodHaddockModHeader :: Maybe LHsDocString
+        -- ^ Haddock module info and description, unparsed
+   } deriving (Data, Typeable)
 
 data HsExtCore name	-- Read from Foo.hcr
   = HsExtCore
@@ -108,10 +96,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