diff options
author | Ben Gamari <ben@smart-cactus.org> | 2017-03-01 11:29:10 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2017-03-02 11:31:20 -0500 |
commit | 537ce41c5373a2e6fa8961f0bdca75e887ac45b7 (patch) | |
tree | a8baab00e040cdd576cafb0c48748ac29d5087a7 | |
parent | fb06bee1c5a0b4d5dfd8e0381ea2a999ca47b84c (diff) | |
download | haskell-537ce41c5373a2e6fa8961f0bdca75e887ac45b7.tar.gz |
Typeable: Rename KindRep bindings to $krep...
-rw-r--r-- | compiler/typecheck/TcTypeable.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/deSugar/should_compile/T2431.stderr | 46 | ||||
-rw-r--r-- | testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr | 12 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/Roles1.stderr | 56 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/Roles13.stderr | 132 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/Roles14.stderr | 8 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/Roles2.stderr | 16 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/Roles3.stderr | 24 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/Roles4.stderr | 16 | ||||
-rw-r--r-- | testsuite/tests/roles/should_compile/T8958.stderr | 24 | ||||
-rw-r--r-- | testsuite/tests/simplCore/should_compile/T7360.stderr | 10 | ||||
-rw-r--r-- | testsuite/tests/simplCore/should_compile/T8274.stdout | 10 | ||||
-rw-r--r-- | testsuite/tests/th/TH_Roles2.stderr | 4 |
13 files changed, 180 insertions, 180 deletions
diff --git a/compiler/typecheck/TcTypeable.hs b/compiler/typecheck/TcTypeable.hs index e7fe588f76..b635c196e6 100644 --- a/compiler/typecheck/TcTypeable.hs +++ b/compiler/typecheck/TcTypeable.hs @@ -379,7 +379,7 @@ mkTyConRepBinds stuff@(Stuff {..}) todo (TypeableTyCon {..}) = do -- Place a NOINLINE pragma on KindReps since they tend to be quite large -- and bloat interface files. kind_rep_id <- (`setInlinePragma` neverInlinePragma) - <$> newSysLocalId (fsLit "krep") (mkTyConTy kindRepTyCon) + <$> newSysLocalId (fsLit "$krep") (mkTyConTy kindRepTyCon) kind_rep <- mkTyConKindRep stuff tycon tycon_kind tycon_rep_rhs <- mkTyConRepTyConRHS stuff todo tycon kind_rep_id diff --git a/testsuite/tests/deSugar/should_compile/T2431.stderr b/testsuite/tests/deSugar/should_compile/T2431.stderr index 722a5e4698..2993e15d95 100644 --- a/testsuite/tests/deSugar/should_compile/T2431.stderr +++ b/testsuite/tests/deSugar/should_compile/T2431.stderr @@ -48,29 +48,29 @@ T2431.$trModule :: GHC.Types.Module T2431.$trModule = GHC.Types.Module $trModule2 $trModule4 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep :: GHC.Types.KindRep +$krep :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep = GHC.Types.KindRepTYPE GHC.Types.LiftedRep +$krep = GHC.Types.KindRepTYPE GHC.Types.LiftedRep -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep1 :: GHC.Types.KindRep +$krep1 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep1 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep +$krep1 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep2 :: GHC.Types.KindRep +$krep2 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep2 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep +$krep2 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep3 :: GHC.Types.KindRep +$krep3 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep3 = GHC.Types.KindRepFun krep1 krep2 +$krep3 = GHC.Types.KindRepFun $krep1 $krep2 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep4 :: GHC.Types.KindRep +$krep4 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep4 = GHC.Types.KindRepFun krep krep3 +$krep4 = GHC.Types.KindRepFun $krep $krep3 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $tc:~:1 :: GHC.Prim.Addr# @@ -92,34 +92,34 @@ T2431.$tc:~: T2431.$trModule $tc:~:2 0# - krep4 + $krep4 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep5 :: GHC.Types.KindRep +$krep5 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep5 = GHC.Types.KindRepVar 0# +$krep5 = GHC.Types.KindRepVar 0# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep6 :: GHC.Types.KindRep +$krep6 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep6 = GHC.Types.KindRepVar 0# +$krep6 = GHC.Types.KindRepVar 0# -- RHS size: {terms: 3, types: 2, coercions: 0, joins: 0/0} -krep7 :: [GHC.Types.KindRep] +$krep7 :: [GHC.Types.KindRep] [GblId, Caf=NoCafRefs] -krep7 +$krep7 = GHC.Types.: - @ GHC.Types.KindRep krep6 (GHC.Types.[] @ GHC.Types.KindRep) + @ GHC.Types.KindRep $krep6 (GHC.Types.[] @ GHC.Types.KindRep) -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0} -krep8 :: [GHC.Types.KindRep] +$krep8 :: [GHC.Types.KindRep] [GblId, Caf=NoCafRefs] -krep8 = GHC.Types.: @ GHC.Types.KindRep krep5 krep7 +$krep8 = GHC.Types.: @ GHC.Types.KindRep $krep5 $krep7 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep9 :: GHC.Types.KindRep +$krep9 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep9 = GHC.Types.KindRepTyConApp T2431.$tc:~: krep8 +$krep9 = GHC.Types.KindRepTyConApp T2431.$tc:~: $krep8 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $tc'Refl1 :: GHC.Prim.Addr# @@ -141,7 +141,7 @@ T2431.$tc'Refl T2431.$trModule $tc'Refl2 1# - krep9 + $krep9 diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr index c7db52a5df..61ce1ae439 100644 --- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr @@ -50,10 +50,10 @@ (0)))))) ({ <no location info> } (HsVar - ({ <no location info> }{Var: (krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})}))))) + ({ <no location info> }{Var: ($krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})}))))) (False))), ({ <no location info> } - (VarBind {Var: (krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})} + (VarBind {Var: ($krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})} ({ <no location info> } (HsApp ({ <no location info> } @@ -111,10 +111,10 @@ (0)))))) ({ <no location info> } (HsVar - ({ <no location info> }{Var: (krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})}))))) + ({ <no location info> }{Var: ($krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})}))))) (False))), ({ <no location info> } - (VarBind {Var: (krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})} + (VarBind {Var: ($krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})} ({ <no location info> } (HsApp ({ <no location info> } @@ -182,10 +182,10 @@ (0)))))) ({ <no location info> } (HsVar - ({ <no location info> }{Var: (krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})}))))) + ({ <no location info> }{Var: ($krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})}))))) (False))), ({ <no location info> } - (VarBind {Var: (krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})} + (VarBind {Var: ($krep{v} [lid] :: ghc-prim:GHC.Types.KindRep{tc})} ({ <no location info> } (HsApp ({ <no location info> } diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr index a81e7c0187..574750ce44 100644 --- a/testsuite/tests/roles/should_compile/Roles1.stderr +++ b/testsuite/tests/roles/should_compile/Roles1.stderr @@ -32,8 +32,8 @@ Roles1.$tcT7 Roles1.$trModule (GHC.Types.TrNameS "T7"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepFun @@ -46,8 +46,8 @@ Roles1.$tc'K7 Roles1.$trModule (GHC.Types.TrNameS "'K7"#) 3 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 2) (GHC.Types.KindRepTyConApp @@ -62,8 +62,8 @@ Roles1.$tcT6 Roles1.$trModule (GHC.Types.TrNameS "T6"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -74,8 +74,8 @@ Roles1.$tc'K6 Roles1.$trModule (GHC.Types.TrNameS "'K6"#) 2 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepTyConApp Roles1.$tcT6 ((:) (GHC.Types.KindRepVar 0) ((:) (GHC.Types.KindRepVar 1) [])) @@ -86,8 +86,8 @@ Roles1.$tcT5 Roles1.$trModule (GHC.Types.TrNameS "T5"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -98,8 +98,8 @@ Roles1.$tc'K5 Roles1.$trModule (GHC.Types.TrNameS "'K5"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepTyConApp @@ -111,8 +111,8 @@ Roles1.$tcT4 Roles1.$trModule (GHC.Types.TrNameS "T4"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -127,8 +127,8 @@ Roles1.$tc'K4 Roles1.$trModule (GHC.Types.TrNameS "'K4"#) 2 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepApp (GHC.Types.KindRepVar 0) (GHC.Types.KindRepVar 1)) @@ -142,8 +142,8 @@ Roles1.$tcT3 Roles1.$trModule (GHC.Types.TrNameS "T3"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -154,8 +154,8 @@ Roles1.$tc'K3 Roles1.$trModule (GHC.Types.TrNameS "'K3"#) 2 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepTyConApp Roles1.$tcT3 ((:) (GHC.Types.KindRepVar 0) ((:) (GHC.Types.KindRepVar 1) [])) @@ -166,8 +166,8 @@ Roles1.$tcT2 Roles1.$trModule (GHC.Types.TrNameS "T2"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -178,8 +178,8 @@ Roles1.$tc'K2 Roles1.$trModule (GHC.Types.TrNameS "'K2"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepTyConApp @@ -191,8 +191,8 @@ Roles1.$tcT1 Roles1.$trModule (GHC.Types.TrNameS "T1"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -203,8 +203,8 @@ Roles1.$tc'K1 Roles1.$trModule (GHC.Types.TrNameS "'K1"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepTyConApp diff --git a/testsuite/tests/roles/should_compile/Roles13.stderr b/testsuite/tests/roles/should_compile/Roles13.stderr index f336a69be1..1ea545504b 100644 --- a/testsuite/tests/roles/should_compile/Roles13.stderr +++ b/testsuite/tests/roles/should_compile/Roles13.stderr @@ -11,10 +11,10 @@ convert1 = \ (ds :: Wrap Age) -> ds -- RHS size: {terms: 1, types: 0, coercions: 5, joins: 0/0} convert :: Wrap Age -> Int [GblId, Arity=1, Caf=NoCafRefs] -convert = - convert1 - `cast` (<Wrap Age>_R -> Roles13.N:Wrap[0] Roles13.N:Age[0] - :: ((Wrap Age -> Wrap Age) :: *) ~R# ((Wrap Age -> Int) :: *)) +convert + = convert1 + `cast` (<Wrap Age>_R -> Roles13.N:Wrap[0] Roles13.N:Age[0] + :: ((Wrap Age -> Wrap Age) :: *) ~R# ((Wrap Age -> Int) :: *)) -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $trModule1 :: GHC.Prim.Addr# @@ -42,9 +42,9 @@ Roles13.$trModule :: GHC.Types.Module Roles13.$trModule = GHC.Types.Module $trModule2 $trModule4 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep :: GHC.Types.KindRep +$krep :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep = GHC.Types.KindRepTYPE GHC.Types.LiftedRep +$krep = GHC.Types.KindRepTYPE GHC.Types.LiftedRep -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $tcAge1 :: GHC.Prim.Addr# @@ -59,33 +59,33 @@ $tcAge2 = GHC.Types.TrNameS $tcAge1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} Roles13.$tcAge :: GHC.Types.TyCon [GblId, Caf=NoCafRefs] -Roles13.$tcAge = - GHC.Types.TyCon - 3456257068627873222## - 14056710845110756026## - Roles13.$trModule - $tcAge2 - 0# - krep +Roles13.$tcAge + = GHC.Types.TyCon + 3456257068627873222## + 14056710845110756026## + Roles13.$trModule + $tcAge2 + 0# + $krep -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0} -krep1 :: GHC.Types.KindRep +$krep1 :: GHC.Types.KindRep [GblId] -krep1 = - GHC.Types.KindRepTyConApp - GHC.Types.$tcInt (GHC.Types.[] @ GHC.Types.KindRep) +$krep1 + = GHC.Types.KindRepTyConApp + GHC.Types.$tcInt (GHC.Types.[] @ GHC.Types.KindRep) -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0} -krep2 :: GHC.Types.KindRep +$krep2 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep2 = - GHC.Types.KindRepTyConApp - Roles13.$tcAge (GHC.Types.[] @ GHC.Types.KindRep) +$krep2 + = GHC.Types.KindRepTyConApp + Roles13.$tcAge (GHC.Types.[] @ GHC.Types.KindRep) -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep3 :: GHC.Types.KindRep +$krep3 :: GHC.Types.KindRep [GblId] -krep3 = GHC.Types.KindRepFun krep1 krep2 +$krep3 = GHC.Types.KindRepFun $krep1 $krep2 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $tc'MkAge1 :: GHC.Prim.Addr# @@ -100,29 +100,29 @@ $tc'MkAge2 = GHC.Types.TrNameS $tc'MkAge1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} Roles13.$tc'MkAge :: GHC.Types.TyCon [GblId] -Roles13.$tc'MkAge = - GHC.Types.TyCon - 18264039750958872441## - 1870189534242358050## - Roles13.$trModule - $tc'MkAge2 - 0# - krep3 +Roles13.$tc'MkAge + = GHC.Types.TyCon + 18264039750958872441## + 1870189534242358050## + Roles13.$trModule + $tc'MkAge2 + 0# + $krep3 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep4 :: GHC.Types.KindRep +$krep4 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep4 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep +$krep4 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep5 :: GHC.Types.KindRep +$krep5 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep5 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep +$krep5 = GHC.Types.KindRepTYPE GHC.Types.LiftedRep -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep6 :: GHC.Types.KindRep +$krep6 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep6 = GHC.Types.KindRepFun krep4 krep5 +$krep6 = GHC.Types.KindRepFun $krep4 $krep5 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $tcWrap1 :: GHC.Prim.Addr# @@ -137,41 +137,41 @@ $tcWrap2 = GHC.Types.TrNameS $tcWrap1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} Roles13.$tcWrap :: GHC.Types.TyCon [GblId, Caf=NoCafRefs] -Roles13.$tcWrap = - GHC.Types.TyCon - 13773534096961634492## - 15591525585626702988## - Roles13.$trModule - $tcWrap2 - 0# - krep6 +Roles13.$tcWrap + = GHC.Types.TyCon + 13773534096961634492## + 15591525585626702988## + Roles13.$trModule + $tcWrap2 + 0# + $krep6 -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep7 :: GHC.Types.KindRep +$krep7 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep7 = GHC.Types.KindRepVar 0# +$krep7 = GHC.Types.KindRepVar 0# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -krep8 :: GHC.Types.KindRep +$krep8 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep8 = GHC.Types.KindRepVar 0# +$krep8 = GHC.Types.KindRepVar 0# -- RHS size: {terms: 3, types: 2, coercions: 0, joins: 0/0} -krep9 :: [GHC.Types.KindRep] +$krep9 :: [GHC.Types.KindRep] [GblId, Caf=NoCafRefs] -krep9 = - GHC.Types.: - @ GHC.Types.KindRep krep8 (GHC.Types.[] @ GHC.Types.KindRep) +$krep9 + = GHC.Types.: + @ GHC.Types.KindRep $krep8 (GHC.Types.[] @ GHC.Types.KindRep) -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep10 :: GHC.Types.KindRep +$krep10 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep10 = GHC.Types.KindRepTyConApp Roles13.$tcWrap krep9 +$krep10 = GHC.Types.KindRepTyConApp Roles13.$tcWrap $krep9 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -krep11 :: GHC.Types.KindRep +$krep11 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs] -krep11 = GHC.Types.KindRepFun krep7 krep10 +$krep11 = GHC.Types.KindRepFun $krep7 $krep10 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} $tc'MkWrap1 :: GHC.Prim.Addr# @@ -186,14 +186,14 @@ $tc'MkWrap2 = GHC.Types.TrNameS $tc'MkWrap1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} Roles13.$tc'MkWrap :: GHC.Types.TyCon [GblId, Caf=NoCafRefs] -Roles13.$tc'MkWrap = - GHC.Types.TyCon - 15580677875333883466## - 808508687714473149## - Roles13.$trModule - $tc'MkWrap2 - 1# - krep11 +Roles13.$tc'MkWrap + = GHC.Types.TyCon + 15580677875333883466## + 808508687714473149## + Roles13.$trModule + $tc'MkWrap2 + 1# + $krep11 diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr index 61d0a597d1..15f61ce9fd 100644 --- a/testsuite/tests/roles/should_compile/Roles14.stderr +++ b/testsuite/tests/roles/should_compile/Roles14.stderr @@ -19,8 +19,8 @@ Roles12.$tcC2 Roles12.$trModule (GHC.Types.TrNameS "C2"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTyConApp GHC.Types.$tcConstraint []) @@ -31,8 +31,8 @@ Roles12.$tc'C:C2 Roles12.$trModule (GHC.Types.TrNameS "'C:C2"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepVar 0)) diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr index 7a795a3fa6..39ca1ea0a8 100644 --- a/testsuite/tests/roles/should_compile/Roles2.stderr +++ b/testsuite/tests/roles/should_compile/Roles2.stderr @@ -18,8 +18,8 @@ Roles2.$tcT2 Roles2.$trModule (GHC.Types.TrNameS "T2"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -30,8 +30,8 @@ Roles2.$tc'K2 Roles2.$trModule (GHC.Types.TrNameS "'K2"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTyConApp GHC.Ptr.$tcFunPtr ((:) (GHC.Types.KindRepVar 0) [])) @@ -44,8 +44,8 @@ Roles2.$tcT1 Roles2.$trModule (GHC.Types.TrNameS "T1"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) @@ -56,8 +56,8 @@ Roles2.$tc'K1 Roles2.$trModule (GHC.Types.TrNameS "'K1"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTyConApp GHC.Types.$tcIO ((:) (GHC.Types.KindRepVar 0) [])) diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr index 5d3c38c355..af9bc168c7 100644 --- a/testsuite/tests/roles/should_compile/Roles3.stderr +++ b/testsuite/tests/roles/should_compile/Roles3.stderr @@ -40,8 +40,8 @@ Roles3.$tcC4 Roles3.$trModule (GHC.Types.TrNameS "C4"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepFun @@ -54,8 +54,8 @@ Roles3.$tcC3 Roles3.$trModule (GHC.Types.TrNameS "C3"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepFun @@ -68,8 +68,8 @@ Roles3.$tcC2 Roles3.$trModule (GHC.Types.TrNameS "C2"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepFun @@ -82,8 +82,8 @@ Roles3.$tc'C:C2 Roles3.$trModule (GHC.Types.TrNameS "'C:C2"#) 2 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepFun (GHC.Types.KindRepTyConApp @@ -103,8 +103,8 @@ Roles3.$tcC1 Roles3.$trModule (GHC.Types.TrNameS "C1"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTyConApp GHC.Types.$tcConstraint []) @@ -115,8 +115,8 @@ Roles3.$tc'C:C1 Roles3.$trModule (GHC.Types.TrNameS "'C:C1"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepVar 0)) diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr index 989d77a9d6..389379bad2 100644 --- a/testsuite/tests/roles/should_compile/Roles4.stderr +++ b/testsuite/tests/roles/should_compile/Roles4.stderr @@ -25,8 +25,8 @@ Roles4.$tcC3 Roles4.$trModule (GHC.Types.TrNameS "C3"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTyConApp GHC.Types.$tcConstraint []) @@ -37,8 +37,8 @@ Roles4.$tc'C:C3 Roles4.$trModule (GHC.Types.TrNameS "'C:C3"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) @@ -53,8 +53,8 @@ Roles4.$tcC1 Roles4.$trModule (GHC.Types.TrNameS "C1"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTyConApp GHC.Types.$tcConstraint []) @@ -65,8 +65,8 @@ Roles4.$tc'C:C1 Roles4.$trModule (GHC.Types.TrNameS "'C:C1"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepVar 0)) diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr index 52bfa274c9..5939c69954 100644 --- a/testsuite/tests/roles/should_compile/T8958.stderr +++ b/testsuite/tests/roles/should_compile/T8958.stderr @@ -27,8 +27,8 @@ T8958.$tcMap T8958.$trModule (GHC.Types.TrNameS "Map"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepFun @@ -41,8 +41,8 @@ T8958.$tc'MkMap T8958.$trModule (GHC.Types.TrNameS "'MkMap"#) 2 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTyConApp GHC.Types.$tc[] @@ -67,8 +67,8 @@ T8958.$tcRepresentational T8958.$trModule (GHC.Types.TrNameS "Representational"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTyConApp @@ -80,8 +80,8 @@ T8958.$tc'C:Representational T8958.$trModule (GHC.Types.TrNameS "'C:Representational"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepTyConApp T8958.$tcRepresentational ((:) @ GHC.Types.KindRep @@ -93,8 +93,8 @@ T8958.$tcNominal T8958.$trModule (GHC.Types.TrNameS "Nominal"#) 0 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) (GHC.Types.KindRepTyConApp @@ -106,8 +106,8 @@ T8958.$tc'C:Nominal T8958.$trModule (GHC.Types.TrNameS "'C:Nominal"#) 1 - krep -krep [InlPrag=[~]] + $krep +$krep [InlPrag=[~]] = GHC.Types.KindRepTyConApp T8958.$tcNominal ((:) @ GHC.Types.KindRep diff --git a/testsuite/tests/simplCore/should_compile/T7360.stderr b/testsuite/tests/simplCore/should_compile/T7360.stderr index 260cbd2c13..89ea2e7d8f 100644 --- a/testsuite/tests/simplCore/should_compile/T7360.stderr +++ b/testsuite/tests/simplCore/should_compile/T7360.stderr @@ -238,23 +238,23 @@ T7360.$tc'Foo2 T7360.$tc'Foo7 -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0} -krep :: GHC.Types.KindRep +$krep :: GHC.Types.KindRep [GblId, Str=m1] -krep +$krep = GHC.Types.KindRepTyConApp GHC.Types.$tcInt (GHC.Types.[] @ GHC.Types.KindRep) -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0} -krep1 :: GHC.Types.KindRep +$krep1 :: GHC.Types.KindRep [GblId, Caf=NoCafRefs, Str=m1] -krep1 +$krep1 = GHC.Types.KindRepTyConApp T7360.$tcFoo (GHC.Types.[] @ GHC.Types.KindRep) -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} T7360.$tc'Foo10 [InlPrag=[~]] :: GHC.Types.KindRep [GblId, Str=m4] -T7360.$tc'Foo10 = GHC.Types.KindRepFun krep krep1 +T7360.$tc'Foo10 = GHC.Types.KindRepFun $krep $krep1 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} T7360.$tc'Foo12 :: GHC.Prim.Addr# diff --git a/testsuite/tests/simplCore/should_compile/T8274.stdout b/testsuite/tests/simplCore/should_compile/T8274.stdout index 90d5cebefb..a64980e51a 100644 --- a/testsuite/tests/simplCore/should_compile/T8274.stdout +++ b/testsuite/tests/simplCore/should_compile/T8274.stdout @@ -7,11 +7,11 @@ T8274.$trModule2 = "T8274"# T8274.$tcP3 :: Addr# T8274.$tcP3 = "P"# T8274.$tcP = GHC.Types.TyCon 7483823267324216774## 12197132127820124256## T8274.$trModule T8274.$tcP2 0# T8274.$tcP1 -krep = GHC.Types.KindRepTyConApp GHC.Types.$tcInt# (GHC.Types.[] @ GHC.Types.KindRep) -krep1 = GHC.Types.KindRepTyConApp GHC.Types.$tcFloat# (GHC.Types.[] @ GHC.Types.KindRep) -krep2 = GHC.Types.KindRepTyConApp GHC.Types.$tcDouble# (GHC.Types.[] @ GHC.Types.KindRep) -krep3 = GHC.Types.KindRepTyConApp GHC.Types.$tcChar# (GHC.Types.[] @ GHC.Types.KindRep) -krep4 = GHC.Types.KindRepTyConApp GHC.Types.$tcWord# (GHC.Types.[] @ GHC.Types.KindRep) +$krep = GHC.Types.KindRepTyConApp GHC.Types.$tcInt# (GHC.Types.[] @ GHC.Types.KindRep) +$krep1 = GHC.Types.KindRepTyConApp GHC.Types.$tcFloat# (GHC.Types.[] @ GHC.Types.KindRep) +$krep2 = GHC.Types.KindRepTyConApp GHC.Types.$tcDouble# (GHC.Types.[] @ GHC.Types.KindRep) +$krep3 = GHC.Types.KindRepTyConApp GHC.Types.$tcChar# (GHC.Types.[] @ GHC.Types.KindRep) +$krep4 = GHC.Types.KindRepTyConApp GHC.Types.$tcWord# (GHC.Types.[] @ GHC.Types.KindRep) T8274.$tc'Positives3 :: Addr# T8274.$tc'Positives3 = "'Positives"# = GHC.Types.TyCon 14886798270706315033## 15735393004803600911## T8274.$trModule T8274.$tc'Positives2 0# T8274.$tc'Positives1 diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr index d2c6316c51..54841e7774 100644 --- a/testsuite/tests/th/TH_Roles2.stderr +++ b/testsuite/tests/th/TH_Roles2.stderr @@ -16,8 +16,8 @@ TH_Roles2.$tcT TH_Roles2.$trModule (GHC.Types.TrNameS "T"#) 1 - krep_a40L -krep_a40L [InlPrag=[~]] + $krep_a40L +$krep_a40L [InlPrag=[~]] = GHC.Types.KindRepFun (GHC.Types.KindRepVar 0) (GHC.Types.KindRepTYPE GHC.Types.LiftedRep) |