[commit: haddock] wip/rae: Update Haddock w.r.t. new HsImplicitBndrs (278990f)

git at git.haskell.org git at git.haskell.org
Mon Nov 20 21:05:07 UTC 2017


Repository : ssh://git@git.haskell.org/haddock

On branch  : wip/rae
Link       : http://git.haskell.org/haddock.git/commitdiff/278990f7ea5350e3b9b8272b1621b7d3117bc642

>---------------------------------------------------------------

commit 278990f7ea5350e3b9b8272b1621b7d3117bc642
Author: Richard Eisenberg <rae at cs.brynmawr.edu>
Date:   Fri Mar 10 11:31:33 2017 -0500

    Update Haddock w.r.t. new HsImplicitBndrs


>---------------------------------------------------------------

278990f7ea5350e3b9b8272b1621b7d3117bc642
 haddock-api/src/Haddock/Convert.hs          | 5 +++--
 haddock-api/src/Haddock/Interface/Rename.hs | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index b596629..577b1a3 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -114,7 +114,8 @@ synifyAxBranch tc (CoAxBranch { cab_tvs = tkvs, cab_lhs = args, cab_rhs = rhs })
         hs_rhs     = synifyType WithinType rhs
     in TyFamEqn { tfe_tycon = name
                 , tfe_pats  = HsIB { hsib_body = typats
-                                   , hsib_vars = map tyVarName tkvs }
+                                   , hsib_vars = map tyVarName tkvs
+                                   , hsib_closed = True }
                 , tfe_fixity = Prefix
                 , tfe_rhs   = hs_rhs }
 
@@ -300,7 +301,7 @@ synifyDataCon use_gadt_syntax dc =
           (False,True) -> case linear_tys of
                            [a,b] -> return $ InfixCon a b
                            _ -> Left "synifyDataCon: infix with non-2 args?"
-  gadt_ty = HsIB [] (synifyType WithinType res_ty)
+  gadt_ty = HsIB [] (synifyType WithinType res_ty) False
  -- finally we get synifyDataCon's result!
  in hs_arg_tys >>=
       \hat ->
diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index f88d9f4..b43860f 100644
--- a/haddock-api/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
@@ -577,7 +577,8 @@ renameImplicit :: (in_thing -> RnM out_thing)
 renameImplicit rn_thing (HsIB { hsib_body = thing })
   = do { thing' <- rn_thing thing
        ; return (HsIB { hsib_body = thing'
-                      , hsib_vars = PlaceHolder }) }
+                      , hsib_vars = PlaceHolder
+                      , hsib_closed = PlaceHolder }) }
 
 renameWc :: (in_thing -> RnM out_thing)
          -> HsWildCardBndrs Name in_thing



More information about the ghc-commits mailing list