From de554bbf68e121f36de62d7feb4f88cbfba5ef07 Mon Sep 17 00:00:00 2001
From: simonpj <simonpj@microsoft.com>
Date: Wed, 10 Feb 2010 10:59:45 +0000
Subject: Track changes in HsTyVarBndr

---
 src/Haddock/Backends/Hoogle.hs | 4 ++--
 src/Haddock/Backends/Html.hs   | 5 ++---
 src/Haddock/Convert.hs         | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Haddock/Backends/Hoogle.hs b/src/Haddock/Backends/Hoogle.hs
index 9958faeb..b1b08b95 100644
--- a/src/Haddock/Backends/Hoogle.hs
+++ b/src/Haddock/Backends/Hoogle.hs
@@ -147,7 +147,7 @@ ppClass x = out x{tcdSigs=[]} :
         context = reL $ HsClassP (unL $ tcdLName x)
             (map (reL . HsTyVar . tyVar . unL) (tcdTyVars x))
 
-        tyVar (UserTyVar v) = v
+        tyVar (UserTyVar v _) = v
         tyVar (KindedTyVar v _) = v
 
 
@@ -191,7 +191,7 @@ ppCtor dat subdocs con = doc (lookupCon subdocs (con_name con))
         name = out $ unL $ con_name con
 
         resType = case con_res con of
-            ResTyH98 -> apps $ map (reL . HsTyVar) $ unL (tcdLName dat) : [x | UserTyVar x <- map unL $ tcdTyVars dat]
+            ResTyH98 -> apps $ map (reL . HsTyVar) $ unL (tcdLName dat) : [x | UserTyVar x _ <- map unL $ tcdTyVars dat]
             ResTyGADT x -> x
 
 
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs
index ae31684f..371fb57c 100644
--- a/src/Haddock/Backends/Html.hs
+++ b/src/Haddock/Backends/Html.hs
@@ -1368,7 +1368,7 @@ ppShortConstr summary con unicode = case con_res con of
     mkFunTy a b = noLoc (HsFunTy a b)
 
 -- ppConstrHdr is for (non-GADT) existentials constructors' syntax
-ppConstrHdr :: HsExplicitForAll -> [Name] -> HsContext DocName -> Bool -> Html
+ppConstrHdr :: HsExplicitFlag -> [Name] -> HsContext DocName -> Bool -> Html
 ppConstrHdr forall tvs ctxt unicode
  = (if null tvs then noHtml else ppForall)
    +++
@@ -1580,7 +1580,7 @@ ppFunLhType  unicode ty = ppr_mono_ty pREC_FUN ty unicode
 -- Drop top-level for-all type variables in user style
 -- since they are implicit in Haskell
 
-ppForAll :: HsExplicitForAll -> [Located (HsTyVarBndr DocName)]
+ppForAll :: HsExplicitFlag -> [Located (HsTyVarBndr DocName)]
          -> Located (HsContext DocName) -> Bool -> Html
 ppForAll expl tvs cxt unicode
   | show_forall = forall_part <+> ppLContext cxt unicode
@@ -1612,7 +1612,6 @@ ppr_mono_ty _         (HsNumTy n)         _ = toHtml (show n) -- generics only
 ppr_mono_ty _         (HsSpliceTy _)      _ = error "ppr_mono_ty HsSpliceTy"
 ppr_mono_ty _         (HsSpliceTyOut _)   _ = error "ppr_mono_ty HsSpliceTyOut"
 #if __GLASGOW_HASKELL__ >= 611
-ppr_mono_ty _         (HsSpliceTyOut _)   _ = error "ppr_mono_ty HsSpliceTyOut"
 ppr_mono_ty _         (HsRecTy _)         _ = error "ppr_mono_ty HsRecTy"
 
 
diff --git a/src/Haddock/Convert.hs b/src/Haddock/Convert.hs
index ce8410ae..5a47eb2e 100644
--- a/src/Haddock/Convert.hs
+++ b/src/Haddock/Convert.hs
@@ -226,7 +226,7 @@ synifyTyVars = map synifyTyVar
       kind = tyVarKind tv
       name = getName tv
      in if isLiftedTypeKind kind
-        then UserTyVar name
+        then UserTyVar name placeHolderKind
         else KindedTyVar name kind
 
 --states of what to do with foralls:
-- 
cgit v1.2.3