diff options
| author | Andrew Martin <andrew.thaddeus@gmail.com> | 2020-10-11 15:59:22 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-03-07 11:25:23 -0500 |
| commit | bd206f09715420aaa62341c9a96411a684eee6e9 (patch) | |
| tree | d461354f9322918e926e5235b31bf8bb91366022 /haddock-api/src | |
| parent | 65868397a59e61b575c70c0757dddbbba9cb5ac9 (diff) | |
Update for boxed rep
Diffstat (limited to 'haddock-api/src')
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 7 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 83711414..a87ba7ce 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -45,7 +45,7 @@ import GHC.Builtin.Types.Prim ( alphaTyVars ) import GHC.Builtin.Types ( eqTyConName, listTyConName, liftedTypeKindTyConName , unitTy, promotedNilDataCon, promotedConsDataCon ) import GHC.Builtin.Names ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey - , liftedRepDataConKey ) + , liftedDataConKey, boxedRepDataConKey ) import GHC.Types.Unique ( getUnique ) import GHC.Utils.Misc ( chkAppend, debugIsOn, dropList, equalLength , filterByList, filterOut ) @@ -575,8 +575,9 @@ synifyType _ vs (TyConApp tc tys) res_ty -- Use */# instead of TYPE 'Lifted/TYPE 'Unlifted (#473) | tc `hasKey` tYPETyConKey - , [TyConApp lev []] <- tys - , lev `hasKey` liftedRepDataConKey + , [TyConApp rep [TyConApp lev []]] <- tys + , rep `hasKey` boxedRepDataConKey + , lev `hasKey` liftedDataConKey = noLoc (HsTyVar noExtField NotPromoted (noLoc liftedTypeKindTyConName)) -- Use non-prefix tuple syntax where possible, because it looks nicer. | Just sort <- tyConTuple_maybe tc diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index 6e21e094..41801710 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -44,8 +44,8 @@ import GHC.Types.Var.Set ( VarSet, emptyVarSet ) import GHC.Types.Var.Env ( TyVarEnv, extendVarEnv, elemVarEnv, emptyVarEnv ) import GHC.Core.TyCo.Rep ( Type(..) ) import GHC.Core.Type ( isRuntimeRepVar ) -import GHC.Builtin.Types( liftedRepDataConTyCon ) import GHC.Parser.Annotation (IsUnicodeSyntax(..)) +import GHC.Builtin.Types( liftedRepTy ) import GHC.Data.StringBuffer ( StringBuffer ) import qualified GHC.Data.StringBuffer as S @@ -743,7 +743,7 @@ defaultRuntimeRepVars = go emptyVarEnv go subs (TyVarTy tv) | tv `elemVarEnv` subs - = TyConApp liftedRepDataConTyCon [] + = liftedRepTy | otherwise = TyVarTy (updateTyVarKind (go subs) tv) |