[project @ 1997-09-22 10:55:42 by simonm]

update typechecker tests

diff --git a/ghc/tests/typecheck/should_compile/tc001.stderr b/ghc/tests/typecheck/should_compile/tc001.stderr
index 590a4a7..e500a32 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc001.stderr
+++ b/ghc/tests/typecheck/should_compile/tc001.stderr
@@ -1,23 +1,21 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [taC6] [d.Num_aCa] [([taC6], a{-r3h,x-}, a_aBO)]
-    +_aCe = PrelBase.+{-r3g,p-} taC6 d.Num_aCa
-    d.Num_aCd = d.Num_aCa
-    fromInt_aCf = PrelBase.fromInt{-8R,p-} taC6 d.Num_aCd
-    lit_aCg = fromInt_aCf PrelBase.I#{-5b,w-}{i} 2#
-    +_aCh = +_aCe
-    fromInt_aCj = fromInt_aCf
-    lit_aCk = fromInt_aCj PrelBase.I#{-5b,w-}{i} 3#
-    a_aBO x_r3d
-         = y_r3f +_aCe lit_aCg
+==================== Typechecked ====================
+AbsBinds [taCe] [d.Num_aCi] [([taCe], a{-r3h,x-}, a_aBW)]
+    +_aCs = PrelBase.+{-r3g,p-} taCe d.Num_aCi
+    d.Num_aCl = d.Num_aCi
+    fromInt_aCr = PrelBase.fromInt{-8R,p-} taCe d.Num_aCl
+    lit_aCq = fromInt_aCr PrelBase.I#{-5b,w-}{i} 2#
+    +_aCp = +_aCs
+    fromInt_aCo = fromInt_aCr
+    lit_aCm = fromInt_aCo PrelBase.I#{-5b,w-}{i} 3#
+    a_aBW x_r3d
+         = y_r3f +_aCs lit_aCq
          where
              {- nonrec -}
-             AbsBinds [] [] [([], y_r3f, y_aBW)]
-                 y_aBW = x_r3d +_aCh lit_aCk
+             AbsBinds [] [] [([], y_r3f, y_aC6)]
+                 y_aC6 = x_r3d +_aCp lit_aCm
              {- nonrec -}
              {- nonrec -}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc002.stderr b/ghc/tests/typecheck/should_compile/tc002.stderr
index 86e7306..0f4a863 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc002.stderr
+++ b/ghc/tests/typecheck/should_compile/tc002.stderr
@@ -1,11 +1,9 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], b{-r1,x-}, b_aBS)]
+    b_aBS = if PrelBase.True{-5E,w-}{i} then lit_aC5 else lit_aC4
+lit_aC5 = PrelBase.I#{-5b,w-}{i} 1#
+lit_aC4 = PrelBase.I#{-5b,w-}{i} 2#
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], b{-r1,x-}, b_aBK)]
-    b_aBK = if PrelBase.True{-5E,w-}{i} then lit_aBW else lit_aBX
-lit_aBW = PrelBase.I#{-5b,w-}{i} 1#
-lit_aBX = PrelBase.I#{-5b,w-}{i} 2#
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc003.stderr b/ghc/tests/typecheck/should_compile/tc003.stderr
index a0a57a5..b77d992 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc003.stderr
+++ b/ghc/tests/typecheck/should_compile/tc003.stderr
@@ -1,22 +1,20 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
 []
 []
-[([], c{-r5,x-}, c_aRg), ([], d{-r4,x-}, d_aRh), ([],
+[([], c{-r5,x-}, c_aRo), ([], d{-r4,x-}, d_aRp), ([],
                                                  e{-r3,x-},
-                                                 e_aRi)]
-    lit_aRS = lit_aRT
-    (c_aRg@(d_aRh, e_aRi))
+                                                 e_aRq)]
+    lit_aRS = lit_aRV
+    (c_aRo@(d_aRp, e_aRq))
        = if PrelBase.True{-5E,w-}{i} then
-             (lit_aRT, lit_aRU)
+             (lit_aRV, lit_aRU)
          else
-             (lit_aRS, lit_aRV)
-lit_aRT = PrelBase.I#{-5b,w-}{i} 1#
+             (lit_aRS, lit_aRT)
+lit_aRV = PrelBase.I#{-5b,w-}{i} 1#
 lit_aRU = PrelBase.I#{-5b,w-}{i} 2#
-lit_aRV = PrelBase.I#{-5b,w-}{i} 3#
+lit_aRT = PrelBase.I#{-5b,w-}{i} 3#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc004.stderr b/ghc/tests/typecheck/should_compile/tc004.stderr
index 4eb6f2d..dc7ff2f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc004.stderr
+++ b/ghc/tests/typecheck/should_compile/tc004.stderr
@@ -1,12 +1,10 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], f{-r3e,x-}, f_aku)]
-    f_aku x_r3d
+==================== Typechecked ====================
+AbsBinds [] [] [([], f{-r3e,x-}, f_aky)]
+    f_aky x_r3d
          = case x_r3d of
              PrelBase.True{-5E,w-}{i} -> PrelBase.True{-5E,w-}{i}
              PrelBase.False{-58,w-}{i} -> x_r3d
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc005.stderr b/ghc/tests/typecheck/should_compile/tc005.stderr
index 6665044..6e06541 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc005.stderr
+++ b/ghc/tests/typecheck/should_compile/tc005.stderr
@@ -1,15 +1,13 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taRr, taRH]
-[d.Num_aRM]
-[([taRr, taRH], g{-r3j,x-}, g_aRj)]
-    fromInt_aRN = PrelBase.fromInt{-8R,p-} taRr d.Num_aRM
-    lit_aRO = fromInt_aRN PrelBase.I#{-5b,w-}{i} 2#
-    g_aRj ((x_r3d PrelBase.:{-55,w-}{i} z_r3e), y_r3f) = x_r3d
-    g_aRj (x_r3h, y_r3i) = lit_aRO
+[taRC, taRQ]
+[d.Num_aRV]
+[([taRC, taRQ], g{-r3j,x-}, g_aRr)]
+    fromInt_aRX = PrelBase.fromInt{-8R,p-} taRC d.Num_aRV
+    lit_aRW = fromInt_aRX PrelBase.I#{-5b,w-}{i} 2#
+    g_aRr ((x_r3d PrelBase.:{-55,w-}{i} z_r3e), y_r3f) = x_r3d
+    g_aRr (x_r3h, y_r3i) = lit_aRW
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc006.stderr b/ghc/tests/typecheck/should_compile/tc006.stderr
index 0890640..966f12f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc006.stderr
+++ b/ghc/tests/typecheck/should_compile/tc006.stderr
@@ -1,10 +1,8 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], h{-r1,x-}, h_aBS)]
+    h_aBS = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} lit_aC4 h_aBS
+lit_aC4 = PrelBase.I#{-5b,w-}{i} 1#
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], h{-r1,x-}, h_aBK)]
-    h_aBK = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} lit_aBW h_aBK
-lit_aBW = PrelBase.I#{-5b,w-}{i} 1#
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc007.stderr b/ghc/tests/typecheck/should_compile/tc007.stderr
index 2547cd0..287256c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc007.stderr
+++ b/ghc/tests/typecheck/should_compile/tc007.stderr
@@ -1,22 +1,20 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], j{-rY,x-}, j_aBQ)]
-    j_aBQ = lit_aCv
-AbsBinds [] [] [([], k{-rX,x-}, k_aBY), ([], l{-rW,x-}, l_aBZ)]
-    k_aBY
+==================== Typechecked ====================
+AbsBinds [] [] [([], j{-rY,x-}, j_aBY)]
+    j_aBY = lit_aCA
+AbsBinds [] [] [([], k{-rX,x-}, k_aC6), ([], l{-rW,x-}, l_aC7)]
+    k_aC6
        = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-}
-             lit_aCt
-             (PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} j{-rY,x-} l_aBZ)
-    l_aBZ = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} lit_aCu k_aBY
-AbsBinds [] [] [([], m{-rV,x-}, m_aCd)]
-    m_aCd = j{-rY,x-} +_aCs j{-rY,x-}
-d.Num_aCr = PrelBase.$d4{-rau,p-}
-+_aCs = PrelBase.+{-rU,p-} PrelBase.Int{-3g,W-} d.Num_aCr
-lit_aCt = PrelBase.I#{-5b,w-}{i} 1#
-lit_aCu = PrelBase.I#{-5b,w-}{i} 0#
-lit_aCv = PrelBase.I#{-5b,w-}{i} 2#
+             lit_aCC
+             (PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} j{-rY,x-} l_aC7)
+    l_aC7 = PrelBase.:{-55,w-}{i} PrelBase.Int{-3g,W-} lit_aCB k_aC6
+AbsBinds [] [] [([], m{-rV,x-}, m_aCl)]
+    m_aCl = j{-rY,x-} +_aCD j{-rY,x-}
+d.Num_aCz = PrelBase.$d4{-rau,p-}
++_aCD = PrelBase.+{-rU,p-} PrelBase.Int{-3g,W-} d.Num_aCz
+lit_aCC = PrelBase.I#{-5b,w-}{i} 1#
+lit_aCB = PrelBase.I#{-5b,w-}{i} 0#
+lit_aCA = PrelBase.I#{-5b,w-}{i} 2#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc008.stderr b/ghc/tests/typecheck/should_compile/tc008.stderr
index 7ffc6b2..57eaa05 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc008.stderr
+++ b/ghc/tests/typecheck/should_compile/tc008.stderr
@@ -1,14 +1,12 @@
+==================== Typechecked ====================
+AbsBinds [taC4] [d.Num_aC7] [([taC4], n{-r1,x-}, n_aBU)]
+    fromInt_aCc = PrelBase.fromInt{-8R,p-} taC4 d.Num_aC7
+    lit_aCb = fromInt_aCc PrelBase.I#{-5b,w-}{i} 1#
+    fromInt_aCa = fromInt_aCc
+    lit_aC8 = fromInt_aCa PrelBase.I#{-5b,w-}{i} 0#
+    n_aBU PrelBase.True{-5E,w-}{i} = lit_aCb
+    n_aBU PrelBase.False{-58,w-}{i} = lit_aC8
 
-
-================================================================================
-Typechecked:
-AbsBinds [taBU] [d.Num_aBX] [([taBU], n{-r1,x-}, n_aBM)]
-    fromInt_aBY = PrelBase.fromInt{-8R,p-} taBU d.Num_aBX
-    lit_aBZ = fromInt_aBY PrelBase.I#{-5b,w-}{i} 1#
-    fromInt_aC1 = fromInt_aBY
-    lit_aC2 = fromInt_aC1 PrelBase.I#{-5b,w-}{i} 0#
-    n_aBM PrelBase.True{-5E,w-}{i} = lit_aBZ
-    n_aBM PrelBase.False{-58,w-}{i} = lit_aC2
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc009.stderr b/ghc/tests/typecheck/should_compile/tc009.stderr
index 1058b2e..ba7b73c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc009.stderr
+++ b/ghc/tests/typecheck/should_compile/tc009.stderr
@@ -1,14 +1,12 @@
+==================== Typechecked ====================
+AbsBinds [taRG] [d.Num_aRK] [([taRG], o{-r3h,x-}, o_aRo)]
+    +_aRQ = PrelBase.+{-r3g,p-} taRG d.Num_aRK
+    d.Num_aRN = d.Num_aRK
+    fromInt_aRP = PrelBase.fromInt{-8R,p-} taRG d.Num_aRN
+    lit_aRO = fromInt_aRP PrelBase.I#{-5b,w-}{i} 1#
+    o_aRo (PrelBase.True{-5E,w-}{i}, x_r3d) = x_r3d
+    o_aRo (PrelBase.False{-58,w-}{i}, y_r3f) = y_r3f +_aRQ lit_aRO
 
-
-================================================================================
-Typechecked:
-AbsBinds [taRx] [d.Num_aRB] [([taRx], o{-r3h,x-}, o_aRg)]
-    +_aRF = PrelBase.+{-r3g,p-} taRx d.Num_aRB
-    d.Num_aRE = d.Num_aRB
-    fromInt_aRG = PrelBase.fromInt{-8R,p-} taRx d.Num_aRE
-    lit_aRH = fromInt_aRG PrelBase.I#{-5b,w-}{i} 1#
-    o_aRg (PrelBase.True{-5E,w-}{i}, x_r3d) = x_r3d
-    o_aRg (PrelBase.False{-58,w-}{i}, y_r3f) = y_r3f +_aRF lit_aRH
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc010.stderr b/ghc/tests/typecheck/should_compile/tc010.stderr
index 457a9ba..f98dcbb 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc010.stderr
+++ b/ghc/tests/typecheck/should_compile/tc010.stderr
@@ -1,21 +1,19 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], p{-r3e,x-}, p_aS7)]
+    lit_aT9 = lit_aTd
+    p_aS7
+       = [(y_r3d +_aTc lit_aT9, PrelBase.True{-5E,w-}{i}) |
+              y_r3d <- [lit_aTe, lit_aTd] (PrelBase.Int{-3g,W-})]
+lit_aTe = PrelBase.I#{-5b,w-}{i} 1#
+lit_aTd = PrelBase.I#{-5b,w-}{i} 2#
+d.Num_aSZ = PrelBase.$d4{-raq,p-}
++_aTc = PrelBase.+{-r9G,p-} PrelBase.Int{-3g,W-} d.Num_aSZ
+d.Monad_aT2 = PrelBase.$d25{-raa,p-}
+>>=_aTb = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aT2
+d.Monad_aT5 = d.Monad_aT2
+return_aTa =
+    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aT5
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], p{-r3e,x-}, p_aRZ)]
-    lit_aT1 = lit_aT3
-    p_aRZ
-       = [(y_r3d +_aT4 lit_aT1, PrelBase.True{-5E,w-}{i}) |
-              y_r3d <- [lit_aT2, lit_aT3] (PrelBase.Int{-3g,W-})]
-lit_aT2 = PrelBase.I#{-5b,w-}{i} 1#
-lit_aT3 = PrelBase.I#{-5b,w-}{i} 2#
-d.Num_aSR = PrelBase.$d4{-raq,p-}
-+_aT4 = PrelBase.+{-r9G,p-} PrelBase.Int{-3g,W-} d.Num_aSR
-d.Monad_aSU = PrelBase.$d25{-raa,p-}
->>=_aT5 = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aSU
-d.Monad_aSX = d.Monad_aSU
-return_aT6 =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aSX
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc011.stderr b/ghc/tests/typecheck/should_compile/tc011.stderr
index 90ec9b8..8e1921b 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc011.stderr
+++ b/ghc/tests/typecheck/should_compile/tc011.stderr
@@ -1,9 +1,7 @@
+==================== Typechecked ====================
+AbsBinds [takw] [] [([takw], x{-r1,x-}, x_aku)]
+    (x_aku@_) = x_aku
 
-
-================================================================================
-Typechecked:
-AbsBinds [taks] [] [([taks], x{-r1,x-}, x_akq)]
-    (x_akq@_) = x_akq
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc012.stderr b/ghc/tests/typecheck/should_compile/tc012.stderr
index f78cd03..4675553 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc012.stderr
+++ b/ghc/tests/typecheck/should_compile/tc012.stderr
@@ -1,9 +1,7 @@
+==================== Typechecked ====================
+AbsBinds [takG] [] [([takG], q{-r3e,x-}, q_akw)]
+    q_akw = \ y_r3d -> y_r3d
 
-
-================================================================================
-Typechecked:
-AbsBinds [takB] [] [([takB], q{-r3e,x-}, q_aks)]
-    q_aks = \ y_r3d -> y_r3d
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc013.stderr b/ghc/tests/typecheck/should_compile/tc013.stderr
index c232026..b93f3ef 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc013.stderr
+++ b/ghc/tests/typecheck/should_compile/tc013.stderr
@@ -1,10 +1,8 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], r{-r3,x-}, r_aRm), ([], s{-r2,x-}, s_aRn)]
+    (r_aRm, s_aRn) = (lit_aRD, 'a')
+lit_aRD = PrelBase.I#{-5b,w-}{i} 1#
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], r{-r3,x-}, r_aRe), ([], s{-r2,x-}, s_aRf)]
-    (r_aRe, s_aRf) = (lit_aRz, 'a')
-lit_aRz = PrelBase.I#{-5b,w-}{i} 1#
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc014.stderr b/ghc/tests/typecheck/should_compile/tc014.stderr
index 449aadb..1dd383c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc014.stderr
+++ b/ghc/tests/typecheck/should_compile/tc014.stderr
@@ -1,12 +1,10 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], t{-rS,x-}, t_aBS)]
+    t_aBS = lit_aCb +_aCc t_aBS
+d.Num_aCa = PrelBase.$d4{-rao,p-}
++_aCc = PrelBase.+{-rR,p-} PrelBase.Int{-3g,W-} d.Num_aCa
+lit_aCb = PrelBase.I#{-5b,w-}{i} 1#
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], t{-rS,x-}, t_aBK)]
-    t_aBK = lit_aC4 +_aC3 t_aBK
-d.Num_aC2 = PrelBase.$d4{-rao,p-}
-+_aC3 = PrelBase.+{-rR,p-} PrelBase.Int{-3g,W-} d.Num_aC2
-lit_aC4 = PrelBase.I#{-5b,w-}{i} 1#
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc015.stderr b/ghc/tests/typecheck/should_compile/tc015.stderr
index 8e3776d..71cbed2 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc015.stderr
+++ b/ghc/tests/typecheck/should_compile/tc015.stderr
@@ -1,12 +1,10 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[tayE, tayH, tayM]
+[tayS, tayM, tayP]
 []
-[([tayE, tayH, tayM], u{-r3h,x-}, u_ays)]
-    u_ays x_r3d = \ (y_r3f, z_r3g) -> x_r3d
+[([tayS, tayM, tayP], u{-r3h,x-}, u_ayw)]
+    u_ayw x_r3d = \ (y_r3f, z_r3g) -> x_r3d
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
@@ -14,4 +12,4 @@ ArrBase IO PrelNum
 _exports_
 ShouldSucceed u;
 _declarations_
-1 u _:_ _forall_ [ta tb tc] => tc -> (ta, tb) -> tc ;;
+1 u _:_ _forall_ [ta tb tc] => ta -> (tb, tc) -> ta ;;

diff --git a/ghc/tests/typecheck/should_compile/tc016.stderr b/ghc/tests/typecheck/should_compile/tc016.stderr
index 5a6dd72..5ec5a44 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc016.stderr
+++ b/ghc/tests/typecheck/should_compile/tc016.stderr
@@ -1,9 +1,7 @@
+==================== Typechecked ====================
+AbsBinds [takR, takT] [] [([takR, takT], f{-r3f,x-}, f_akx)]
+    f_akx (x_r3d@_) (y_r3e@_) = x_r3d
 
-
-================================================================================
-Typechecked:
-AbsBinds [takL, takN] [] [([takL, takN], f{-r3f,x-}, f_akt)]
-    f_akt (x_r3d@_) (y_r3e@_) = x_r3d
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc017.stderr b/ghc/tests/typecheck/should_compile/tc017.stderr
index 3c92bbe..4830688 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc017.stderr
+++ b/ghc/tests/typecheck/should_compile/tc017.stderr
@@ -1,14 +1,12 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], v{-r1,x-}, v_aBS)]
+    v_aBS
+       | PrelBase.True{-5E,w-}{i} = v_aBS +_aCe lit_aCd
+       | PrelBase.False{-58,w-}{i} = v_aBS
+d.Num_aCc = PrelBase.$d4{-rao,p-}
++_aCe = PrelBase.+{-r9E,p-} PrelBase.Int{-3g,W-} d.Num_aCc
+lit_aCd = PrelBase.I#{-5b,w-}{i} 1#
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], v{-r1,x-}, v_aBK)]
-    v_aBK
-       | PrelBase.True{-5E,w-}{i} = v_aBK +_aC5 lit_aC6
-       | PrelBase.False{-58,w-}{i} = v_aBK
-d.Num_aC4 = PrelBase.$d4{-rao,p-}
-+_aC5 = PrelBase.+{-r9E,p-} PrelBase.Int{-3g,W-} d.Num_aC4
-lit_aC6 = PrelBase.I#{-5b,w-}{i} 1#
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc018.stderr b/ghc/tests/typecheck/should_compile/tc018.stderr
index 7b5d2d0..9e6a8f6 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc018.stderr
+++ b/ghc/tests/typecheck/should_compile/tc018.stderr
@@ -1,22 +1,20 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], w{-r3f,x-}, w_aBQ)]
-    w_aBQ
+==================== Typechecked ====================
+AbsBinds [] [] [([], w{-r3f,x-}, w_aBY)]
+    w_aBY
        = a_r3d
        where
            {- nonrec -}
-           AbsBinds [] [] [([], y_r3e, y_aBP)]
-               y_aBP = lit_aC8
+           AbsBinds [] [] [([], y_r3e, y_aBX)]
+               y_aBX = lit_aCg
            {- nonrec -}
            {- nonrec -}
            {- nonrec -}
-           AbsBinds [] [] [([], a_r3d, a_aBZ)]
-               a_aBZ = y_r3e
+           AbsBinds [] [] [([], a_r3d, a_aC7)]
+               a_aC7 = y_r3e
            {- nonrec -}
            {- nonrec -}
-lit_aC8 = PrelBase.I#{-5b,w-}{i} 2#
+lit_aCg = PrelBase.I#{-5b,w-}{i} 2#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc019.stderr b/ghc/tests/typecheck/should_compile/tc019.stderr
index d99d75f..8a3d509 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc019.stderr
+++ b/ghc/tests/typecheck/should_compile/tc019.stderr
@@ -1,25 +1,23 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
 []
 []
-[([], al{-r3i,x-}, al_aS2), ([], am{-r3h,x-}, am_aS3)]
-    lit_aTo = lit_aTp
-    (al_aS2 PrelBase.:{-55,w-}{i} am_aS3)
-       = [y_r3e +_aTr lit_aTo |
-              (y_r3e, z_r3f) <- [(lit_aTp,
-                                  lit_aTq)] ((PrelBase.Int{-3g,W-}, PrelBase.Int{-3g,W-}))]
-lit_aTp = PrelBase.I#{-5b,w-}{i} 1#
-lit_aTq = PrelBase.I#{-5b,w-}{i} 2#
-d.Num_aTe = PrelBase.$d4{-rat,p-}
-+_aTr = PrelBase.+{-r3g,p-} PrelBase.Int{-3g,W-} d.Num_aTe
-d.Monad_aTh = PrelBase.$d25{-rad,p-}
->>=_aTs = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aTh
-d.Monad_aTk = d.Monad_aTh
+[([], al{-r3i,x-}, al_aSa), ([], am{-r3h,x-}, am_aSb)]
+    lit_aTs = lit_aTx
+    (al_aSa PrelBase.:{-55,w-}{i} am_aSb)
+       = [y_r3e +_aTv lit_aTs |
+              (y_r3e, z_r3f) <- [(lit_aTx,
+                                  lit_aTw)] ((PrelBase.Int{-3g,W-}, PrelBase.Int{-3g,W-}))]
+lit_aTx = PrelBase.I#{-5b,w-}{i} 1#
+lit_aTw = PrelBase.I#{-5b,w-}{i} 2#
+d.Num_aTi = PrelBase.$d4{-rat,p-}
++_aTv = PrelBase.+{-r3g,p-} PrelBase.Int{-3g,W-} d.Num_aTi
+d.Monad_aTl = PrelBase.$d25{-rad,p-}
+>>=_aTu = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aTl
+d.Monad_aTo = d.Monad_aTl
 return_aTt =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aTk
+    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aTo
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc020.stderr b/ghc/tests/typecheck/should_compile/tc020.stderr
index 7ec7b1d..ea13f95 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc020.stderr
+++ b/ghc/tests/typecheck/should_compile/tc020.stderr
@@ -1,16 +1,14 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [takG] [] [([takG], f{-r3g,x-}, f_aku)]
-    f_aku x_r3d
+==================== Typechecked ====================
+AbsBinds [takM] [] [([takM], f{-r3g,x-}, f_aky)]
+    f_aky x_r3d
          = a_r3f
          where
              {- rec -}
-             AbsBinds [] [] [([], a_r3f, a_akC)]
-                 a_akC = PrelBase.:{-55,w-}{i} takG x_r3d a_akC
+             AbsBinds [] [] [([], a_r3f, a_akI)]
+                 a_akI = PrelBase.:{-55,w-}{i} takM x_r3d a_akI
              {- nonrec -}
              {- nonrec -}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc021.stderr b/ghc/tests/typecheck/should_compile/tc021.stderr
index 7873760..61109c1 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc021.stderr
+++ b/ghc/tests/typecheck/should_compile/tc021.stderr
@@ -1,16 +1,14 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [tayv] [] [([tayv], x{-r3g,x-}, x_ayt)]
-    x_ayt = x_ayt
-AbsBinds [tayB, tayD] [] [([tayB, tayD], a{-r3h,x-}, a_ayx)]
-    a_ayx = (x{-r3g,x-} tayB, x{-r3g,x-} tayD)
+==================== Typechecked ====================
+AbsBinds [tayz] [] [([tayz], x{-r3g,x-}, x_ayx)]
+    x_ayx = x_ayx
+AbsBinds [tayF, tayH] [] [([tayF, tayH], a{-r3h,x-}, a_ayB)]
+    a_ayB = (x{-r3g,x-} tayF, x{-r3g,x-} tayH)
 AbsBinds
-[tayW, tayS, tayU]
+[taz1, tayX, tayZ]
 []
-[([tayW, tayS, tayU], f{-r3i,x-}, f_ayJ)]
-    f_ayJ x_r3f = a{-r3h,x-} [tayS, tayU]
+[([taz1, tayX, tayZ], f{-r3i,x-}, f_ayN)]
+    f_ayN x_r3f = a{-r3h,x-} [tayX, tayZ]
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc022.stderr b/ghc/tests/typecheck/should_compile/tc022.stderr
index 4b409de..15036cb 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc022.stderr
+++ b/ghc/tests/typecheck/should_compile/tc022.stderr
@@ -1,11 +1,9 @@
+==================== Typechecked ====================
+AbsBinds [takI] [] [([takI], iD{-r3f,x-}, iD_aky)]
+    iD_aky x_r3e = x_r3e
+AbsBinds [takQ] [] [([takQ], main{-r3g,x-}, main_akK)]
+    main_akK = iD{-r3f,x-} (takQ -> takQ) iD{-r3f,x-} takQ
 
-
-================================================================================
-Typechecked:
-AbsBinds [takD] [] [([takD], iD{-r3f,x-}, iD_aku)]
-    iD_aku x_r3e = x_r3e
-AbsBinds [takL] [] [([takL], main{-r3g,x-}, main_akF)]
-    main_akF = iD{-r3f,x-} (takL -> takL) iD{-r3f,x-} takL
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc023.stderr b/ghc/tests/typecheck/should_compile/tc023.stderr
index 1e7a98f..db51c99 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc023.stderr
+++ b/ghc/tests/typecheck/should_compile/tc023.stderr
@@ -1,19 +1,17 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [takP, takR] [] [([takP, takR], k{-r3l,x-}, k_akB)]
-    k_akB x_r3j y_r3k = x_r3j
+==================== Typechecked ====================
+AbsBinds [takV, takX] [] [([takV, takX], k{-r3l,x-}, k_akF)]
+    k_akF x_r3j y_r3k = x_r3j
 AbsBinds
-[taln, talp, talr]
+[talx, talz, talB]
 []
-[([taln, talp, talr], s{-r3m,x-}, s_akT)]
-    s_akT f_r3f g_r3g x_r3h = f_r3f x_r3h g_r3g x_r3h
-AbsBinds [talA] [] [([talA], main{-r3n,x-}, main_alt)]
-    main_alt
-       = s{-r3m,x-} [talA, GHC.Void{-3T,W-} -> talA, talA] k{-r3l,x-}
-                                                               [GHC.Void{-3T,W-} -> talA, talA]
-                                                           k{-r3l,x-} [GHC.Void{-3T,W-}, talA]
+[([talx, talz, talB], s{-r3m,x-}, s_akZ)]
+    s_akZ f_r3f g_r3g x_r3h = f_r3f x_r3h g_r3g x_r3h
+AbsBinds [talJ] [] [([talJ], main{-r3n,x-}, main_alD)]
+    main_alD
+       = s{-r3m,x-} [talJ, talJ, GHC.Void{-3T,W-} -> talJ] k{-r3l,x-}
+                                                               [GHC.Void{-3T,W-} -> talJ, talJ]
+                                                           k{-r3l,x-} [GHC.Void{-3T,W-}, talJ]
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
@@ -23,4 +21,4 @@ ShouldSucceed k main s;
 _declarations_
 1 k _:_ _forall_ [ta tb] => tb -> ta -> tb ;;
 1 main _:_ _forall_ [ta] => ta -> ta ;;
-1 s _:_ _forall_ [ta tb tc] => (tc -> tb -> ta) -> (tc -> tb) -> tc -> ta ;;
+1 s _:_ _forall_ [ta tb tc] => (tb -> tc -> ta) -> (tb -> tc) -> tb -> ta ;;

diff --git a/ghc/tests/typecheck/should_compile/tc024.stderr b/ghc/tests/typecheck/should_compile/tc024.stderr
index 58c7fd9..862268b 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc024.stderr
+++ b/ghc/tests/typecheck/should_compile/tc024.stderr
@@ -1,21 +1,19 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [takR, takT] [] [([takR, takT], k{-r3n,x-}, k_akD)]
-    k_akD x_r3l y_r3m = x_r3l
+==================== Typechecked ====================
+AbsBinds [takX, takZ] [] [([takX, takZ], k{-r3n,x-}, k_akH)]
+    k_akH x_r3l y_r3m = x_r3l
 AbsBinds
-[talp, talr, talt]
+[talz, talB, talD]
 []
-[([talp, talr, talt], s{-r3o,x-}, s_akV)]
-    s_akV f_r3h g_r3i x_r3j = f_r3h x_r3j g_r3i x_r3j
-AbsBinds [talE] [] [([talE], main{-r3p,x-}, main_alv)]
-    main_alv x_r3f
-            = s{-r3o,x-} [talE, GHC.Void{-3T,W-} -> talE, talE] k{-r3n,x-}
+[([talz, talB, talD], s{-r3o,x-}, s_al1)]
+    s_al1 f_r3h g_r3i x_r3j = f_r3h x_r3j g_r3i x_r3j
+AbsBinds [talP] [] [([talP], main{-r3p,x-}, main_alF)]
+    main_alF x_r3f
+            = s{-r3o,x-} [talP, talP, GHC.Void{-3T,W-} -> talP] k{-r3n,x-}
                                                                     [GHC.Void{-3T,W-}
-                                                                     -> talE, talE]
-                                                                k{-r3n,x-} [GHC.Void{-3T,W-}, talE]
+                                                                     -> talP, talP]
+                                                                k{-r3n,x-} [GHC.Void{-3T,W-}, talP]
                                                                 x_r3f
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_
@@ -25,4 +23,4 @@ ShouldSucceed k main s;
 _declarations_
 1 k _:_ _forall_ [ta tb] => tb -> ta -> tb ;;
 1 main _:_ _forall_ [ta] => ta -> ta ;;
-1 s _:_ _forall_ [ta tb tc] => (tc -> tb -> ta) -> (tc -> tb) -> tc -> ta ;;
+1 s _:_ _forall_ [ta tb tc] => (tb -> tc -> ta) -> (tb -> tc) -> tb -> ta ;;

diff --git a/ghc/tests/typecheck/should_compile/tc025.stderr b/ghc/tests/typecheck/should_compile/tc025.stderr
index 98ba08f..bcb0890 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc025.stderr
+++ b/ghc/tests/typecheck/should_compile/tc025.stderr
@@ -1,18 +1,16 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], g{-r3j,x-}, g_akx)]
-    g_akx x_r3d
+==================== Typechecked ====================
+AbsBinds [] [] [([], g{-r3j,x-}, g_akB)]
+    g_akB x_r3d
          = f_r3f PrelBase.Bool{-34,W-} f_r3f
                                            PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i} x_r3d
                                        x_r3d
          where
              {- rec -}
-             AbsBinds [takV] [] [([takV], f_r3f, f_akF)]
-                 f_akF x_r3h y_r3i = if x_r3h then y_r3i else f_akF x_r3h y_r3i
+             AbsBinds [tal1] [] [([tal1], f_r3f, f_akL)]
+                 f_akL x_r3h y_r3i = if x_r3h then y_r3i else f_akL x_r3h y_r3i
              {- nonrec -}
              {- nonrec -}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc026.stderr b/ghc/tests/typecheck/should_compile/tc026.stderr
index 00bfdbb..de883f5 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc026.stderr
+++ b/ghc/tests/typecheck/should_compile/tc026.stderr
@@ -1,15 +1,13 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [takL] [] [([takL], f{-r3i,x-}, f_akx)]
-    f_akx x_r3g y_r3h = if x_r3g then y_r3h else f_akx x_r3g y_r3h
-AbsBinds [] [] [([], g{-r3j,x-}, g_akN)]
-    g_akN x_r3e
+==================== Typechecked ====================
+AbsBinds [takR] [] [([takR], f{-r3i,x-}, f_akB)]
+    f_akB x_r3g y_r3h = if x_r3g then y_r3h else f_akB x_r3g y_r3h
+AbsBinds [] [] [([], g{-r3j,x-}, g_akT)]
+    g_akT x_r3e
          = f{-r3i,x-} PrelBase.Bool{-34,W-} f{-r3i,x-}
                                                 PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i}
                                                                       x_r3e
                                             x_r3e
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc027.stderr b/ghc/tests/typecheck/should_compile/tc027.stderr
index 57f4917..3e2ee5f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc027.stderr
+++ b/ghc/tests/typecheck/should_compile/tc027.stderr
@@ -1,20 +1,18 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[tal1]
+[tala]
 []
-[([tal1], f{-r3n,x-}, f_akC), ([tal1], g{-r3m,x-}, g_akD)]
-    f_akC x_r3h y_r3i = if x_r3h then y_r3i else g_akD y_r3i x_r3h
-    g_akD y_r3k x_r3l = if x_r3l then y_r3k else f_akC x_r3l y_r3k
-AbsBinds [] [] [([], h{-r3o,x-}, h_al3)]
-    h_al3 x_r3f
+[([tala], f{-r3n,x-}, f_akG), ([tala], g{-r3m,x-}, g_akH)]
+    f_akG x_r3h y_r3i = if x_r3h then y_r3i else g_akH y_r3i x_r3h
+    g_akH y_r3k x_r3l = if x_r3l then y_r3k else f_akG x_r3l y_r3k
+AbsBinds [] [] [([], h{-r3o,x-}, h_alc)]
+    h_alc x_r3f
          = f{-r3n,x-} PrelBase.Bool{-34,W-} f{-r3n,x-}
                                                 PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i}
                                                                       x_r3f
                                             x_r3f
 
+
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1

diff --git a/ghc/tests/typecheck/should_compile/tc028.stderr b/ghc/tests/typecheck/should_compile/tc028.stderr
index 802f82c..2bd79ef 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc028.stderr
+++ b/ghc/tests/typecheck/should_compile/tc028.stderr
@@ -1,7 +1,4 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1

diff --git a/ghc/tests/typecheck/should_compile/tc029.stderr b/ghc/tests/typecheck/should_compile/tc029.stderr
index 7c6ec51..7fe721e 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc029.stderr
+++ b/ghc/tests/typecheck/should_compile/tc029.stderr
@@ -1,11 +1,9 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 H{-r4,x-}{i} = \ tpl_B1 -> H{-r4,x-}{i} {tpl_B1}
 M{-r3,x-}{i} = \ tpl_B1 -> M{-r3,x-}{i} {tpl_B1}
-AbsBinds [] [] [([], $d1{-rB5,x-}, d.Eval_aB2)]
-    d.Eval_aB2 = ({-dict-} [] [])
+AbsBinds [] [] [([], $d1{-rBd,x-}, d.Eval_aBa)]
+    d.Eval_aBa = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc030.stderr b/ghc/tests/typecheck/should_compile/tc030.stderr
index f5cf2ff..af1d13f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc030.stderr
+++ b/ghc/tests/typecheck/should_compile/tc030.stderr
@@ -1,7 +1,4 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1

diff --git a/ghc/tests/typecheck/should_compile/tc031.stderr b/ghc/tests/typecheck/should_compile/tc031.stderr
index dbbb210..b1f30e7 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc031.stderr
+++ b/ghc/tests/typecheck/should_compile/tc031.stderr
@@ -1,11 +1,9 @@
+==================== Typechecked ====================
+Node{-r2,x-}{i} =
+    \ tpl_B1 tpl_B2 -> Node{-r2,x-}{i} {tpl_B1 tpl_B2}
+AbsBinds [] [] [([], $d1{-rB1,x-}, d.Eval_aAY)]
+    d.Eval_aAY = ({-dict-} [] [])
 
-
-================================================================================
-Typechecked:
-Node{-r3,x-}{i} =
-    \ tpl_B1 tpl_B2 -> Node{-r3,x-}{i} {tpl_B1 tpl_B2}
-AbsBinds [] [] [([], $d1{-rAT,x-}, d.Eval_aAQ)]
-    d.Eval_aAQ = ({-dict-} [] [])
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc032.stderr b/ghc/tests/typecheck/should_compile/tc032.stderr
index 4e64be8..173553f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc032.stderr
+++ b/ghc/tests/typecheck/should_compile/tc032.stderr
@@ -1,14 +1,12 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Node{-r4,x-}{i} =
     _/\_ b_tr3h -> \ tpl_B1 tpl_B2 ->
        Node{-r4,x-}{i} {_@_ b_tr3h tpl_B1 tpl_B2}
 Other{-r3,x-}{i} =
     _/\_ b_tr3h -> \ tpl_B1 -> Other{-r3,x-}{i} {_@_ b_tr3h tpl_B1}
-AbsBinds [taQa] [] [([taQa], $d1{-rQd,x-}, d.Eval_aQ9)]
-    d.Eval_aQ9 = ({-dict-} [] [])
+AbsBinds [taQi] [] [([taQi], $d1{-rQl,x-}, d.Eval_aQh)]
+    d.Eval_aQh = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc033.stderr b/ghc/tests/typecheck/should_compile/tc033.stderr
index 3c28282..5995e23 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc033.stderr
+++ b/ghc/tests/typecheck/should_compile/tc033.stderr
@@ -1,13 +1,11 @@
-
-
-================================================================================
-Typechecked:
-Twist2{-r9,x-}{i} = \ tpl_B1 -> Twist2{-r9,x-}{i} {tpl_B1}
+==================== Typechecked ====================
+Twist2{-r4,x-}{i} = \ tpl_B1 -> Twist2{-r4,x-}{i} {tpl_B1}
 Twine2{-r8,x-}{i} = \ tpl_B1 -> Twine2{-r8,x-}{i} {tpl_B1}
-AbsBinds [] [] [([], $d1{-rBa,x-}, d.Eval_aB2)]
-    d.Eval_aB2 = ({-dict-} [] [])
-AbsBinds [] [] [([], $d2{-rBc,x-}, d.Eval_aB7)]
-    d.Eval_aB7 = ({-dict-} [] [])
+AbsBinds [] [] [([], $d1{-rBi,x-}, d.Eval_aBa)]
+    d.Eval_aBa = ({-dict-} [] [])
+AbsBinds [] [] [([], $d2{-rBk,x-}, d.Eval_aBf)]
+    d.Eval_aBf = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc034.stderr b/ghc/tests/typecheck/should_compile/tc034.stderr
index cb2d6c4..2cb8a7c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc034.stderr
+++ b/ghc/tests/typecheck/should_compile/tc034.stderr
@@ -1,24 +1,22 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 ANull{-r6,x-}{i} = _/\_ a_tr3p -> ANull{-r6,x-}{i} {_@_ a_tr3p}
 ANode{-r5,x-}{i} =
     _/\_ a_tr3p -> \ tpl_B1 tpl_B2 ->
        ANode{-r5,x-}{i} {_@_ a_tr3p tpl_B1 tpl_B2}
-AbsBinds [taCx] [d.Num_aCA] [([taCx], g{-r3q,x-}, g_aC9)]
-    fromInt_aCK = PrelBase.fromInt{-8R,p-} taCx d.Num_aCA
-    lit_aCO = fromInt_aCK PrelBase.I#{-5b,w-}{i} 2#
-    fromInt_aCP = fromInt_aCK
-    lit_aCQ = fromInt_aCP PrelBase.I#{-5b,w-}{i} 3#
-    fromInt_aCR = fromInt_aCK
-    lit_aCS = fromInt_aCR PrelBase.I#{-5b,w-}{i} 4#
-    g_aC9 ANull{-r6,x-}{i} = lit_aCO
-    g_aC9 (ANode{-r5,x-}{i} b_r3k (ANode{-r5,x-}{i} c_r3l d_r3m))
-         | b_r3k = lit_aCQ
-         | PrelBase.True{-5E,w-}{i} = lit_aCS
-AbsBinds [taCJ] [] [([taCJ], $d1{-rCN,x-}, d.Eval_aCI)]
-    d.Eval_aCI = ({-dict-} [] [])
+AbsBinds [taCG] [d.Num_aCJ] [([taCG], g{-r3q,x-}, g_aCh)]
+    fromInt_aCY = PrelBase.fromInt{-8R,p-} taCG d.Num_aCJ
+    lit_aCX = fromInt_aCY PrelBase.I#{-5b,w-}{i} 2#
+    fromInt_aCW = fromInt_aCY
+    lit_aCV = fromInt_aCW PrelBase.I#{-5b,w-}{i} 3#
+    fromInt_aCU = fromInt_aCY
+    lit_aCT = fromInt_aCU PrelBase.I#{-5b,w-}{i} 4#
+    g_aCh ANull{-r6,x-}{i} = lit_aCX
+    g_aCh (ANode{-r5,x-}{i} b_r3k (ANode{-r5,x-}{i} c_r3l d_r3m))
+         | b_r3k = lit_aCV
+         | PrelBase.True{-5E,w-}{i} = lit_aCT
+AbsBinds [taCS] [] [([taCS], $d1{-rD1,x-}, d.Eval_aCR)]
+    d.Eval_aCR = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc035.stderr b/ghc/tests/typecheck/should_compile/tc035.stderr
index 6d63628..fe1892c 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc035.stderr
+++ b/ghc/tests/typecheck/should_compile/tc035.stderr
@@ -1,21 +1,19 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Var{-r5,x-}{i} =
     _/\_ a_tr3q -> \ tpl_B1 -> Var{-r5,x-}{i} {_@_ a_tr3q tpl_B1}
 App{-r4,x-}{i} =
     _/\_ a_tr3q -> \ tpl_B1 tpl_B2 ->
        App{-r4,x-}{i} {_@_ a_tr3q tpl_B1 tpl_B2}
-AbsBinds [taRI] [] [([taRI], g{-r3t,x-}, g_aRm)]
-    g_aRm (a_r3j, (Var{-r5,x-}{i} name_r3k))
+AbsBinds [taRR] [] [([taRR], g{-r3t,x-}, g_aRu)]
+    g_aRu (a_r3j, (Var{-r5,x-}{i} name_r3k))
          = [name_r3k] ([PrelBase.Char{-38,W-}])
-    g_aRm (a_r3m, (App{-r4,x-}{i} e1_r3n e2_r3o))
-         = ++_aS9 [PrelBase.Char{-38,W-}] (g_aRm e1_r3n) (g_aRm e2_r3o)
-AbsBinds [taS5] [] [([taS5], $d1{-rS8,x-}, d.Eval_aS2)]
-    d.Eval_aS2 = ({-dict-} [] [])
-d.MonadPlus_aS4 = PrelBase.$d23{-rpi,p-}
-++_aS9 = PrelBase.++{-ruo,p-} PrelBase.[]{-3j,W-} d.MonadPlus_aS4
+    g_aRu (a_r3m, (App{-r4,x-}{i} e1_r3n e2_r3o))
+         = ++_aSf [PrelBase.Char{-38,W-}] (g_aRu e1_r3n) (g_aRu e2_r3o)
+AbsBinds [taSe] [] [([taSe], $d1{-rSi,x-}, d.Eval_aSb)]
+    d.Eval_aSb = ({-dict-} [] [])
+d.MonadPlus_aSd = PrelBase.$d23{-rpi,p-}
+++_aSf = PrelBase.++{-ruo,p-} PrelBase.[]{-3j,W-} d.MonadPlus_aSd
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc036.stderr b/ghc/tests/typecheck/should_compile/tc036.stderr
index f7d8d4b..2d369ec 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc036.stderr
+++ b/ghc/tests/typecheck/should_compile/tc036.stderr
@@ -1,14 +1,12 @@
-
-
-================================================================================
-Typechecked:
-scsel_APrelBaseEq{-aAP,x-} =
+==================== Typechecked ====================
+scsel_APrelBaseEq{-aAX,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op1{-r3g,x-} =
+op1{-r3f,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taAO] [d.A_aAN] []
+AbsBinds [taAW] [d.A_aAV] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc037.stderr b/ghc/tests/typecheck/should_compile/tc037.stderr
index 61a9612..a20bafb 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc037.stderr
+++ b/ghc/tests/typecheck/should_compile/tc037.stderr
@@ -1,24 +1,22 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [takZ] [d.Eq'_alo] [([takZ], $d1{-rlx,x-}, d.Eq'_akS)]
-    d.Eq'_alr = d.Eq'_alo
-    deq_aly = deq{-r3u,x-} takZ d.Eq'_alr
-    deq_alz = deq_alA
-    AbsBinds [] [] [([], deq_alA, deq_akW)]
-       deq_akW PrelBase.[]{-5i,w-}{i} PrelBase.[]{-5i,w-}{i}
+==================== Typechecked ====================
+AbsBinds [tal3] [d.Eq'_als] [([tal3], $d1{-rlB,x-}, d.Eq'_akW)]
+    d.Eq'_alv = d.Eq'_als
+    deq_alE = deq{-r3u,x-} tal3 d.Eq'_alv
+    deq_alD = deq_alC
+    AbsBinds [] [] [([], deq_alC, deq_al0)]
+       deq_al0 PrelBase.[]{-5i,w-}{i} PrelBase.[]{-5i,w-}{i}
                = PrelBase.True{-5E,w-}{i}
-       deq_akW (x_r3k PrelBase.:{-55,w-}{i} xs_r3l)
+       deq_al0 (x_r3k PrelBase.:{-55,w-}{i} xs_r3l)
                (y_r3m PrelBase.:{-55,w-}{i} ys_r3n)
-               = if x_r3k deq_aly y_r3m then
-                     deq_alz xs_r3l ys_r3n
+               = if x_r3k deq_alE y_r3m then
+                     deq_alD xs_r3l ys_r3n
                  else
                      PrelBase.False{-58,w-}{i}
-       deq_akW other1_r3p other2_r3q = PrelBase.False{-58,w-}{i}
-    d.Eq'_akS = ({-dict-} [] [deq_alA])
+       deq_al0 other1_r3p other2_r3q = PrelBase.False{-58,w-}{i}
+    d.Eq'_akW = ({-dict-} [] [deq_alC])
 deq{-r3u,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talw] [d.Eq'_alv] []
+AbsBinds [talA] [d.Eq'_alz] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc038.stderr b/ghc/tests/typecheck/should_compile/tc038.stderr
index 22d0fa4..137ab70 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc038.stderr
+++ b/ghc/tests/typecheck/should_compile/tc038.stderr
@@ -1,16 +1,14 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [taC6] [d.Num_aCa] [([taC6], f{-r3f,x-}, f_aBN)]
-    d.Eq_aC8 = PrelBase.scsel_NumPrelBaseEq{-aCd,p-} taC6 d.Num_aCa
-    ==_aCb = PrelBase.=={-8Y,p-} taC6 d.Eq_aC8
-    fromInteger_aCc = PrelBase.fromInteger{-8S,p-} taC6 d.Num_aCa
-    f_aBN (x_r3d PrelBase.:{-55,w-}{i} xs_r3e)
-         = if x_r3d ==_aCb (fromInteger_aCc 2) then
+==================== Typechecked ====================
+AbsBinds [taCf] [d.Num_aCj] [([taCf], f{-r3f,x-}, f_aBV)]
+    d.Eq_aCh = PrelBase.scsel_NumPrelBaseEq{-aCm,p-} taCf d.Num_aCj
+    ==_aCl = PrelBase.=={-8Y,p-} taCf d.Eq_aCh
+    fromInteger_aCk = PrelBase.fromInteger{-8S,p-} taCf d.Num_aCj
+    f_aBV (x_r3d PrelBase.:{-55,w-}{i} xs_r3e)
+         = if x_r3d ==_aCl (fromInteger_aCk 2) then
                xs_r3e
            else
-               PrelBase.[]{-5i,w-}{i} taC6
+               PrelBase.[]{-5i,w-}{i} taCf
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc039.stderr b/ghc/tests/typecheck/should_compile/tc039.stderr
index f7d8d4b..2d369ec 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc039.stderr
+++ b/ghc/tests/typecheck/should_compile/tc039.stderr
@@ -1,14 +1,12 @@
-
-
-================================================================================
-Typechecked:
-scsel_APrelBaseEq{-aAP,x-} =
+==================== Typechecked ====================
+scsel_APrelBaseEq{-aAX,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op1{-r3g,x-} =
+op1{-r3f,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taAO] [d.A_aAN] []
+AbsBinds [taAW] [d.A_aAV] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc040.stderr b/ghc/tests/typecheck/should_compile/tc040.stderr
index 054a10b..ac9b2c9 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc040.stderr
+++ b/ghc/tests/typecheck/should_compile/tc040.stderr
@@ -1,22 +1,20 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [taAV] [d.Eq_aBd] [([taAV], f{-r3e,x-}, f_aAS)]
-    d.Eq_aBf = d.Eq_aBd
-    ==_aBg = PrelBase.=={-8Y,p-} taAV d.Eq_aBf
-    f_aAS x_r3g
+==================== Typechecked ====================
+AbsBinds [taB3] [d.Eq_aBk] [([taB3], f{-r3e,x-}, f_aB0)]
+    d.Eq_aBm = d.Eq_aBk
+    ==_aBn = PrelBase.=={-8Y,p-} taB3 d.Eq_aBm
+    f_aB0 x_r3g
          = g_r3i x_r3g
          where
              {- nonrec -}
-             AbsBinds [] [] [([], g_r3i, g_aAX)]
-                 g_aAX y_r3k
-                       = if y_r3k ==_aBg x_r3g then
-                             PrelBase.[]{-5i,w-}{i} taAV
+             AbsBinds [] [] [([], g_r3i, g_aB5)]
+                 g_aB5 y_r3k
+                       = if y_r3k ==_aBn x_r3g then
+                             PrelBase.[]{-5i,w-}{i} taB3
                          else
-                             [y_r3k] (taAV)
+                             [y_r3k] (taB3)
              {- nonrec -}
              {- nonrec -}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc041.stderr b/ghc/tests/typecheck/should_compile/tc041.stderr
index e0e415f..d5fdc9e 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc041.stderr
+++ b/ghc/tests/typecheck/should_compile/tc041.stderr
@@ -1,17 +1,15 @@
+==================== Typechecked ====================
+AbsBinds [] [] [([], f{-r1,x-}, f_akQ)]
+    f_akQ x_r3h y_r3i = op1_alg x_r3h x_r3h
+AbsBinds [] [] [([], $d1{-rlh,x-}, d.H_al2)]
+    AbsBinds [] [] [([], op1_ali, op1_al6)]
+       op1_al6 x_r3n y_r3o = y_r3o
+    d.H_al2 = ({-dict-} [] [op1_ali])
+op1{-r3s,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [talf] [d.H_alc] []
+d.H_ale = $d1{-rlh,x-}
+op1_alg = op1{-r3s,x-} PrelBase.Bool{-34,W-} d.H_ale
 
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], f{-r1,x-}, f_akM)]
-    f_akM x_r3h y_r3i = op1_ald x_r3h x_r3h
-AbsBinds [] [] [([], $d1{-rlc,x-}, d.H_akY)]
-    AbsBinds [] [] [([], op1_ale, op1_al2)]
-       op1_al2 x_r3n y_r3o = y_r3o
-    d.H_akY = ({-dict-} [] [op1_ale])
-op1{-r3t,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talb] [d.H_al8] []
-d.H_ala = $d1{-rlc,x-}
-op1_ald = op1{-r3t,x-} PrelBase.Bool{-34,W-} d.H_ala
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc042.stderr b/ghc/tests/typecheck/should_compile/tc042.stderr
index 6af74cd..088d0e2 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc042.stderr
+++ b/ghc/tests/typecheck/should_compile/tc042.stderr
@@ -1,7 +1,4 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Leaf{-rx,x-}{i} =
     _/\_ t_tr5p -> \ tpl_B1 -> Leaf{-rx,x-}{i} {_@_ t_tr5p tpl_B1}
 Node{-rw,x-}{i} =
@@ -13,13 +10,13 @@ Nil{-rt,x-}{i} = _/\_ alpha_tr5s -> Nil{-rt,x-}{i} {_@_ alpha_tr5s}
 Cons{-rs,x-}{i} =
     _/\_ alpha_tr5s -> \ tpl_B1 tpl_B2 ->
        Cons{-rs,x-}{i} {_@_ alpha_tr5s tpl_B1 tpl_B2}
-Mkpair{-r5B,x-}{i} =
+Mkpair{-r5z,x-}{i} =
     _/\_ a_tr5u b_tr5v -> \ tpl_B1 tpl_B2 ->
-       Mkpair{-r5B,x-}{i} {_@_ a_tr5u _@_ b_tr5v tpl_B1 tpl_B2}
+       Mkpair{-r5z,x-}{i} {_@_ a_tr5u _@_ b_tr5v tpl_B1 tpl_B2}
 FF{-rr,x-}{i} = FF{-rr,x-}{i} {}
 TT{-rq,x-}{i} = TT{-rq,x-}{i} {}
-AbsBinds [] [] [([], before{-r4a,x-}, before_aDu)]
-    before_aDu xs_r4W
+AbsBinds [] [] [([], before{-r4a,x-}, before_aDC)]
+    before_aDC xs_r4W
               = case xs_r4W of
                   Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} Nat{-r5x,x-}
                   (Cons{-rs,x-}{i} y_r4Z ys_r50)
@@ -27,77 +24,78 @@ AbsBinds [] [] [([], before{-r4a,x-}, before_aDu)]
                        Zero{-rv,x-}{i} -> Nil{-rt,x-}{i} Nat{-r5x,x-}
                        (Succ{-ru,x-}{i} n_r53)
                        -> Cons{-rs,x-}{i} Nat{-r5x,x-} y_r4Z before{-r4a,x-} ys_r50
-AbsBinds [taDR] [] [([taDR], lEngth{-r49,x-}, lEngth_aDO)]
-    lEngth_aDO xs_r4Q
+AbsBinds [taDZ] [] [([taDZ], lEngth{-r49,x-}, lEngth_aDW)]
+    lEngth_aDW xs_r4Q
               = case xs_r4Q of
                   Nil{-rt,x-}{i} -> Zero{-rv,x-}{i}
                   (Cons{-rs,x-}{i} y_r4T ys_r4U)
-                  -> Succ{-ru,x-}{i} lEngth{-r49,x-} taDR ys_r4U
-AbsBinds [taEe] [] [([taEe], app{-r48,x-}, app_aEb)]
-    app_aEb xs_r4J zs_r4K
+                  -> Succ{-ru,x-}{i} lEngth{-r49,x-} taDZ ys_r4U
+AbsBinds [taEm] [] [([taEm], app{-r48,x-}, app_aEj)]
+    app_aEj xs_r4J zs_r4K
            = case xs_r4J of
                Nil{-rt,x-}{i} -> zs_r4K
                (Cons{-rs,x-}{i} y_r4N ys_r4O)
-               -> Cons{-rs,x-}{i} taEe y_r4N app{-r48,x-} taEe ys_r4O zs_r4K
-AbsBinds [taEE] [] [([taEE], rEverse{-r4b,x-}, rEverse_aEB)]
-    rEverse_aEB rs_r55
+               -> Cons{-rs,x-}{i} taEm y_r4N app{-r48,x-} taEm ys_r4O zs_r4K
+AbsBinds [taEM] [] [([taEM], rEverse{-r4b,x-}, rEverse_aEJ)]
+    rEverse_aEJ rs_r55
                = case rs_r55 of
-                   Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} taEE
+                   Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} taEM
                    (Cons{-rs,x-}{i} y_r58 ys_r59)
-                   -> app{-r48,x-} taEE rEverse{-r4b,x-} taEE ys_r59
-                                        Cons{-rs,x-}{i} taEE y_r58 Nil{-rt,x-}{i} taEE
-AbsBinds [taF8] [] [([taF8], flatten{-r4c,x-}, flatten_aF5)]
-    flatten_aF5 t_r5b
+                   -> app{-r48,x-} taEM rEverse{-r4b,x-} taEM ys_r59
+                                        Cons{-rs,x-}{i} taEM y_r58 Nil{-rt,x-}{i} taEM
+AbsBinds [taFg] [] [([taFg], flatten{-r4c,x-}, flatten_aFd)]
+    flatten_aFd t_r5b
                = case t_r5b of
                    (Leaf{-rx,x-}{i} x_r5d)
-                   -> Cons{-rs,x-}{i} taF8 x_r5d Nil{-rt,x-}{i} taF8
+                   -> Cons{-rs,x-}{i} taFg x_r5d Nil{-rt,x-}{i} taFg
                    (Node{-rw,x-}{i} l_r5f r_r5g)
-                   -> app{-r48,x-} taF8 flatten{-r4c,x-} taF8 l_r5f
-                                        flatten{-r4c,x-} taF8 r_r5g
-AbsBinds [] [] [([], add{-r47,x-}, add_aFx)]
-    add_aFx a_r4D b_r4E
+                   -> app{-r48,x-} taFg flatten{-r4c,x-} taFg l_r5f
+                                        flatten{-r4c,x-} taFg r_r5g
+AbsBinds [] [] [([], add{-r47,x-}, add_aFF)]
+    add_aFF a_r4D b_r4E
            = case a_r4D of
                Zero{-rv,x-}{i} -> b_r4E
                (Succ{-ru,x-}{i} c_r4H) -> Succ{-ru,x-}{i} add{-r47,x-} c_r4H b_r4E
-AbsBinds [] [] [([], sUm{-r4d,x-}, sUm_aFF)]
-    sUm_aFF t_r5i
+AbsBinds [] [] [([], sUm{-r4d,x-}, sUm_aFN)]
+    sUm_aFN t_r5i
            = case t_r5i of
                (Leaf{-rx,x-}{i} t_r5k) -> t_r5k
                (Node{-rw,x-}{i} l_r5m r_r5n)
                -> add{-r47,x-} sUm{-r4d,x-} l_r5m sUm{-r4d,x-} r_r5n
-AbsBinds [taG1] [] [([taG1], idl{-r46,x-}, idl_aFY)]
-    idl_aFY xs_r4x
+AbsBinds [taG9] [] [([taG9], idl{-r46,x-}, idl_aG6)]
+    idl_aG6 xs_r4x
            = case xs_r4x of
-               Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} taG1
+               Nil{-rt,x-}{i} -> Nil{-rt,x-}{i} taG9
                (Cons{-rs,x-}{i} y_r4A ys_r4B)
-               -> Cons{-rs,x-}{i} taG1 y_r4A idl{-r46,x-} taG1 ys_r4B
-AbsBinds [taGq] [] [([taGq], nUll{-r45,x-}, nUll_aGn)]
-    nUll_aGn l_r4r
+               -> Cons{-rs,x-}{i} taG9 y_r4A idl{-r46,x-} taG9 ys_r4B
+AbsBinds [taGy] [] [([taGy], nUll{-r45,x-}, nUll_aGv)]
+    nUll_aGv l_r4r
             = case l_r4r of
                 Nil{-rt,x-}{i} -> TT{-rq,x-}{i}
                 (Cons{-rs,x-}{i} y_r4u ys_r4v) -> FF{-rr,x-}{i}
-AbsBinds [] [] [([], neg{-r44,x-}, neg_aGD)]
-    neg_aGD b_r4n
+AbsBinds [] [] [([], neg{-r44,x-}, neg_aGL)]
+    neg_aGL b_r4n
            = case b_r4n of
                FF{-rr,x-}{i} -> TT{-rq,x-}{i}
                TT{-rq,x-}{i} -> FF{-rr,x-}{i}
-AbsBinds [taGR, taGS] [] [([taGS, taGR], swap{-r43,x-}, swap_aGO)]
-    swap_aGO t_r4i
+AbsBinds [taGZ, taH0] [] [([taH0, taGZ], swap{-r43,x-}, swap_aGW)]
+    swap_aGW t_r4i
             = case t_r4i of
-                (Mkpair{-r5B,x-}{i} x_r4k y_r4l)
-                -> Mkpair{-r5B,x-}{i} [taGS, taGR] y_r4l x_r4k
-AbsBinds [] [] [([], idb{-r42,x-}, idb_aH9)]
-    idb_aH9 x_r4g = x_r4g
-AbsBinds [taHF] [] [([taHF], $d1{-rHL,x-}, d.Eval_aHh)]
-    d.Eval_aHh = ({-dict-} [] [])
-AbsBinds [] [] [([], $d2{-rHN,x-}, d.Eval_aHm)]
-    d.Eval_aHm = ({-dict-} [] [])
-AbsBinds [taHG] [] [([taHG], $d3{-rHP,x-}, d.Eval_aHs)]
-    d.Eval_aHs = ({-dict-} [] [])
-AbsBinds [taHH, taHI] [] [([taHH, taHI], $d4{-rHR,x-}, d.Eval_aHz)]
-    d.Eval_aHz = ({-dict-} [] [])
-AbsBinds [] [] [([], $d5{-rHT,x-}, d.Eval_aHE)]
-    d.Eval_aHE = ({-dict-} [] [])
+                (Mkpair{-r5z,x-}{i} x_r4k y_r4l)
+                -> Mkpair{-r5z,x-}{i} [taH0, taGZ] y_r4l x_r4k
+AbsBinds [] [] [([], idb{-r42,x-}, idb_aHh)]
+    idb_aHh x_r4g = x_r4g
+AbsBinds [taHN] [] [([taHN], $d1{-rI1,x-}, d.Eval_aHp)]
+    d.Eval_aHp = ({-dict-} [] [])
+AbsBinds [] [] [([], $d2{-rI0,x-}, d.Eval_aHu)]
+    d.Eval_aHu = ({-dict-} [] [])
+AbsBinds [taHO] [] [([taHO], $d3{-rHZ,x-}, d.Eval_aHA)]
+    d.Eval_aHA = ({-dict-} [] [])
+AbsBinds [taHP, taHQ] [] [([taHP, taHQ], $d4{-rHY,x-}, d.Eval_aHH)]
+    d.Eval_aHH = ({-dict-} [] [])
+AbsBinds [] [] [([], $d5{-rHX,x-}, d.Eval_aHM)]
+    d.Eval_aHM = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc043.stderr b/ghc/tests/typecheck/should_compile/tc043.stderr
index fc2e717..f325ad4 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc043.stderr
+++ b/ghc/tests/typecheck/should_compile/tc043.stderr
@@ -1,28 +1,26 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [taCy, taCu] [d.A_aCA] [([taCy, taCu], f{-r3B,x-}, f_aCm)]
-    op1_aDr = op1{-r3D,x-} taCu d.A_aCA
-    f_aCm x_r3h = op1_aDr
-AbsBinds [taCN] [d.B_aD3] [([taCN], $d1{-rDs,x-}, d.B_aCG)]
-    op2_aDw = op2_aDx
-    AbsBinds [] [] [([], op2_aDx, op2_aCK)]
-       op2_aCK PrelBase.[]{-5i,w-}{i} = PrelBase.I#{-5b,w-}{i} 0#
-       op2_aCK (x_r3p PrelBase.:{-55,w-}{i} xs_r3q)
-               = lit_aDv +_aDu (op2_aDw xs_r3q)
-    d.B_aCG = ({-dict-} [] [op2_aDx])
-AbsBinds [] [] [([], $d2{-rDt,x-}, d.A_aDb)]
-    AbsBinds [] [] [([], op1_aDy, op1_aDf)]
-       op1_aDf = PrelBase.I#{-5b,w-}{i} 2#
-    d.A_aDb = ({-dict-} [] [op1_aDy])
-op2{-r3E,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDp] [d.B_aDj] []
+==================== Typechecked ====================
+AbsBinds [taCH, taCE] [d.A_aCJ] [([taCH, taCE], f{-r3B,x-}, f_aCu)]
+    op1_aDA = op1{-r3D,x-} taCE d.A_aCJ
+    f_aCu x_r3h = op1_aDA
+AbsBinds [taCW] [d.B_aDc] [([taCW], $d1{-rDE,x-}, d.B_aCP)]
+    op2_aDG = op2_aDF
+    AbsBinds [] [] [([], op2_aDF, op2_aCT)]
+       op2_aCT PrelBase.[]{-5i,w-}{i} = PrelBase.I#{-5b,w-}{i} 0#
+       op2_aCT (x_r3p PrelBase.:{-55,w-}{i} xs_r3q)
+               = lit_aDB +_aDC (op2_aDG xs_r3q)
+    d.B_aCP = ({-dict-} [] [op2_aDF])
+AbsBinds [] [] [([], $d2{-rDD,x-}, d.A_aDk)]
+    AbsBinds [] [] [([], op1_aDH, op1_aDo)]
+       op1_aDo = PrelBase.I#{-5b,w-}{i} 2#
+    d.A_aDk = ({-dict-} [] [op1_aDH])
+op2{-r3C,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taDy] [d.B_aDs] []
 op1{-r3D,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDq] [d.A_aDm] []
-d.Num_aDo = PrelBase.$d4{-raQ,p-}
-+_aDu = PrelBase.+{-rfF,p-} PrelBase.Int{-3g,W-} d.Num_aDo
-lit_aDv = PrelBase.I#{-5b,w-}{i} 1#
+AbsBinds [taDz] [d.A_aDv] []
+d.Num_aDx = PrelBase.$d4{-raQ,p-}
++_aDC = PrelBase.+{-rfF,p-} PrelBase.Int{-3g,W-} d.Num_aDx
+lit_aDB = PrelBase.I#{-5b,w-}{i} 1#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc044.stderr b/ghc/tests/typecheck/should_compile/tc044.stderr
index 6ee2d5c..3761871 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc044.stderr
+++ b/ghc/tests/typecheck/should_compile/tc044.stderr
@@ -1,9 +1,7 @@
+==================== Typechecked ====================
+AbsBinds [tarc] [] [([tarc], f{-r1,x-}, f_ar1)]
+    f_ar1 _ | PrelBase.otherwise{-818,p-} = PrelBase.(){-60,w-}{i}
 
-
-================================================================================
-Typechecked:
-AbsBinds [tar6] [] [([tar6], f{-r1,x-}, f_aqX)]
-    f_aqX _ | PrelBase.otherwise{-818,p-} = PrelBase.(){-60,w-}{i}
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc045.stderr b/ghc/tests/typecheck/should_compile/tc045.stderr
index 879c889..e8f2770 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc045.stderr
+++ b/ghc/tests/typecheck/should_compile/tc045.stderr
@@ -1,28 +1,26 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [tald] [] [([tald], $d1{-rlI,x-}, d.C_al6)]
-    AbsBinds [] [] [([], op1_alJ, op1_ala)]
-       op1_ala xs_r3k = xs_r3k
-    d.C_al6 = ({-dict-} [] [op1_alJ])
+==================== Typechecked ====================
+AbsBinds [talh] [] [([talh], $d1{-rlM,x-}, d.C_ala)]
+    AbsBinds [] [] [([], op1_alN, op1_ale)]
+       op1_ale xs_r3k = xs_r3k
+    d.C_ala = ({-dict-} [] [op1_alN])
 AbsBinds
-[talr]
-[d.B_alv, d.C_alw]
-[([talr], $d2{-rlK,x-}, d.B_alk)]
-    d.C_alu = d.C_alw
-    AbsBinds [] [] [([], op2_alM, op2_alo)]
-       op2_alo xs_r3s ys_r3t = xs_r3s
-    d.B_alk = ({-dict-} [d.C_alu] [op2_alM])
-scsel_BShouldSucceedC{-alL,x-} =
+[talv]
+[d.B_aly, d.C_alz]
+[([talv], $d2{-rlP,x-}, d.B_alo)]
+    d.C_alA = d.C_alz
+    AbsBinds [] [] [([], op2_alQ, op2_als)]
+       op2_als xs_r3s ys_r3t = xs_r3s
+    d.B_alo = ({-dict-} [d.C_alA] [op2_alQ])
+scsel_BShouldSucceedC{-alO,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op2{-r3C,x-} =
+op2{-r3B,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [talG] [d.B_alC] []
-op1{-r3B,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talH] [d.C_alF] []
+AbsBinds [talK] [d.B_alG] []
+op1{-r3C,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [talL] [d.C_alJ] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc046.stderr b/ghc/tests/typecheck/should_compile/tc046.stderr
index 18c2be9..2896bd8 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc046.stderr
+++ b/ghc/tests/typecheck/should_compile/tc046.stderr
@@ -1,16 +1,14 @@
-
-
-================================================================================
-Typechecked:
-scsel_BShouldSucceedC{-akS,x-} =
+==================== Typechecked ====================
+scsel_BShouldSucceedC{-akW,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op2{-r3n,x-} =
+op2{-r3l,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [takQ] [d.B_akM] []
-op1{-r3m,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [takR] [d.C_akP] []
+AbsBinds [takU] [d.B_akQ] []
+op1{-r3n,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [takV] [d.C_akT] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc047.stderr b/ghc/tests/typecheck/should_compile/tc047.stderr
index 756d497..90a65d8 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc047.stderr
+++ b/ghc/tests/typecheck/should_compile/tc047.stderr
@@ -1,26 +1,24 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [tayV, tayY] [] [([tayV, tayY], sd{-r3w,x-}, sd_ayO)]
-    sd_ayO (f_r3s, s_r3t) = s_r3t
-AbsBinds [tazn, tazr] [] [([tazn, tazr], mp{-r3x,x-}, mp_az3)]
-    mp_az3 f_r3m PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} tazr
-    mp_az3 f_r3o (x_r3p PrelBase.:{-55,w-}{i} xs_r3q)
-          = PrelBase.:{-55,w-}{i} tazr (f_r3o x_r3p) (mp_az3 f_r3o xs_r3q)
+==================== Typechecked ====================
+AbsBinds [taz2, taz5] [] [([taz2, taz5], sd{-r3w,x-}, sd_ayS)]
+    sd_ayS (f_r3s, s_r3t) = s_r3t
+AbsBinds [tazu, tazy] [] [([tazu, tazy], mp{-r3x,x-}, mp_az8)]
+    mp_az8 f_r3m PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} tazy
+    mp_az8 f_r3o (x_r3p PrelBase.:{-55,w-}{i} xs_r3q)
+          = PrelBase.:{-55,w-}{i} tazy (f_r3o x_r3p) (mp_az8 f_r3o xs_r3q)
 AbsBinds
-[taA2, tazZ, taA0]
+[taAa, taA7, taA8]
 []
-[([taA2, tazZ, taA0], f{-r3y,x-}, f_azx)]
-    f_azx x_r3g
-         = ranOAL_r3i [taA0, tazZ]
+[([taAa, taA7, taA8], f{-r3y,x-}, f_azE)]
+    f_azE x_r3g
+         = ranOAL_r3i [taA8, taA7]
          where
              {- nonrec -}
-             AbsBinds [tazP, tazS] [] [([tazP, tazS], ranOAL_r3i, ranOAL_azF)]
-                 ranOAL_azF xs_r3k
-                            = mp{-r3x,x-} [(tazS, tazP), tazP] sd{-r3w,x-} [tazS, tazP] xs_r3k
+             AbsBinds [tazZ, taA2] [] [([tazZ, taA2], ranOAL_r3i, ranOAL_azO)]
+                 ranOAL_azO xs_r3k
+                            = mp{-r3x,x-} [(taA2, tazZ), tazZ] sd{-r3w,x-} [taA2, tazZ] xs_r3k
              {- nonrec -}
              {- nonrec -}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc048.stderr b/ghc/tests/typecheck/should_compile/tc048.stderr
index d4227e7..f217093 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc048.stderr
+++ b/ghc/tests/typecheck/should_compile/tc048.stderr
@@ -1,43 +1,41 @@
-
-
-================================================================================
-Typechecked:
-MkAFE{-r3X,x-}{i} =
+==================== Typechecked ====================
+MkAFE{-r3S,x-}{i} =
     _/\_ n_tr3K a_tr3L b_tr3M -> \ tpl_B1 ->
-       MkAFE{-r3X,x-}{i} {_@_ n_tr3K _@_ a_tr3L _@_ b_tr3M tpl_B1}
-MkFG{-r3W,x-}{i} =
+       MkAFE{-r3S,x-}{i} {_@_ n_tr3K _@_ a_tr3L _@_ b_tr3M tpl_B1}
+MkFG{-r3U,x-}{i} =
     _/\_ a_tr3O b_tr3P -> \ tpl_B1 ->
-       MkFG{-r3W,x-}{i} {_@_ a_tr3O _@_ b_tr3P tpl_B1}
-MkOL{-r3V,x-}{i} =
-    _/\_ a_tr3R -> \ tpl_B1 -> MkOL{-r3V,x-}{i} {_@_ a_tr3R tpl_B1}
-AbsBinds [taR8, taRb] [] [([taR8, taRb], sNd{-r3v,x-}, sNd_aR1)]
-    sNd_aR1 (f_r3F, s_r3G) = s_r3G
-AbsBinds [taRA, taRE] [] [([taRA, taRE], mAp{-r3u,x-}, mAp_aRg)]
-    mAp_aRg f_r3z PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} taRE
-    mAp_aRg f_r3B (x_r3C PrelBase.:{-55,w-}{i} xs_r3D)
-           = PrelBase.:{-55,w-}{i} taRE (f_r3B x_r3C) (mAp_aRg f_r3B xs_r3D)
+       MkFG{-r3U,x-}{i} {_@_ a_tr3O _@_ b_tr3P tpl_B1}
+MkOL{-r3W,x-}{i} =
+    _/\_ a_tr3R -> \ tpl_B1 -> MkOL{-r3W,x-}{i} {_@_ a_tr3R tpl_B1}
+AbsBinds [taRj, taRm] [] [([taRj, taRm], sNd{-r3u,x-}, sNd_aR9)]
+    sNd_aR9 (f_r3F, s_r3G) = s_r3G
+AbsBinds [taRL, taRP] [] [([taRL, taRP], mAp{-r3v,x-}, mAp_aRp)]
+    mAp_aRp f_r3z PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} taRP
+    mAp_aRp f_r3B (x_r3C PrelBase.:{-55,w-}{i} xs_r3D)
+           = PrelBase.:{-55,w-}{i} taRP (f_r3B x_r3C) (mAp_aRp f_r3B xs_r3D)
 AbsBinds
-[taRU, taRV]
+[taS5, taS6]
 []
-[([taRU, taRV], ranOAL{-r3s,x-}, ranOAL_aRP)]
-    ranOAL_aRP (MkOL{-r3V,x-}{i} xs_r3x)
-              = mAp{-r3u,x-} [(taRU, taRV), taRV] sNd{-r3v,x-} [taRU, taRV]
+[([taS5, taS6], ranOAL{-r3s,x-}, ranOAL_aS0)]
+    ranOAL_aS0 (MkOL{-r3W,x-}{i} xs_r3x)
+              = mAp{-r3v,x-} [(taS5, taS6), taS6] sNd{-r3u,x-} [taS5, taS6]
                                                   xs_r3x
 AbsBinds
-[taSn, taSo, taSp]
+[taSy, taSz, taSA]
 []
-[([taSn, taSo, taSp], ranAFE{-r3t,x-}, ranAFE_aSe)]
-    ranAFE_aSe (MkAFE{-r3X,x-}{i} nfs_r3I)
-              = ranOAL{-r3s,x-} [taSn, FG{-r3T,x-} taSo taSp] nfs_r3I
+[([taSy, taSz, taSA], ranAFE{-r3t,x-}, ranAFE_aSp)]
+    ranAFE_aSp (MkAFE{-r3S,x-}{i} nfs_r3I)
+              = ranOAL{-r3s,x-} [taSy, FG{-r3V,x-} taSz taSA] nfs_r3I
 AbsBinds
-[taSQ, taSR, taSS]
+[taT1, taT3, taT2]
 []
-[([taSQ, taSR, taSS], $d1{-rSY,x-}, d.Eval_aSC)]
-    d.Eval_aSC = ({-dict-} [] [])
-AbsBinds [taST, taSU] [] [([taST, taSU], $d2{-rT0,x-}, d.Eval_aSJ)]
-    d.Eval_aSJ = ({-dict-} [] [])
-AbsBinds [taSV] [] [([taSV], $d3{-rT2,x-}, d.Eval_aSP)]
-    d.Eval_aSP = ({-dict-} [] [])
+[([taT1, taT3, taT2], $d1{-rTd,x-}, d.Eval_aSN)]
+    d.Eval_aSN = ({-dict-} [] [])
+AbsBinds [taT4, taT5] [] [([taT4, taT5], $d2{-rTc,x-}, d.Eval_aSU)]
+    d.Eval_aSU = ({-dict-} [] [])
+AbsBinds [taT6] [] [([taT6], $d3{-rTb,x-}, d.Eval_aT0)]
+    d.Eval_aT0 = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc049.stderr b/ghc/tests/typecheck/should_compile/tc049.stderr
index 7c87764..ee105fe 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc049.stderr
+++ b/ghc/tests/typecheck/should_compile/tc049.stderr
@@ -1,110 +1,108 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], main3{-r3W,x-}, main3_aSS)]
-    main3_aSS
-       = [[lit_aXD] (PrelBase.Int{-3g,W-}),
-          [lit_aXE] (PrelBase.Int{-3g,W-})] ([PrelBase.Int{-3g,W-}])
-         ==_aXC [[lit_aXF] (PrelBase.Int{-3g,W-})] ([PrelBase.Int{-3g,W-}])
-AbsBinds [] [] [([], main2{-r3X,x-}, main2_aTq)]
-    main2_aTq = "Hello" ==_aXB "Goodbye"
-AbsBinds [] [] [([], main1{-r3Y,x-}, main1_aTz)]
-    main1_aTz
-       = [[(lit_aXz,
+==================== Typechecked ====================
+AbsBinds [] [] [([], main3{-r3W,x-}, main3_aT0)]
+    main3_aT0
+       = [[lit_aXN] (PrelBase.Int{-3g,W-}),
+          [lit_aXM] (PrelBase.Int{-3g,W-})] ([PrelBase.Int{-3g,W-}])
+         ==_aXO [[lit_aXL] (PrelBase.Int{-3g,W-})] ([PrelBase.Int{-3g,W-}])
+AbsBinds [] [] [([], main2{-r3X,x-}, main2_aTs)]
+    main2_aTs = "Hello" ==_aXP "Goodbye"
+AbsBinds [] [] [([], main1{-r3Y,x-}, main1_aTB)]
+    main1_aTB
+       = [[(lit_aXR,
             PrelBase.True{-5E,w-}{i})] ((PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-}))] ([(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})])
-         ==_aXy [[(lit_aXA,
+         ==_aXS [[(lit_aXQ,
                    PrelBase.False{-58,w-}{i})] ((PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-}))] ([(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})])
 AbsBinds
-[taUG]
-[d.Eq_aUY]
-[([taUG], mem3{-r40,x-}, mem3_aUe), ([taUG],
+[taUC]
+[d.Eq_aUX]
+[([taUC], mem3{-r40,x-}, mem3_aU9), ([taUC],
                                     mem4{-r3Z,x-},
-                                    mem4_aUf)]
-    d.Eq_aUW = PrelBase.$d28{-rb4,p-} taUG d.Eq_aUY
-    ==_aXG = PrelBase.=={-8Y,p-} [taUG] d.Eq_aUW
-    mem3_aUe x_r3N PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem3_aUe x_r3P (y_r3Q PrelBase.:{-55,w-}{i} ys_r3R)
-            = if [x_r3P] (taUG) ==_aXG [y_r3Q] (taUG) then
-                  mem4_aUf x_r3P ys_r3R
+                                    mem4_aUa)]
+    d.Eq_aUV = PrelBase.$d28{-rb4,p-} taUC d.Eq_aUX
+    ==_aXT = PrelBase.=={-8Y,p-} [taUC] d.Eq_aUV
+    mem3_aU9 x_r3N PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
+    mem3_aU9 x_r3P (y_r3Q PrelBase.:{-55,w-}{i} ys_r3R)
+            = if [x_r3P] (taUC) ==_aXT [y_r3Q] (taUC) then
+                  mem4_aUa x_r3P ys_r3R
               else
                   PrelBase.False{-58,w-}{i}
-    mem4_aUf y_r3T (x_r3U PrelBase.:{-55,w-}{i} xs_r3V)
-            = mem3_aUe y_r3T xs_r3V
-AbsBinds [] [] [([], oR1{-r42,x-}, oR1_aV0)]
-    oR1_aV0 a_r3E b_r3F
+    mem4_aUa y_r3T (x_r3U PrelBase.:{-55,w-}{i} xs_r3V)
+            = mem3_aU9 y_r3T xs_r3V
+AbsBinds [] [] [([], oR1{-r42,x-}, oR1_aUZ)]
+    oR1_aUZ a_r3E b_r3F
            = if a_r3E then PrelBase.True{-5E,w-}{i} else b_r3F
-AbsBinds [] [] [([], oR{-r44,x-}, oR_aVe)]
-    oR_aVe a_r3v b_r3w
+AbsBinds [] [] [([], oR{-r44,x-}, oR_aVf)]
+    oR_aVf a_r3v b_r3w
           = if a_r3v then PrelBase.True{-5E,w-}{i} else b_r3w
 AbsBinds
-[taWa]
-[d.Eq_aWd]
-[([taWa], mem2{-r41,x-}, mem2_aVs), ([taWa],
+[taWj]
+[d.Eq_aWm]
+[([taWj], mem2{-r41,x-}, mem2_aVv), ([taWj],
                                     mem1{-r43,x-},
-                                    mem1_aVt)]
-    ==_aXH = PrelBase.=={-8Y,p-} taWa d.Eq_aWd
-    ==_aXI = ==_aXH
-    mem2_aVs x_r3H PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem2_aVs x_r3J (y_r3K PrelBase.:{-55,w-}{i} ys_r3L)
-            = (x_r3J ==_aXH y_r3K) oR{-r44,x-} (mem1_aVt x_r3J ys_r3L)
-    mem1_aVt x_r3y PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem1_aVt x_r3A (y_r3B PrelBase.:{-55,w-}{i} ys_r3C)
-            = (x_r3A ==_aXI y_r3B) oR1{-r42,x-} (mem2_aVs x_r3A ys_r3C)
-AbsBinds [taWA] [d.Eq_aWD] [([taWA], mem{-r45,x-}, mem_aWf)]
-    ==_aXJ = PrelBase.=={-8Y,p-} taWA d.Eq_aWD
-    mem_aWf x_r3p PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
-    mem_aWf x_r3r (y_r3s PrelBase.:{-55,w-}{i} ys_r3t)
-           = (x_r3r ==_aXJ y_r3s) oR{-r44,x-} (mem_aWf x_r3r ys_r3t)
+                                    mem1_aVw)]
+    ==_aXV = PrelBase.=={-8Y,p-} taWj d.Eq_aWm
+    ==_aXU = ==_aXV
+    mem2_aVv x_r3H PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
+    mem2_aVv x_r3J (y_r3K PrelBase.:{-55,w-}{i} ys_r3L)
+            = (x_r3J ==_aXV y_r3K) oR{-r44,x-} (mem1_aVw x_r3J ys_r3L)
+    mem1_aVw x_r3y PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
+    mem1_aVw x_r3A (y_r3B PrelBase.:{-55,w-}{i} ys_r3C)
+            = (x_r3A ==_aXU y_r3B) oR1{-r42,x-} (mem2_aVv x_r3A ys_r3C)
+AbsBinds [taWM] [d.Eq_aWP] [([taWM], mem{-r45,x-}, mem_aWo)]
+    ==_aXW = PrelBase.=={-8Y,p-} taWM d.Eq_aWP
+    mem_aWo x_r3p PrelBase.[]{-5i,w-}{i} = PrelBase.False{-58,w-}{i}
+    mem_aWo x_r3r (y_r3s PrelBase.:{-55,w-}{i} ys_r3t)
+           = (x_r3r ==_aXW y_r3s) oR{-r44,x-} (mem_aWo x_r3r ys_r3t)
 AbsBinds
-[taWZ]
-[d.Ord_aX3, d.Num_aX6]
-[([taWZ], fib{-r46,x-}, fib_aWF)]
-    <=_aXK = PrelBase.<={-rgd,p-} taWZ d.Ord_aX3
-    fromInt_aXL = PrelBase.fromInt{-8R,p-} taWZ d.Num_aX6
-    lit_aXM = fromInt_aXL PrelBase.I#{-5b,w-}{i} 2#
-    d.Num_aX8 = d.Num_aX6
-    +_aXN = PrelBase.+{-rg6,p-} taWZ d.Num_aX8
-    d.Num_aXa = d.Num_aX6
-    -_aXO = PrelBase.-{-817,p-} taWZ d.Num_aXa
-    fromInt_aXP = fromInt_aXL
-    lit_aXQ = fromInt_aXP PrelBase.I#{-5b,w-}{i} 1#
-    -_aXR = -_aXO
-    lit_aXS = lit_aXM
-    fib_aWF n_r3n
-           = if n_r3n <=_aXK lit_aXM then
+[taXc]
+[d.Ord_aXg, d.Num_aXj]
+[([taXc], fib{-r46,x-}, fib_aWR)]
+    <=_aY5 = PrelBase.<={-rgd,p-} taXc d.Ord_aXg
+    fromInt_aY4 = PrelBase.fromInt{-8R,p-} taXc d.Num_aXj
+    lit_aY3 = fromInt_aY4 PrelBase.I#{-5b,w-}{i} 2#
+    d.Num_aXl = d.Num_aXj
+    +_aY2 = PrelBase.+{-rg6,p-} taXc d.Num_aXl
+    d.Num_aXn = d.Num_aXj
+    -_aY1 = PrelBase.-{-817,p-} taXc d.Num_aXn
+    fromInt_aY0 = fromInt_aY4
+    lit_aXZ = fromInt_aY0 PrelBase.I#{-5b,w-}{i} 1#
+    -_aXY = -_aY1
+    lit_aXX = lit_aY3
+    fib_aWR n_r3n
+           = if n_r3n <=_aY5 lit_aY3 then
                  n_r3n
              else
-                 (fib_aWF n_r3n -_aXO lit_aXQ) +_aXN (fib_aWF n_r3n -_aXR lit_aXS)
-d.Eq_aXj = PrelBase.$d8{-rbE,p-}
-d.Eq_aXk = PrelBase.$d33{-rba,p-}
-d.Eq_aXh =
+                 (fib_aWR n_r3n -_aY1 lit_aXZ) +_aY2 (fib_aWR n_r3n -_aXY lit_aXX)
+d.Eq_aXw = PrelBase.$d8{-rbE,p-}
+d.Eq_aXx = PrelBase.$d33{-rba,p-}
+d.Eq_aXu =
     PrelTup.$d9{-rwm,p-} [PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-}]
-       [d.Eq_aXj, d.Eq_aXk]
-d.Eq_aXf =
+       [d.Eq_aXw, d.Eq_aXx]
+d.Eq_aXs =
     PrelBase.$d28{-rb4,p-}
        (PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})
-       d.Eq_aXh
-d.Eq_aXd =
+       d.Eq_aXu
+d.Eq_aXq =
     PrelBase.$d28{-rb4,p-}
        [(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})]
-       d.Eq_aXf
-==_aXy =
+       d.Eq_aXs
+==_aXS =
     PrelBase.=={-8Y,p-}
        [[(PrelBase.Int{-3g,W-}, PrelBase.Bool{-34,W-})]]
-       d.Eq_aXd
-lit_aXz = PrelBase.I#{-5b,w-}{i} 1#
-lit_aXA = PrelBase.I#{-5b,w-}{i} 2#
-d.Eq_aXq = PrelBase.$d34{-rbb,p-}
-d.Eq_aXo = PrelBase.$d28{-rb4,p-} PrelBase.Char{-38,W-} d.Eq_aXq
-==_aXB = PrelBase.=={-8Y,p-} [PrelBase.Char{-38,W-}] d.Eq_aXo
-d.Eq_aXx = d.Eq_aXj
-d.Eq_aXv = PrelBase.$d28{-rb4,p-} PrelBase.Int{-3g,W-} d.Eq_aXx
-d.Eq_aXt = PrelBase.$d28{-rb4,p-} [PrelBase.Int{-3g,W-}] d.Eq_aXv
-==_aXC = PrelBase.=={-8Y,p-} [[PrelBase.Int{-3g,W-}]] d.Eq_aXt
-lit_aXD = lit_aXz
-lit_aXE = lit_aXA
-lit_aXF = PrelBase.I#{-5b,w-}{i} 3#
+       d.Eq_aXq
+lit_aXR = PrelBase.I#{-5b,w-}{i} 1#
+lit_aXQ = PrelBase.I#{-5b,w-}{i} 2#
+d.Eq_aXD = PrelBase.$d34{-rbb,p-}
+d.Eq_aXB = PrelBase.$d28{-rb4,p-} PrelBase.Char{-38,W-} d.Eq_aXD
+==_aXP = PrelBase.=={-8Y,p-} [PrelBase.Char{-38,W-}] d.Eq_aXB
+d.Eq_aXK = d.Eq_aXw
+d.Eq_aXI = PrelBase.$d28{-rb4,p-} PrelBase.Int{-3g,W-} d.Eq_aXK
+d.Eq_aXG = PrelBase.$d28{-rb4,p-} [PrelBase.Int{-3g,W-}] d.Eq_aXI
+==_aXO = PrelBase.=={-8Y,p-} [[PrelBase.Int{-3g,W-}]] d.Eq_aXG
+lit_aXN = lit_aXR
+lit_aXM = lit_aXQ
+lit_aXL = PrelBase.I#{-5b,w-}{i} 3#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc050.stderr b/ghc/tests/typecheck/should_compile/tc050.stderr
index e5f1f50..91a6bd6 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc050.stderr
+++ b/ghc/tests/typecheck/should_compile/tc050.stderr
@@ -1,45 +1,43 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taCD, taCz]
-[d.Foo_aCF, d.Num_aCI]
-[([taCD, taCz], g{-r3F,x-}, g_aCl)]
-    o_and_aDR = o_and{-r3I,x-} taCz d.Foo_aCF
-    fromInt_aDY = PrelBase.fromInt{-8R,p-} taCz d.Num_aCI
-    lit_aDZ = fromInt_aDY PrelBase.I#{-5b,w-}{i} 1#
-    g_aCl x_r3j y_r3k = o_and_aDR x_r3j lit_aDZ
-AbsBinds [taD1] [] [([taD1], f{-r3G,x-}, f_aCK)]
-    f_aCK x_r3g y_r3h = o_and_aDU x_r3g PrelBase.False{-58,w-}{i}
-AbsBinds [] [] [([], $d1{-rDS,x-}, d.Foo_aD8)]
-    AbsBinds [] [] [([], o_and_aE0, o_and_aDc)]
-       lit_aE1 = lit_aDV
-       ==_aE2 = ==_aDW
-       ==_aE3 = ==_aDW
-       lit_aE4 = lit_aDX
-       ==_aE5 = ==_aDW
-       o_and_aDc x_r3p 0 = PrelBase.I#{-5b,w-}{i} 0#
-       o_and_aDc 0 x_r3r = PrelBase.I#{-5b,w-}{i} 0#
-       o_and_aDc 1 1 = PrelBase.I#{-5b,w-}{i} 1#
-    d.Foo_aD8 = ({-dict-} [] [o_and_aE0])
-AbsBinds [] [] [([], $d2{-rDT,x-}, d.Foo_aDA)]
-    AbsBinds [] [] [([], o_and_aE6, o_and_aDE)]
-       o_and_aDE PrelBase.False{-58,w-}{i} x_r3y
+[taCN, taCJ]
+[d.Foo_aCP, d.Num_aCS]
+[([taCN, taCJ], g{-r3F,x-}, g_aCt)]
+    o_and_aE5 = o_and{-r3H,x-} taCJ d.Foo_aCP
+    fromInt_aE4 = PrelBase.fromInt{-8R,p-} taCJ d.Num_aCS
+    lit_aE3 = fromInt_aE4 PrelBase.I#{-5b,w-}{i} 1#
+    g_aCt x_r3j y_r3k = o_and_aE5 x_r3j lit_aE3
+AbsBinds [taDd] [] [([taDd], f{-r3G,x-}, f_aCU)]
+    f_aCU x_r3g y_r3h = o_and_aE9 x_r3g PrelBase.False{-58,w-}{i}
+AbsBinds [] [] [([], $d1{-rEb,x-}, d.Foo_aDk)]
+    AbsBinds [] [] [([], o_and_aEc, o_and_aDo)]
+       lit_aEh = lit_aE8
+       ==_aEg = ==_aE7
+       ==_aEf = ==_aE7
+       lit_aEe = lit_aE6
+       ==_aEd = ==_aE7
+       o_and_aDo x_r3p 0 = PrelBase.I#{-5b,w-}{i} 0#
+       o_and_aDo 0 x_r3r = PrelBase.I#{-5b,w-}{i} 0#
+       o_and_aDo 1 1 = PrelBase.I#{-5b,w-}{i} 1#
+    d.Foo_aDk = ({-dict-} [] [o_and_aEc])
+AbsBinds [] [] [([], $d2{-rEa,x-}, d.Foo_aDM)]
+    AbsBinds [] [] [([], o_and_aEi, o_and_aDQ)]
+       o_and_aDQ PrelBase.False{-58,w-}{i} x_r3y
                  = PrelBase.False{-58,w-}{i}
-       o_and_aDE x_r3A PrelBase.False{-58,w-}{i}
+       o_and_aDQ x_r3A PrelBase.False{-58,w-}{i}
                  = PrelBase.False{-58,w-}{i}
-       o_and_aDE PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
+       o_and_aDQ PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
                  = PrelBase.True{-5E,w-}{i}
-    d.Foo_aDA = ({-dict-} [] [o_and_aE6])
-o_and{-r3I,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDQ] [d.Foo_aDK] []
-d.Foo_aDM = $d2{-rDT,x-}
-o_and_aDU = o_and{-r3I,x-} PrelBase.Bool{-34,W-} d.Foo_aDM
-lit_aDV = PrelBase.I#{-5b,w-}{i} 0#
-d.Eq_aDP = PrelBase.$d8{-rbh,p-}
-==_aDW = PrelBase.=={-8Y,p-} PrelBase.Int{-3g,W-} d.Eq_aDP
-lit_aDX = PrelBase.I#{-5b,w-}{i} 1#
+    d.Foo_aDM = ({-dict-} [] [o_and_aEi])
+o_and{-r3H,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taE2] [d.Foo_aDW] []
+d.Foo_aDY = $d2{-rEa,x-}
+o_and_aE9 = o_and{-r3H,x-} PrelBase.Bool{-34,W-} d.Foo_aDY
+lit_aE8 = PrelBase.I#{-5b,w-}{i} 0#
+d.Eq_aE1 = PrelBase.$d8{-rbh,p-}
+==_aE7 = PrelBase.=={-8Y,p-} PrelBase.Int{-3g,W-} d.Eq_aE1
+lit_aE6 = PrelBase.I#{-5b,w-}{i} 1#
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc051.stderr b/ghc/tests/typecheck/should_compile/tc051.stderr
index 25ad280..a28656e 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc051.stderr
+++ b/ghc/tests/typecheck/should_compile/tc051.stderr
@@ -1,29 +1,27 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], $d1{-rlY,x-}, d.Ord'_alb)]
-    d.Eq'_alg = $d3{-rm0,x-}
-    AbsBinds [] [] [([], lt_am2, lt_alf)]
-       lt_alf x_r3j y_r3k = PrelBase.True{-5E,w-}{i}
-    d.Ord'_alb = ({-dict-} [d.Eq'_alg] [lt_am2])
-AbsBinds [taly] [d.Eq'_alB] [([taly], $d2{-rlZ,x-}, d.Eq'_alr)]
-    AbsBinds [] [] [([], doubleeq_am3, doubleeq_alv)]
-       doubleeq_alv x_r3s y_r3t = PrelBase.True{-5E,w-}{i}
-    d.Eq'_alr = ({-dict-} [] [doubleeq_am3])
-AbsBinds [] [] [([], $d3{-rm0,x-}, d.Eq'_alI)]
-    AbsBinds [] [] [([], doubleeq_am4, doubleeq_alM)]
-       doubleeq_alM x_r3z y_r3A = PrelBase.True{-5E,w-}{i}
-    d.Eq'_alI = ({-dict-} [] [doubleeq_am4])
-scsel_Ord'ShouldSucceedEq'{-am1,x-} =
+==================== Typechecked ====================
+AbsBinds [] [] [([], $d1{-rm2,x-}, d.Ord'_alf)]
+    d.Eq'_alk = $d3{-rm5,x-}
+    AbsBinds [] [] [([], lt_am3, lt_alj)]
+       lt_alj x_r3j y_r3k = PrelBase.True{-5E,w-}{i}
+    d.Ord'_alf = ({-dict-} [d.Eq'_alk] [lt_am3])
+AbsBinds [talC] [d.Eq'_alF] [([talC], $d2{-rm6,x-}, d.Eq'_alv)]
+    AbsBinds [] [] [([], doubleeq_am7, doubleeq_alz)]
+       doubleeq_alz x_r3s y_r3t = PrelBase.True{-5E,w-}{i}
+    d.Eq'_alv = ({-dict-} [] [doubleeq_am7])
+AbsBinds [] [] [([], $d3{-rm5,x-}, d.Eq'_alM)]
+    AbsBinds [] [] [([], doubleeq_am8, doubleeq_alQ)]
+       doubleeq_alQ x_r3z y_r3A = PrelBase.True{-5E,w-}{i}
+    d.Eq'_alM = ({-dict-} [] [doubleeq_am8])
+scsel_Ord'ShouldSucceedEq'{-am4,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3J,x-} =
+lt{-r3H,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [talW] [d.Ord'_alS] []
-doubleeq{-r3I,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talX] [d.Eq'_alV] []
+AbsBinds [tam0] [d.Ord'_alW] []
+doubleeq{-r3J,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [tam1] [d.Eq'_alZ] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc052.stderr b/ghc/tests/typecheck/should_compile/tc052.stderr
index 5f56597..2d76e12 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc052.stderr
+++ b/ghc/tests/typecheck/should_compile/tc052.stderr
@@ -1,7 +1,4 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1

diff --git a/ghc/tests/typecheck/should_compile/tc053.stderr b/ghc/tests/typecheck/should_compile/tc053.stderr
index 1746c5b..016dc08 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc053.stderr
+++ b/ghc/tests/typecheck/should_compile/tc053.stderr
@@ -1,34 +1,32 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taCq]
-[d.Eq'_aCv, d.Num_aCy]
-[([taCq], f{-r3A,x-}, f_aCf)]
-    d.Eq'_aCt = $d1{-rDn,x-} taCq d.Eq'_aCv
-    deq_aDp = deq{-r3B,x-} [taCq] d.Eq'_aCt
-    fromInt_aDq = PrelBase.fromInt{-8R,p-} taCq d.Num_aCy
-    lit_aDr = fromInt_aDq PrelBase.I#{-5b,w-}{i} 1#
-    f_aCf x_r3f = deq_aDp x_r3f [lit_aDr] (taCq)
-AbsBinds [taCP] [d.Eq'_aD1] [([taCP], $d1{-rDn,x-}, d.Eq'_aCE)]
-    d.Eq'_aD5 = d.Eq'_aD1
-    deq_aDs = deq{-r3B,x-} taCP d.Eq'_aD5
-    deq_aDt = deq_aDu
-    AbsBinds [] [] [([], deq_aDu, deq_aCI)]
-       deq_aCI (a_r3m PrelBase.:{-55,w-}{i} as_r3n)
+[taCA]
+[d.Eq'_aCF, d.Num_aCI]
+[([taCA], f{-r3A,x-}, f_aCn)]
+    d.Eq'_aCD = $d1{-rDB,x-} taCA d.Eq'_aCF
+    deq_aDz = deq{-r3B,x-} [taCA] d.Eq'_aCD
+    fromInt_aDy = PrelBase.fromInt{-8R,p-} taCA d.Num_aCI
+    lit_aDx = fromInt_aDy PrelBase.I#{-5b,w-}{i} 1#
+    f_aCn x_r3f = deq_aDz x_r3f [lit_aDx] (taCA)
+AbsBinds [taCZ] [d.Eq'_aDb] [([taCZ], $d1{-rDB,x-}, d.Eq'_aCO)]
+    d.Eq'_aDf = d.Eq'_aDb
+    deq_aDE = deq{-r3B,x-} taCZ d.Eq'_aDf
+    deq_aDD = deq_aDC
+    AbsBinds [] [] [([], deq_aDC, deq_aCS)]
+       deq_aCS (a_r3m PrelBase.:{-55,w-}{i} as_r3n)
                (b_r3o PrelBase.:{-55,w-}{i} bs_r3p)
-               = if deq_aDs a_r3m b_r3o then
-                     deq_aDt as_r3n bs_r3p
+               = if deq_aDE a_r3m b_r3o then
+                     deq_aDD as_r3n bs_r3p
                  else
                      PrelBase.False{-58,w-}{i}
-    d.Eq'_aCE = ({-dict-} [] [deq_aDu])
-AbsBinds [] [] [([], $d2{-rDo,x-}, d.Eq'_aDb)]
-    AbsBinds [] [] [([], deq_aDv, deq_aDf)]
-       deq_aDf x_r3v y_r3w = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDb = ({-dict-} [] [deq_aDv])
+    d.Eq'_aCO = ({-dict-} [] [deq_aDC])
+AbsBinds [] [] [([], $d2{-rDA,x-}, d.Eq'_aDl)]
+    AbsBinds [] [] [([], deq_aDF, deq_aDp)]
+       deq_aDp x_r3v y_r3w = PrelBase.True{-5E,w-}{i}
+    d.Eq'_aDl = ({-dict-} [] [deq_aDF])
 deq{-r3B,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDm] [d.Eq'_aDl] []
+AbsBinds [taDw] [d.Eq'_aDv] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc054.stderr b/ghc/tests/typecheck/should_compile/tc054.stderr
index 2924ab6..956d6c3 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc054.stderr
+++ b/ghc/tests/typecheck/should_compile/tc054.stderr
@@ -1,35 +1,33 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taCH, taCC]
-[d.Ord'_aCJ, d.Num_aCM]
-[([taCH, taCC], f{-r3D,x-}, f_aCo)]
-    lt_aDm = lt{-r3G,x-} taCC d.Ord'_aCJ
-    fromInt_aDq = PrelBase.fromInt{-8R,p-} taCC d.Num_aCM
-    lit_aDr = fromInt_aDq PrelBase.I#{-5b,w-}{i} 1#
-    f_aCo x_r3h y_r3i
-         | lt_aDm x_r3h lit_aDr = PrelBase.True{-5E,w-}{i}
+[taCS, taCN]
+[d.Ord'_aCU, d.Num_aCX]
+[([taCS, taCN], f{-r3D,x-}, f_aCw)]
+    lt_aDz = lt{-r3E,x-} taCN d.Ord'_aCU
+    fromInt_aDy = PrelBase.fromInt{-8R,p-} taCN d.Num_aCX
+    lit_aDx = fromInt_aDy PrelBase.I#{-5b,w-}{i} 1#
+    f_aCw x_r3h y_r3i
+         | lt_aDz x_r3h lit_aDx = PrelBase.True{-5E,w-}{i}
          | PrelBase.otherwise{-818,p-} = PrelBase.False{-58,w-}{i}
-AbsBinds [] [] [([], $d1{-rDn,x-}, d.Ord'_aCR)]
-    d.Eq'_aCW = $d2{-rDo,x-}
-    AbsBinds [] [] [([], lt_aDs, lt_aCV)]
-       lt_aCV x_r3n y_r3o = PrelBase.True{-5E,w-}{i}
-    d.Ord'_aCR = ({-dict-} [d.Eq'_aCW] [lt_aDs])
-AbsBinds [] [] [([], $d2{-rDo,x-}, d.Eq'_aD6)]
-    AbsBinds [] [] [([], doubleeq_aDt, doubleeq_aDa)]
-       doubleeq_aDa x_r3u y_r3v = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aD6 = ({-dict-} [] [doubleeq_aDt])
-scsel_Ord'ShouldSucceedEq'{-aDp,x-} =
+AbsBinds [] [] [([], $d1{-rDC,x-}, d.Ord'_aD2)]
+    d.Eq'_aD7 = $d2{-rDB,x-}
+    AbsBinds [] [] [([], lt_aDD, lt_aD6)]
+       lt_aD6 x_r3n y_r3o = PrelBase.True{-5E,w-}{i}
+    d.Ord'_aD2 = ({-dict-} [d.Eq'_aD7] [lt_aDD])
+AbsBinds [] [] [([], $d2{-rDB,x-}, d.Eq'_aDh)]
+    AbsBinds [] [] [([], doubleeq_aDE, doubleeq_aDl)]
+       doubleeq_aDl x_r3u y_r3v = PrelBase.True{-5E,w-}{i}
+    d.Eq'_aDh = ({-dict-} [] [doubleeq_aDE])
+scsel_Ord'ShouldSucceedEq'{-aDA,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3G,x-} =
+lt{-r3E,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taDk] [d.Ord'_aDg] []
-doubleeq{-r3F,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDl] [d.Eq'_aDj] []
+AbsBinds [taDv] [d.Ord'_aDr] []
+doubleeq{-r3G,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taDw] [d.Eq'_aDu] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc055.stderr b/ghc/tests/typecheck/should_compile/tc055.stderr
index 15e0430..e1ed7a6 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc055.stderr
+++ b/ghc/tests/typecheck/should_compile/tc055.stderr
@@ -1,14 +1,12 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
 [tayU, tayW]
 []
-[([tayU, tayW], x{-r3i,x-}, x_ayt), ([tayU, tayW],
+[([tayU, tayW], x{-r3i,x-}, x_ayx), ([tayU, tayW],
                                     y{-r3h,x-},
-                                    y_ayu)]
-    (x_ayt, y_ayu) = (\ p_r3e -> p_r3e, \ q_r3g -> q_r3g)
+                                    y_ayy)]
+    (x_ayx, y_ayy) = (\ p_r3e -> p_r3e, \ q_r3g -> q_r3g)
+
 
 NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file

diff --git a/ghc/tests/typecheck/should_compile/tc056.stderr b/ghc/tests/typecheck/should_compile/tc056.stderr
index 032b701..7166906 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc056.stderr
+++ b/ghc/tests/typecheck/should_compile/tc056.stderr
@@ -1,40 +1,38 @@
  
 tc056.hs:15:warning:
     Duplicated class assertion `Eq' a' in context: `(Eq' a, Eq' a)'
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taCJ, taCG]
-[d.Eq'_aCN, d.Num_aCR]
-[([taCJ, taCG], f{-r3E,x-}, f_aCq)]
-    d.Eq'_aCO = d.Eq'_aCN
-    d.Eq'_aCL = $d1{-rDw,x-} taCG [d.Eq'_aCN, d.Eq'_aCO]
-    doubleeq_aDz = doubleeq{-r3G,x-} [taCG] d.Eq'_aCL
-    fromInt_aDA = PrelBase.fromInt{-8R,p-} taCG d.Num_aCR
-    lit_aDB = fromInt_aDA PrelBase.I#{-5b,w-}{i} 1#
-    f_aCq x_r3h y_r3i = doubleeq_aDz x_r3h [lit_aDB] (taCG)
+[taCU, taCR]
+[d.Eq'_aCY, d.Num_aD2]
+[([taCU, taCR], f{-r3E,x-}, f_aCy)]
+    d.Eq'_aCZ = d.Eq'_aCY
+    d.Eq'_aCW = $d1{-rDM,x-} taCR [d.Eq'_aCY, d.Eq'_aCZ]
+    doubleeq_aDJ = doubleeq{-r3H,x-} [taCR] d.Eq'_aCW
+    fromInt_aDI = PrelBase.fromInt{-8R,p-} taCR d.Num_aD2
+    lit_aDH = fromInt_aDI PrelBase.I#{-5b,w-}{i} 1#
+    f_aCy x_r3h y_r3i = doubleeq_aDJ x_r3h [lit_aDH] (taCR)
 AbsBinds
-[taD4]
-[d.Eq'_aD7, d.Eq'_aD8]
-[([taD4], $d1{-rDw,x-}, d.Eq'_aCX)]
-    AbsBinds [] [] [([], doubleeq_aDC, doubleeq_aD1)]
-       doubleeq_aD1 x_r3p y_r3q = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aCX = ({-dict-} [] [doubleeq_aDC])
-AbsBinds [] [] [([], $d2{-rDx,x-}, d.Eq'_aDg)]
-    AbsBinds [] [] [([], doubleeq_aDD, doubleeq_aDk)]
-       doubleeq_aDk x_r3w y_r3x = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDg = ({-dict-} [] [doubleeq_aDD])
-scsel_Ord'ShouldSucceedEq'{-aDy,x-} =
+[taDf]
+[d.Eq'_aDi, d.Eq'_aDj]
+[([taDf], $d1{-rDM,x-}, d.Eq'_aD8)]
+    AbsBinds [] [] [([], doubleeq_aDN, doubleeq_aDc)]
+       doubleeq_aDc x_r3p y_r3q = PrelBase.True{-5E,w-}{i}
+    d.Eq'_aD8 = ({-dict-} [] [doubleeq_aDN])
+AbsBinds [] [] [([], $d2{-rDL,x-}, d.Eq'_aDr)]
+    AbsBinds [] [] [([], doubleeq_aDO, doubleeq_aDv)]
+       doubleeq_aDv x_r3w y_r3x = PrelBase.True{-5E,w-}{i}
+    d.Eq'_aDr = ({-dict-} [] [doubleeq_aDO])
+scsel_Ord'ShouldSucceedEq'{-aDK,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3H,x-} =
+lt{-r3F,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taDu] [d.Ord'_aDq] []
-doubleeq{-r3G,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDv] [d.Eq'_aDt] []
+AbsBinds [taDF] [d.Ord'_aDB] []
+doubleeq{-r3H,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taDG] [d.Eq'_aDE] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc057.stderr b/ghc/tests/typecheck/should_compile/tc057.stderr
index bbc303f..a8c8f4b 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc057.stderr
+++ b/ghc/tests/typecheck/should_compile/tc057.stderr
@@ -1,40 +1,35 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], dand{-r3j,x-}, dand_aCq)]
-    dand_aCq PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
+==================== Typechecked ====================
+AbsBinds [] [] [([], dand{-r3j,x-}, dand_aCy)]
+    dand_aCy PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
             = PrelBase.True{-5E,w-}{i}
-    dand_aCq x_r3m y_r3n = PrelBase.False{-58,w-}{i}
-AbsBinds [taCI] [d.Eq'_aCY] [([taCI], f{-r3i,x-}, f_aCF)]
-    d.Eq'_aD0 = d.Eq'_aCY
-    deq_aE1 = deq{-r3M,x-} taCI d.Eq'_aD0
-    f_aCF p_r3p q_r3q
-         = dand{-r3j,x-} deq_aE1 p_r3p q_r3q
-                         deq_aDZ [lit_aE0] (PrelBase.Int{-3g,W-})
+    dand_aCy x_r3m y_r3n = PrelBase.False{-58,w-}{i}
+AbsBinds [taCT] [d.Eq'_aD7] [([taCT], f{-r3i,x-}, f_aCQ)]
+    d.Eq'_aD9 = d.Eq'_aD7
+    deq_aE9 = deq{-r3M,x-} taCT d.Eq'_aD9
+    f_aCQ p_r3p q_r3q
+         = dand{-r3j,x-} deq_aE9 p_r3p q_r3q
+                         deq_aE6 [PrelBase.I#{-5b,w-}{i} 1#] (PrelBase.Int{-3g,W-})
                                  [PrelBase.I#{-5b,w-}{i} 2#] (PrelBase.Int{-3g,W-})
-AbsBinds [taDj] [d.Eq'_aDv] [([taDj], $d1{-rDX,x-}, d.Eq'_aD8)]
-    d.Eq'_aDz = d.Eq'_aDv
-    f_aE2 = f{-r3i,x-} taDj d.Eq'_aDz
-    d.Eq'_aDB = d.Eq'_aD8
-    f_aE3 = f{-r3i,x-} [taDj] d.Eq'_aDB
-    AbsBinds [] [] [([], deq_aE4, deq_aDc)]
-       deq_aDc (a_r3y PrelBase.:{-55,w-}{i} as_r3z)
+AbsBinds [taDs] [d.Eq'_aDE] [([taDs], $d1{-rE8,x-}, d.Eq'_aDh)]
+    d.Eq'_aDI = d.Eq'_aDE
+    f_aEc = f{-r3i,x-} taDs d.Eq'_aDI
+    d.Eq'_aDK = d.Eq'_aDh
+    f_aEb = f{-r3i,x-} [taDs] d.Eq'_aDK
+    AbsBinds [] [] [([], deq_aEa, deq_aDl)]
+       deq_aDl (a_r3y PrelBase.:{-55,w-}{i} as_r3z)
                (b_r3A PrelBase.:{-55,w-}{i} bs_r3B)
-               = dand{-r3j,x-} f_aE2 a_r3y b_r3A f_aE3 as_r3z bs_r3B
-    d.Eq'_aD8 = ({-dict-} [] [deq_aE4])
-AbsBinds [] [] [([], $d2{-rDY,x-}, d.Eq'_aDH)]
-    AbsBinds [] [] [([], deq_aE5, deq_aDL)]
-       deq_aDL x_r3H y_r3I = PrelBase.True{-5E,w-}{i}
-    d.Eq'_aDH = ({-dict-} [] [deq_aE5])
+               = dand{-r3j,x-} f_aEc a_r3y b_r3A f_aEb as_r3z bs_r3B
+    d.Eq'_aDh = ({-dict-} [] [deq_aEa])
+AbsBinds [] [] [([], $d2{-rE7,x-}, d.Eq'_aDQ)]
+    AbsBinds [] [] [([], deq_aEd, deq_aDU)]
+       deq_aDU x_r3H y_r3I = PrelBase.True{-5E,w-}{i}
+    d.Eq'_aDQ = ({-dict-} [] [deq_aEd])
 deq{-r3M,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDW] [d.Eq'_aDR] []
-d.Eq'_aDV = $d2{-rDY,x-}
-d.Eq'_aDT = $d1{-rDX,x-} PrelBase.Int{-3g,W-} d.Eq'_aDV
-deq_aDZ = deq{-r3M,x-} [PrelBase.Int{-3g,W-}] d.Eq'_aDT
-lit_aE0 = PrelBase.I#{-5b,w-}{i} 1#
+AbsBinds [taE5] [d.Eq'_aE0] []
+d.Eq'_aE4 = $d2{-rE7,x-}
+d.Eq'_aE2 = $d1{-rE8,x-} PrelBase.Int{-3g,W-} d.Eq'_aE4
+deq_aE6 = deq{-r3M,x-} [PrelBase.Int{-3g,W-}] d.Eq'_aE2
 
-NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc058.stderr b/ghc/tests/typecheck/should_compile/tc058.stderr
index c3d731c..78de2c0 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc058.stderr
+++ b/ghc/tests/typecheck/should_compile/tc058.stderr
@@ -1,42 +1,40 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taCQ, taCN]
-[d.Ord2_aCV, d.Num_aCY]
-[([taCQ, taCN], f{-r3M,x-}, f_aCx)]
-    d.Eq2_aCU = scsel_Ord2ShouldSucceedEq2{-aDW,x-} taCN d.Ord2_aCV
-    d.Eq2_aCS = $d1{-rDT,x-} taCN [d.Eq2_aCU, d.Ord2_aCV]
-    doubleeq_aDX = doubleeq{-r3N,x-} [taCN] d.Eq2_aCS
-    fromInt_aDY = PrelBase.fromInt{-8R,p-} taCN d.Num_aCY
-    lit_aDZ = fromInt_aDY PrelBase.I#{-5b,w-}{i} 1#
-    f_aCx x_r3h y_r3i = doubleeq_aDX x_r3h [lit_aDZ] (taCN)
+[taD1, taCY]
+[d.Ord2_aD6, d.Num_aD9]
+[([taD1, taCY], f{-r3M,x-}, f_aCF)]
+    d.Eq2_aD5 = scsel_Ord2ShouldSucceedEq2{-aE7,x-} taCY d.Ord2_aD6
+    d.Eq2_aD3 = $d1{-rEa,x-} taCY [d.Eq2_aD5, d.Ord2_aD6]
+    doubleeq_aE6 = doubleeq{-r3O,x-} [taCY] d.Eq2_aD3
+    fromInt_aE5 = PrelBase.fromInt{-8R,p-} taCY d.Num_aD9
+    lit_aE4 = fromInt_aE5 PrelBase.I#{-5b,w-}{i} 1#
+    f_aCF x_r3h y_r3i = doubleeq_aE6 x_r3h [lit_aE4] (taCY)
 AbsBinds
-[taDc]
-[d.Eq2_aDf, d.Ord2_aDg]
-[([taDc], $d1{-rDT,x-}, d.Eq2_aD5)]
-    AbsBinds [] [] [([], doubleeq_aE0, doubleeq_aD9)]
-       doubleeq_aD9 xs_r3q ys_r3r = PrelBase.True{-5E,w-}{i}
-    d.Eq2_aD5 = ({-dict-} [] [doubleeq_aE0])
-AbsBinds [] [] [([], $d2{-rDU,x-}, d.Ord2_aDo)]
-    d.Eq2_aDt = $d3{-rDV,x-}
-    AbsBinds [] [] [([], lt_aE1, lt_aDs)]
-       lt_aDs x_r3x y_r3y = PrelBase.True{-5E,w-}{i}
-    d.Ord2_aDo = ({-dict-} [d.Eq2_aDt] [lt_aE1])
-AbsBinds [] [] [([], $d3{-rDV,x-}, d.Eq2_aDD)]
-    AbsBinds [] [] [([], doubleeq_aE2, doubleeq_aDH)]
-       doubleeq_aDH x_r3E y_r3F = PrelBase.True{-5E,w-}{i}
-    d.Eq2_aDD = ({-dict-} [] [doubleeq_aE2])
-scsel_Ord2ShouldSucceedEq2{-aDW,x-} =
+[taDn]
+[d.Eq2_aDq, d.Ord2_aDr]
+[([taDn], $d1{-rEa,x-}, d.Eq2_aDg)]
+    AbsBinds [] [] [([], doubleeq_aEb, doubleeq_aDk)]
+       doubleeq_aDk xs_r3q ys_r3r = PrelBase.True{-5E,w-}{i}
+    d.Eq2_aDg = ({-dict-} [] [doubleeq_aEb])
+AbsBinds [] [] [([], $d2{-rE9,x-}, d.Ord2_aDz)]
+    d.Eq2_aDE = $d3{-rE8,x-}
+    AbsBinds [] [] [([], lt_aEc, lt_aDD)]
+       lt_aDD x_r3x y_r3y = PrelBase.True{-5E,w-}{i}
+    d.Ord2_aDz = ({-dict-} [d.Eq2_aDE] [lt_aEc])
+AbsBinds [] [] [([], $d3{-rE8,x-}, d.Eq2_aDO)]
+    AbsBinds [] [] [([], doubleeq_aEd, doubleeq_aDS)]
+       doubleeq_aDS x_r3E y_r3F = PrelBase.True{-5E,w-}{i}
+    d.Eq2_aDO = ({-dict-} [] [doubleeq_aEd])
+scsel_Ord2ShouldSucceedEq2{-aE7,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-lt{-r3O,x-} =
+lt{-r3N,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taDR] [d.Ord2_aDN] []
-doubleeq{-r3N,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taDS] [d.Eq2_aDQ] []
+AbsBinds [taE2] [d.Ord2_aDY] []
+doubleeq{-r3O,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taE3] [d.Eq2_aE1] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc059.stderr b/ghc/tests/typecheck/should_compile/tc059.stderr
index 1efc33c..6bfbcf3 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc059.stderr
+++ b/ghc/tests/typecheck/should_compile/tc059.stderr
@@ -1,46 +1,44 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taCB]
-[d.Eq2_aCG, d.Num_aCJ]
-[([taCB], f{-r3J,x-}, f_aCq)]
-    d.Eq2_aCE = $d1{-rDT,x-} taCB d.Eq2_aCG
-    deq_aDV = deq{-r3K,x-} [taCB] d.Eq2_aCE
-    fromInt_aDW = PrelBase.fromInt{-8R,p-} taCB d.Num_aCJ
-    lit_aDX = fromInt_aDW PrelBase.I#{-5b,w-}{i} 1#
-    f_aCq x_r3g = deq_aDV x_r3g [lit_aDX] (taCB)
-AbsBinds [taD0] [d.Eq2_aDq] [([taD0], $d1{-rDT,x-}, d.Eq2_aCP)]
-    d.Eq2_aDt = d.Eq2_aDq
-    deq_aDY = deq{-r3K,x-} taD0 d.Eq2_aDt
-    d.Eq2_aDv = d.Eq2_aDq
-    foo_aDZ = foo{-r3L,x-} taD0 d.Eq2_aDv
-    deq_aE0 = deq_aE2
-    foo_aE1 = foo_aE3
-    AbsBinds [] [] [([], deq_aE2, deq_aCT)]
-       deq_aCT (a_r3n PrelBase.:{-55,w-}{i} as_r3o)
+[taCL]
+[d.Eq2_aCQ, d.Num_aCT]
+[([taCL], f{-r3J,x-}, f_aCy)]
+    d.Eq2_aCO = $d1{-rE7,x-} taCL d.Eq2_aCQ
+    deq_aE5 = deq{-r3L,x-} [taCL] d.Eq2_aCO
+    fromInt_aE4 = PrelBase.fromInt{-8R,p-} taCL d.Num_aCT
+    lit_aE3 = fromInt_aE4 PrelBase.I#{-5b,w-}{i} 1#
+    f_aCy x_r3g = deq_aE5 x_r3g [lit_aE3] (taCL)
+AbsBinds [taDa] [d.Eq2_aDA] [([taDa], $d1{-rE7,x-}, d.Eq2_aCZ)]
+    d.Eq2_aDD = d.Eq2_aDA
+    deq_aEd = deq{-r3L,x-} taDa d.Eq2_aDD
+    d.Eq2_aDF = d.Eq2_aDA
+    foo_aEc = foo{-r3K,x-} taDa d.Eq2_aDF
+    deq_aEb = deq_aE9
+    foo_aEa = foo_aE8
+    AbsBinds [] [] [([], deq_aE9, deq_aD3)]
+       deq_aD3 (a_r3n PrelBase.:{-55,w-}{i} as_r3o)
                (b_r3p PrelBase.:{-55,w-}{i} bs_r3q)
-               = if deq_aDY a_r3n foo_aDZ b_r3p then
-                     deq_aE0 as_r3o foo_aE1 bs_r3q
+               = if deq_aEd a_r3n foo_aEc b_r3p then
+                     deq_aEb as_r3o foo_aEa bs_r3q
                  else
                      PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], foo_aE3, foo_aDn)]
-       foo_aDn x_r3u = x_r3u
-    d.Eq2_aCP = ({-dict-} [] [deq_aE2, foo_aE3])
-AbsBinds [] [] [([], $d2{-rDU,x-}, d.Eq2_aDB)]
-    AbsBinds [] [] [([], deq_aE4, deq_aDF)]
-       deq_aDF x_r3A y_r3B = PrelBase.True{-5E,w-}{i}
-    AbsBinds [] [] [([], foo_aE5, foo_aDM)]
-       foo_aDM x_r3F = x_r3F
-    d.Eq2_aDB = ({-dict-} [] [deq_aE4, foo_aE5])
-deq{-r3K,x-} =
+    AbsBinds [] [] [([], foo_aE8, foo_aDx)]
+       foo_aDx x_r3u = x_r3u
+    d.Eq2_aCZ = ({-dict-} [] [deq_aE9, foo_aE8])
+AbsBinds [] [] [([], $d2{-rE6,x-}, d.Eq2_aDL)]
+    AbsBinds [] [] [([], deq_aEf, deq_aDP)]
+       deq_aDP x_r3A y_r3B = PrelBase.True{-5E,w-}{i}
+    AbsBinds [] [] [([], foo_aEe, foo_aDW)]
+       foo_aDW x_r3F = x_r3F
+    d.Eq2_aDL = ({-dict-} [] [deq_aEf, foo_aEe])
+deq{-r3L,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-foo{-r3L,x-} =
+foo{-r3K,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taDS] [d.Eq2_aDR] []
+AbsBinds [taE2] [d.Eq2_aE1] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc060.stderr b/ghc/tests/typecheck/should_compile/tc060.stderr
index fcb4ced..f1278b2 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc060.stderr
+++ b/ghc/tests/typecheck/should_compile/tc060.stderr
@@ -1,25 +1,23 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], $d1{-rlE,x-}, d.Eq2_akU)]
-    AbsBinds [] [] [([], deq_alF, deq_akY)]
-       deq_akY x_r3h y_r3i = PrelBase.True{-5E,w-}{i}
-    d.Eq2_akU = ({-dict-} [] [deq_alF])
-AbsBinds [tali] [d.Eq2_alu] [([tali], $d2{-rlG,x-}, d.Eq2_al7)]
-    d.Eq2_aly = d.Eq2_alu
-    deq_alH = deq{-r3x,x-} tali d.Eq2_aly
-    deq_alI = deq_alJ
-    AbsBinds [] [] [([], deq_alJ, deq_alb)]
-       deq_alb (a_r3q PrelBase.:{-55,w-}{i} as_r3r)
+==================== Typechecked ====================
+AbsBinds [] [] [([], $d1{-rlI,x-}, d.Eq2_akY)]
+    AbsBinds [] [] [([], deq_alJ, deq_al2)]
+       deq_al2 x_r3h y_r3i = PrelBase.True{-5E,w-}{i}
+    d.Eq2_akY = ({-dict-} [] [deq_alJ])
+AbsBinds [talm] [d.Eq2_aly] [([talm], $d2{-rlK,x-}, d.Eq2_alb)]
+    d.Eq2_alC = d.Eq2_aly
+    deq_alN = deq{-r3x,x-} talm d.Eq2_alC
+    deq_alM = deq_alL
+    AbsBinds [] [] [([], deq_alL, deq_alf)]
+       deq_alf (a_r3q PrelBase.:{-55,w-}{i} as_r3r)
                (b_r3s PrelBase.:{-55,w-}{i} bs_r3t)
-               = if deq_alH a_r3q b_r3s then
-                     deq_alI as_r3r bs_r3t
+               = if deq_alN a_r3q b_r3s then
+                     deq_alM as_r3r bs_r3t
                  else
                      PrelBase.False{-58,w-}{i}
-    d.Eq2_al7 = ({-dict-} [] [deq_alJ])
+    d.Eq2_alb = ({-dict-} [] [deq_alL])
 deq{-r3x,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talD] [d.Eq2_alC] []
+AbsBinds [talH] [d.Eq2_alG] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc061.stderr b/ghc/tests/typecheck/should_compile/tc061.stderr
index 6d1544a..cc07cec 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc061.stderr
+++ b/ghc/tests/typecheck/should_compile/tc061.stderr
@@ -1,21 +1,19 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], $d1{-rlB,x-}, d.Eq1_akU)]
-    AbsBinds [] [] [([], deq_alC, deq_akY)]
-       deq_akY x_r3h y_r3i = PrelBase.True{-5E,w-}{i}
-    d.Eq1_akU = ({-dict-} [] [deq_alC])
-AbsBinds [tali] [d.Eq1_alr] [([tali], $d2{-rlD,x-}, d.Eq1_al7)]
-    d.Eq1_alv = d.Eq1_alr
-    deq_alE = deq{-r3x,x-} tali d.Eq1_alv
-    AbsBinds [] [] [([], deq_alF, deq_alb)]
-       deq_alb (a_r3q PrelBase.:{-55,w-}{i} as_r3r)
+==================== Typechecked ====================
+AbsBinds [] [] [([], $d1{-rlF,x-}, d.Eq1_akY)]
+    AbsBinds [] [] [([], deq_alG, deq_al2)]
+       deq_al2 x_r3h y_r3i = PrelBase.True{-5E,w-}{i}
+    d.Eq1_akY = ({-dict-} [] [deq_alG])
+AbsBinds [talm] [d.Eq1_alv] [([talm], $d2{-rlH,x-}, d.Eq1_alb)]
+    d.Eq1_alz = d.Eq1_alv
+    deq_alJ = deq{-r3x,x-} talm d.Eq1_alz
+    AbsBinds [] [] [([], deq_alI, deq_alf)]
+       deq_alf (a_r3q PrelBase.:{-55,w-}{i} as_r3r)
                (b_r3s PrelBase.:{-55,w-}{i} bs_r3t)
-               = deq_alE a_r3q b_r3s
-    d.Eq1_al7 = ({-dict-} [] [deq_alF])
+               = deq_alJ a_r3q b_r3s
+    d.Eq1_alb = ({-dict-} [] [deq_alI])
 deq{-r3x,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [talA] [d.Eq1_alz] []
+AbsBinds [talE] [d.Eq1_alD] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc062.stderr b/ghc/tests/typecheck/should_compile/tc062.stderr
index 5c14f52..f8dd836 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc062.stderr
+++ b/ghc/tests/typecheck/should_compile/tc062.stderr
@@ -1,30 +1,28 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [tal9] [d.Eq1_alj] [([tal9], f{-r3C,x-}, f_akX)]
-    d.Eq1_alh = $d1{-rm8,x-} tal9 d.Eq1_alj
-    deq_ama = deq{-r3D,x-} [tal9] d.Eq1_alh
-    f_akX x_r3f (y_r3g PrelBase.:{-55,w-}{i} ys_r3h)
-         = deq_ama x_r3f ys_r3h
-AbsBinds [talA] [d.Eq1_alM] [([talA], $d1{-rm8,x-}, d.Eq1_alp)]
-    d.Eq1_alQ = d.Eq1_alM
-    deq_amb = deq{-r3D,x-} talA d.Eq1_alQ
-    deq_amc = deq_amd
-    AbsBinds [] [] [([], deq_amd, deq_alt)]
-       deq_alt (a_r3o PrelBase.:{-55,w-}{i} as_r3p)
+==================== Typechecked ====================
+AbsBinds [talh] [d.Eq1_alq] [([talh], f{-r3C,x-}, f_al1)]
+    d.Eq1_alo = $d1{-rmh,x-} talh d.Eq1_alq
+    deq_amf = deq{-r3D,x-} [talh] d.Eq1_alo
+    f_al1 x_r3f (y_r3g PrelBase.:{-55,w-}{i} ys_r3h)
+         = deq_amf x_r3f ys_r3h
+AbsBinds [talH] [d.Eq1_alT] [([talH], $d1{-rmh,x-}, d.Eq1_alw)]
+    d.Eq1_alX = d.Eq1_alT
+    deq_amk = deq{-r3D,x-} talH d.Eq1_alX
+    deq_amj = deq_ami
+    AbsBinds [] [] [([], deq_ami, deq_alA)]
+       deq_alA (a_r3o PrelBase.:{-55,w-}{i} as_r3p)
                (b_r3q PrelBase.:{-55,w-}{i} bs_r3r)
-               = if deq_amb a_r3o b_r3q then
-                     deq_amc as_r3p bs_r3r
+               = if deq_amk a_r3o b_r3q then
+                     deq_amj as_r3p bs_r3r
                  else
                      PrelBase.False{-58,w-}{i}
-    d.Eq1_alp = ({-dict-} [] [deq_amd])
-AbsBinds [] [] [([], $d2{-rm9,x-}, d.Eq1_alW)]
-    AbsBinds [] [] [([], deq_ame, deq_am0)]
-       deq_am0 x_r3x y_r3y = PrelBase.True{-5E,w-}{i}
-    d.Eq1_alW = ({-dict-} [] [deq_ame])
+    d.Eq1_alw = ({-dict-} [] [deq_ami])
+AbsBinds [] [] [([], $d2{-rmg,x-}, d.Eq1_am3)]
+    AbsBinds [] [] [([], deq_aml, deq_am7)]
+       deq_am7 x_r3x y_r3y = PrelBase.True{-5E,w-}{i}
+    d.Eq1_am3 = ({-dict-} [] [deq_aml])
 deq{-r3D,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [tam7] [d.Eq1_am6] []
+AbsBinds [tame] [d.Eq1_amd] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc063.stderr b/ghc/tests/typecheck/should_compile/tc063.stderr
index bf00699..37148af 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc063.stderr
+++ b/ghc/tests/typecheck/should_compile/tc063.stderr
@@ -1,26 +1,24 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Tag{-r3G,x-}{i} =
     _/\_ a_tr3C -> \ tpl_B1 -> Tag{-r3G,x-}{i} {_@_ a_tr3C tpl_B1}
-AbsBinds [taBx] [d.Reps_aBA] [([taBx], g{-r3D,x-}, g_aBo)]
-    f_aCe = f{-r3H,x-} taBx d.Reps_aBA
-    g_aBo x_r3h = f_aCe x_r3h x_r3h
-AbsBinds [taCc] [] [([taCc], $d3{-rCh,x-}, d.Eval_aBG)]
-    d.Eval_aBG = ({-dict-} [] [])
-AbsBinds [] [] [([], $d1{-rCi,x-}, d.Reps_aBL)]
-    AbsBinds [] [] [([], f_aCk, f_aBP)]
-       f_aBP PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
+AbsBinds [taBG] [d.Reps_aBJ] [([taBG], g{-r3D,x-}, g_aBw)]
+    f_aCn = f{-r3E,x-} taBG d.Reps_aBJ
+    g_aBw x_r3h = f_aCn x_r3h x_r3h
+AbsBinds [taCl] [] [([taCl], $d3{-rCs,x-}, d.Eval_aBP)]
+    d.Eval_aBP = ({-dict-} [] [])
+AbsBinds [] [] [([], $d1{-rCp,x-}, d.Reps_aBU)]
+    AbsBinds [] [] [([], f_aCt, f_aBY)]
+       f_aBY PrelBase.True{-5E,w-}{i} PrelBase.True{-5E,w-}{i}
              = PrelBase.True{-5E,w-}{i}
-       f_aBP x_r3n y_r3o = PrelBase.False{-58,w-}{i}
-    d.Reps_aBL = ({-dict-} [] [f_aCk])
-AbsBinds [taC5] [] [([taC5], $d2{-rCj,x-}, d.Reps_aBY)]
-    AbsBinds [] [] [([], f_aCl, f_aC2)]
-       f_aC2 x_r3v y_r3w = y_r3w
-    d.Reps_aBY = ({-dict-} [] [f_aCl])
-f{-r3H,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taCd] [d.Reps_aCb] []
+       f_aBY x_r3n y_r3o = PrelBase.False{-58,w-}{i}
+    d.Reps_aBU = ({-dict-} [] [f_aCt])
+AbsBinds [taCe] [] [([taCe], $d2{-rCo,x-}, d.Reps_aC7)]
+    AbsBinds [] [] [([], f_aCu, f_aCb)]
+       f_aCb x_r3v y_r3w = y_r3w
+    d.Reps_aC7 = ({-dict-} [] [f_aCu])
+f{-r3E,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taCm] [d.Reps_aCk] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc064.stderr b/ghc/tests/typecheck/should_compile/tc064.stderr
index 1cf473d..553a999 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc064.stderr
+++ b/ghc/tests/typecheck/should_compile/tc064.stderr
@@ -1,13 +1,11 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 FF{-r5,x-}{i} = FF{-r5,x-}{i} {}
 TT{-r4,x-}{i} = TT{-r4,x-}{i} {}
-AbsBinds [] [] [([], idb{-r6,x-}, idb_aAU)]
-    idb_aAU x_r3k = x_r3k
-AbsBinds [] [] [([], $d1{-rB4,x-}, d.Eval_aB1)]
-    d.Eval_aB1 = ({-dict-} [] [])
+AbsBinds [] [] [([], idb{-r6,x-}, idb_aB2)]
+    idb_aB2 x_r3k = x_r3k
+AbsBinds [] [] [([], $d1{-rBc,x-}, d.Eval_aB9)]
+    d.Eval_aB9 = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc065.stderr b/ghc/tests/typecheck/should_compile/tc065.stderr
index e7bd19f..f3a32e0 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc065.stderr
+++ b/ghc/tests/typecheck/should_compile/tc065.stderr
@@ -1,119 +1,116 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Succeeded{-rd,x-}{i} =
     _/\_ a_tr8i b_tr8j -> \ tpl_B1 ->
        Succeeded{-rd,x-}{i} {_@_ a_tr8i _@_ b_tr8j tpl_B1}
 Failed{-rc,x-}{i} =
     _/\_ a_tr8i b_tr8j -> \ tpl_B1 ->
        Failed{-rc,x-}{i} {_@_ a_tr8i _@_ b_tr8j tpl_B1}
-MkDigraph{-r8z,x-}{i} =
+MkDigraph{-r8y,x-}{i} =
     _/\_ vertex_tr8t -> \ tpl_B1 ->
-       MkDigraph{-r8z,x-}{i} {_@_ vertex_tr8t tpl_B1}
+       MkDigraph{-r8y,x-}{i} {_@_ vertex_tr8t tpl_B1}
 AbsBinds
-[ta14c]
-[d.Eq_a14r]
-[([ta14c], isRecursiveCycle{-r6D,x-}, isRecursiveCycle_a147)]
-    d.Eq_a14v = d.Eq_a14r
-    d.Eq_a14w = d.Eq_a14r
-    d.Eq_a14t =
-       PrelTup.$d9{-rDa,p-} [ta14c, ta14c] [d.Eq_a14v, d.Eq_a14w]
-    elem_a1gA = PrelList.elem{-rDi,p-} (ta14c, ta14c) d.Eq_a14t
-    isRecursiveCycle_a147 [vertex_r8c] edges_r8d
-                         = (vertex_r8c, vertex_r8c) elem_a1gA edges_r8d
-    isRecursiveCycle_a147 cycle_r8f edges_r8g
+[ta14k]
+[d.Eq_a14z]
+[([ta14k], isRecursiveCycle{-r6D,x-}, isRecursiveCycle_a14f)]
+    d.Eq_a14D = d.Eq_a14z
+    d.Eq_a14E = d.Eq_a14z
+    d.Eq_a14B =
+       PrelTup.$d9{-rDa,p-} [ta14k, ta14k] [d.Eq_a14D, d.Eq_a14E]
+    elem_a1fZ = PrelList.elem{-rDi,p-} (ta14k, ta14k) d.Eq_a14B
+    isRecursiveCycle_a14f [vertex_r8c] edges_r8d
+                         = (vertex_r8c, vertex_r8c) elem_a1fZ edges_r8d
+    isRecursiveCycle_a14f cycle_r8f edges_r8g
                          = PrelBase.True{-5E,w-}{i}
 AbsBinds
-[ta14I, ta14J, ta14K]
-[d.Eq_a15B, d.Ord_a15C]
-[([ta14J, ta14I, ta14K], lookupVertex{-r6C,x-}, lookupVertex_a14F)]
-    d.Eq_a15E = d.Eq_a15B
-    ==_a1gB = PrelBase.=={-8Y,p-} ta14I d.Eq_a15E
-    lookupVertex_a14F flat_info_r84 vertex_r85
-                     = PrelList.head{-rEs,p-} ta14K code_list_r87
+[ta14Q, ta14R, ta14S]
+[d.Eq_a15J, d.Ord_a15K]
+[([ta14R, ta14Q, ta14S], lookupVertex{-r6C,x-}, lookupVertex_a14N)]
+    d.Eq_a15M = d.Eq_a15J
+    ==_a1gh = PrelBase.=={-8Y,p-} ta14Q d.Eq_a15M
+    lookupVertex_a14N flat_info_r84 vertex_r85
+                     = PrelList.head{-rEs,p-} ta14S code_list_r87
                      where
                          {- nonrec -}
-                         AbsBinds [] [] [([], code_list_r87, code_list_a14O)]
-                             code_list_a14O
+                         AbsBinds [] [] [([], code_list_r87, code_list_a14W)]
+                             code_list_a14W
                                  = [code_r8a |
                                         (vertex'_r89, _, _, code_r8a) <- flat_info_r84, vertex_r85
-                                                                                        ==_a1gB vertex'_r89]
+                                                                                        ==_a1gh vertex'_r89]
                          {- nonrec -}
                          {- nonrec -}
 AbsBinds
-[ta15X, ta160, ta161]
-[d.Eq_a17I, d.Ord_a17J]
-[([ta160, ta161, ta15X], mkEdges{-r6B,x-}, mkEdges_a15U)]
-    d.Ord_a17F = d.Ord_a17J
-    d.MonadZero_a17G = PrelBase.$d24{-ri3,p-}
-    mkEdges_a15U vertices_r7M flat_info_r7N
+[ta165, ta168, ta169]
+[d.Eq_a17S, d.Ord_a17T]
+[([ta168, ta169, ta165], mkEdges{-r6B,x-}, mkEdges_a162)]
+    d.Ord_a17P = d.Ord_a17T
+    d.MonadZero_a17Q = PrelBase.$d24{-ri3,p-}
+    mkEdges_a162 vertices_r7M flat_info_r7N
                 = [(source_vertex_r7X, target_vertex_r82) |
                        (source_vertex_r7X, _, used_names_r7Y, _) <- flat_info_r7N, target_name_r80 <- Set.setToList{-rge,p-}
-                                                                                                          ta160 used_names_r7Y, target_vertex_r82 <- vertices_defining_a1gC target_name_r80
+                                                                                                          ta168 used_names_r7Y, target_vertex_r82 <- vertices_defining_a1gi target_name_r80
                                                                                                                                                                             flat_info_r7N]
                 where
                     {- nonrec -}
                     AbsBinds
-                    [ta16m, ta16r, ta16u, aa16w, ta16z]
-                    [d.Ord_a16M, d.MonadZero_a16S]
-                    [([ta16m, ta16r, ta16u, aa16w, ta16z],
+                    [ta16x, ta16C, ta16F, aa16H, ta16K]
+                    [d.Ord_a16W, d.MonadZero_a172]
+                    [([ta16x, ta16C, ta16F, aa16H, ta16K],
                       vertices_defining_r7P,
-                      vertices_defining_a163)]
-                        d.Monad_a16O =
-                            PrelBase.scsel_MonadZeroPrelBaseMonad{-a1gH,p-} aa16w
-                                d.MonadZero_a16S
-                        elementOf_a1gD = Set.elementOf{-rg7,p-} ta16z d.Ord_a16M
-                        >>=_a1gE = PrelBase.>>={-811,p-} aa16w d.Monad_a16O
-                        d.Monad_a16Q = d.Monad_a16O
-                        return_a1gF = PrelBase.return{-816,p-} aa16w d.Monad_a16Q
-                        zero_a1gG = PrelBase.zero{-810,p-} aa16w d.MonadZero_a16S
-                        vertices_defining_a163 name_r7R flat_info_r7S
+                      vertices_defining_a16b)]
+                        d.Monad_a16Y =
+                            PrelBase.scsel_MonadZeroPrelBaseMonad{-a1gn,p-} aa16H
+                                d.MonadZero_a172
+                        elementOf_a1gm = Set.elementOf{-rg7,p-} ta16K d.Ord_a16W
+                        >>=_a1gl = PrelBase.>>={-811,p-} aa16H d.Monad_a16Y
+                        d.Monad_a170 = d.Monad_a16Y
+                        return_a1gk = PrelBase.return{-816,p-} aa16H d.Monad_a170
+                        zero_a1gj = PrelBase.zero{-810,p-} aa16H d.MonadZero_a172
+                        vertices_defining_a16b name_r7R flat_info_r7S
                                                = [vertex_r7U |
                                                       (vertex_r7U, names_defined_r7V, _, _) <- flat_info_r7S, name_r7R
-                                                                                                              elementOf_a1gD names_defined_r7V]
+                                                                                                              elementOf_a1gm names_defined_r7V]
                     {- nonrec -}
-                    vertices_defining_a1gC =
+                    vertices_defining_a1gi =
                         vertices_defining_r7P
-                            [ta15X, Set.Set{-rg4,p-} ta160, ta161, PrelBase.[]{-3j,W-}, ta160]
-                            [d.Ord_a17F, d.MonadZero_a17G]
+                            [ta165, Set.Set{-rg4,p-} ta168, ta169, PrelBase.[]{-3j,W-}, ta168]
+                            [d.Ord_a17P, d.MonadZero_a17Q]
                     {- nonrec -}
 AbsBinds
-[ta180, ta181, ta182]
+[ta18a, ta18b, ta18c]
 []
-[([ta181, ta182, ta180], mkVertices{-r6A,x-}, mkVertices_a17X)]
-    mkVertices_a17X info_r7I
+[([ta18b, ta18c, ta18a], mkVertices{-r6A,x-}, mkVertices_a187)]
+    mkVertices_a187 info_r7I
                    = [vertex_r7K | (vertex_r7K, _, _, _) <- info_r7I]
 AbsBinds
-[ta18F]
-[d.Eq_a18W]
-[([ta18F], isCyclic{-r6y,x-}, isCyclic_a18C)]
-    d.Eq_a190 = d.Eq_a18W
-    d.Eq_a191 = d.Eq_a18W
-    d.Eq_a18Y =
-       PrelTup.$d9{-rDa,p-} [ta18F, ta18F] [d.Eq_a190, d.Eq_a191]
-    elem_a1gI = PrelList.elem{-rDi,p-} (ta18F, ta18F) d.Eq_a18Y
-    isCyclic_a18C edges_r7r [v_r7s]
-                 = (v_r7s, v_r7s) elem_a1gI edges_r7r
-    isCyclic_a18C edges_r7u vs_r7v = PrelBase.True{-5E,w-}{i}
-AbsBinds [ta1au] [d.Eq_a1aw] [([ta1au], dfs{-r6F,x-}, dfs_a193)]
-    elem_a1gJ = PrelList.elem{-rDi,p-} ta1au d.Eq_a1aw
-    dfs_a193 r_r7e (vs_r7f, ns_r7g) PrelBase.[]{-5i,w-}{i}
+[ta18P]
+[d.Eq_a196]
+[([ta18P], isCyclic{-r6y,x-}, isCyclic_a18M)]
+    d.Eq_a19a = d.Eq_a196
+    d.Eq_a19b = d.Eq_a196
+    d.Eq_a198 =
+       PrelTup.$d9{-rDa,p-} [ta18P, ta18P] [d.Eq_a19a, d.Eq_a19b]
+    elem_a1go = PrelList.elem{-rDi,p-} (ta18P, ta18P) d.Eq_a198
+    isCyclic_a18M edges_r7r [v_r7s]
+                 = (v_r7s, v_r7s) elem_a1go edges_r7r
+    isCyclic_a18M edges_r7u vs_r7v = PrelBase.True{-5E,w-}{i}
+AbsBinds [ta1au] [d.Eq_a1aw] [([ta1au], dfs{-r6E,x-}, dfs_a19d)]
+    elem_a1gp = PrelList.elem{-rDi,p-} ta1au d.Eq_a1aw
+    dfs_a19d r_r7e (vs_r7f, ns_r7g) PrelBase.[]{-5i,w-}{i}
             = (vs_r7f, ns_r7g)
-    dfs_a193 r_r7i
+    dfs_a19d r_r7i
             (vs_r7j, ns_r7k)
             (x_r7l PrelBase.:{-55,w-}{i} xs_r7m)
-            | x_r7l elem_a1gJ vs_r7j = dfs_a193 r_r7i (vs_r7j, ns_r7k) xs_r7m
+            | x_r7l elem_a1gp vs_r7j = dfs_a19d r_r7i (vs_r7j, ns_r7k) xs_r7m
             | PrelBase.otherwise{-818,p-}
-            = dfs_a193 r_r7i
+            = dfs_a19d r_r7i
                        (vs'_r7o,
-                        ++_a1gs ta1au (PrelBase.:{-55,w-}{i} ta1au x_r7l ns'_r7p) ns_r7k)
+                        ++_a1g7 ta1au (PrelBase.:{-55,w-}{i} ta1au x_r7l ns'_r7p) ns_r7k)
                        xs_r7m
             where
                 {- nonrec -}
-                AbsBinds [] [] [([], vs'_r7o, vs'_a19M), ([], ns'_r7p, ns'_a19N)]
-                    (vs'_a19M, ns'_a19N)
-                        = dfs_a193 r_r7i
+                AbsBinds [] [] [([], vs'_r7o, vs'_a19Z), ([], ns'_r7p, ns'_a1a0)]
+                    (vs'_a19Z, ns'_a1a0)
+                        = dfs_a19d r_r7i
                                    (PrelBase.:{-55,w-}{i} ta1au x_r7l vs_r7j,
                                     PrelBase.[]{-5i,w-}{i} ta1au)
                                    r_r7i x_r7l
@@ -121,20 +118,20 @@ AbsBinds [ta1au] [d.Eq_a1aw] [([ta1au], dfs{-r6F,x-}, dfs_a193)]
                 {- nonrec -}
 AbsBinds
 [ta1aG]
-[d.Eq_a1eb]
+[d.Eq_a1dR]
 [([ta1aG], stronglyConnComp{-r6x,x-}, stronglyConnComp_a1aD)]
-    d.Eq_a1e9 = d.Eq_a1eb
-    d.Eq_a1e6 = d.Eq_a1eb
-    d.Eq_a1ed = d.Eq_a1eb
-    dfs_a1gK = dfs{-r6F,x-} ta1aG d.Eq_a1ed
-    d.Eq_a1e7 = d.Eq_a1eb
+    d.Eq_a1dP = d.Eq_a1dR
+    d.Eq_a1dM = d.Eq_a1dR
+    d.Eq_a1dT = d.Eq_a1dR
+    dfs_a1gq = dfs{-r6E,x-} ta1aG d.Eq_a1dT
+    d.Eq_a1dN = d.Eq_a1dR
     stronglyConnComp_a1aD es_r6H vs_r6I
                          = PrelTup.snd{-rDg,p-}
-                               [[ta1aG], [[ta1aG]]] span_tree_a1gL new_range_a1gM reversed_edges_r6K
+                               [[ta1aG], [[ta1aG]]] span_tree_a1gr new_range_a1gt reversed_edges_r6K
                                                                    (PrelBase.[]{-5i,w-}{i} ta1aG,
                                                                     PrelBase.[]{-5i,w-}{i} [ta1aG])
                                                                    PrelTup.snd{-rDg,p-}
-                                                                       [[ta1aG], [ta1aG]] dfs_a1gK new_range_a1gN es_r6H
+                                                                       [[ta1aG], [ta1aG]] dfs_a1gq new_range_a1gs es_r6H
                                                                                                    (PrelBase.[]{-5i,w-}{i}
                                                                                                         ta1aG,
                                                                                                     PrelBase.[]{-5i,w-}{i}
@@ -143,24 +140,24 @@ AbsBinds
                          where
                              {- rec -}
                              AbsBinds
-                             [ta1c5]
-                             [d.Eq_a1c7]
-                             [([ta1c5], span_tree_r6N, span_tree_a1aK)]
-                                 elem_a1gO = PrelList.elem{-rDi,p-} ta1c5 d.Eq_a1c7
-                                 d.Eq_a1c9 = d.Eq_a1c7
-                                 dfs_a1gP = dfs{-r6F,x-} ta1c5 d.Eq_a1c9
+                             [ta1bV]
+                             [d.Eq_a1bX]
+                             [([ta1bV], span_tree_r6N, span_tree_a1aK)]
+                                 elem_a1gv = PrelList.elem{-rDi,p-} ta1bV d.Eq_a1bX
+                                 d.Eq_a1bZ = d.Eq_a1bX
+                                 dfs_a1gu = dfs{-r6E,x-} ta1bV d.Eq_a1bZ
                                  span_tree_a1aK r_r71 (vs_r72, ns_r73) PrelBase.[]{-5i,w-}{i}
                                                 = (vs_r72, ns_r73)
                                  span_tree_a1aK r_r75
                                                 (vs_r76, ns_r77)
                                                 (x_r78 PrelBase.:{-55,w-}{i} xs_r79)
-                                                | x_r78 elem_a1gO vs_r76
+                                                | x_r78 elem_a1gv vs_r76
                                                 = span_tree_a1aK r_r75 (vs_r76, ns_r77) xs_r79
                                                 | PrelBase.otherwise{-818,p-}
                                                 = span_tree_a1aK r_r75
                                                                  (vs'_r7b,
-                                                                  PrelBase.:{-55,w-}{i} [ta1c5]
-                                                                      (PrelBase.:{-55,w-}{i} ta1c5
+                                                                  PrelBase.:{-55,w-}{i} [ta1bV]
+                                                                      (PrelBase.:{-55,w-}{i} ta1bV
                                                                            x_r78 ns'_r7c)
                                                                       ns_r77)
                                                                  xs_r79
@@ -169,112 +166,113 @@ AbsBinds
                                                     AbsBinds
                                                     []
                                                     []
-                                                    [([], vs'_r7b, vs'_a1bt), ([],
+                                                    [([], vs'_r7b, vs'_a1bw), ([],
                                                                                ns'_r7c,
-                                                                               ns'_a1bu)]
-                                                        (vs'_a1bt, ns'_a1bu)
-                                                            = dfs_a1gP r_r75
-                                                                       (PrelBase.:{-55,w-}{i} ta1c5
+                                                                               ns'_a1bx)]
+                                                        (vs'_a1bw, ns'_a1bx)
+                                                            = dfs_a1gu r_r75
+                                                                       (PrelBase.:{-55,w-}{i} ta1bV
                                                                             x_r78 vs_r76,
                                                                         PrelBase.[]{-5i,w-}{i}
-                                                                            ta1c5)
+                                                                            ta1bV)
                                                                        r_r75 x_r78
                                                     {- nonrec -}
                                                     {- nonrec -}
                              {- nonrec -}
-                             span_tree_a1gL = span_tree_r6N ta1aG d.Eq_a1e9
+                             span_tree_a1gr = span_tree_r6N ta1aG d.Eq_a1dP
                              {- nonrec -}
                              {- rec -}
                              AbsBinds
-                             [ta1cF, ta1cI]
-                             [d.Eq_a1cK]
-                             [([ta1cF, ta1cI], new_range_r6M, new_range_a1cb)]
-                                 ==_a1gQ = PrelBase.=={-8Y,p-} ta1cF d.Eq_a1cK
-                                 new_range_a1cb PrelBase.[]{-5i,w-}{i} w_r6U
-                                                = PrelBase.[]{-5i,w-}{i} ta1cI
-                                 new_range_a1cb ((x_r6W, y_r6X) PrelBase.:{-55,w-}{i} xys_r6Y)
+                             [ta1cx, ta1cA]
+                             [d.Eq_a1cC]
+                             [([ta1cx, ta1cA], new_range_r6M, new_range_a1c1)]
+                                 ==_a1gw = PrelBase.=={-8Y,p-} ta1cx d.Eq_a1cC
+                                 new_range_a1c1 PrelBase.[]{-5i,w-}{i} w_r6U
+                                                = PrelBase.[]{-5i,w-}{i} ta1cA
+                                 new_range_a1c1 ((x_r6W, y_r6X) PrelBase.:{-55,w-}{i} xys_r6Y)
                                                 w_r6Z
-                                                = if x_r6W ==_a1gQ w_r6Z then
-                                                      PrelBase.:{-55,w-}{i} ta1cI
-                                                          y_r6X (new_range_a1cb xys_r6Y w_r6Z)
+                                                = if x_r6W ==_a1gw w_r6Z then
+                                                      PrelBase.:{-55,w-}{i} ta1cA
+                                                          y_r6X (new_range_a1c1 xys_r6Y w_r6Z)
                                                   else
-                                                      new_range_a1cb xys_r6Y w_r6Z
+                                                      new_range_a1c1 xys_r6Y w_r6Z
                              {- nonrec -}
-                             new_range_a1gM = new_range_r6M [ta1aG, ta1aG] d.Eq_a1e6
-                             new_range_a1gN = new_range_r6M [ta1aG, ta1aG] d.Eq_a1e7
+                             new_range_a1gt = new_range_r6M [ta1aG, ta1aG] d.Eq_a1dM
+                             new_range_a1gs = new_range_r6M [ta1aG, ta1aG] d.Eq_a1dN
                              {- nonrec -}
                              {- nonrec -}
-                             AbsBinds [ta1cZ] [] [([ta1cZ], swap_r6L, swap_a1cQ)]
-                                 swap_a1cQ (x_r6R, y_r6S) = (y_r6S, x_r6R)
+                             AbsBinds [ta1cR] [] [([ta1cR], swap_r6L, swap_a1cI)]
+                                 swap_a1cI (x_r6R, y_r6S) = (y_r6S, x_r6R)
                              {- nonrec -}
                              {- nonrec -}
                              {- nonrec -}
-                             AbsBinds [] [] [([], reversed_edges_r6K, reversed_edges_a1d6)]
-                                 reversed_edges_a1d6
-                                     = map_a1gr [Edge{-r8x,x-} ta1aG, Edge{-r8x,x-} ta1aG] swap_r6L
+                             AbsBinds [] [] [([], reversed_edges_r6K, reversed_edges_a1cU)]
+                                 reversed_edges_a1cU
+                                     = map_a1g8 [Edge{-r8x,x-} ta1aG, Edge{-r8x,x-} ta1aG] swap_r6L
                                                                                                ta1aG
                                                                                            es_r6H
                              {- nonrec -}
                              {- nonrec -}
 AbsBinds
-[ta1eo]
-[d.Eq_a1fh]
-[([ta1eo], topSort{-r6z,x-}, topSort_a1el)]
-    d.Eq_a1fp = d.Eq_a1fh
-    isCyclic_a1gR = isCyclic{-r6y,x-} ta1eo d.Eq_a1fp
-    d.Eq_a1fr = d.Eq_a1fh
-    stronglyConnComp_a1gS = stronglyConnComp{-r6x,x-} ta1eo d.Eq_a1fr
-    topSort_a1el edges_r7x vertices_r7y
+[ta1e4]
+[d.Eq_a1eX]
+[([ta1e4], topSort{-r6z,x-}, topSort_a1e1)]
+    d.Eq_a1f5 = d.Eq_a1eX
+    isCyclic_a1gy = isCyclic{-r6y,x-} ta1e4 d.Eq_a1f5
+    d.Eq_a1f7 = d.Eq_a1eX
+    stronglyConnComp_a1gx = stronglyConnComp{-r6x,x-} ta1e4 d.Eq_a1f7
+    topSort_a1e1 edges_r7x vertices_r7y
                 = case cycles_r7B of
                     PrelBase.[]{-5i,w-}{i}
-                    -> Succeeded{-rd,x-}{i} [[ta1eo], [[ta1eo]]] [v_r7F |
+                    -> Succeeded{-rd,x-}{i} [[ta1e4], [[ta1e4]]] [v_r7F |
                                                                       [v_r7F] <- singletons_r7C]
-                    _ -> Failed{-rc,x-}{i} [[ta1eo], [[ta1eo]]] cycles_r7B
+                    _ -> Failed{-rc,x-}{i} [[ta1e4], [[ta1e4]]] cycles_r7B
                 where
                     {- nonrec -}
-                    AbsBinds [] [] [([], sccs_r7A, sccs_a1es)]
-                        sccs_a1es = stronglyConnComp_a1gS edges_r7x vertices_r7y
+                    AbsBinds [] [] [([], sccs_r7A, sccs_a1e8)]
+                        sccs_a1e8 = stronglyConnComp_a1gx edges_r7x vertices_r7y
                     {- nonrec -}
                     {- nonrec -}
                     {- nonrec -}
                     AbsBinds
                     []
                     []
-                    [([], cycles_r7B, cycles_a1ez), ([],
+                    [([], cycles_r7B, cycles_a1ef), ([],
                                                      singletons_r7C,
-                                                     singletons_a1eA)]
-                        (cycles_a1ez, singletons_a1eA)
-                            = List.partition{-rhs,p-} [ta1eo] isCyclic_a1gR edges_r7x sccs_r7A
+                                                     singletons_a1eg)]
+                        (cycles_a1ef, singletons_a1eg)
+                            = List.partition{-rhs,p-} [ta1e4] isCyclic_a1gy edges_r7x sccs_r7A
                     {- nonrec -}
                     {- nonrec -}
-AbsBinds [ta1fx] [] [([ta1fx], mkDigraph{-r6E,x-}, mkDigraph_a1ft)]
-    mkDigraph_a1ft = MkDigraph{-r8z,x-}{i} ta1fx
+AbsBinds [ta1fd] [] [([ta1fd], mkDigraph{-r6F,x-}, mkDigraph_a1f9)]
+    mkDigraph_a1f9 = MkDigraph{-r8y,x-}{i} ta1fd
 AbsBinds
-[ta1g2, ta1g3]
+[ta1fI, ta1fJ]
 []
-[([ta1g2, ta1g3], $d1{-r1gl,x-}, d.Eval_a1fE)]
-    d.Eval_a1fE = ({-dict-} [] [])
-AbsBinds [ta1g4] [] [([ta1g4], $d2{-r1gn,x-}, d.Eval_a1fK)]
-    d.Eval_a1fK = ({-dict-} [] [])
-d.Monad_a1fM = PrelBase.$d25{-ri4,p-}
->>=_a1go = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_a1fM
-d.Monad_a1fP = d.Monad_a1fM
-return_a1gp =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_a1fP
-d.MonadZero_a1fR = PrelBase.$d24{-ri3,p-}
-zero_a1gq =
-    PrelBase.zero{-810,p-} PrelBase.[]{-3j,W-} d.MonadZero_a1fR
-d.Functor_a1fU = PrelBase.$d26{-ri5,p-}
-map_a1gr = PrelBase.map{-rn5,p-} PrelBase.[]{-3j,W-} d.Functor_a1fU
-d.MonadPlus_a1fX = PrelBase.$d23{-ri2,p-}
-++_a1gs = PrelBase.++{-rn8,p-} PrelBase.[]{-3j,W-} d.MonadPlus_a1fX
->>=_a1gt = >>=_a1go
-return_a1gu = return_a1gp
->>=_a1gv = >>=_a1go
-return_a1gw = return_a1gp
->>=_a1gx = >>=_a1go
-return_a1gy = return_a1gp
-zero_a1gz = zero_a1gq
+[([ta1fI, ta1fJ], $d1{-r1gg,x-}, d.Eval_a1fk)]
+    d.Eval_a1fk = ({-dict-} [] [])
+AbsBinds [ta1fK] [] [([ta1fK], $d2{-r1gf,x-}, d.Eval_a1fq)]
+    d.Eval_a1fq = ({-dict-} [] [])
+d.Monad_a1fs = PrelBase.$d25{-ri4,p-}
+>>=_a1gb = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_a1fs
+d.Monad_a1fv = d.Monad_a1fs
+return_a1ga =
+    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_a1fv
+d.MonadZero_a1fx = PrelBase.$d24{-ri3,p-}
+zero_a1g9 =
+    PrelBase.zero{-810,p-} PrelBase.[]{-3j,W-} d.MonadZero_a1fx
+d.Functor_a1fA = PrelBase.$d26{-ri5,p-}
+map_a1g8 = PrelBase.map{-rn5,p-} PrelBase.[]{-3j,W-} d.Functor_a1fA
+d.MonadPlus_a1fD = PrelBase.$d23{-ri2,p-}
+++_a1g7 = PrelBase.++{-rn8,p-} PrelBase.[]{-3j,W-} d.MonadPlus_a1fD
+>>=_a1g6 = >>=_a1gb
+return_a1g5 = return_a1ga
+>>=_a1g4 = >>=_a1gb
+return_a1g3 = return_a1ga
+>>=_a1g2 = >>=_a1gb
+return_a1g1 = return_a1ga
+zero_a1g0 = zero_a1g9
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc066.stderr b/ghc/tests/typecheck/should_compile/tc066.stderr
index a3091ef..de6ee30 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc066.stderr
+++ b/ghc/tests/typecheck/should_compile/tc066.stderr
@@ -1,20 +1,18 @@
-
-
-================================================================================
-Typechecked:
-MkPair{-r3o,x-}{i} =
+==================== Typechecked ====================
+MkPair{-r3n,x-}{i} =
     _/\_ a_tr3k b_tr3l -> \ tpl_B1 tpl_B2 ->
-       MkPair{-r3o,x-}{i} {_@_ a_tr3k _@_ b_tr3l tpl_B1 tpl_B2}
+       MkPair{-r3n,x-}{i} {_@_ a_tr3k _@_ b_tr3l tpl_B1 tpl_B2}
 AbsBinds
-[taBY, taC1, aaC2]
-[d.Monad_aCe]
-[([taBY, taC1, aaC2], f{-r3m,x-}, f_aBM)]
-    >>=_aCt = PrelBase.>>={-811,p-} aaC2 d.Monad_aCe
-    d.Monad_aCg = d.Monad_aCe
-    return_aCx = PrelBase.return{-816,p-} aaC2 d.Monad_aCg
-    f_aBM x_r3f = [a_r3i | (MkPair{-r3o,x-}{i} c_r3h a_r3i) <- x_r3f]
-AbsBinds [taCr, taCs] [] [([taCr, taCs], $d1{-rCw,x-}, d.Eval_aCn)]
-    d.Eval_aCn = ({-dict-} [] [])
+[taC8, taCb, aaCc]
+[d.Monad_aCn]
+[([taC8, taCb, aaCc], f{-r3m,x-}, f_aBU)]
+    >>=_aCD = PrelBase.>>={-811,p-} aaCc d.Monad_aCn
+    d.Monad_aCp = d.Monad_aCn
+    return_aCC = PrelBase.return{-816,p-} aaCc d.Monad_aCp
+    f_aBU x_r3f = [a_r3i | (MkPair{-r3n,x-}{i} c_r3h a_r3i) <- x_r3f]
+AbsBinds [taCA, taCB] [] [([taCA, taCB], $d1{-rCG,x-}, d.Eval_aCw)]
+    d.Eval_aCw = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc067.stderr b/ghc/tests/typecheck/should_compile/tc067.stderr
index e0528c1..5cd3904 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc067.stderr
+++ b/ghc/tests/typecheck/should_compile/tc067.stderr
@@ -1,11 +1,9 @@
+==================== Typechecked ====================
+AbsBinds [takQ] [] [([takQ], f{-r3g,x-}, f_aky)]
+    f_aky PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} takQ
+    f_aky (x_r3e PrelBase.:{-55,w-}{i} xs_r3f)
+         = PrelBase.:{-55,w-}{i} takQ x_r3e (f_aky xs_r3f)
 
-
-================================================================================
-Typechecked:
-AbsBinds [takL] [] [([takL], f{-r3g,x-}, f_aku)]
-    f_aku PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} takL
-    f_aku (x_r3e PrelBase.:{-55,w-}{i} xs_r3f)
-         = PrelBase.:{-55,w-}{i} takL x_r3e (f_aku xs_r3f)
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc068.stderr b/ghc/tests/typecheck/should_compile/tc068.stderr
index 80cafb3..3119bd8 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc068.stderr
+++ b/ghc/tests/typecheck/should_compile/tc068.stderr
@@ -1,42 +1,40 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 X{-r9,x-}{i} = _/\_ b_tr3U -> X{-r9,x-}{i} {_@_ b_tr3U}
 Y{-r8,x-}{i} =
     _/\_ b_tr3U -> \ tpl_B1 -> Y{-r8,x-}{i} {_@_ b_tr3U tpl_B1}
 D{-r7,x-}{i} =
     _/\_ a_tr3W -> \ tpl_B1 -> D{-r7,x-}{i} {_@_ a_tr3W tpl_B1}
 C{-r6,x-}{i} = _/\_ a_tr3W -> C{-r6,x-}{i} {_@_ a_tr3W}
-AbsBinds [taDA] [] [([taDA], $d3{-rDE,x-}, d.Eval_aBV)]
-    d.Eval_aBV = ({-dict-} [] [])
-AbsBinds [taDB] [] [([taDB], $d4{-rDG,x-}, d.Eval_aC1)]
-    d.Eval_aC1 = ({-dict-} [] [])
-AbsBinds [taCe] [d.Eq_aCH] [([taCe], $d1{-rDH,x-}, d.Eq_aC7)]
-    d.Eq_aCL = d.Eq_aCH
-    ==_aDJ = PrelBase.=={-8Y,p-} taCe d.Eq_aCL
-    ==_aDK = ==_aDL
-    AbsBinds [] [] [([], ==_aDL, ==_aCb)]
-       ==_aCb X{-r9,x-}{i} X{-r9,x-}{i} = PrelBase.True{-5E,w-}{i}
-       ==_aCb (Y{-r8,x-}{i} a_r3r) (Y{-r8,x-}{i} b_r3s)
-              = a_r3r ==_aDJ b_r3s
-       ==_aCb a_r3u b_r3v = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDM, /=_aCA)]
-       /=_aCA a_r3z b_r3A = PrelBase.not{-rgM,p-} a_r3z ==_aDK b_r3A
-    d.Eq_aC7 = ({-dict-} [] [==_aDL, /=_aDM])
-AbsBinds [taD1] [d.Eq_aDs] [([taD1], $d2{-rDI,x-}, d.Eq_aCS)]
-    d.Eq_aDy = d.Eq_aDs
-    d.Eq_aDw = $d1{-rDH,x-} taD1 d.Eq_aDy
-    ==_aDN = PrelBase.=={-8Y,p-} (B{-r3X,x-} taD1) d.Eq_aDw
-    ==_aDO = ==_aDP
-    AbsBinds [] [] [([], ==_aDP, ==_aCW)]
-       ==_aCW (D{-r7,x-}{i} x_r3H) (D{-r7,x-}{i} y_r3I)
-              = x_r3H ==_aDN y_r3I
-       ==_aCW C{-r6,x-}{i} C{-r6,x-}{i} = PrelBase.True{-5E,w-}{i}
-       ==_aCW a_r3L b_r3M = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDQ, /=_aDl)]
-       /=_aDl a_r3Q b_r3R = PrelBase.not{-rgM,p-} a_r3Q ==_aDO b_r3R
-    d.Eq_aCS = ({-dict-} [] [==_aDP, /=_aDQ])
+AbsBinds [taDI] [] [([taDI], $d3{-rDM,x-}, d.Eval_aC3)]
+    d.Eval_aC3 = ({-dict-} [] [])
+AbsBinds [taDJ] [] [([taDJ], $d4{-rDQ,x-}, d.Eval_aC9)]
+    d.Eval_aC9 = ({-dict-} [] [])
+AbsBinds [taCm] [d.Eq_aCP] [([taCm], $d1{-rDO,x-}, d.Eq_aCf)]
+    d.Eq_aCT = d.Eq_aCP
+    ==_aDU = PrelBase.=={-8Y,p-} taCm d.Eq_aCT
+    ==_aDT = ==_aDS
+    AbsBinds [] [] [([], ==_aDS, ==_aCj)]
+       ==_aCj X{-r9,x-}{i} X{-r9,x-}{i} = PrelBase.True{-5E,w-}{i}
+       ==_aCj (Y{-r8,x-}{i} a_r3r) (Y{-r8,x-}{i} b_r3s)
+              = a_r3r ==_aDU b_r3s
+       ==_aCj a_r3u b_r3v = PrelBase.False{-58,w-}{i}
+    AbsBinds [] [] [([], /=_aDR, /=_aCI)]
+       /=_aCI a_r3z b_r3A = PrelBase.not{-rgM,p-} a_r3z ==_aDT b_r3A
+    d.Eq_aCf = ({-dict-} [] [==_aDS, /=_aDR])
+AbsBinds [taD9] [d.Eq_aDA] [([taD9], $d2{-rDN,x-}, d.Eq_aD0)]
+    d.Eq_aDG = d.Eq_aDA
+    d.Eq_aDE = $d1{-rDO,x-} taD9 d.Eq_aDG
+    ==_aDY = PrelBase.=={-8Y,p-} (B{-r3X,x-} taD9) d.Eq_aDE
+    ==_aDX = ==_aDW
+    AbsBinds [] [] [([], ==_aDW, ==_aD4)]
+       ==_aD4 (D{-r7,x-}{i} x_r3H) (D{-r7,x-}{i} y_r3I)
+              = x_r3H ==_aDY y_r3I
+       ==_aD4 C{-r6,x-}{i} C{-r6,x-}{i} = PrelBase.True{-5E,w-}{i}
+       ==_aD4 a_r3L b_r3M = PrelBase.False{-58,w-}{i}
+    AbsBinds [] [] [([], /=_aDV, /=_aDt)]
+       /=_aDt a_r3Q b_r3R = PrelBase.not{-rgM,p-} a_r3Q ==_aDX b_r3R
+    d.Eq_aD0 = ({-dict-} [] [==_aDW, /=_aDV])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc069.stderr b/ghc/tests/typecheck/should_compile/tc069.stderr
index bad9079..76d6a58 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc069.stderr
+++ b/ghc/tests/typecheck/should_compile/tc069.stderr
@@ -1,18 +1,16 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], x{-r3i,x-}, x_akw)]
-    x_akw = 'a'
-AbsBinds [] [] [([], y{-r3h,x-}, y_akz), ([], ys{-r3g,x-}, ys_akA)]
-    (y_akz PrelBase.:{-55,w-}{i} ys_akA)
+==================== Typechecked ====================
+AbsBinds [] [] [([], x{-r3i,x-}, x_akA)]
+    x_akA = 'a'
+AbsBinds [] [] [([], y{-r3h,x-}, y_akD), ([], ys{-r3g,x-}, ys_akE)]
+    (y_akD PrelBase.:{-55,w-}{i} ys_akE)
        = ['a', 'b', 'c'] (PrelBase.Char{-38,W-})
        where
            {- nonrec -}
-           AbsBinds [] [] [([], p_r3f, p_akI)]
-               p_akI = x{-r3i,x-}
+           AbsBinds [] [] [([], p_r3f, p_akM)]
+               p_akM = x{-r3i,x-}
            {- nonrec -}
            {- nonrec -}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc070.stderr b/ghc/tests/typecheck/should_compile/tc070.stderr
index 1cf473d..553a999 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc070.stderr
+++ b/ghc/tests/typecheck/should_compile/tc070.stderr
@@ -1,13 +1,11 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 FF{-r5,x-}{i} = FF{-r5,x-}{i} {}
 TT{-r4,x-}{i} = TT{-r4,x-}{i} {}
-AbsBinds [] [] [([], idb{-r6,x-}, idb_aAU)]
-    idb_aAU x_r3k = x_r3k
-AbsBinds [] [] [([], $d1{-rB4,x-}, d.Eval_aB1)]
-    d.Eval_aB1 = ({-dict-} [] [])
+AbsBinds [] [] [([], idb{-r6,x-}, idb_aB2)]
+    idb_aB2 x_r3k = x_r3k
+AbsBinds [] [] [([], $d1{-rBc,x-}, d.Eval_aB9)]
+    d.Eval_aB9 = ({-dict-} [] [])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc073.stderr b/ghc/tests/typecheck/should_compile/tc073.stderr
index e0528c1..5cd3904 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc073.stderr
+++ b/ghc/tests/typecheck/should_compile/tc073.stderr
@@ -1,11 +1,9 @@
+==================== Typechecked ====================
+AbsBinds [takQ] [] [([takQ], f{-r3g,x-}, f_aky)]
+    f_aky PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} takQ
+    f_aky (x_r3e PrelBase.:{-55,w-}{i} xs_r3f)
+         = PrelBase.:{-55,w-}{i} takQ x_r3e (f_aky xs_r3f)
 
-
-================================================================================
-Typechecked:
-AbsBinds [takL] [] [([takL], f{-r3g,x-}, f_aku)]
-    f_aku PrelBase.[]{-5i,w-}{i} = PrelBase.[]{-5i,w-}{i} takL
-    f_aku (x_r3e PrelBase.:{-55,w-}{i} xs_r3f)
-         = PrelBase.:{-55,w-}{i} takL x_r3e (f_aku xs_r3f)
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc074.stderr b/ghc/tests/typecheck/should_compile/tc074.stderr
index 80cafb3..3119bd8 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc074.stderr
+++ b/ghc/tests/typecheck/should_compile/tc074.stderr
@@ -1,42 +1,40 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 X{-r9,x-}{i} = _/\_ b_tr3U -> X{-r9,x-}{i} {_@_ b_tr3U}
 Y{-r8,x-}{i} =
     _/\_ b_tr3U -> \ tpl_B1 -> Y{-r8,x-}{i} {_@_ b_tr3U tpl_B1}
 D{-r7,x-}{i} =
     _/\_ a_tr3W -> \ tpl_B1 -> D{-r7,x-}{i} {_@_ a_tr3W tpl_B1}
 C{-r6,x-}{i} = _/\_ a_tr3W -> C{-r6,x-}{i} {_@_ a_tr3W}
-AbsBinds [taDA] [] [([taDA], $d3{-rDE,x-}, d.Eval_aBV)]
-    d.Eval_aBV = ({-dict-} [] [])
-AbsBinds [taDB] [] [([taDB], $d4{-rDG,x-}, d.Eval_aC1)]
-    d.Eval_aC1 = ({-dict-} [] [])
-AbsBinds [taCe] [d.Eq_aCH] [([taCe], $d1{-rDH,x-}, d.Eq_aC7)]
-    d.Eq_aCL = d.Eq_aCH
-    ==_aDJ = PrelBase.=={-8Y,p-} taCe d.Eq_aCL
-    ==_aDK = ==_aDL
-    AbsBinds [] [] [([], ==_aDL, ==_aCb)]
-       ==_aCb X{-r9,x-}{i} X{-r9,x-}{i} = PrelBase.True{-5E,w-}{i}
-       ==_aCb (Y{-r8,x-}{i} a_r3r) (Y{-r8,x-}{i} b_r3s)
-              = a_r3r ==_aDJ b_r3s
-       ==_aCb a_r3u b_r3v = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDM, /=_aCA)]
-       /=_aCA a_r3z b_r3A = PrelBase.not{-rgM,p-} a_r3z ==_aDK b_r3A
-    d.Eq_aC7 = ({-dict-} [] [==_aDL, /=_aDM])
-AbsBinds [taD1] [d.Eq_aDs] [([taD1], $d2{-rDI,x-}, d.Eq_aCS)]
-    d.Eq_aDy = d.Eq_aDs
-    d.Eq_aDw = $d1{-rDH,x-} taD1 d.Eq_aDy
-    ==_aDN = PrelBase.=={-8Y,p-} (B{-r3X,x-} taD1) d.Eq_aDw
-    ==_aDO = ==_aDP
-    AbsBinds [] [] [([], ==_aDP, ==_aCW)]
-       ==_aCW (D{-r7,x-}{i} x_r3H) (D{-r7,x-}{i} y_r3I)
-              = x_r3H ==_aDN y_r3I
-       ==_aCW C{-r6,x-}{i} C{-r6,x-}{i} = PrelBase.True{-5E,w-}{i}
-       ==_aCW a_r3L b_r3M = PrelBase.False{-58,w-}{i}
-    AbsBinds [] [] [([], /=_aDQ, /=_aDl)]
-       /=_aDl a_r3Q b_r3R = PrelBase.not{-rgM,p-} a_r3Q ==_aDO b_r3R
-    d.Eq_aCS = ({-dict-} [] [==_aDP, /=_aDQ])
+AbsBinds [taDI] [] [([taDI], $d3{-rDM,x-}, d.Eval_aC3)]
+    d.Eval_aC3 = ({-dict-} [] [])
+AbsBinds [taDJ] [] [([taDJ], $d4{-rDQ,x-}, d.Eval_aC9)]
+    d.Eval_aC9 = ({-dict-} [] [])
+AbsBinds [taCm] [d.Eq_aCP] [([taCm], $d1{-rDO,x-}, d.Eq_aCf)]
+    d.Eq_aCT = d.Eq_aCP
+    ==_aDU = PrelBase.=={-8Y,p-} taCm d.Eq_aCT
+    ==_aDT = ==_aDS
+    AbsBinds [] [] [([], ==_aDS, ==_aCj)]
+       ==_aCj X{-r9,x-}{i} X{-r9,x-}{i} = PrelBase.True{-5E,w-}{i}
+       ==_aCj (Y{-r8,x-}{i} a_r3r) (Y{-r8,x-}{i} b_r3s)
+              = a_r3r ==_aDU b_r3s
+       ==_aCj a_r3u b_r3v = PrelBase.False{-58,w-}{i}
+    AbsBinds [] [] [([], /=_aDR, /=_aCI)]
+       /=_aCI a_r3z b_r3A = PrelBase.not{-rgM,p-} a_r3z ==_aDT b_r3A
+    d.Eq_aCf = ({-dict-} [] [==_aDS, /=_aDR])
+AbsBinds [taD9] [d.Eq_aDA] [([taD9], $d2{-rDN,x-}, d.Eq_aD0)]
+    d.Eq_aDG = d.Eq_aDA
+    d.Eq_aDE = $d1{-rDO,x-} taD9 d.Eq_aDG
+    ==_aDY = PrelBase.=={-8Y,p-} (B{-r3X,x-} taD9) d.Eq_aDE
+    ==_aDX = ==_aDW
+    AbsBinds [] [] [([], ==_aDW, ==_aD4)]
+       ==_aD4 (D{-r7,x-}{i} x_r3H) (D{-r7,x-}{i} y_r3I)
+              = x_r3H ==_aDY y_r3I
+       ==_aD4 C{-r6,x-}{i} C{-r6,x-}{i} = PrelBase.True{-5E,w-}{i}
+       ==_aD4 a_r3L b_r3M = PrelBase.False{-58,w-}{i}
+    AbsBinds [] [] [([], /=_aDV, /=_aDt)]
+       /=_aDt a_r3Q b_r3R = PrelBase.not{-rgM,p-} a_r3Q ==_aDX b_r3R
+    d.Eq_aD0 = ({-dict-} [] [==_aDW, /=_aDV])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc076.stderr b/ghc/tests/typecheck/should_compile/tc076.stderr
index 7ab7488..c7b80eb 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc076.stderr
+++ b/ghc/tests/typecheck/should_compile/tc076.stderr
@@ -1,17 +1,15 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], x{-r3,x-}, x_aBl)]
-    x_aBl
+==================== Typechecked ====================
+AbsBinds [] [] [([], x{-r3,x-}, x_aBt)]
+    x_aBt
        = [[PrelBase.True{-5E,w-}{i}] (PrelBase.Bool{-34,W-})] ([PrelBase.Bool{-34,W-}])
-AbsBinds [] [] [([], xs{-r2,x-}, xs_aBt)]
-    xs_aBt = [x_r3j | x_r3h <- x{-r3,x-}, x_r3j <- x_r3h]
-d.Monad_aBL = PrelBase.$d25{-rae,p-}
->>=_aBS = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aBL
-d.Monad_aBO = d.Monad_aBL
-return_aBT =
-    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aBO
+AbsBinds [] [] [([], xs{-r2,x-}, xs_aBB)]
+    xs_aBB = [x_r3j | x_r3h <- x{-r3,x-}, x_r3j <- x_r3h]
+d.Monad_aBT = PrelBase.$d25{-rae,p-}
+>>=_aC1 = PrelBase.>>={-811,p-} PrelBase.[]{-3j,W-} d.Monad_aBT
+d.Monad_aBW = d.Monad_aBT
+return_aC0 =
+    PrelBase.return{-816,p-} PrelBase.[]{-3j,W-} d.Monad_aBW
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc077.stderr b/ghc/tests/typecheck/should_compile/tc077.stderr
index 6ae9286..65ee562 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc077.stderr
+++ b/ghc/tests/typecheck/should_compile/tc077.stderr
@@ -1,26 +1,24 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 ONE{-r7,x-}{i} = ONE{-r7,x-}{i} {}
 TWO{-r6,x-}{i} = TWO{-r6,x-}{i} {}
-AbsBinds [] [] [([], $d1{-rCq,x-}, d.Eval_aCf)]
-    d.Eval_aCf = ({-dict-} [] [])
-scsel_EQShouldSucceedORD{-aCr,x-} =
+AbsBinds [] [] [([], $d1{-rCy,x-}, d.Eval_aCn)]
+    d.Eval_aCn = ({-dict-} [] [])
+scsel_EQShouldSucceedORD{-aCB,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
        tpl_B1;}
-scsel_EQPrelBaseShow{-aCs,x-} =
+scsel_EQPrelBaseShow{-aCA,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
        tpl_B2;}
-==={-r3r,x-} =
+==={-r3p,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,,){-63,w-}{i} tpl_B1 tpl_B2 tpl_B3  ->
        tpl_B3;}
-AbsBinds [taCm] [d.EQ_aCi] []
-scsel_ORDPrelBaseNum{-aCt,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [taCn] [d.ORD_aCl] []
+AbsBinds [taCu] [d.EQ_aCq] []
+scsel_ORDPrelBaseNum{-aCz,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [taCv] [d.ORD_aCt] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc078.stderr b/ghc/tests/typecheck/should_compile/tc078.stderr
index c1826d7..74bf30f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc078.stderr
+++ b/ghc/tests/typecheck/should_compile/tc078.stderr
@@ -1,65 +1,63 @@
  
 tc078.hs:7: No explicit method nor default method for `PrelBase.=='
            in an instance declaration for `PrelBase.Eq'
-
-
-================================================================================
-Typechecked:
-MkBar{-r3m,x-}{i} =
+==================== Typechecked ====================
+MkBar{-r3l,x-}{i} =
     _/\_ a_tr3k -> \ tpl_B1 tpl_B2 ->
-       MkBar{-r3m,x-}{i} {_@_ a_tr3k tpl_B1 tpl_B2}
-AbsBinds [taDD] [] [([taDD], $d3{-rDH,x-}, d.Eval_aBH)]
-    d.Eval_aBH = ({-dict-} [] [])
+       MkBar{-r3l,x-}{i} {_@_ a_tr3k tpl_B1 tpl_B2}
+AbsBinds [taDL] [] [([taDL], $d3{-rDP,x-}, d.Eval_aBP)]
+    d.Eval_aBP = ({-dict-} [] [])
 AbsBinds
-[taBV]
-[d.Ord_aCP, d.Eq_aCQ]
-[([taBV], $d1{-rDI,x-}, d.Ord_aBN)]
-    d.Eq_aCO = d.Eq_aCQ
-    d.Ord_aCU = d.Ord_aBN
-    $mcompare_aDK =
-       PrelBase.$mcompare{-rf4,p-} (Bar{-r3l,x-} taBV) d.Ord_aCU
-    d.Ord_aCW = d.Ord_aBN
-    $m<_aDL = PrelBase.$m<{-reZ,p-} (Bar{-r3l,x-} taBV) d.Ord_aCW
-    d.Ord_aCY = d.Ord_aBN
-    $m<=_aDM = PrelBase.$m<={-rf0,p-} (Bar{-r3l,x-} taBV) d.Ord_aCY
-    d.Ord_aD0 = d.Ord_aBN
-    $m>=_aDN = PrelBase.$m>={-rf2,p-} (Bar{-r3l,x-} taBV) d.Ord_aD0
-    d.Ord_aD2 = d.Ord_aBN
-    $m>_aDO = PrelBase.$m>{-rf1,p-} (Bar{-r3l,x-} taBV) d.Ord_aD2
-    d.Ord_aD4 = d.Ord_aBN
-    $mmax_aDP = PrelBase.$mmax{-rf8,p-} (Bar{-r3l,x-} taBV) d.Ord_aD4
-    d.Ord_aD6 = d.Ord_aBN
-    $mmin_aDQ = PrelBase.$mmin{-rf9,p-} (Bar{-r3l,x-} taBV) d.Ord_aD6
-    AbsBinds [] [] [([], compare_aDR, compare_aBS)]
-       compare_aBS = $mcompare_aDK
-    AbsBinds [] [] [([], <_aDS, <_aC2)]
-       <_aC2 = $m<_aDL
-    AbsBinds [] [] [([], <=_aDT, <=_aCb)]
-       <=_aCb = $m<=_aDM
-    AbsBinds [] [] [([], >=_aDU, >=_aCk)]
-       >=_aCk = $m>=_aDN
-    AbsBinds [] [] [([], >_aDV, >_aCt)]
-       >_aCt = $m>_aDO
-    AbsBinds [] [] [([], max_aDW, max_aCC)]
-       max_aCC = $mmax_aDP
-    AbsBinds [] [] [([], min_aDX, min_aCL)]
-       min_aCL = $mmin_aDQ
-    d.Ord_aBN =
+[taC3]
+[d.Ord_aCW, d.Eq_aCX]
+[([taC3], $d1{-rDR,x-}, d.Ord_aBV)]
+    d.Eq_aCY = d.Eq_aCX
+    d.Ord_aD2 = d.Ord_aBV
+    $mcompare_aE5 =
+       PrelBase.$mcompare{-rf4,p-} (Bar{-r3m,x-} taC3) d.Ord_aD2
+    d.Ord_aD4 = d.Ord_aBV
+    $m<_aE4 = PrelBase.$m<{-reZ,p-} (Bar{-r3m,x-} taC3) d.Ord_aD4
+    d.Ord_aD6 = d.Ord_aBV
+    $m<=_aE3 = PrelBase.$m<={-rf0,p-} (Bar{-r3m,x-} taC3) d.Ord_aD6
+    d.Ord_aD8 = d.Ord_aBV
+    $m>=_aE2 = PrelBase.$m>={-rf2,p-} (Bar{-r3m,x-} taC3) d.Ord_aD8
+    d.Ord_aDa = d.Ord_aBV
+    $m>_aE1 = PrelBase.$m>{-rf1,p-} (Bar{-r3m,x-} taC3) d.Ord_aDa
+    d.Ord_aDc = d.Ord_aBV
+    $mmax_aE0 = PrelBase.$mmax{-rf8,p-} (Bar{-r3m,x-} taC3) d.Ord_aDc
+    d.Ord_aDe = d.Ord_aBV
+    $mmin_aDZ = PrelBase.$mmin{-rf9,p-} (Bar{-r3m,x-} taC3) d.Ord_aDe
+    AbsBinds [] [] [([], compare_aDY, compare_aC0)]
+       compare_aC0 = $mcompare_aE5
+    AbsBinds [] [] [([], <_aDX, <_aCa)]
+       <_aCa = $m<_aE4
+    AbsBinds [] [] [([], <=_aDW, <=_aCj)]
+       <=_aCj = $m<=_aE3
+    AbsBinds [] [] [([], >=_aDV, >=_aCs)]
+       >=_aCs = $m>=_aE2
+    AbsBinds [] [] [([], >_aDU, >_aCB)]
+       >_aCB = $m>_aE1
+    AbsBinds [] [] [([], max_aDT, max_aCK)]
+       max_aCK = $mmax_aE0
+    AbsBinds [] [] [([], min_aDS, min_aCT)]
+       min_aCT = $mmin_aDZ
+    d.Ord_aBV =
        ({-dict-}
-        [d.Eq_aCO]
-        [compare_aDR, <_aDS, <=_aDT, >=_aDU, >_aDV, max_aDW, min_aDX])
-AbsBinds [taDo] [d.Eq_aDx] [([taDo], $d2{-rDJ,x-}, d.Eq_aDg)]
-    d.Eq_aDB = d.Eq_aDg
-    $m/=_aDY = PrelBase.$m/={-reY,p-} (Bar{-r3l,x-} taDo) d.Eq_aDB
-    AbsBinds [] [] [([], ==_aDZ, ==_aDl)]
-       ==_aDl
+        [d.Eq_aCY]
+        [compare_aDY, <_aDX, <=_aDW, >=_aDV, >_aDU, max_aDT, min_aDS])
+AbsBinds [taDw] [d.Eq_aDF] [([taDw], $d2{-rDQ,x-}, d.Eq_aDo)]
+    d.Eq_aDJ = d.Eq_aDo
+    $m/=_aE8 = PrelBase.$m/={-reY,p-} (Bar{-r3m,x-} taDw) d.Eq_aDJ
+    AbsBinds [] [] [([], ==_aE7, ==_aDt)]
+       ==_aDt
            = GHCerr.noDefaultMethodError{-8k,w-}
-                 (Bar{-r3l,x-} taDo
-                  -> Bar{-r3l,x-} taDo
+                 (Bar{-r3m,x-} taDw
+                  -> Bar{-r3m,x-} taDw
                   -> PrelBase.Bool{-34,W-}) "<NoSrcLoc>|PrelBase.=="
-    AbsBinds [] [] [([], /=_aE0, /=_aDu)]
-       /=_aDu = $m/=_aDY
-    d.Eq_aDg = ({-dict-} [] [==_aDZ, /=_aE0])
+    AbsBinds [] [] [([], /=_aE6, /=_aDC)]
+       /=_aDC = $m/=_aE8
+    d.Eq_aDo = ({-dict-} [] [==_aE7, /=_aE6])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldFail 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc079.stderr b/ghc/tests/typecheck/should_compile/tc079.stderr
index 4f1209d..8e17caf 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc079.stderr
+++ b/ghc/tests/typecheck/should_compile/tc079.stderr
@@ -1,55 +1,53 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [taC2] [d.Foo_aCq] [([taC2], $d1{-rDQ,x-}, d.Foo_aBS)]
-    d.Foo_aCs = d.Foo_aBS
-    $mop1_aDU = $mop1{-rBV,x-} [taC2] d.Foo_aCs
-    d.Foo_aCu = d.Foo_aBS
-    $mop2_aDV = $mop2{-rBZ,x-} [taC2] d.Foo_aCu
-    AbsBinds [] [] [([], op1_aDW, op1_aBY)]
-       op1_aBY = $mop1_aDU
-    AbsBinds [taCk] [d.Ord_aCn] [([taCk], op2_aDX, op2_aCb)]
-       d.Ord_aCp = d.Ord_aCn
-       $mop2_aDY = $mop2_aDV taCk d.Ord_aCp
-       op2_aCb = $mop2_aDY
-    d.Foo_aBS = ({-dict-} [] [op1_aDW, op2_aDX])
-AbsBinds [] [] [([], $d2{-rDR,x-}, d.Foo_aCA)]
-    AbsBinds [] [] [([], op1_aDZ, op1_aCF)]
-       op1_aCF = $mop1_aDS
-    AbsBinds [taD0] [d.Ord_aD3] [([taD0], op2_aE0, op2_aCR)]
-       d.Ord_aD7 = d.Ord_aD3
-       $mop2_aE1 = $mop2_aDT taD0 d.Ord_aD7
-       op2_aCR = $mop2_aE1
-    d.Foo_aCA = ({-dict-} [] [op1_aDZ, op2_aE0])
-op1{-r3C,x-} =
+==================== Typechecked ====================
+AbsBinds [taCa] [d.Foo_aCy] [([taCa], $d1{-rDY,x-}, d.Foo_aC0)]
+    d.Foo_aCA = d.Foo_aC0
+    $mop1_aE2 = $mop1{-rC3,x-} [taCa] d.Foo_aCA
+    d.Foo_aCC = d.Foo_aC0
+    $mop2_aE1 = $mop2{-rC7,x-} [taCa] d.Foo_aCC
+    AbsBinds [] [] [([], op1_aE0, op1_aC6)]
+       op1_aC6 = $mop1_aE2
+    AbsBinds [taCs] [d.Ord_aCv] [([taCs], op2_aDZ, op2_aCj)]
+       d.Ord_aCx = d.Ord_aCv
+       $mop2_aE6 = $mop2_aE1 taCs d.Ord_aCx
+       op2_aCj = $mop2_aE6
+    d.Foo_aC0 = ({-dict-} [] [op1_aE0, op2_aDZ])
+AbsBinds [] [] [([], $d2{-rE5,x-}, d.Foo_aCI)]
+    AbsBinds [] [] [([], op1_aE8, op1_aCN)]
+       op1_aCN = $mop1_aE4
+    AbsBinds [taD8] [d.Ord_aDb] [([taD8], op2_aE7, op2_aCZ)]
+       d.Ord_aDf = d.Ord_aDb
+       $mop2_aE9 = $mop2_aE3 taD8 d.Ord_aDf
+       op2_aCZ = $mop2_aE9
+    d.Foo_aCI = ({-dict-} [] [op1_aE8, op2_aE7])
+op1{-r3D,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-op2{-r3D,x-} =
+op2{-r3C,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
 AbsBinds
-[taDi]
-[d.Foo_aDI]
-[([taDi], $mop1{-rBV,x-}, op1_aE2), ([taDi],
-                                    $mop2{-rBZ,x-},
-                                    op2_aE4)]
-    d.Foo_aDK = d.Foo_aDI
-    op1_aE3 = op1{-r3C,x-} taDi d.Foo_aDK
-    AbsBinds [] [] [([], op1_aE2, op1_aDf)]
-       op1_aDf x_r3u = PrelBase.True{-5E,w-}{i}
-    AbsBinds [taDu] [d.Ord_aDE] [([taDu], op2_aE4, op2_aDo)]
-       d.Ord_aDG = d.Ord_aDE
-       <_aE5 = PrelBase.<{-rfI,p-} taDu d.Ord_aDG
-       op2_aDo x_r3y y_r3z z_r3A
-               = if (op1_aE3 x_r3y) PrelBase.&&{-r3B,p-} (y_r3z <_aE5 z_r3A) then
+[taDq]
+[d.Foo_aDQ]
+[([taDq], $mop1{-rC3,x-}, op1_aEa), ([taDq],
+                                    $mop2{-rC7,x-},
+                                    op2_aEb)]
+    d.Foo_aDS = d.Foo_aDQ
+    op1_aEc = op1{-r3D,x-} taDq d.Foo_aDS
+    AbsBinds [] [] [([], op1_aEa, op1_aDn)]
+       op1_aDn x_r3u = PrelBase.True{-5E,w-}{i}
+    AbsBinds [taDC] [d.Ord_aDM] [([taDC], op2_aEb, op2_aDw)]
+       d.Ord_aDO = d.Ord_aDM
+       <_aEd = PrelBase.<{-rfI,p-} taDC d.Ord_aDO
+       op2_aDw x_r3y y_r3z z_r3A
+               = if (op1_aEc x_r3y) PrelBase.&&{-r3B,p-} (y_r3z <_aEd z_r3A) then
                      y_r3z
                  else
                      z_r3A
-d.Foo_aDM = $d2{-rDR,x-}
-$mop1_aDS = $mop1{-rBV,x-} PrelBase.Int{-3g,W-} d.Foo_aDM
-d.Foo_aDP = d.Foo_aDM
-$mop2_aDT = $mop2{-rBZ,x-} PrelBase.Int{-3g,W-} d.Foo_aDP
+d.Foo_aDU = $d2{-rE5,x-}
+$mop1_aE4 = $mop1{-rC3,x-} PrelBase.Int{-3g,W-} d.Foo_aDU
+d.Foo_aDX = d.Foo_aDU
+$mop2_aE3 = $mop2{-rC7,x-} PrelBase.Int{-3g,W-} d.Foo_aDX
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc080.stderr b/ghc/tests/typecheck/should_compile/tc080.stderr
index bbc7fcf..d42fdbb 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc080.stderr
+++ b/ghc/tests/typecheck/should_compile/tc080.stderr
@@ -1,68 +1,65 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [] [] [([], charToInt{-r3R,x-}, charToInt_aZA)]
-    charToInt_aZA x_r4E
-                 = (PrelBase.ord{-riq,p-} x_r4E) -_a1a5 (PrelBase.ord{-riq,p-} '0')
-AbsBinds [] [] [([], strToInt{-r3Q,x-}, strToInt_aZI)]
-    d.Integral_a10K = PrelNum.$d36{-rI6,p-}
-    strToInt_aZI x_r4v
-                = strToInt'_a1ai (PrelList.length{-rz0,p-}
+==================== Typechecked ====================
+AbsBinds [] [] [([], charToInt{-r3R,x-}, charToInt_aZI)]
+    charToInt_aZI x_r4E
+                 = (PrelBase.ord{-riq,p-} x_r4E) -_a1a9 (PrelBase.ord{-riq,p-} '0')
+AbsBinds [] [] [([], strToInt{-r3Q,x-}, strToInt_aZQ)]
+    d.Integral_a10U = PrelNum.$d36{-rI6,p-}
+    strToInt_aZQ x_r4v
+                = strToInt'_a1am (PrelList.length{-rz0,p-}
                                       PrelBase.Char{-38,W-} x_r4v)
-                                 -_a19Z lit_a1a0
+                                 -_a1af lit_a1ae
                                  x_r4v
                 where
                     {- rec -}
                     AbsBinds
-                    [ta10j]
-                    [d.Integral_a10t]
-                    [([ta10j], strToInt'_r4x, strToInt'_aZL)]
-                        d.Real_a19S =
-                            PrelNum.scsel_IntegralPrelNumReal{-a1an,p-} ta10j d.Integral_a10t
-                        d.Num_a10w =
-                            PrelNum.scsel_RealPrelBaseNum{-a1ao,p-} ta10j d.Real_a19S
-                        d.Num_a10s = PrelBase.$d4{-rcO,p-}
-                        ^_a1aj =
-                            PrelNum.^{-rAz,p-} [ta10j, PrelBase.Int{-3g,W-}]
-                                [d.Num_a10s, d.Integral_a10t]
-                        -_a1ak = PrelBase.-{-817,p-} ta10j d.Num_a10w
-                        d.Num_a10z = d.Num_a10w
-                        fromInt_a1al = PrelBase.fromInt{-8R,p-} ta10j d.Num_a10z
-                        lit_a1am = fromInt_a1al PrelBase.I#{-5b,w-}{i} 1#
-                        strToInt'_aZL _ PrelBase.[]{-5i,w-}{i} = lit_a1a1
-                        strToInt'_aZL x_r4A (a_r4B PrelBase.:{-55,w-}{i} l_r4C)
-                                      = ((charToInt{-r3R,x-} a_r4B) *_a1a3 (lit_a1a4 ^_a1aj x_r4A))
-                                        +_a1a2 (strToInt'_aZL x_r4A -_a1ak lit_a1am l_r4C)
+                    [ta10t]
+                    [d.Integral_a10D]
+                    [([ta10t], strToInt'_r4x, strToInt'_aZT)]
+                        d.Real_a19W =
+                            PrelNum.scsel_IntegralPrelNumReal{-a1ar,p-} ta10t d.Integral_a10D
+                        d.Num_a10G =
+                            PrelNum.scsel_RealPrelBaseNum{-a1as,p-} ta10t d.Real_a19W
+                        d.Num_a10C = PrelBase.$d4{-rcO,p-}
+                        ^_a1aq =
+                            PrelNum.^{-rAz,p-} [ta10t, PrelBase.Int{-3g,W-}]
+                                [d.Num_a10C, d.Integral_a10D]
+                        -_a1ap = PrelBase.-{-817,p-} ta10t d.Num_a10G
+                        d.Num_a10J = d.Num_a10G
+                        fromInt_a1ao = PrelBase.fromInt{-8R,p-} ta10t d.Num_a10J
+                        lit_a1an = fromInt_a1ao PrelBase.I#{-5b,w-}{i} 1#
+                        strToInt'_aZT _ PrelBase.[]{-5i,w-}{i} = lit_a1ad
+                        strToInt'_aZT x_r4A (a_r4B PrelBase.:{-55,w-}{i} l_r4C)
+                                      = ((charToInt{-r3R,x-} a_r4B) *_a1ab (lit_a1aa ^_a1aq x_r4A))
+                                        +_a1ac (strToInt'_aZT x_r4A -_a1ap lit_a1an l_r4C)
                     {- nonrec -}
-                    strToInt'_a1ai = strToInt'_r4x PrelBase.Int{-3g,W-} d.Integral_a10K
+                    strToInt'_a1am = strToInt'_r4x PrelBase.Int{-3g,W-} d.Integral_a10U
                     {- nonrec -}
-AbsBinds [ta10Z] [] [([ta10Z], span'{-r3O,x-}, span'_a10W)]
-    span'_a10W p_r49 PrelBase.[]{-5i,w-}{i}
-              = (PrelBase.[]{-5i,w-}{i} ta10Z, PrelBase.[]{-5i,w-}{i} ta10Z)
-    span'_a10W p_r4b (x_r4c PrelBase.:{-55,w-}{i} xs'_r4d)
+AbsBinds [ta119] [] [([ta119], span'{-r3O,x-}, span'_a116)]
+    span'_a116 p_r49 PrelBase.[]{-5i,w-}{i}
+              = (PrelBase.[]{-5i,w-}{i} ta119, PrelBase.[]{-5i,w-}{i} ta119)
+    span'_a116 p_r4b (x_r4c PrelBase.:{-55,w-}{i} xs'_r4d)
               | p_r4b x_r4c
-              = fixLeak_r4f [[ta10Z], ta10Z] x_r4c
-                                             span'{-r3O,x-} ta10Z p_r4b xs'_r4d
+              = fixLeak_r4f [[ta119], ta119] x_r4c
+                                             span'{-r3O,x-} ta119 p_r4b xs'_r4d
               where
                   {- nonrec -}
                   AbsBinds
-                  [ta11F, ta11H]
+                  [ta11N, ta11P]
                   []
-                  [([ta11F, ta11H], fixLeak_r4f, fixLeak_a11j)]
-                      fixLeak_a11j x_r4h (xs_r4i, ys_r4j)
-                                   = (PrelBase.:{-55,w-}{i} ta11H x_r4h xs_r4i, ys_r4j)
+                  [([ta11N, ta11P], fixLeak_r4f, fixLeak_a11p)]
+                      fixLeak_a11p x_r4h (xs_r4i, ys_r4j)
+                                   = (PrelBase.:{-55,w-}{i} ta11P x_r4h xs_r4i, ys_r4j)
                   {- nonrec -}
                   {- nonrec -}
-    span'_a10W _ xs_r4l = (PrelBase.[]{-5i,w-}{i} ta10Z, xs_r4l)
-AbsBinds [] [] [([], lines'{-r3P,x-}, lines'_a121)]
-    lines'_a121 "" = PrelBase.[]{-5i,w-}{i} [PrelBase.Char{-38,W-}]
-    lines'_a121 s_r4o
-               = plumb_r4q span'{-r3O,x-} PrelBase.Char{-38,W-} /=_a19Y '\n' s_r4o
+    span'_a116 _ xs_r4l = (PrelBase.[]{-5i,w-}{i} ta119, xs_r4l)
+AbsBinds [] [] [([], lines'{-r3P,x-}, lines'_a125)]
+    lines'_a125 "" = PrelBase.[]{-5i,w-}{i} [PrelBase.Char{-38,W-}]
+    lines'_a125 s_r4o
+               = plumb_r4q span'{-r3O,x-} PrelBase.Char{-38,W-} /=_a1ag '\n' s_r4o
                where
                    {- nonrec -}
-                   AbsBinds [] [] [([], plumb_r4q, plumb_a126)]
-                       plumb_a126 (l_r4s, s'_r4t)
+                   AbsBinds [] [] [([], plumb_r4q, plumb_a12a)]
+                       plumb_a12a (l_r4s, s'_r4t)
                                   = PrelBase.:{-55,w-}{i} [PrelBase.Char{-38,W-}]
                                         l_r4s
                                         (if PrelList.null{-rz6,p-}
@@ -73,47 +70,47 @@ AbsBinds [] [] [([], lines'{-r3P,x-}, lines'_a121)]
                                                                  PrelBase.Char{-38,W-} s'_r4t)
                    {- nonrec -}
                    {- nonrec -}
-AbsBinds [] [] [([], whiteSpace{-r3N,x-}, whiteSpace_a12C)]
-    whiteSpace_a12C
+AbsBinds [] [] [([], whiteSpace{-r3N,x-}, whiteSpace_a12H)]
+    whiteSpace_a12H
        = PrelBase.dropWhile{-rhV,p-}
              PrelBase.Char{-38,W-} PrelBase.isSpace{-rig,p-}
-AbsBinds [] [] [([], seperatedBy{-r3M,x-}, seperatedBy_a12G)]
-    seperatedBy_a12G ch_r3W PrelBase.[]{-5i,w-}{i}
+AbsBinds [] [] [([], seperatedBy{-r3M,x-}, seperatedBy_a12L)]
+    seperatedBy_a12L ch_r3W PrelBase.[]{-5i,w-}{i}
                     = PrelBase.[]{-5i,w-}{i} PrelBase.String{-r5n,p-}
-    seperatedBy_a12G ch_r3Y xs_r3Z
+    seperatedBy_a12L ch_r3Y xs_r3Z
                     = twaddle_r41 ch_r3Y
                                   span'{-r3O,x-} PrelBase.Char{-38,W-} \ x_r47
-                                                                         -> x_r47 /=_a19W ch_r3Y
+                                                                         -> x_r47 /=_a1ai ch_r3Y
                                                                        xs_r3Z
                     where
                         {- nonrec -}
-                        AbsBinds [] [] [([], twaddle_r41, twaddle_a12N)]
-                            twaddle_a12N ch_r43 (l_r44, (_ PrelBase.:{-55,w-}{i} r_r45))
+                        AbsBinds [] [] [([], twaddle_r41, twaddle_a12S)]
+                            twaddle_a12S ch_r43 (l_r44, (_ PrelBase.:{-55,w-}{i} r_r45))
                                          = PrelBase.:{-55,w-}{i} PrelBase.String{-r5n,p-}
                                                l_r44 (seperatedBy{-r3M,x-} ch_r43 r_r45)
                         {- nonrec -}
                         {- nonrec -}
 AbsBinds
-[ta13E]
-[d.Parse_a154]
-[([ta13E], $d1{-r19T,x-}, d.Parse_a13s)]
-    d.Parse_a158 = d.Parse_a13s
-    $mparseFile_a1ap = $mparseFile{-r13v,x-} [ta13E] d.Parse_a158
-    d.Parse_a15a = d.Parse_a13s
-    $mparseLine_a1aq = $mparseLine{-r13z,x-} [ta13E] d.Parse_a15a
-    d.Parse_a15e = d.Parse_a154
-    parseLine_a1ar = parseLine{-r4R,x-} ta13E d.Parse_a15e
-    d.Parse_a15k = d.Parse_a13s
-    $mparse_a1as = $mparse{-r13A,x-} [ta13E] d.Parse_a15k
-    d.Parse_a15m = d.Parse_a154
-    forced_a1at = forced{-r5S,x-} ta13E d.Parse_a15m
-    AbsBinds [] [] [([], parseFile_a1au, parseFile_a13y)]
-       parseFile_a13y = $mparseFile_a1ap
-    AbsBinds [] [] [([], parseLine_a1av, parseLine_a13L)]
-       parseLine_a13L = $mparseLine_a1aq
-    AbsBinds [] [] [([], parseType_a1aw, parseType_a13T)]
-       parseType_a13T more_r4L
-                      = (map_a1a6 [PrelBase.String{-r5n,p-}, ta13E] parseLine_a1ar
+[ta13L]
+[d.Parse_a158]
+[([ta13L], $d1{-r1al,x-}, d.Parse_a13z)]
+    d.Parse_a15c = d.Parse_a13z
+    $mparseFile_a1aC = $mparseFile{-r13C,x-} [ta13L] d.Parse_a15c
+    d.Parse_a15e = d.Parse_a13z
+    $mparseLine_a1aB = $mparseLine{-r13I,x-} [ta13L] d.Parse_a15e
+    d.Parse_a15i = d.Parse_a158
+    parseLine_a1aA = parseLine{-r4R,x-} ta13L d.Parse_a15i
+    d.Parse_a15o = d.Parse_a13z
+    $mparse_a1az = $mparse{-r13H,x-} [ta13L] d.Parse_a15o
+    d.Parse_a15q = d.Parse_a158
+    forced_a1ay = forced{-r5P,x-} ta13L d.Parse_a15q
+    AbsBinds [] [] [([], parseFile_a1ax, parseFile_a13F)]
+       parseFile_a13F = $mparseFile_a1aC
+    AbsBinds [] [] [([], parseLine_a1aw, parseLine_a13S)]
+       parseLine_a13S = $mparseLine_a1aB
+    AbsBinds [] [] [([], parseType_a1av, parseType_a140)]
+       parseType_a140 more_r4L
+                      = (map_a1a8 [PrelBase.String{-r5n,p-}, ta13L] parseLine_a1aA
                                                                     seperatedBy{-r3M,x-} ','
                                                                                          ++_a1a7
                                                                                              PrelBase.Char{-38,W-}
@@ -122,64 +119,64 @@ AbsBinds
                          out_r4O)
                       where
                           {- nonrec -}
-                          AbsBinds [] [] [([], l_r4N, l_a13W), ([], out_r4O, out_a13X)]
-                              (l_a13W, (']' PrelBase.:{-55,w-}{i} out_a13X))
+                          AbsBinds [] [] [([], l_r4N, l_a143), ([], out_r4O, out_a144)]
+                              (l_a143, (']' PrelBase.:{-55,w-}{i} out_a144))
                                   = span'{-r3O,x-} PrelBase.Char{-38,W-} \ x_r4Q
-                                                                           -> x_r4Q /=_a1a8 ']'
+                                                                           -> x_r4Q /=_a1a6 ']'
                                                                          PrelList.tail{-rzj,p-}
                                                                              PrelBase.Char{-38,W-} more_r4L
                           {- nonrec -}
                           {- nonrec -}
-    AbsBinds [] [] [([], parse_a1ax, parse_a14R)]
-       parse_a14R = $mparse_a1as
-    AbsBinds [] [] [([], forced_a1ay, forced_a14Z)]
-       forced_a14Z = PrelList.all{-rwP,p-} ta13E forced_a1at
-    d.Parse_a13s =
+    AbsBinds [] [] [([], parse_a1au, parse_a14V)]
+       parse_a14V = $mparse_a1az
+    AbsBinds [] [] [([], forced_a1at, forced_a153)]
+       forced_a153 = PrelList.all{-rwP,p-} ta13L forced_a1ay
+    d.Parse_a13z =
        ({-dict-}
         []
-        [parseFile_a1au, parseLine_a1av, parseType_a1aw, parse_a1ax, forced_a1ay])
-AbsBinds [] [] [([], $d2{-r19U,x-}, d.Parse_a15s)]
-    AbsBinds [] [] [([], parseFile_a1az, parseFile_a15x)]
-       parseFile_a15x = $mparseFile_a1a9
-    AbsBinds [] [] [([], parseLine_a1aA, parseLine_a15H)]
-       parseLine_a15H = $mparseLine_a1aa
-    AbsBinds [] [] [([], parseType_a1aB, parseType_a15Q)]
-       parseType_a15Q (ch_r4Z PrelBase.:{-55,w-}{i} str_r50)
+        [parseFile_a1ax, parseLine_a1aw, parseType_a1av, parse_a1au, forced_a1at])
+AbsBinds [] [] [([], $d2{-r1ak,x-}, d.Parse_a15w)]
+    AbsBinds [] [] [([], parseFile_a1aH, parseFile_a15B)]
+       parseFile_a15B = $mparseFile_a1a5
+    AbsBinds [] [] [([], parseLine_a1aG, parseLine_a15L)]
+       parseLine_a15L = $mparseLine_a1a4
+    AbsBinds [] [] [([], parseType_a1aF, parseType_a15U)]
+       parseType_a15U (ch_r4Z PrelBase.:{-55,w-}{i} str_r50)
                       = (ch_r4Z, str_r50)
-    AbsBinds [] [] [([], parse_a1aC, parse_a164)]
-       parse_a164 = $mparse_a1ab
-    AbsBinds [] [] [([], forced_a1aD, forced_a16d)]
-       forced_a16d n_r54 = PrelBase.True{-5E,w-}{i}
-    d.Parse_a15s =
+    AbsBinds [] [] [([], parse_a1aE, parse_a166)]
+       parse_a166 = $mparse_a1a3
+    AbsBinds [] [] [([], forced_a1aD, forced_a16f)]
+       forced_a16f n_r54 = PrelBase.True{-5E,w-}{i}
+    d.Parse_a15w =
        ({-dict-}
         []
-        [parseFile_a1az, parseLine_a1aA, parseType_a1aB, parse_a1aC, forced_a1aD])
-AbsBinds [] [] [([], $d3{-r19V,x-}, d.Parse_a16q)]
-    AbsBinds [] [] [([], parseFile_a1aE, parseFile_a16v)]
-       parseFile_a16v = $mparseFile_a1ac
-    AbsBinds [] [] [([], parseLine_a1aF, parseLine_a16F)]
-       parseLine_a16F = $mparseLine_a1ad
-    AbsBinds [] [] [([], parseType_a1aG, parseType_a16O)]
-       parseType_a16O str_r5a
+        [parseFile_a1aH, parseLine_a1aG, parseType_a1aF, parse_a1aE, forced_a1aD])
+AbsBinds [] [] [([], $d3{-r1aj,x-}, d.Parse_a16s)]
+    AbsBinds [] [] [([], parseFile_a1aM, parseFile_a16x)]
+       parseFile_a16x = $mparseFile_a1a2
+    AbsBinds [] [] [([], parseLine_a1aL, parseLine_a16H)]
+       parseLine_a16H = $mparseLine_a1a1
+    AbsBinds [] [] [([], parseType_a1aK, parseType_a16Q)]
+       parseType_a16Q str_r5a
                       = pl_r5c PrelBase.String{-r5n,p-} span'{-r3O,x-}
                                                             PrelBase.Char{-38,W-} PrelBase.isDigit{-ria,p-}
                                                                                   str_r5a
                       where
                           {- nonrec -}
-                          AbsBinds [ta178] [] [([ta178], pl_r5c, pl_a16R)]
-                              pl_a16R (l_r5e, r_r5f) = (strToInt{-r3Q,x-} l_r5e, r_r5f)
+                          AbsBinds [ta17b] [] [([ta17b], pl_r5c, pl_a16T)]
+                              pl_a16T (l_r5e, r_r5f) = (strToInt{-r3Q,x-} l_r5e, r_r5f)
                           {- nonrec -}
                           {- nonrec -}
-    AbsBinds [] [] [([], parse_a1aH, parse_a17h)]
-       parse_a17h = $mparse_a1ae
-    AbsBinds [] [] [([], forced_a1aI, forced_a17q)]
-       forced_a17q n_r5j
-                   | n_r5j >=_a1af lit_a1ag = PrelBase.True{-5E,w-}{i}
-    d.Parse_a16q =
+    AbsBinds [] [] [([], parse_a1aJ, parse_a17k)]
+       parse_a17k = $mparse_a1a0
+    AbsBinds [] [] [([], forced_a1aI, forced_a17t)]
+       forced_a17t n_r5j
+                   | n_r5j >=_a19Z lit_a19Y = PrelBase.True{-5E,w-}{i}
+    d.Parse_a16s =
        ({-dict-}
         []
-        [parseFile_a1aE, parseLine_a1aF, parseType_a1aG, parse_a1aH, forced_a1aI])
-parseFile{-r5P,x-} =
+        [parseFile_a1aM, parseLine_a1aL, parseType_a1aK, parse_a1aJ, forced_a1aI])
+parseFile{-r5S,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
@@ -193,21 +190,21 @@ parseLine{-r4R,x-} =
        of {
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B2;}
-parseType{-r5Q,x-} =
+parseType{-r5R,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B3;}
-parse{-r5R,x-} =
+parse{-r5Q,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B4;}
-forced{-r5S,x-} =
+forced{-r5P,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
@@ -215,93 +212,96 @@ forced{-r5S,x-} =
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B5;}
 AbsBinds
-[ta182]
-[d.Parse_a197]
-[([ta182], $mparseFile{-r13v,x-}, parseFile_a1aJ), ([ta182],
-                                                   $mparseLine{-r13z,x-},
-                                                   parseLine_a1aO), ([ta182],
-                                                                     $mparse{-r13A,x-},
-                                                                     parse_a1aP), ([ta182],
-                                                                                   $mforced{-r13B,x-},
-                                                                                   forced_a1aQ)]
-    d.Parse_a199 = d.Parse_a197
-    forced_a1aK = forced{-r5S,x-} ta182 d.Parse_a199
-    d.Parse_a19d = d.Parse_a197
-    parseLine_a1aL = parseLine{-r4R,x-} ta182 d.Parse_a19d
-    d.Parse_a19f = d.Parse_a197
-    parse_a1aM = parse{-r5R,x-} ta182 d.Parse_a19f
-    d.Parse_a19h = d.Parse_a197
-    parseType_a1aN = parseType{-r5Q,x-} ta182 d.Parse_a19h
-    AbsBinds [] [] [([], parseFile_a1aJ, parseFile_a17K)]
-       parseFile_a17K string_r5A
-                      | PrelList.all{-rwP,p-} ta182 forced_a1aK x_r5C = x_r5C
+[ta186]
+[d.Parse_a19b]
+[([ta186], $mparseFile{-r13C,x-}, parseFile_a1aN), ([ta186],
+                                                   $mparseLine{-r13I,x-},
+                                                   parseLine_a1aQ), ([ta186],
+                                                                     $mparse{-r13H,x-},
+                                                                     parse_a1aP), ([ta186],
+                                                                                   $mforced{-r13G,x-},
+                                                                                   forced_a1aO)]
+    d.Parse_a19d = d.Parse_a19b
+    forced_a1aU = forced{-r5P,x-} ta186 d.Parse_a19d
+    d.Parse_a19h = d.Parse_a19b
+    parseLine_a1aT = parseLine{-r4R,x-} ta186 d.Parse_a19h
+    d.Parse_a19j = d.Parse_a19b
+    parse_a1aS = parse{-r5Q,x-} ta186 d.Parse_a19j
+    d.Parse_a19l = d.Parse_a19b
+    parseType_a1aR = parseType{-r5R,x-} ta186 d.Parse_a19l
+    AbsBinds [] [] [([], parseFile_a1aN, parseFile_a17N)]
+       parseFile_a17N string_r5A
+                      | PrelList.all{-rwP,p-} ta186 forced_a1aU x_r5C = x_r5C
                       where
                           {- nonrec -}
-                          AbsBinds [] [] [([], x_r5C, x_a17N)]
-                              x_a17N
-                                  = map_a1ah [PrelBase.String{-r5n,p-}, ta182] parseLine_a1aL
+                          AbsBinds [] [] [([], x_r5C, x_a17Q)]
+                              x_a17Q
+                                  = map_a19X [PrelBase.String{-r5n,p-}, ta186] parseLine_a1aT
                                                                                lines'{-r3P,x-} string_r5A
                           {- nonrec -}
                           {- nonrec -}
-    AbsBinds [] [] [([], parseLine_a1aO, parseLine_a18o)]
-       parseLine_a18o
+    AbsBinds [] [] [([], parseLine_a1aQ, parseLine_a18r)]
+       parseLine_a18r
            = PrelBase..{-rc2,p-}
-                 [(ta182, PrelBase.String{-r5n,p-}), PrelBase.String{-r5n,p-}, ta182]
-                 (pl_r5G [ta182, PrelBase.String{-r5n,p-}]) parse_a1aM
+                 [(ta186, PrelBase.String{-r5n,p-}), PrelBase.String{-r5n,p-}, ta186]
+                 (pl_r5G [ta186, PrelBase.String{-r5n,p-}]) parse_a1aS
            where
                {- nonrec -}
-               AbsBinds [ta18v, ta18y] [] [([ta18v, ta18y], pl_r5G, pl_a18n)]
-                   pl_a18n (a_r5I, _) = a_r5I
+               AbsBinds [ta18B, ta18E] [] [([ta18B, ta18E], pl_r5G, pl_a18q)]
+                   pl_a18q (a_r5I, _) = a_r5I
                {- nonrec -}
                {- nonrec -}
-    AbsBinds [] [] [([], parse_a1aP, parse_a18R)]
-       parse_a18R
+    AbsBinds [] [] [([], parse_a1aP, parse_a18V)]
+       parse_a18V
            = PrelBase..{-rc2,p-}
-                 [PrelBase.String{-r5n,p-}, PrelBase.String{-r5n,p-}, (ta182, PrelBase.String{-r5n,p-})]
-                 parseType_a1aN whiteSpace{-r3N,x-}
-    AbsBinds [] [] [([], forced_a1aQ, forced_a192)]
-       forced_a192 x_r5O = PrelBase.True{-5E,w-}{i}
-d.Eq_a19j = PrelBase.$d34{-rcI,p-}
-/=_a19W = PrelBase./={-rhx,p-} PrelBase.Char{-38,W-} d.Eq_a19j
-d.Eq_a19o = d.Eq_a19j
-d.Eq_a19m = PrelBase.$d28{-rcB,p-} PrelBase.Char{-38,W-} d.Eq_a19o
-==_a19X = PrelBase.=={-8Y,p-} [PrelBase.Char{-38,W-}] d.Eq_a19m
-/=_a19Y = /=_a19W
-d.Num_a19q = PrelBase.$d4{-rcO,p-}
--_a19Z = PrelBase.-{-817,p-} PrelBase.Int{-3g,W-} d.Num_a19q
-lit_a1a0 = PrelBase.I#{-5b,w-}{i} 1#
-lit_a1a1 = PrelBase.I#{-5b,w-}{i} 0#
-d.Num_a19t = d.Num_a19q
-+_a1a2 = PrelBase.+{-rhC,p-} PrelBase.Int{-3g,W-} d.Num_a19t
-d.Num_a19v = d.Num_a19q
-*_a1a3 = PrelBase.*{-rhD,p-} PrelBase.Int{-3g,W-} d.Num_a19v
-lit_a1a4 = PrelBase.I#{-5b,w-}{i} 10#
--_a1a5 = -_a19Z
-d.Functor_a19x = PrelBase.$d26{-rcz,p-}
-map_a1a6 = PrelBase.map{-rhy,p-} PrelBase.[]{-3j,W-} d.Functor_a19x
-d.MonadPlus_a19A = PrelBase.$d23{-rcw,p-}
-++_a1a7 = PrelBase.++{-rhB,p-} PrelBase.[]{-3j,W-} d.MonadPlus_a19A
-/=_a1a8 = /=_a19W
-d.Parse_a19D = $d2{-r19U,x-}
-$mparseFile_a1a9 =
-    $mparseFile{-r13v,x-} PrelBase.Char{-38,W-} d.Parse_a19D
-d.Parse_a19G = d.Parse_a19D
-$mparseLine_a1aa =
-    $mparseLine{-r13z,x-} PrelBase.Char{-38,W-} d.Parse_a19G
-d.Parse_a19I = d.Parse_a19D
-$mparse_a1ab = $mparse{-r13A,x-} PrelBase.Char{-38,W-} d.Parse_a19I
-d.Parse_a19K = $d3{-r19V,x-}
-$mparseFile_a1ac =
-    $mparseFile{-r13v,x-} PrelBase.Int{-3g,W-} d.Parse_a19K
-d.Parse_a19N = d.Parse_a19K
-$mparseLine_a1ad =
-    $mparseLine{-r13z,x-} PrelBase.Int{-3g,W-} d.Parse_a19N
-d.Parse_a19P = d.Parse_a19K
-$mparse_a1ae = $mparse{-r13A,x-} PrelBase.Int{-3g,W-} d.Parse_a19P
-d.Ord_a19R = PrelBase.$d7{-rda,p-}
->=_a1af = PrelBase.>={-8Z,p-} PrelBase.Int{-3g,W-} d.Ord_a19R
-lit_a1ag = lit_a1a1
-map_a1ah = map_a1a6
+                 [PrelBase.String{-r5n,p-}, PrelBase.String{-r5n,p-}, (ta186, PrelBase.String{-r5n,p-})]
+                 parseType_a1aR whiteSpace{-r3N,x-}
+    AbsBinds [] [] [([], forced_a1aO, forced_a196)]
+       forced_a196 x_r5O = PrelBase.True{-5E,w-}{i}
+d.Eq_a19n = PrelBase.$d34{-rcI,p-}
+/=_a1ai = PrelBase./={-rhx,p-} PrelBase.Char{-38,W-} d.Eq_a19n
+d.Eq_a19s = d.Eq_a19n
+d.Eq_a19q = PrelBase.$d28{-rcB,p-} PrelBase.Char{-38,W-} d.Eq_a19s
+==_a1ah = PrelBase.=={-8Y,p-} [PrelBase.Char{-38,W-}] d.Eq_a19q
+/=_a1ag = /=_a1ai
+d.Num_a19u = PrelBase.$d4{-rcO,p-}
+-_a1af = PrelBase.-{-817,p-} PrelBase.Int{-3g,W-} d.Num_a19u
+lit_a1ae = PrelBase.I#{-5b,w-}{i} 1#
+lit_a1ad = PrelBase.I#{-5b,w-}{i} 0#
+d.Num_a19x = d.Num_a19u
++_a1ac = PrelBase.+{-rhC,p-} PrelBase.Int{-3g,W-} d.Num_a19x
+d.Num_a19z = d.Num_a19u
+*_a1ab = PrelBase.*{-rhD,p-} PrelBase.Int{-3g,W-} d.Num_a19z
+lit_a1aa = PrelBase.I#{-5b,w-}{i} 10#
+-_a1a9 = -_a1af
+d.Functor_a19B = PrelBase.$d26{-rcz,p-}
+map_a1a8 = PrelBase.map{-rhy,p-} PrelBase.[]{-3j,W-} d.Functor_a19B
+d.MonadPlus_a19E = PrelBase.$d23{-rcw,p-}
+++_a1a7 = PrelBase.++{-rhB,p-} PrelBase.[]{-3j,W-} d.MonadPlus_a19E
+/=_a1a6 = /=_a1ai
+d.Parse_a19H = $d2{-r1ak,x-}
+$mparseFile_a1a5 =
+    $mparseFile{-r13C,x-} PrelBase.Char{-38,W-} d.Parse_a19H
+d.Parse_a19K = d.Parse_a19H
+$mparseLine_a1a4 =
+    $mparseLine{-r13I,x-} PrelBase.Char{-38,W-} d.Parse_a19K
+d.Parse_a19M = d.Parse_a19H
+$mparse_a1a3 = $mparse{-r13H,x-} PrelBase.Char{-38,W-} d.Parse_a19M
+d.Parse_a19O = $d3{-r1aj,x-}
+$mparseFile_a1a2 =
+    $mparseFile{-r13C,x-} PrelBase.Int{-3g,W-} d.Parse_a19O
+d.Parse_a19R = d.Parse_a19O
+$mparseLine_a1a1 =
+    $mparseLine{-r13I,x-} PrelBase.Int{-3g,W-} d.Parse_a19R
+d.Parse_a19T = d.Parse_a19O
+$mparse_a1a0 = $mparse{-r13H,x-} PrelBase.Int{-3g,W-} d.Parse_a19T
+d.Ord_a19V = PrelBase.$d7{-rda,p-}
+>=_a19Z = PrelBase.>={-8Z,p-} PrelBase.Int{-3g,W-} d.Ord_a19V
+lit_a19Y = lit_a1ad
+map_a19X = map_a1a8
+
+
+NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc081.stderr b/ghc/tests/typecheck/should_compile/tc081.stderr
new file mode 100644 (file)
index 0000000..c27b315
--- /dev/null
+++ b/ghc/tests/typecheck/should_compile/tc081.stderr
@@ -0,0 +1,107 @@
+==================== Typechecked ====================
+AbsBinds
+[taTE]
+[d.Num_aTM, d.Ord_aTR]
+[([taTE], f3{-r3A,x-}, f3_aT2)]
+    +_aVR = PrelBase.+{-rfD,p-} taTE d.Num_aTM
+    d.Num_aTP = d.Num_aTM
+    fromInt_aVQ = PrelBase.fromInt{-8R,p-} taTE d.Num_aTP
+    lit_aVP = fromInt_aVQ PrelBase.I#{-5b,w-}{i} 1#
+    <_aVO = PrelBase.<{-ra4,p-} taTE d.Ord_aTR
+    fromInt_aVN = fromInt_aVQ
+    lit_aVM = fromInt_aVN PrelBase.I#{-5b,w-}{i} 3#
+    d.Ord_aTU = d.Ord_aTR
+    >_aVL = PrelBase.>{-rfK,p-} taTE d.Ord_aTU
+    fromInt_aVK = fromInt_aVQ
+    lit_aVJ = fromInt_aVK PrelBase.I#{-5b,w-}{i} 2#
+    f3_aT2 x_r3t
+          = (x_r3t +_aVR lit_aVP,
+             x_r3t <_aVO lit_aVM,
+             g3_r3v PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i},
+             g3_r3v PrelBase.Char{-38,W-} 'c')
+          where
+              {- nonrec -}
+              AbsBinds [taTi] [] [([taTi], g3_r3v, g3_aTc)]
+                  g3_aTc
+                      = \ y_r3x
+                          -> if x_r3t >_aVL lit_aVJ then
+                                 PrelBase.[]{-5i,w-}{i} taTi
+                             else
+                                 [y_r3x] (taTi)
+              {- nonrec -}
+              {- nonrec -}
+AbsBinds
+[taUx]
+[d.Num_aUF, d.Ord_aUK]
+[([taUx], f2{-r3B,x-}, f2_aTX)]
+    +_aW0 = PrelBase.+{-rfD,p-} taUx d.Num_aUF
+    d.Num_aUI = d.Num_aUF
+    fromInt_aVZ = PrelBase.fromInt{-8R,p-} taUx d.Num_aUI
+    lit_aVY = fromInt_aVZ PrelBase.I#{-5b,w-}{i} 1#
+    <_aVX = PrelBase.<{-ra4,p-} taUx d.Ord_aUK
+    fromInt_aVW = fromInt_aVZ
+    lit_aVV = fromInt_aVW PrelBase.I#{-5b,w-}{i} 3#
+    d.Ord_aUN = d.Ord_aUK
+    >_aVU = PrelBase.>{-rfK,p-} taUx d.Ord_aUN
+    fromInt_aVT = fromInt_aVZ
+    lit_aVS = fromInt_aVT PrelBase.I#{-5b,w-}{i} 2#
+    f2_aTX x_r3l
+          = (x_r3l +_aW0 lit_aVY,
+             x_r3l <_aVX lit_aVV,
+             g2_r3n PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i},
+             g2_r3n PrelBase.Char{-38,W-} 'c')
+          where
+              {- nonrec -}
+              AbsBinds [taUc] [] [([taUc], g2_r3n, g2_aU9)]
+                  g2_aU9 y_r3r
+                         = if x_r3l >_aVU lit_aVS then
+                               PrelBase.[]{-5i,w-}{i} taUc
+                           else
+                               [y_r3r] (taUc)
+              {- nonrec -}
+              {- nonrec -}
+AbsBinds
+[taVs]
+[d.Num_aVA, d.Ord_aVF]
+[([taVs], f{-r3C,x-}, f_aUQ)]
+    +_aWa = PrelBase.+{-rfD,p-} taVs d.Num_aVA
+    d.Num_aVD = d.Num_aVA
+    fromInt_aW9 = PrelBase.fromInt{-8R,p-} taVs d.Num_aVD
+    lit_aW8 = fromInt_aW9 PrelBase.I#{-5b,w-}{i} 1#
+    <_aW7 = PrelBase.<{-ra4,p-} taVs d.Ord_aVF
+    fromInt_aW6 = fromInt_aW9
+    lit_aW5 = fromInt_aW6 PrelBase.I#{-5b,w-}{i} 3#
+    d.Ord_aVI = d.Ord_aVF
+    >_aW4 = PrelBase.>{-rfK,p-} taVs d.Ord_aVI
+    fromInt_aW3 = fromInt_aW9
+    lit_aW1 = fromInt_aW3 PrelBase.I#{-5b,w-}{i} 2#
+    f_aUQ x_r3f
+         = (x_r3f +_aWa lit_aW8,
+            x_r3f <_aW7 lit_aW5,
+            g_r3h PrelBase.Bool{-34,W-} PrelBase.True{-5E,w-}{i},
+            g_r3h PrelBase.Char{-38,W-} 'c')
+         where
+             {- nonrec -}
+             AbsBinds [taVe] [] [([taVe], g_r3h, g_aV0)]
+                 g_aV0 y_r3j
+                       = if x_r3f >_aW4 lit_aW1 then
+                             PrelBase.[]{-5i,w-}{i} taVe
+                         else
+                             [y_r3j] (taVe)
+             {- nonrec -}
+             {- nonrec -}
+
+ghc: module version changed to 1; reason: no old .hi file
+_interface_ ShouldSucceed 1
+_instance_modules_
+ArrBase IO PrelNum
+_usages_
+PrelBase 1 :: $d1 1 $d12 1 $d15 1 $d16 1 $d2 1 $d22 1 $d27 1 $d28 1 $d3 1 $d33 1 $d34 1 $d35 1 $d38 1 $d39 1 $d4 1 $d40 1 $d42 1 $d43 1 $d45 1 $d46 1 $d47 1 $d50 1 $d51 1 $d52 1 $d55 1 $d56 1 $d7 1 $d8 1 $d9 1 $m- 1 $m/= 1 $m< 1 $m<= 1 $m> 1 $m>= 1 $mcompare 1 $mfromInt 1 $mmax 1 $mmin 1 $mshowList 1 Eq 1 Eval 1 Num 1 Ord 1 Ordering 1 Show 1 String 1;
+PrelNum 1 :: $d10 1 $d16 1 $d17 1 $d18 1 $d29 1 $d33 1 $d34 1 $d35 1;
+PrelTup 1 :: $d11 1 $d15 1 $d2 1 $d51 1;
+_exports_
+ShouldSucceed f f2 f3;
+_declarations_
+1 f _:_ _forall_ [ta] {PrelBase.Num ta, PrelBase.Ord ta} => ta -> (ta, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
+1 f2 _:_ _forall_ [ta] {PrelBase.Num ta, PrelBase.Ord ta} => ta -> (ta, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;
+1 f3 _:_ _forall_ [ta] {PrelBase.Num ta, PrelBase.Ord ta} => ta -> (ta, PrelBase.Bool, [PrelBase.Bool], [PrelBase.Char]) ;;

diff --git a/ghc/tests/typecheck/should_compile/tc082.stderr b/ghc/tests/typecheck/should_compile/tc082.stderr
index ec3b654..f1046b9 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc082.stderr
+++ b/ghc/tests/typecheck/should_compile/tc082.stderr
@@ -1,21 +1,19 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [tary] [] [([tary], f{-r3p,x-}, f_arl)]
-    d.Normal_arA = $d1{-rrW,x-} [GHC.Void{-3T,W-}, GHC.Void{-3T,W-}]
-    normal_arX =
-       normal{-r3r,x-} (GHC.Void{-3T,W-} -> GHC.Void{-3T,W-}) d.Normal_arA
-    f_arl x_r3f = normal_arX PrelBase.id{-r9U,p-} GHC.Void{-3T,W-}
+==================== Typechecked ====================
+AbsBinds [tarE] [] [([tarE], f{-r3p,x-}, f_arp)]
+    d.Normal_arG = $d1{-rs3,x-} [GHC.Void{-3T,W-}, GHC.Void{-3T,W-}]
+    normal_as2 =
+       normal{-r3q,x-} (GHC.Void{-3T,W-} -> GHC.Void{-3T,W-}) d.Normal_arG
+    f_arp x_r3f = normal_as2 PrelBase.id{-r9U,p-} GHC.Void{-3T,W-}
 AbsBinds
-[tarP, tarQ]
+[tarV, tarW]
 []
-[([tarP, tarQ], $d1{-rrW,x-}, d.Normal_arI)]
-    AbsBinds [] [] [([], normal_arY, normal_arM)]
-       normal_arM _ = PrelBase.True{-5E,w-}{i}
-    d.Normal_arI = ({-dict-} [] [normal_arY])
-normal{-r3r,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
-AbsBinds [tarV] [d.Normal_arU] []
+[([tarV, tarW], $d1{-rs3,x-}, d.Normal_arO)]
+    AbsBinds [] [] [([], normal_as4, normal_arS)]
+       normal_arS _ = PrelBase.True{-5E,w-}{i}
+    d.Normal_arO = ({-dict-} [] [normal_as4])
+normal{-r3q,x-} = _/\_ t12 -> \ tpl_B1 -> tpl_B1
+AbsBinds [tas1] [d.Normal_as0] []
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc084.stderr b/ghc/tests/typecheck/should_compile/tc084.stderr
index 5771a4f..d75dc0d 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc084.stderr
+++ b/ghc/tests/typecheck/should_compile/tc084.stderr
@@ -1,23 +1,21 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taC7, taCa]
-[d.Num_aCi]
-[([taCa, taC7], g{-r3h,x-}, g_aC3)]
-    d.Num_aCk = d.Num_aCi
-    +_aCR = PrelBase.+{-rfr,p-} taC7 d.Num_aCk
-    d.Num_aCm = d.Num_aCi
-    -_aCS = PrelBase.-{-817,p-} taC7 d.Num_aCm
-    g_aC3 b_r3l x_r3m y_r3n
-         = if b_r3l then x_r3m +_aCR x_r3m else x_r3m -_aCS x_r3m
-AbsBinds [taCu] [] [([taCu], f{-r3i,x-}, f_aCo)]
-    g_aCT = g{-r3h,x-} [taCu, PrelBase.Int{-3g,W-}] d.Num_aCz
-    f_aCo = g_aCT PrelBase.True{-5E,w-}{i}
-AbsBinds [taCQ] [] [([taCQ], h{-r3j,x-}, h_aCB)]
-    h_aCB y_r3p x_r3q = f{-r3i,x-} taCQ x_r3q y_r3p
-d.Num_aCz = PrelBase.$d4{-raC,p-}
+[taCf, taCi]
+[d.Num_aCq]
+[([taCi, taCf], g{-r3h,x-}, g_aCb)]
+    d.Num_aCs = d.Num_aCq
+    +_aD1 = PrelBase.+{-rfr,p-} taCf d.Num_aCs
+    d.Num_aCu = d.Num_aCq
+    -_aD0 = PrelBase.-{-817,p-} taCf d.Num_aCu
+    g_aCb b_r3l x_r3m y_r3n
+         = if b_r3l then x_r3m +_aD1 x_r3m else x_r3m -_aD0 x_r3m
+AbsBinds [taCC] [] [([taCC], f{-r3j,x-}, f_aCw)]
+    g_aD2 = g{-r3h,x-} [taCC, PrelBase.Int{-3g,W-}] d.Num_aCH
+    f_aCw = g_aD2 PrelBase.True{-5E,w-}{i}
+AbsBinds [taCZ] [] [([taCZ], h{-r3i,x-}, h_aCJ)]
+    h_aCJ y_r3p x_r3q = f{-r3j,x-} taCZ x_r3q y_r3p
+d.Num_aCH = PrelBase.$d4{-raC,p-}
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc085.stderr b/ghc/tests/typecheck/should_compile/tc085.stderr
index 2e14883..7c846d8 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc085.stderr
+++ b/ghc/tests/typecheck/should_compile/tc085.stderr
@@ -1,10 +1,8 @@
+==================== Typechecked ====================
+FooData{-r2,l-}{i} = FooData{-r2,l-}{i} {}
+AbsBinds [] [] [([], $d1{-rBz,x-}, d.Eval_aBw)]
+    d.Eval_aBw = ({-dict-} [] [])
 
-
-================================================================================
-Typechecked:
-FooData{-r5,l-}{i} = FooData{-r5,l-}{i} {}
-AbsBinds [] [] [([], $d1{-rBr,x-}, d.Eval_aBo)]
-    d.Eval_aBo = ({-dict-} [] [])
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc086.stderr b/ghc/tests/typecheck/should_compile/tc086.stderr
index 35f78eb..6b83360 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc086.stderr
+++ b/ghc/tests/typecheck/should_compile/tc086.stderr
@@ -1,93 +1,90 @@
-
-
-================================================================================
-Typechecked:
-scsel_RingShouldSucceedGroup{-aFJ,x-} =
+==================== Typechecked ====================
+scsel_RingShouldSucceedGroup{-aFR,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B1;}
-*{-r6D,l-} =
+*{-r6w,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case tpl_B1 of { PrelTup.(,){-62,w-}{i} tpl_B1 tpl_B2  -> tpl_B2;}
-AbsBinds [taE5] [d.Ring_aFn] [([taE5], $m*{-rFK,x-}, *_aFL)]
-    d.Group_aFk = scsel_RingShouldSucceedGroup{-aFJ,x-} taE5 d.Ring_aFn
-    AbsBinds [] [] [([], *_aFL, *_aE2)]
-       *_aE2 a_r6L b_r6M
-             = multiply_aFO a_r6L b_r6M
+AbsBinds [taEd] [d.Ring_aFv] [([taEd], $m*{-rFS,x-}, *_aFT)]
+    d.Group_aFs = scsel_RingShouldSucceedGroup{-aFR,x-} taEd d.Ring_aFv
+    AbsBinds [] [] [([], *_aFT, *_aEa)]
+       *_aEa a_r6L b_r6M
+             = multiply_aFW a_r6L b_r6M
              where
                  {- rec -}
                  AbsBinds
-                 [taEe]
-                 [d.Group_aF3]
-                 [([taEe], multiply_r6O, multiply_aEb)]
-                     d.Group_aF5 = d.Group_aF3
-                     compare_aFP = compare{-r6w,l-} taEe d.Group_aF5
-                     d.Group_aF7 = d.Group_aF3
-                     zero_aFQ = zero{-r6A,l-} taEe d.Group_aF7
-                     zero_aFR = zero_aFQ
-                     d.Group_aF9 = d.Group_aF3
-                     -_aFS = -{-r6z,l-} taEe d.Group_aF9
-                     zero_aFT = zero_aFQ
-                     d.Group_aFb = d.Group_aF3
-                     multiply_aFU = multiply_r6O taEe d.Group_aFb
-                     -_aFV = -_aFS
-                     zero_aFW = zero_aFQ
-                     compare_aFX = compare_aFP
-                     d.Group_aFd = d.Group_aF3
-                     one_aFY = one{-r6B,l-} taEe d.Group_aFd
-                     d.Group_aFf = d.Group_aF3
-                     +_aFZ = +{-r6y,l-} taEe d.Group_aFf
-                     multiply_aG0 = multiply_aFU
-                     -_aG1 = -_aFS
-                     one_aG2 = one_aFY
-                     multiply_aEb a_r6S b_r6T
-                                  = case compare_aFP a_r6S zero_aFQ of
-                                      PrelBase.EQ{-r2a,p-}{i} -> zero_aFR
-                                      PrelBase.LT{-r28,p-}{i}
-                                      -> zero_aFT -_aFS (multiply_aFU zero_aFW -_aFV a_r6S b_r6T)
-                                      PrelBase.GT{-r2c,p-}{i}
-                                      -> case compare_aFX a_r6S one_aFY of
-                                           PrelBase.EQ{-r2a,p-}{i} -> b_r6T
+                 [taEm]
+                 [d.Group_aFb]
+                 [([taEm], multiply_r6O, multiply_aEj)]
+                     d.Group_aFd = d.Group_aFb
+                     compare_aGa = compare{-r6D,l-} taEm d.Group_aFd
+                     d.Group_aFf = d.Group_aFb
+                     zero_aG9 = zero{-r6z,l-} taEm d.Group_aFf
+                     zero_aG8 = zero_aG9
+                     d.Group_aFh = d.Group_aFb
+                     -_aG7 = -{-r6A,l-} taEm d.Group_aFh
+                     zero_aG6 = zero_aG9
+                     d.Group_aFj = d.Group_aFb
+                     multiply_aG5 = multiply_r6O taEm d.Group_aFj
+                     -_aG4 = -_aG7
+                     zero_aG3 = zero_aG9
+                     compare_aG2 = compare_aGa
+                     d.Group_aFl = d.Group_aFb
+                     one_aG1 = one{-r6y,l-} taEm d.Group_aFl
+                     d.Group_aFn = d.Group_aFb
+                     +_aG0 = +{-r6B,l-} taEm d.Group_aFn
+                     multiply_aFZ = multiply_aG5
+                     -_aFY = -_aG7
+                     one_aFX = one_aG1
+                     multiply_aEj a_r6S b_r6T
+                                  = case compare_aGa a_r6S zero_aG9 of
+                                      PrelBase.EQ{-r5J,p-}{i} -> zero_aG8
+                                      PrelBase.LT{-r5K,p-}{i}
+                                      -> zero_aG6 -_aG7 (multiply_aG5 zero_aG3 -_aG4 a_r6S b_r6T)
+                                      PrelBase.GT{-r5I,p-}{i}
+                                      -> case compare_aG2 a_r6S one_aG1 of
+                                           PrelBase.EQ{-r5J,p-}{i} -> b_r6T
                                            _
-                                           -> b_r6T +_aFZ (multiply_aG0 a_r6S -_aG1 one_aG2 b_r6T)
+                                           -> b_r6T +_aG0 (multiply_aFZ a_r6S -_aFY one_aFX b_r6T)
                  {- nonrec -}
-                 multiply_aFO = multiply_r6O taE5 d.Group_aFk
+                 multiply_aFW = multiply_r6O taEd d.Group_aFs
                  {- nonrec -}
-compare{-r6w,l-} =
+compare{-r6D,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
        tpl_B1;}
-fromInteger{-r6x,l-} =
+fromInteger{-r6C,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
        tpl_B2;}
-+{-r6y,l-} =
++{-r6B,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
        tpl_B3;}
--{-r6z,l-} =
+-{-r6A,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
        tpl_B4;}
-zero{-r6A,l-} =
+zero{-r6z,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
        tpl_B5;}
-one{-r6B,l-} =
+one{-r6y,l-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
@@ -95,18 +92,19 @@ one{-r6B,l-} =
        PrelTup.(,,,,,){-66,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5 tpl_B6  ->
        tpl_B6;}
 AbsBinds
-[taFt]
-[d.Group_aFG]
-[([taFt], $mzero{-rFM,x-}, zero_aG3), ([taFt],
-                                      $mone{-rFN,x-},
-                                      one_aG6)]
-    d.Group_aFI = d.Group_aFG
-    fromInteger_aG4 = fromInteger{-r6x,l-} taFt d.Group_aFI
-    fromInteger_aG5 = fromInteger_aG4
-    AbsBinds [] [] [([], zero_aG3, zero_aFs)]
-       zero_aFs = fromInteger_aG4 0
-    AbsBinds [] [] [([], one_aG6, one_aFA)]
-       one_aFA = fromInteger_aG5 1
+[taFB]
+[d.Group_aFO]
+[([taFB], $mzero{-rFV,x-}, zero_aGb), ([taFB],
+                                      $mone{-rFU,x-},
+                                      one_aGc)]
+    d.Group_aFQ = d.Group_aFO
+    fromInteger_aGe = fromInteger{-r6C,l-} taFB d.Group_aFQ
+    fromInteger_aGd = fromInteger_aGe
+    AbsBinds [] [] [([], zero_aGb, zero_aFA)]
+       zero_aFA = fromInteger_aGe 0
+    AbsBinds [] [] [([], one_aGc, one_aFI)]
+       one_aFI = fromInteger_aGd 1
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc087.stderr b/ghc/tests/typecheck/should_compile/tc087.stderr
index 8e9cafe..bda588e 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc087.stderr
+++ b/ghc/tests/typecheck/should_compile/tc087.stderr
@@ -1,101 +1,98 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 Null{-rf,x-}{i} =
     _/\_ t_ar59 a_tr5a -> Null{-rf,x-}{i} {_@_ t_ar59 _@_ a_tr5a}
 Cons{-re,x-}{i} =
     _/\_ t_ar59 a_tr5a -> \ tpl_B1 tpl_B2 ->
        Cons{-re,x-}{i} {_@_ t_ar59 _@_ a_tr5a tpl_B1 tpl_B2}
-AbsBinds [ta13I] [d.Num_a13T] [([ta13I], out{-r4v,x-}, out_a13F)]
-    d.Eq_a13V = PrelBase.scsel_NumPrelBaseEq{-a19a,p-} ta13I d.Num_a13T
-    ==_a196 = PrelBase.=={-8Y,p-} ta13I d.Eq_a13V
-    d.Num_a13X = d.Num_a13T
-    sum_a197 = PrelList.sum{-ro0,p-} ta13I d.Num_a13X
-    d.Num_a140 = d.Num_a13T
-    fromInt_a198 = PrelBase.fromInt{-8R,p-} ta13I d.Num_a140
-    lit_a199 = fromInt_a198 PrelBase.I#{-5b,w-}{i} 0#
-    out_a13F x_r4O
-            | (sum_a197 x_r4O) ==_a196 lit_a199 = PrelIO.putStr{-riO,p-} "ok\n"
+AbsBinds [ta13Q] [d.Num_a141] [([ta13Q], out{-r4v,x-}, out_a13N)]
+    d.Eq_a143 = PrelBase.scsel_NumPrelBaseEq{-a19j,p-} ta13Q d.Num_a141
+    ==_a18Z = PrelBase.=={-8Y,p-} ta13Q d.Eq_a143
+    d.Num_a145 = d.Num_a141
+    sum_a18Y = PrelList.sum{-ro0,p-} ta13Q d.Num_a145
+    d.Num_a148 = d.Num_a141
+    fromInt_a18X = PrelBase.fromInt{-8R,p-} ta13Q d.Num_a148
+    lit_a18W = fromInt_a18X PrelBase.I#{-5b,w-}{i} 0#
+    out_a13N x_r4O
+            | (sum_a18Y x_r4O) ==_a18Z lit_a18W = PrelIO.putStr{-riO,p-} "ok\n"
             | PrelBase.otherwise{-818,p-} = PrelIO.putStr{-riO,p-} "ok\n"
-out_a18N = out{-r4v,x-} PrelBase.Int{-3g,W-} d.Num_a18n
-out_a18O = out{-r4v,x-} PrelBase.Double{-3a,W-} d.Num_a18o
+out_a19i = out{-r4v,x-} PrelBase.Int{-3g,W-} d.Num_a18w
+out_a19h = out{-r4v,x-} PrelBase.Double{-3a,W-} d.Num_a18x
 AbsBinds
-[ta14p, aa14q]
-[d.PriorityQueue_a14u, d.Ord_a14w]
-[([ta14p, aa14q], insertMany{-r4x,x-}, insertMany_a143)]
-    insert_a14r = insert{-r5d,x-} aa14q d.PriorityQueue_a14u
-    insert_a19b = insert_a14r ta14p d.Ord_a14w
-    insertMany_a143 x_r4G q_r4H
-                   = PrelBase.foldr{-89,w-} [ta14p, aa14q ta14p] insert_a19b
+[ta14z, aa14A]
+[d.PriorityQueue_a14E, d.Ord_a14G]
+[([ta14z, aa14A], insertMany{-r4x,x-}, insertMany_a14b)]
+    insert_a14B = insert{-r5d,x-} aa14A d.PriorityQueue_a14E
+    insert_a19k = insert_a14B ta14z d.Ord_a14G
+    insertMany_a14b x_r4G q_r4H
+                   = PrelBase.foldr{-89,w-} [ta14z, aa14A ta14z] insert_a19k
                                                                  q_r4H
                                                                  x_r4G
 AbsBinds
-[aa153, ta155]
-[d.PriorityQueue_a158, d.Ord_a15a]
-[([aa153, ta155], toOrderedList{-r4w,x-}, toOrderedList_a14y)]
-    splitMin_a156 = splitMin{-r5f,x-} aa153 d.PriorityQueue_a158
-    splitMin_a19c = splitMin_a156 ta155 d.Ord_a15a
-    toOrderedList_a14y q_r4A
-                      = case splitMin_a19c q_r4A of
-                          Null{-rf,x-}{i} -> PrelBase.[]{-5i,w-}{i} ta155
+[aa15e, ta15g]
+[d.PriorityQueue_a15j, d.Ord_a15l]
+[([aa15e, ta15g], toOrderedList{-r4y,x-}, toOrderedList_a14I)]
+    splitMin_a15h = splitMin{-r5b,x-} aa15e d.PriorityQueue_a15j
+    splitMin_a19l = splitMin_a15h ta15g d.Ord_a15l
+    toOrderedList_a14I q_r4A
+                      = case splitMin_a19l q_r4A of
+                          Null{-rf,x-}{i} -> PrelBase.[]{-5i,w-}{i} ta15g
                           (Cons{-re,x-}{i} a_r4D q_r4E)
-                          -> PrelBase.:{-55,w-}{i} ta155 a_r4D (toOrderedList_a14y q_r4E)
+                          -> PrelBase.:{-55,w-}{i} ta15g a_r4D (toOrderedList_a14I q_r4E)
 AbsBinds
-[aa15w, ta15x]
-[d.PriorityQueue_a15A, d.Ord_a15B]
-[([aa15w, ta15x], pqSort{-r4y,x-}, pqSort_a15c)]
-    toOrderedList_a19d =
-       toOrderedList{-r4w,x-} [aa15w, ta15x]
-           [d.PriorityQueue_a15A, d.Ord_a15B]
-    d.PriorityQueue_a15D = d.PriorityQueue_a15A
-    d.Ord_a15E = d.Ord_a15B
-    insertMany_a19e =
-       insertMany{-r4x,x-} [ta15x, aa15w]
-           [d.PriorityQueue_a15D, d.Ord_a15E]
-    pqSort_a15c q_r4J x_r4K
-               = toOrderedList_a19d insertMany_a19e x_r4K q_r4J
+[aa15J, ta15K]
+[d.PriorityQueue_a15N, d.Ord_a15O]
+[([aa15J, ta15K], pqSort{-r4w,x-}, pqSort_a15n)]
+    toOrderedList_a19n =
+       toOrderedList{-r4y,x-} [aa15J, ta15K]
+           [d.PriorityQueue_a15N, d.Ord_a15O]
+    d.PriorityQueue_a15Q = d.PriorityQueue_a15N
+    d.Ord_a15R = d.Ord_a15O
+    insertMany_a19m =
+       insertMany{-r4x,x-} [ta15K, aa15J]
+           [d.PriorityQueue_a15Q, d.Ord_a15R]
+    pqSort_a15n q_r4J x_r4K
+               = toOrderedList_a19n insertMany_a19m x_r4K q_r4J
 AbsBinds
-[aa15R]
-[d.PriorityQueue_a16G]
-[([aa15R], check{-r4u,x-}, check_a15N)]
-    d.PriorityQueue_a17d = d.PriorityQueue_a16G
-    d.Ord_a17e = PrelBase.$d7{-rcM,p-}
-    pqSort_a19f =
-       pqSort{-r4y,x-} [aa15R, PrelBase.Int{-3g,W-}]
-           [d.PriorityQueue_a17d, d.Ord_a17e]
-    d.Ord_a16H = d.Ord_a17e
-    d.PriorityQueue_a17l = d.PriorityQueue_a16G
-    d.Ord_a17m = PrelNum.$d17{-rwV,p-}
-    pqSort_a19g =
-       pqSort{-r4y,x-} [aa15R, PrelBase.Double{-3a,W-}]
-           [d.PriorityQueue_a17l, d.Ord_a17m]
-    d.Ord_a16I = d.Ord_a17m
-    check_a15N empty_r4M
+[aa164]
+[d.PriorityQueue_a16P]
+[([aa164], check{-r4u,x-}, check_a160)]
+    d.PriorityQueue_a17m = d.PriorityQueue_a16P
+    d.Ord_a17n = PrelBase.$d7{-rcM,p-}
+    pqSort_a19p =
+       pqSort{-r4w,x-} [aa164, PrelBase.Int{-3g,W-}]
+           [d.PriorityQueue_a17m, d.Ord_a17n]
+    d.Ord_a16Q = d.Ord_a17n
+    d.PriorityQueue_a17u = d.PriorityQueue_a16P
+    d.Ord_a17v = PrelNum.$d17{-rwV,p-}
+    pqSort_a19o =
+       pqSort{-r4w,x-} [aa164, PrelBase.Double{-3a,W-}]
+           [d.PriorityQueue_a17u, d.Ord_a17v]
+    d.Ord_a16R = d.Ord_a17v
+    check_a160 empty_r4M
               = do
                   PrelIO.putStr{-riO,p-} "*** sorting\n"
-                  out_a18N pqSort_a19f empty_a19h
-                                       [(enumFromTo_a18W) lit_a18U .. lit_a18V]
-                  out_a18O pqSort_a19g empty_a19i
-                                       [(enumFromThenTo_a193) lit_a18Y, lit_a190 .. lit_a192]
+                  out_a19i pqSort_a19p empty_a19r
+                                       [(enumFromTo_a199) lit_a19b .. lit_a19a]
+                  out_a19h pqSort_a19o empty_a19q
+                                       [(enumFromThenTo_a192) lit_a197, lit_a195 .. lit_a193]
               where
                   {- nonrec -}
-                  empty_a19h = empty_r4M PrelBase.Int{-3g,W-} d.Ord_a16H
-                  empty_a19i = empty_r4M PrelBase.Double{-3a,W-} d.Ord_a16I
+                  empty_a19r = empty_r4M PrelBase.Int{-3g,W-} d.Ord_a16Q
+                  empty_a19q = empty_r4M PrelBase.Double{-3a,W-} d.Ord_a16R
                   {- nonrec -}
 AbsBinds
-[aa18I, ta18J]
+[aa18R, ta18S]
 []
-[([aa18I, ta18J], $d1{-r18S,x-}, d.Eval_a17F)]
-    d.Eval_a17F = ({-dict-} [] [])
-empty{-r5b,x-} =
+[([aa18R, ta18S], $d1{-r19g,x-}, d.Eval_a17O)]
+    d.Eval_a17O = ({-dict-} [] [])
+empty{-r5f,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B1;}
-single{-r5c,x-} =
+single{-r5e,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
@@ -109,14 +106,14 @@ insert{-r5d,x-} =
        of {
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B3;}
-meld{-r5e,x-} =
+meld{-r5c,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
        of {
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B4;}
-splitMin{-r5f,x-} =
+splitMin{-r5b,x-} =
     _/\_ t12 -> \ tpl_B1 ->
        case
            tpl_B1
@@ -124,43 +121,44 @@ splitMin{-r5f,x-} =
        PrelTup.(,,,,){-65,w-}{i} tpl_B1 tpl_B2 tpl_B3 tpl_B4 tpl_B5  ->
        tpl_B5;}
 AbsBinds
-[aa17N]
-[d.PriorityQueue_a18i]
-[([aa17N], $minsert{-r18T,x-}, insert_a19j)]
-    d.PriorityQueue_a18k = d.PriorityQueue_a18i
-    meld_a189 = meld{-r5e,x-} aa17N d.PriorityQueue_a18k
-    d.PriorityQueue_a18m = d.PriorityQueue_a18i
-    single_a188 = single{-r5c,x-} aa17N d.PriorityQueue_a18m
-    AbsBinds [ta17Q] [d.Ord_a18c] [([ta17Q], insert_a19j, insert_a17L)]
-       d.Ord_a18e = d.Ord_a18c
-       meld_a19k = meld_a189 ta17Q d.Ord_a18e
-       d.Ord_a18g = d.Ord_a18c
-       single_a19l = single_a188 ta17Q d.Ord_a18g
-       insert_a17L a_r56 q_r57 = (single_a19l a_r56) meld_a19k q_r57
-d.Num_a18n = PrelBase.$d4{-rcq,p-}
-lit_a18U = PrelBase.I#{-5b,w-}{i} 1#
-lit_a18V = PrelBase.I#{-5b,w-}{i} 99#
-d.Enum_a18r = PrelBase.$d6{-rcL,p-}
-enumFromTo_a18W =
-    PrelBase.enumFromTo{-8W,p-} PrelBase.Int{-3g,W-} d.Enum_a18r
-d.Num_a18o = PrelNum.$d16{-rwU,p-}
-d.Fractional_a18w = PrelNum.$d14{-rwS,p-}
-fromRational_a18X =
+[aa17W]
+[d.PriorityQueue_a18r]
+[([aa17W], $minsert{-r19c,x-}, insert_a19s)]
+    d.PriorityQueue_a18t = d.PriorityQueue_a18r
+    meld_a18i = meld{-r5c,x-} aa17W d.PriorityQueue_a18t
+    d.PriorityQueue_a18v = d.PriorityQueue_a18r
+    single_a18h = single{-r5e,x-} aa17W d.PriorityQueue_a18v
+    AbsBinds [ta17Z] [d.Ord_a18l] [([ta17Z], insert_a19s, insert_a17U)]
+       d.Ord_a18n = d.Ord_a18l
+       meld_a19u = meld_a18i ta17Z d.Ord_a18n
+       d.Ord_a18p = d.Ord_a18l
+       single_a19t = single_a18h ta17Z d.Ord_a18p
+       insert_a17U a_r56 q_r57 = (single_a19t a_r56) meld_a19u q_r57
+d.Num_a18w = PrelBase.$d4{-rcq,p-}
+lit_a19b = PrelBase.I#{-5b,w-}{i} 1#
+lit_a19a = PrelBase.I#{-5b,w-}{i} 99#
+d.Enum_a18A = PrelBase.$d6{-rcL,p-}
+enumFromTo_a199 =
+    PrelBase.enumFromTo{-8W,p-} PrelBase.Int{-3g,W-} d.Enum_a18A
+d.Num_a18x = PrelNum.$d16{-rwU,p-}
+d.Fractional_a18F = PrelNum.$d14{-rwS,p-}
+fromRational_a198 =
     PrelNum.fromRational{-8T,p-} PrelBase.Double{-3a,W-}
-       d.Fractional_a18w
-lit_a18Y = fromRational_a18X 1.0000000000000000
-fromRational_a18Z = fromRational_a18X
-lit_a190 = fromRational_a18Z 1.1000000000000001
-fromRational_a191 = fromRational_a18X
-lit_a192 = fromRational_a191 99.900000000000006
-d.Enum_a18B = PrelNum.$d8{-rxr,p-}
-enumFromThenTo_a193 =
-    PrelBase.enumFromThenTo{-8X,p-} PrelBase.Double{-3a,W-} d.Enum_a18B
-d.Monad_a18E = IOBase.$d3{-rm9,p-}
->>=_a194 = PrelBase.>>={-811,p-} IOBase.IO{-3e,p-} d.Monad_a18E
-d.Monad_a18H = d.Monad_a18E
-return_a195 =
-    PrelBase.return{-816,p-} IOBase.IO{-3e,p-} d.Monad_a18H
+       d.Fractional_a18F
+lit_a197 = fromRational_a198 1.0
+fromRational_a196 = fromRational_a198
+lit_a195 = fromRational_a196 1.1
+fromRational_a194 = fromRational_a198
+lit_a193 = fromRational_a194 99.9
+d.Enum_a18K = PrelNum.$d8{-rxr,p-}
+enumFromThenTo_a192 =
+    PrelBase.enumFromThenTo{-8X,p-} PrelBase.Double{-3a,W-} d.Enum_a18K
+d.Monad_a18N = IOBase.$d3{-rm9,p-}
+>>=_a191 = PrelBase.>>={-811,p-} IOBase.IO{-3e,p-} d.Monad_a18N
+d.Monad_a18Q = d.Monad_a18N
+return_a190 =
+    PrelBase.return{-816,p-} IOBase.IO{-3e,p-} d.Monad_a18Q
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc088.stderr b/ghc/tests/typecheck/should_compile/tc088.stderr
index 3304d5f..fccf298 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc088.stderr
+++ b/ghc/tests/typecheck/should_compile/tc088.stderr
@@ -1,63 +1,61 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taD0, taD1]
-[d.Num_aEx, d.Eq_aEy, d.Show_aEz, d.Eval_aEA]
-[([taD0, taD1], $d1{-rFx,x-}, d.Num_aCT)]
-    d.Eq_aEw = d.Eq_aEy
-    d.Show_aEB = d.Show_aEz
-    d.Eval_aEC = d.Eval_aEA
-    d.Num_aEG = d.Num_aEx
-    +_aFz = PrelBase.+{-rgc,p-} taD1 d.Num_aEG
-    d.Num_aEI = d.Num_aEx
-    -_aFA = PrelBase.-{-817,p-} taD1 d.Num_aEI
-    d.Num_aEK = d.Num_aEx
-    *_aFB = PrelBase.*{-rgd,p-} taD1 d.Num_aEK
-    d.Num_aEM = d.Num_aEx
-    negate_aFC = PrelBase.negate{-rge,p-} taD1 d.Num_aEM
-    d.Num_aEO = d.Num_aEx
-    abs_aFD = PrelBase.abs{-rgf,p-} taD1 d.Num_aEO
-    d.Num_aEQ = d.Num_aEx
-    signum_aFE = PrelBase.signum{-rgg,p-} taD1 d.Num_aEQ
-    d.Num_aES = d.Num_aEx
-    fromInteger_aFF = PrelBase.fromInteger{-8S,p-} taD1 d.Num_aES
-    d.Num_aEU = d.Num_aEx
-    fromInt_aFG = PrelBase.fromInt{-8R,p-} taD1 d.Num_aEU
-    AbsBinds [] [] [([], +_aFH, +_aCX)]
-       +_aCX f_r3h g_r3i = \ a_r3k -> (f_r3h a_r3k) +_aFz (g_r3i a_r3k)
-    AbsBinds [] [] [([], -_aFI, -_aDd)]
-       -_aDd f_r3o g_r3p = \ a_r3r -> (f_r3o a_r3r) -_aFA (g_r3p a_r3r)
-    AbsBinds [] [] [([], *_aFJ, *_aDr)]
-       *_aDr f_r3v g_r3w = \ a_r3y -> (f_r3v a_r3y) *_aFB (g_r3w a_r3y)
-    AbsBinds [] [] [([], negate_aFK, negate_aDF)]
-       negate_aDF f_r3C = \ a_r3E -> negate_aFC f_r3C a_r3E
-    AbsBinds [] [] [([], abs_aFL, abs_aDR)]
-       abs_aDR f_r3I = \ a_r3K -> abs_aFD f_r3I a_r3K
-    AbsBinds [] [] [([], signum_aFM, signum_aE3)]
-       signum_aE3 f_r3O = \ a_r3Q -> signum_aFE f_r3O a_r3Q
-    AbsBinds [] [] [([], fromInteger_aFN, fromInteger_aEf)]
-       fromInteger_aEf n_r3U = \ a_r3W -> fromInteger_aFF n_r3U
-    AbsBinds [] [] [([], fromInt_aFO, fromInt_aEq)]
-       fromInt_aEq n_r40 = \ a_r42 -> fromInt_aFG n_r40
-    d.Num_aCT =
+[taD8, taD9]
+[d.Num_aEE, d.Eq_aEF, d.Show_aEG, d.Eval_aEH]
+[([taD8, taD9], $d1{-rFF,x-}, d.Num_aD1)]
+    d.Eq_aEI = d.Eq_aEF
+    d.Show_aEJ = d.Show_aEG
+    d.Eval_aEK = d.Eval_aEH
+    d.Num_aEO = d.Num_aEE
+    +_aFV = PrelBase.+{-rgc,p-} taD9 d.Num_aEO
+    d.Num_aEQ = d.Num_aEE
+    -_aFU = PrelBase.-{-817,p-} taD9 d.Num_aEQ
+    d.Num_aES = d.Num_aEE
+    *_aFT = PrelBase.*{-rgd,p-} taD9 d.Num_aES
+    d.Num_aEU = d.Num_aEE
+    negate_aFS = PrelBase.negate{-rge,p-} taD9 d.Num_aEU
+    d.Num_aEW = d.Num_aEE
+    abs_aFR = PrelBase.abs{-rgf,p-} taD9 d.Num_aEW
+    d.Num_aEY = d.Num_aEE
+    signum_aFQ = PrelBase.signum{-rgg,p-} taD9 d.Num_aEY
+    d.Num_aF0 = d.Num_aEE
+    fromInteger_aFP = PrelBase.fromInteger{-8S,p-} taD9 d.Num_aF0
+    d.Num_aF2 = d.Num_aEE
+    fromInt_aFO = PrelBase.fromInt{-8R,p-} taD9 d.Num_aF2
+    AbsBinds [] [] [([], +_aFN, +_aD5)]
+       +_aD5 f_r3h g_r3i = \ a_r3k -> (f_r3h a_r3k) +_aFV (g_r3i a_r3k)
+    AbsBinds [] [] [([], -_aFM, -_aDl)]
+       -_aDl f_r3o g_r3p = \ a_r3r -> (f_r3o a_r3r) -_aFU (g_r3p a_r3r)
+    AbsBinds [] [] [([], *_aFL, *_aDz)]
+       *_aDz f_r3v g_r3w = \ a_r3y -> (f_r3v a_r3y) *_aFT (g_r3w a_r3y)
+    AbsBinds [] [] [([], negate_aFK, negate_aDN)]
+       negate_aDN f_r3C = \ a_r3E -> negate_aFS f_r3C a_r3E
+    AbsBinds [] [] [([], abs_aFJ, abs_aDZ)]
+       abs_aDZ f_r3I = \ a_r3K -> abs_aFR f_r3I a_r3K
+    AbsBinds [] [] [([], signum_aFI, signum_aEb)]
+       signum_aEb f_r3O = \ a_r3Q -> signum_aFQ f_r3O a_r3Q
+    AbsBinds [] [] [([], fromInteger_aFH, fromInteger_aEn)]
+       fromInteger_aEn n_r3U = \ a_r3W -> fromInteger_aFP n_r3U
+    AbsBinds [] [] [([], fromInt_aFG, fromInt_aEy)]
+       fromInt_aEy n_r40 = \ a_r42 -> fromInt_aFO n_r40
+    d.Num_aD1 =
        ({-dict-}
-        [d.Eq_aEw, d.Show_aEB, d.Eval_aEC]
-        [+_aFH, -_aFI, *_aFJ, negate_aFK, abs_aFL, signum_aFM, fromInteger_aFN, fromInt_aFO])
+        [d.Eq_aEI, d.Show_aEJ, d.Eval_aEK]
+        [+_aFN, -_aFM, *_aFL, negate_aFK, abs_aFJ, signum_aFI, fromInteger_aFH, fromInt_aFG])
 AbsBinds
-[taFe, taFf]
-[d.Eq_aFr]
-[([taFe, taFf], $d2{-rFy,x-}, d.Eq_aF7)]
-    d.Eq_aFv = d.Eq_aF7
-    $m/=_aFP = PrelBase.$m/={-rfO,p-} (taFe -> taFf) d.Eq_aFv
-    AbsBinds [] [] [([], ==_aFQ, ==_aFb)]
-       ==_aFb f_r4a g_r4b
+[taFm, taFn]
+[d.Eq_aFz]
+[([taFm, taFn], $d2{-rFW,x-}, d.Eq_aFf)]
+    d.Eq_aFD = d.Eq_aFf
+    $m/=_aFZ = PrelBase.$m/={-rfO,p-} (taFm -> taFn) d.Eq_aFD
+    AbsBinds [] [] [([], ==_aFY, ==_aFj)]
+       ==_aFj f_r4a g_r4b
               = IOBase.error{-87,w-}
                     PrelBase.Bool{-34,W-} "attempt to compare functions"
-    AbsBinds [] [] [([], /=_aFR, /=_aFo)]
-       /=_aFo = $m/=_aFP
-    d.Eq_aF7 = ({-dict-} [] [==_aFQ, /=_aFR])
+    AbsBinds [] [] [([], /=_aFX, /=_aFw)]
+       /=_aFw = $m/=_aFZ
+    d.Eq_aFf = ({-dict-} [] [==_aFY, /=_aFX])
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc089.stderr b/ghc/tests/typecheck/should_compile/tc089.stderr
index 7e29d78..a250e21 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc089.stderr
+++ b/ghc/tests/typecheck/should_compile/tc089.stderr
@@ -1,426 +1,423 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taBv, taBy, taBB]
+[taBC, taBF, taBI]
 []
-[([taBv, taBy, taBB], s_3_2{-r5Z,x-}, s_3_2_aBn)]
-    s_3_2_aBn (v0_r4o, v1_r4p, v2_r4q) = v2_r4q
+[([taBC, taBF, taBI], s_3_2{-r5Z,x-}, s_3_2_aBr)]
+    s_3_2_aBr (v0_r4o, v1_r4p, v2_r4q) = v2_r4q
 AbsBinds
-[taBO, taBR, taBU]
+[taBW, taBZ, taC2]
 []
-[([taBO, taBR, taBU], s_3_1{-r60,x-}, s_3_1_aBG)]
-    s_3_1_aBG (v0_r4k, v1_r4l, v2_r4m) = v1_r4l
+[([taBW, taBZ, taC2], s_3_1{-r60,x-}, s_3_1_aBL)]
+    s_3_1_aBL (v0_r4k, v1_r4l, v2_r4m) = v1_r4l
 AbsBinds
-[taC7, taCa, taCd]
+[taCg, taCj, taCm]
 []
-[([taC7, taCa, taCd], s_3_0{-r61,x-}, s_3_0_aBZ)]
-    s_3_0_aBZ (v0_r4g, v1_r4h, v2_r4i) = v0_r4g
-AbsBinds [taCr] [] [([taCr], s_1_0{-r62,x-}, s_1_0_aCi)]
-    s_1_0_aCi v0_r4e = v0_r4e
+[([taCg, taCj, taCm], s_3_0{-r61,x-}, s_3_0_aC5)]
+    s_3_0_aC5 (v0_r4g, v1_r4h, v2_r4i) = v0_r4g
+AbsBinds [taCz] [] [([taCz], s_1_0{-r62,x-}, s_1_0_aCp)]
+    s_1_0_aCp v0_r4e = v0_r4e
 AbsBinds
-[taCA, taCD]
+[taCL, taCO]
 []
-[([taCA, taCD], s_2_1{-r63,x-}, s_2_1_aCt)]
-    s_2_1_aCt (v0_r4b, v1_r4c) = v1_r4c
+[([taCL, taCO], s_2_1{-r63,x-}, s_2_1_aCB)]
+    s_2_1_aCB (v0_r4b, v1_r4c) = v1_r4c
 AbsBinds
-[taCP, taCS]
+[taD1, taD4]
 []
-[([taCP, taCS], s_2_0{-r64,x-}, s_2_0_aCI)]
-    s_2_0_aCI (v0_r48, v1_r49) = v0_r48
+[([taD1, taD4], s_2_0{-r64,x-}, s_2_0_aCR)]
+    s_2_0_aCR (v0_r48, v1_r49) = v0_r48
 AbsBinds
-[taDh, taDf]
+[taDt, taDr]
 []
-[([taDh, taDf], f_rec{-r66,x-}, f_rec_aCX)]
-    f_rec_aCX f0_r3Y a_r3Z = f0_r3Y s_1_0{-r62,x-} taDf a_r3Z
+[([taDt, taDr], f_rec{-r66,x-}, f_rec_aD7)]
+    f_rec_aD7 f0_r3Y a_r3Z = f0_r3Y s_1_0{-r62,x-} taDr a_r3Z
 AbsBinds
-[taDC, taDE, taDG]
+[taDR, taDT, taDV]
 []
-[([taDC, taDE, taDG], absIf{-r69,x-}, absIf_aDj)]
-    absIf_aDj a_r3N b_r3O c_r3P = a_r3N
-AbsBinds [taDP] [] [([taDP], head{-r6b,x-}, head_aDI)]
-    head_aDI (x_r3K PrelBase.:{-55,w-}{i} xs_r3L) = x_r3K
-AbsBinds [taDZ] [] [([taDZ], bottom{-r6a,x-}, bottom_aDV)]
-    bottom_aDV = head{-r6b,x-} taDZ
-AbsBinds [taEf] [] [([taEf], fac_rec0{-r5T,x-}, fac_rec0_aE1)]
-    fac_rec0_aE1 n_r4H a_r4I
-                = bottom{-r6a,x-} taEf [n_r4H, a_r4I] (taEf)
-AbsBinds [taEs] [] [([taEs], f_rec0{-r5P,x-}, f_rec0_aEj)]
-    f_rec0_aEj a_r4Q = bottom{-r6a,x-} taEs [a_r4Q] (taEs)
-AbsBinds [taEF] [] [([taEF], f_rec1{-r5Q,x-}, f_rec1_aEw)]
-    f_rec1_aEw a_r4O
-              = f_rec{-r66,x-} [taEF, taEF] f_rec0{-r5P,x-} taEF a_r4O
-AbsBinds [taEU] [] [([taEU], f_rec2{-r5R,x-}, f_rec2_aEL)]
-    f_rec2_aEL a_r4M
-              = f_rec{-r66,x-} [taEU, taEU] f_rec1{-r5Q,x-} taEU a_r4M
-AbsBinds [taF9] [] [([taF9], f{-r5S,x-}, f_aF0)]
-    f_aF0 a_r4K
-         = f_rec{-r66,x-} [taF9, taF9] f_rec2{-r5R,x-} taF9 a_r4K
-AbsBinds [taFD] [] [([taFD], g_rec0{-r5F,x-}, g_rec0_aFf)]
-    g_rec0_aFf x_r5B y_r5C z_r5D p_r5E
-              = bottom{-r6a,x-} taFD [x_r5B, y_r5C, z_r5D, p_r5E] (taFD)
-AbsBinds [taFV] [] [([taFV], absAnd{-r68,x-}, absAnd_aFH)]
-    absAnd_aFH a_r3R b_r3S = head{-r6b,x-} taFV [a_r3R, b_r3S] (taFV)
-AbsBinds [taG1] [] [([taG1], one{-r6c,x-}, one_aFZ)]
-    one_aFZ = one_aFZ
+[([taDR, taDT, taDV], absIf{-r69,x-}, absIf_aDv)]
+    absIf_aDv a_r3N b_r3O c_r3P = a_r3N
+AbsBinds [taE7] [] [([taE7], head{-r6b,x-}, head_aDX)]
+    head_aDX (x_r3K PrelBase.:{-55,w-}{i} xs_r3L) = x_r3K
+AbsBinds [taEf] [] [([taEf], bottom{-r6a,x-}, bottom_aEb)]
+    bottom_aEb = head{-r6b,x-} taEf
+AbsBinds [taEx] [] [([taEx], fac_rec0{-r5T,x-}, fac_rec0_aEh)]
+    fac_rec0_aEh n_r4H a_r4I
+                = bottom{-r6a,x-} taEx [n_r4H, a_r4I] (taEx)
+AbsBinds [taEJ] [] [([taEJ], f_rec0{-r5P,x-}, f_rec0_aEz)]
+    f_rec0_aEz a_r4Q = bottom{-r6a,x-} taEJ [a_r4Q] (taEJ)
+AbsBinds [taEV] [] [([taEV], f_rec1{-r5Q,x-}, f_rec1_aEL)]
+    f_rec1_aEL a_r4O
+              = f_rec{-r66,x-} [taEV, taEV] f_rec0{-r5P,x-} taEV a_r4O
+AbsBinds [taFb] [] [([taFb], f_rec2{-r5R,x-}, f_rec2_aF1)]
+    f_rec2_aF1 a_r4M
+              = f_rec{-r66,x-} [taFb, taFb] f_rec1{-r5Q,x-} taFb a_r4M
+AbsBinds [taFr] [] [([taFr], f{-r5S,x-}, f_aFh)]
+    f_aFh a_r4K
+         = f_rec{-r66,x-} [taFr, taFr] f_rec2{-r5R,x-} taFr a_r4K
+AbsBinds [taFZ] [] [([taFZ], g_rec0{-r5F,x-}, g_rec0_aFx)]
+    g_rec0_aFx x_r5B y_r5C z_r5D p_r5E
+              = bottom{-r6a,x-} taFZ [x_r5B, y_r5C, z_r5D, p_r5E] (taFZ)
+AbsBinds [taGh] [] [([taGh], absAnd{-r68,x-}, absAnd_aG1)]
+    absAnd_aG1 a_r3R b_r3S = head{-r6b,x-} taGh [a_r3R, b_r3S] (taGh)
+AbsBinds [taGl] [] [([taGl], one{-r6c,x-}, one_aGj)]
+    one_aGj = one_aGj
 AbsBinds
-[taGE, taH1, taH3, taH6, taH7]
+[taH9, taHp, taHr, taHu, taHv]
 []
-[([taGE, taH1, taH3, taH6, taH7], fac_rec{-r67,x-}, fac_rec_aG3)]
-    fac_rec_aG3 fac0_r3U n_r3V a_r3W
-               = absIf{-r69,x-} [taH7, taGE, taH1] absAnd{-r68,x-}
-                                                       taH1 s_3_0{-r61,x-} [taH1, taH6, taH3] n_r3V
-                                                            one{-r6c,x-} taH1
-                                                   s_2_0{-r64,x-} [taH7, taH6] a_r3W
-                                                   fac0_r3U absAnd{-r68,x-} taH3 s_3_2{-r5Z,x-}
-                                                                                     [taH1, taH6, taH3] n_r3V
-                                                                                 one{-r6c,x-} taH3
-                                                            absAnd{-r68,x-} taH6 s_3_1{-r60,x-}
-                                                                                     [taH1, taH6, taH3] n_r3V
+[([taH9, taHp, taHr, taHu, taHv], fac_rec{-r67,x-}, fac_rec_aGn)]
+    fac_rec_aGn fac0_r3U n_r3V a_r3W
+               = absIf{-r69,x-} [taHv, taH9, taHp] absAnd{-r68,x-}
+                                                       taHp s_3_0{-r61,x-} [taHp, taHu, taHr] n_r3V
+                                                            one{-r6c,x-} taHp
+                                                   s_2_0{-r64,x-} [taHv, taHu] a_r3W
+                                                   fac0_r3U absAnd{-r68,x-} taHr s_3_2{-r5Z,x-}
+                                                                                     [taHp, taHu, taHr] n_r3V
+                                                                                 one{-r6c,x-} taHr
+                                                            absAnd{-r68,x-} taHu s_3_1{-r60,x-}
+                                                                                     [taHp, taHu, taHr] n_r3V
                                                                                  s_2_1{-r63,x-}
-                                                                                     [taH7, taH6] a_r3W
+                                                                                     [taHv, taHu] a_r3W
 AbsBinds
-[taHo, taHw, taHx]
+[taHO, taHW, taHX]
 []
-[([taHo, taHw, taHx], fac_rec1{-r5U,x-}, fac_rec1_aH9)]
-    fac_rec1_aH9 n_r4E a_r4F
-                = fac_rec{-r67,x-} [taHw, taHo, taHw, taHw, taHx] fac_rec0{-r5T,x-}
-                                                                      taHw
+[([taHO, taHW, taHX], fac_rec1{-r5U,x-}, fac_rec1_aHx)]
+    fac_rec1_aHx n_r4E a_r4F
+                = fac_rec{-r67,x-} [taHW, taHO, taHW, taHW, taHX] fac_rec0{-r5T,x-}
+                                                                      taHW
                                                                   n_r4E
                                                                   a_r4F
 AbsBinds
-[taHO, taHW, taHZ, taI0, taI1]
+[taIg, taIo, taIr, taIs, taIt]
 []
-[([taHO, taHW, taHZ, taI0, taI1], fac_rec2{-r5V,x-}, fac_rec2_aHz)]
-    fac_rec2_aHz n_r4B a_r4C
+[([taIg, taIo, taIr, taIs, taIt], fac_rec2{-r5V,x-}, fac_rec2_aHZ)]
+    fac_rec2_aHZ n_r4B a_r4C
                 = fac_rec{-r67,x-}
-                      [taI0, taHO, (taI0, taHW, taHW), (taHZ, taHW), taI1] fac_rec1{-r5U,x-}
-                                                                               [taI0, taHW, taHZ]
+                      [taIs, taIg, (taIs, taIo, taIo), (taIr, taIo), taIt] fac_rec1{-r5U,x-}
+                                                                               [taIs, taIo, taIr]
                                                                            n_r4B
                                                                            a_r4C
 AbsBinds
-[taIi, taIr, taIs, taIu, taIx, taIy, taIz]
+[taIM, taIV, taIW, taIY, taJ1, taJ2, taJ3]
 []
-[([taIi, taIr, taIs, taIu, taIx, taIy, taIz],
+[([taIM, taIV, taIW, taIY, taJ1, taJ2, taJ3],
   fac_rec3{-r5W,x-},
-  fac_rec3_aI3)]
-    fac_rec3_aI3 n_r4y a_r4z
+  fac_rec3_aIv)]
+    fac_rec3_aIv n_r4y a_r4z
                 = fac_rec{-r67,x-}
-                      [taIy, taIi, (taIy, (taIr, taIs), (taIu, taIs, taIs)), (taIx, (taIr, taIs)), taIz] fac_rec2{-r5V,x-}
-                                                                                                             [taIy, taIs, taIr, taIu, taIx]
+                      [taJ2, taIM, (taJ2, (taIV, taIW), (taIY, taIW, taIW)), (taJ1, (taIV, taIW)), taJ3] fac_rec2{-r5V,x-}
+                                                                                                             [taJ2, taIW, taIV, taIY, taJ1]
                                                                                                          n_r4y
                                                                                                          a_r4z
 AbsBinds
-[taIQ, taJ1, taJ2, taJ3, taJ5, taJ6, taJ9, taJa, taJb]
+[taJm, taJx, taJy, taJz, taJB, taJC, taJF, taJG, taJH]
 []
-[([taIQ, taJ1, taJ2, taJ3, taJ5, taJ6, taJ9, taJa, taJb],
+[([taJm, taJx, taJy, taJz, taJB, taJC, taJF, taJG, taJH],
   fac_rec4{-r5X,x-},
-  fac_rec4_aIB)]
-    fac_rec4_aIB n_r4v a_r4w
+  fac_rec4_aJ5)]
+    fac_rec4_aJ5 n_r4v a_r4w
                 = fac_rec{-r67,x-}
-                      [taJa, taIQ, (taJa, (taJ1, (taJ2, taJ3)), (taJ5, (taJ2, taJ3), (taJ6, taJ3, taJ3))), (taJ9, (taJ1, (taJ2, taJ3))), taJb] fac_rec3{-r5W,x-}
-                                                                                                                                                   [taJa, taJ2, taJ3, taJ6, taJ1, taJ5, taJ9]
+                      [taJG, taJm, (taJG, (taJx, (taJy, taJz)), (taJB, (taJy, taJz), (taJC, taJz, taJz))), (taJF, (taJx, (taJy, taJz))), taJH] fac_rec3{-r5W,x-}
+                                                                                                                                                   [taJG, taJy, taJz, taJC, taJx, taJB, taJF]
                                                                                                                                                n_r4v
                                                                                                                                                a_r4w
 AbsBinds
-[taJs, taJF, taJG, taJH, taJI, taJK, taJL, taJM, taJP, taJQ, taJR]
+[taK0, taKd, taKe, taKf, taKg, taKi, taKj, taKk, taKn, taKo, taKp]
 []
-[([taJs, taJF, taJG, taJH, taJI, taJK, taJL, taJM, taJP, taJQ,
-   taJR],
+[([taK0, taKd, taKe, taKf, taKg, taKi, taKj, taKk, taKn, taKo,
+   taKp],
   fac{-r5Y,x-},
-  fac_aJd)]
-    fac_aJd n_r4s a_r4t
+  fac_aJJ)]
+    fac_aJJ n_r4s a_r4t
            = fac_rec{-r67,x-}
-                 [taJQ, taJs, (taJQ, (taJF, (taJG, (taJH, taJI))), (taJK, (taJG, (taJH, taJI)), (taJL, (taJH, taJI), (taJM, taJI, taJI)))), (taJP, (taJF, (taJG, (taJH, taJI)))), taJR] fac_rec4{-r5X,x-}
-                                                                                                                                                                                            [taJQ, taJG, taJH, taJI, taJL, taJM, taJF, taJK, taJP]
+                 [taKo, taK0, (taKo, (taKd, (taKe, (taKf, taKg))), (taKi, (taKe, (taKf, taKg)), (taKj, (taKf, taKg), (taKk, taKg, taKg)))), (taKn, (taKd, (taKe, (taKf, taKg)))), taKp] fac_rec4{-r5X,x-}
+                                                                                                                                                                                            [taKo, taKe, taKf, taKg, taKj, taKk, taKd, taKi, taKn]
                                                                                                                                                                                         n_r4s
                                                                                                                                                                                         a_r4t
 AbsBinds
-[taKR, taL3, taL5, taL8, taLE, taLF, taLH, taLJ, taLR, taLS, taLT]
+[taLv, taLN, taLP, taLR, taMq, taMr, taMt, taMv, taMB, taMC, taMD]
 []
-[([taKR, taL3, taL5, taL8, taLE, taLF, taLH, taLJ, taLR, taLS,
-   taLT],
+[([taLv, taLN, taLP, taLR, taMq, taMr, taMt, taMv, taMB, taMC,
+   taMD],
   g_rec{-r65,x-},
-  g_rec_aJT)]
-    g_rec_aJT g0_r41 g1_r42 x_r43 y_r44 z_r45 p_r46
-             = absIf{-r69,x-} [taLF, taKR, taLS] absAnd{-r68,x-}
-                                                     taLS s_3_0{-r61,x-} [taLS, taLT, taLR] p_r46
-                                                          one{-r6c,x-} taLS
-                                                 absAnd{-r68,x-} taLF s_1_0{-r62,x-} taLF x_r43
+  g_rec_aKr)]
+    g_rec_aKr g0_r41 g1_r42 x_r43 y_r44 z_r45 p_r46
+             = absIf{-r69,x-} [taMr, taLv, taMC] absAnd{-r68,x-}
+                                                     taMC s_3_0{-r61,x-} [taMC, taMD, taMB] p_r46
+                                                          one{-r6c,x-} taMC
+                                                 absAnd{-r68,x-} taMr s_1_0{-r62,x-} taMr x_r43
                                                                       s_3_0{-r61,x-}
-                                                                          [taLF, taLE, taLH] z_r45
-                                                 absAnd{-r68,x-} taKR g0_r41 s_1_0{-r62,x-}
-                                                                                 taL3 y_r44
-                                                                             one{-r6c,x-} taL5
-                                                                             one{-r6c,x-} taL8
+                                                                          [taMr, taMq, taMt] z_r45
+                                                 absAnd{-r68,x-} taLv g0_r41 s_1_0{-r62,x-}
+                                                                                 taLN y_r44
+                                                                             one{-r6c,x-} taLP
+                                                                             one{-r6c,x-} taLR
                                                                              absAnd{-r68,x-}
-                                                                                 taLT s_3_1{-r60,x-}
-                                                                                          [taLS, taLT, taLR] p_r46
+                                                                                 taMD s_3_1{-r60,x-}
+                                                                                          [taMC, taMD, taMB] p_r46
                                                                                       one{-r6c,x-}
-                                                                                          taLT
+                                                                                          taMD
                                                                       g1_r42 s_3_2{-r5Z,x-}
-                                                                                 [taLF, taLE, taLH] z_r45
+                                                                                 [taMr, taMq, taMt] z_r45
                                                                              s_3_1{-r60,x-}
-                                                                                 [taLF, taLE, taLH] z_r45
-                                                                             one{-r6c,x-} taLJ
+                                                                                 [taMr, taMq, taMt] z_r45
+                                                                             one{-r6c,x-} taMv
                                                                              absAnd{-r68,x-}
-                                                                                 taLR s_3_2{-r5Z,x-}
-                                                                                          [taLS, taLT, taLR] p_r46
+                                                                                 taMB s_3_2{-r5Z,x-}
+                                                                                          [taMC, taMD, taMB] p_r46
                                                                                       one{-r6c,x-}
-                                                                                          taLR
+                                                                                          taMB
 AbsBinds
-[taMu, taMC, taMJ]
+[taNi, taNq, taNx]
 []
-[([taMu, taMC, taMJ], g_rec1{-r5G,x-}, g_rec1_aLX)]
-    g_rec1_aLX x_r5w y_r5x z_r5y p_r5z
+[([taNi, taNq, taNx], g_rec1{-r5G,x-}, g_rec1_aMH)]
+    g_rec1_aMH x_r5w y_r5x z_r5y p_r5z
               = g_rec{-r65,x-}
-                    [taMC, taMC, taMC, taMC, taMC, taMJ, taMC, taMC, taMC, taMu, taMC] g_rec0{-r5F,x-}
-                                                                                           taMC
+                    [taNq, taNq, taNq, taNq, taNq, taNx, taNq, taNq, taNq, taNi, taNq] g_rec0{-r5F,x-}
+                                                                                           taNq
                                                                                        g_rec0{-r5F,x-}
-                                                                                           taMC
+                                                                                           taNq
                                                                                        x_r5w
                                                                                        y_r5x
                                                                                        z_r5y
                                                                                        p_r5z
 AbsBinds
-[taNi, taNo, taNq, taNu, taNz, taNB, taNF]
+[taOa, taOg, taOi, taOm, taOr, taOt, taOx]
 []
-[([taNi, taNo, taNq, taNu, taNz, taNB, taNF],
+[([taOa, taOg, taOi, taOm, taOr, taOt, taOx],
   g_rec2{-r5H,x-},
-  g_rec2_aML)]
-    g_rec2_aML x_r5r y_r5s z_r5t p_r5u
+  g_rec2_aNz)]
+    g_rec2_aNz x_r5r y_r5s z_r5t p_r5u
               = g_rec{-r65,x-}
-                    [taNu, taNo, taNq, (taNo, taNq, taNq), taNB, taNF, taNz, (taNz, taNB, taNB), (taNu, taNB, taNB), taNi, (taNu, taNq, taNq)] g_rec1{-r5G,x-}
-                                                                                                                                                   [taNu, taNq, taNo]
+                    [taOm, taOg, taOi, (taOg, taOi, taOi), taOt, taOx, taOr, (taOr, taOt, taOt), (taOm, taOt, taOt), taOa, (taOm, taOi, taOi)] g_rec1{-r5G,x-}
+                                                                                                                                                   [taOm, taOi, taOg]
                                                                                                                                                g_rec1{-r5G,x-}
-                                                                                                                                                   [taNu, taNB, taNz]
+                                                                                                                                                   [taOm, taOt, taOr]
                                                                                                                                                x_r5r
                                                                                                                                                y_r5s
                                                                                                                                                z_r5t
                                                                                                                                                p_r5u
 AbsBinds
-[taOe, taOo, taOs, taOw, taOx, taOy, taOH, taOJ, taOL, taOP, taOQ, taOR]
+[taPa, taPk, taPo, taPs, taPt, taPu, taPD, taPF, taPH, taPL, taPM, taPN]
 []
-[([taOe, taOo, taOs, taOw, taOx, taOy, taOH, taOJ, taOL, taOP,
-   taOQ, taOR],
+[([taPa, taPk, taPo, taPs, taPt, taPu, taPD, taPF, taPH, taPL,
+   taPM, taPN],
   g_rec3{-r5I,x-},
-  g_rec3_aNH)]
-    g_rec3_aNH x_r5m y_r5n z_r5o p_r5p
+  g_rec3_aOz)]
+    g_rec3_aOz x_r5m y_r5n z_r5o p_r5p
               = g_rec{-r65,x-}
-                    [taOy, taOo, GHC.Void{-3T,W-}, (taOo, taOs, GHC.Void{-3T,W-}), taOJ, taOR, taOH, (taOH, taOL, GHC.Void{-3T,W-}), (taOy, (taOP, taOQ, taOQ), (taOP, taOL, taOL)), taOe, (taOy, (taOw, taOx, taOx), (taOw, taOs, taOs))] g_rec2{-r5H,x-}
-                                                                                                                                                                                                                                               [taOy, GHC.Void{-3T,W-}, taOx, taOw, GHC.Void{-3T,W-}, taOs, taOo]
+                    [taPu, taPk, GHC.Void{-3T,W-}, (taPk, taPo, GHC.Void{-3T,W-}), taPF, taPN, taPD, (taPD, taPH, GHC.Void{-3T,W-}), (taPu, (taPL, taPM, taPM), (taPL, taPH, taPH)), taPa, (taPu, (taPs, taPt, taPt), (taPs, taPo, taPo))] g_rec2{-r5H,x-}
+                                                                                                                                                                                                                                               [taPu, GHC.Void{-3T,W-}, taPt, taPs, GHC.Void{-3T,W-}, taPo, taPk]
                                                                                                                                                                                                                                            g_rec2{-r5H,x-}
-                                                                                                                                                                                                                                               [taOy, taOJ, taOQ, taOP, GHC.Void{-3T,W-}, taOL, taOH]
+                                                                                                                                                                                                                                               [taPu, taPF, taPM, taPL, GHC.Void{-3T,W-}, taPH, taPD]
                                                                                                                                                                                                                                            x_r5m
                                                                                                                                                                                                                                            y_r5n
                                                                                                                                                                                                                                            z_r5o
                                                                                                                                                                                                                                            p_r5p
 AbsBinds
-[taPq, taPF, taPN, taPO, taPP, taPQ, taPR, taPS, taPT, taPU, taQ8, taQa, taQg, taQh, taQi, taQj, taQk, taQl, taQm, taQn]
+[taQq, taQF, taQN, taQO, taQP, taQQ, taQR, taQS, taQT, taQU, taR8, taRa, taRg, taRh, taRi, taRj, taRk, taRl, taRm, taRn]
 []
-[([taPq, taPF, taPN, taPO, taPP, taPQ, taPR, taPS, taPT, taPU,
-   taQ8, taQa, taQg, taQh, taQi, taQj, taQk, taQl, taQm, taQn],
+[([taQq, taQF, taQN, taQO, taQP, taQQ, taQR, taQS, taQT, taQU,
+   taR8, taRa, taRg, taRh, taRi, taRj, taRk, taRl, taRm, taRn],
   g_rec4{-r5J,x-},
-  g_rec4_aOT)]
-    g_rec4_aOT x_r5h y_r5i z_r5j p_r5k
+  g_rec4_aPP)]
+    g_rec4_aPP x_r5h y_r5i z_r5j p_r5k
               = g_rec{-r65,x-}
-                    [taPU, taPF, GHC.Void{-3T,W-}, (taPF, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taQa, taQn, taQ8, (taQ8, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taPU, (taQg, (taQh, taQi, taQi), (taQh, taQj, taQj)), (taQg, (taQk, taQl, taQl), (taQk, taQm, taQm))), taPq, (taPU, (taPN, (taPO, taPP, taPP), (taPO, taPQ, taPQ)), (taPN, (taPR, taPS, taPS), (taPR, taPT, taPT)))] g_rec3{-r5I,x-}
-                                                                                                                                                                                                                                                                                                                                                                                       [taPU, GHC.Void{-3T,W-}, taPQ, taPO, taPP, taPN, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taPT, taPR, taPS, taPF]
+                    [taQU, taQF, GHC.Void{-3T,W-}, (taQF, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taRa, taRn, taR8, (taR8, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taQU, (taRg, (taRh, taRi, taRi), (taRh, taRj, taRj)), (taRg, (taRk, taRl, taRl), (taRk, taRm, taRm))), taQq, (taQU, (taQN, (taQO, taQP, taQP), (taQO, taQQ, taQQ)), (taQN, (taQR, taQS, taQS), (taQR, taQT, taQT)))] g_rec3{-r5I,x-}
+                                                                                                                                                                                                                                                                                                                                                                                       [taQU, GHC.Void{-3T,W-}, taQQ, taQO, taQP, taQN, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taQT, taQR, taQS, taQF]
                                                                                                                                                                                                                                                                                                                                                                                    g_rec3{-r5I,x-}
-                                                                                                                                                                                                                                                                                                                                                                                       [taPU, taQa, taQj, taQh, taQi, taQg, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taQm, taQk, taQl, taQ8]
+                                                                                                                                                                                                                                                                                                                                                                                       [taQU, taRa, taRj, taRh, taRi, taRg, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taRm, taRk, taRl, taR8]
                                                                                                                                                                                                                                                                                                                                                                                    x_r5h
                                                                                                                                                                                                                                                                                                                                                                                    y_r5i
                                                                                                                                                                                                                                                                                                                                                                                    z_r5j
                                                                                                                                                                                                                                                                                                                                                                                    p_r5k
 AbsBinds
-[taQW, taRj, taRr, taRs, taRt, taRu, taRv, taRw, taRx, taRy, taRz, taRA, taRB, taRC, taRD, taRE, taRF, taRG, taS2, taS4, taSa, taSb, taSc, taSd, taSe, taSf, taSg, taSh, taSi, taSj, taSk, taSl, taSm, taSn, taSo, taSp]
+[taS0, taSn, taSv, taSw, taSx, taSy, taSz, taSA, taSB, taSC, taSD, taSE, taSF, taSG, taSH, taSI, taSJ, taSK, taT6, taT8, taTe, taTf, taTg, taTh, taTi, taTj, taTk, taTl, taTm, taTn, taTo, taTp, taTq, taTr, taTs, taTt]
 []
-[([taQW, taRj, taRr, taRs, taRt, taRu, taRv, taRw, taRx, taRy,
-   taRz, taRA, taRB, taRC, taRD, taRE, taRF, taRG, taS2, taS4, taSa,
-   taSb, taSc, taSd, taSe, taSf, taSg, taSh, taSi, taSj, taSk, taSl,
-   taSm, taSn, taSo, taSp],
+[([taS0, taSn, taSv, taSw, taSx, taSy, taSz, taSA, taSB, taSC,
+   taSD, taSE, taSF, taSG, taSH, taSI, taSJ, taSK, taT6, taT8, taTe,
+   taTf, taTg, taTh, taTi, taTj, taTk, taTl, taTm, taTn, taTo, taTp,
+   taTq, taTr, taTs, taTt],
   g_rec5{-r5K,x-},
-  g_rec5_aQp)]
-    g_rec5_aQp x_r5c y_r5d z_r5e p_r5f
+  g_rec5_aRp)]
+    g_rec5_aRp x_r5c y_r5d z_r5e p_r5f
               = g_rec{-r65,x-}
-                    [taRG, taRj, GHC.Void{-3T,W-}, (taRj, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taS4, taSp, taS2, (taS2, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taRG, (taSa, (taSb, (taSc, taSd, taSd), (taSc, taSe, taSe)), (taSb, (taSf, taSg, taSg), (taSf, taSh, taSh))), (taSa, (taSi, (taSj, taSk, taSk), (taSj, taSl, taSl)), (taSi, (taSm, taSn, taSn), (taSm, taSo, taSo)))), taQW, (taRG, (taRr, (taRs, (taRt, taRu, taRu), (taRt, taRv, taRv)), (taRs, (taRw, taRx, taRx), (taRw, taRy, taRy))), (taRr, (taRz, (taRA, taRB, taRB), (taRA, taRC, taRC)), (taRz, (taRD, taRE, taRE), (taRD, taRF, taRF))))] g_rec4{-r5J,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taRG, GHC.Void{-3T,W-}, taRs, taRt, taRu, taRv, taRw, taRx, taRy, taRr, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taRz, taRA, taRB, taRC, taRD, taRE, taRF, taRj]
+                    [taSK, taSn, GHC.Void{-3T,W-}, (taSn, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taT8, taTt, taT6, (taT6, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taSK, (taTe, (taTf, (taTg, taTh, taTh), (taTg, taTi, taTi)), (taTf, (taTj, taTk, taTk), (taTj, taTl, taTl))), (taTe, (taTm, (taTn, taTo, taTo), (taTn, taTp, taTp)), (taTm, (taTq, taTr, taTr), (taTq, taTs, taTs)))), taS0, (taSK, (taSv, (taSw, (taSx, taSy, taSy), (taSx, taSz, taSz)), (taSw, (taSA, taSB, taSB), (taSA, taSC, taSC))), (taSv, (taSD, (taSE, taSF, taSF), (taSE, taSG, taSG)), (taSD, (taSH, taSI, taSI), (taSH, taSJ, taSJ))))] g_rec4{-r5J,x-}
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taSK, GHC.Void{-3T,W-}, taSw, taSx, taSy, taSz, taSA, taSB, taSC, taSv, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taSD, taSE, taSF, taSG, taSH, taSI, taSJ, taSn]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    g_rec4{-r5J,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taRG, taS4, taSb, taSc, taSd, taSe, taSf, taSg, taSh, taSa, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taSi, taSj, taSk, taSl, taSm, taSn, taSo, taS2]
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taSK, taT8, taTf, taTg, taTh, taTi, taTj, taTk, taTl, taTe, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taTm, taTn, taTo, taTp, taTq, taTr, taTs, taT6]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    x_r5c
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    y_r5d
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    z_r5e
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    p_r5f
 AbsBinds
-[taSY, taTB, taTJ, taTK, taTL, taTM, taTN, taTO, taTP, taTQ, taTR, taTS, taTT, taTU, taTV, taTW, taTX, taTY, taTZ, taU0, taU1, taU2, taU3, taU4, taU5, taU6, taU7, taU8, taU9, taUa, taUb, taUc, taUd, taUe, taUQ, taUS, taUY, taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk, taVl, taVm, taVn, taVo, taVp, taVq, taVr, taVs, taVt]
+[taU6, taUJ, taUR, taUS, taUT, taUU, taUV, taUW, taUX, taUY, taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk, taVl, taVm, taVY, taW0, taW6, taW7, taW8, taW9, taWa, taWb, taWc, taWd, taWe, taWf, taWg, taWh, taWi, taWj, taWk, taWl, taWm, taWn, taWo, taWp, taWq, taWr, taWs, taWt, taWu, taWv, taWw, taWx, taWy, taWz, taWA, taWB]
 []
-[([taSY, taTB, taTJ, taTK, taTL, taTM, taTN, taTO, taTP, taTQ,
-   taTR, taTS, taTT, taTU, taTV, taTW, taTX, taTY, taTZ, taU0, taU1,
-   taU2, taU3, taU4, taU5, taU6, taU7, taU8, taU9, taUa, taUb, taUc,
-   taUd, taUe, taUQ, taUS, taUY, taUZ, taV0, taV1, taV2, taV3, taV4,
-   taV5, taV6, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taVe, taVf,
-   taVg, taVh, taVi, taVj, taVk, taVl, taVm, taVn, taVo, taVp, taVq,
-   taVr, taVs, taVt],
+[([taU6, taUJ, taUR, taUS, taUT, taUU, taUV, taUW, taUX, taUY,
+   taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taV7, taV8, taV9,
+   taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk,
+   taVl, taVm, taVY, taW0, taW6, taW7, taW8, taW9, taWa, taWb, taWc,
+   taWd, taWe, taWf, taWg, taWh, taWi, taWj, taWk, taWl, taWm, taWn,
+   taWo, taWp, taWq, taWr, taWs, taWt, taWu, taWv, taWw, taWx, taWy,
+   taWz, taWA, taWB],
   g_rec6{-r5L,x-},
-  g_rec6_aSr)]
-    g_rec6_aSr x_r57 y_r58 z_r59 p_r5a
+  g_rec6_aTv)]
+    g_rec6_aTv x_r57 y_r58 z_r59 p_r5a
               = g_rec{-r65,x-}
-                    [taUe, taTB, GHC.Void{-3T,W-}, (taTB, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taUS, taVt, taUQ, (taUQ, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taUe, (taUY, (taUZ, (taV0, (taV1, taV2, taV2), (taV1, taV3, taV3)), (taV0, (taV4, taV5, taV5), (taV4, taV6, taV6))), (taUZ, (taV7, (taV8, taV9, taV9), (taV8, taVa, taVa)), (taV7, (taVb, taVc, taVc), (taVb, taVd, taVd)))), (taUY, (taVe, (taVf, (taVg, taVh, taVh), (taVg, taVi, taVi)), (taVf, (taVj, taVk, taVk), (taVj, taVl, taVl))), (taVe, (taVm, (taVn, taVo, taVo), (taVn, taVp, taVp)), (taVm, (taVq, taVr, taVr), (taVq, taVs, taVs))))), taSY, (taUe, (taTJ, (taTK, (taTL, (taTM, taTN, taTN), (taTM, taTO, taTO)), (taTL, (taTP, taTQ, taTQ), (taTP, taTR, taTR))), (taTK, (taTS, (taTT, taTU, taTU), (taTT, taTV, taTV)), (taTS, (taTW, taTX, taTX), (taTW, taTY, taTY)))), (taTJ, (taTZ, (taU0, (taU1, taU2, taU2), (taU1, taU3, taU3)), (taU0, (taU4, taU5, taU5), (taU4, taU6, taU6))), (taTZ, (taU7, (taU8, taU9, taU9), (taU8, taUa, taUa)), (taU7, (taUb, taUc, taUc), (taUb, taUd, taUd)))))] g_rec5{-r5K,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taUe, GHC.Void{-3T,W-}, taTK, taTL, taTM, taTN, taTO, taTP, taTQ, taTR, taTS, taTT, taTU, taTV, taTW, taTX, taTY, taTJ, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taTZ, taU0, taU1, taU2, taU3, taU4, taU5, taU6, taU7, taU8, taU9, taUa, taUb, taUc, taUd, taTB]
+                    [taVm, taUJ, GHC.Void{-3T,W-}, (taUJ, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taW0, taWB, taVY, (taVY, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taVm, (taW6, (taW7, (taW8, (taW9, taWa, taWa), (taW9, taWb, taWb)), (taW8, (taWc, taWd, taWd), (taWc, taWe, taWe))), (taW7, (taWf, (taWg, taWh, taWh), (taWg, taWi, taWi)), (taWf, (taWj, taWk, taWk), (taWj, taWl, taWl)))), (taW6, (taWm, (taWn, (taWo, taWp, taWp), (taWo, taWq, taWq)), (taWn, (taWr, taWs, taWs), (taWr, taWt, taWt))), (taWm, (taWu, (taWv, taWw, taWw), (taWv, taWx, taWx)), (taWu, (taWy, taWz, taWz), (taWy, taWA, taWA))))), taU6, (taVm, (taUR, (taUS, (taUT, (taUU, taUV, taUV), (taUU, taUW, taUW)), (taUT, (taUX, taUY, taUY), (taUX, taUZ, taUZ))), (taUS, (taV0, (taV1, taV2, taV2), (taV1, taV3, taV3)), (taV0, (taV4, taV5, taV5), (taV4, taV6, taV6)))), (taUR, (taV7, (taV8, (taV9, taVa, taVa), (taV9, taVb, taVb)), (taV8, (taVc, taVd, taVd), (taVc, taVe, taVe))), (taV7, (taVf, (taVg, taVh, taVh), (taVg, taVi, taVi)), (taVf, (taVj, taVk, taVk), (taVj, taVl, taVl)))))] g_rec5{-r5K,x-}
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taVm, GHC.Void{-3T,W-}, taUS, taUT, taUU, taUV, taUW, taUX, taUY, taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taUR, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taVe, taVf, taVg, taVh, taVi, taVj, taVk, taVl, taUJ]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    g_rec5{-r5K,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taUe, taUS, taUZ, taV0, taV1, taV2, taV3, taV4, taV5, taV6, taV7, taV8, taV9, taVa, taVb, taVc, taVd, taUY, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taVe, taVf, taVg, taVh, taVi, taVj, taVk, taVl, taVm, taVn, taVo, taVp, taVq, taVr, taVs, taUQ]
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       [taVm, taW0, taW7, taW8, taW9, taWa, taWb, taWc, taWd, taWe, taWf, taWg, taWh, taWi, taWj, taWk, taWl, taW6, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taWm, taWn, taWo, taWp, taWq, taWr, taWs, taWt, taWu, taWv, taWw, taWx, taWy, taWz, taWA, taVY]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    x_r57
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    y_r58
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    z_r59
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    p_r5a
 AbsBinds
-[taW2, taXb, taXj, taXk, taXl, taXm, taXn, taXo, taXp, taXq, taXr, taXs, taXt, taXu, taXv, taXw, taXx, taXy, taXz, taXA, taXB, taXC, taXD, taXE, taXF, taXG, taXH, taXI, taXJ, taXK, taXL, taXM, taXN, taXO, taXP, taXQ, taXR, taXS, taXT, taXU, taXV, taXW, taXX, taXY, taXZ, taY0, taY1, taY2, taY3, taY4, taY5, taY6, taY7, taY8, taY9, taYa, taYb, taYc, taYd, taYe, taYf, taYg, taYh, taYi, taYj, taYk, taZs, taZu, taZA, taZB, taZC, taZD, taZE, taZF, taZG, taZH, taZI, taZJ, taZK, taZL, taZM, taZN, taZO, taZP, taZQ, taZR, taZS, taZT, taZU, taZV, taZW, taZX, taZY, taZZ, ta100, ta101, ta102, ta103, ta104, ta105, ta106, ta107, ta108, ta109, ta10a, ta10b, ta10c, ta10d, ta10e, ta10f, ta10g, ta10h, ta10i, ta10j, ta10k, ta10l, ta10m, ta10n, ta10o, ta10p, ta10q, ta10r, ta10s, ta10t, ta10u, ta10v, ta10w, ta10x, ta10y, ta10z, ta10A, ta10B]
+[taXe, taYn, taYv, taYw, taYx, taYy, taYz, taYA, taYB, taYC, taYD, taYE, taYF, taYG, taYH, taYI, taYJ, taYK, taYL, taYM, taYN, taYO, taYP, taYQ, taYR, taYS, taYT, taYU, taYV, taYW, taYX, taYY, taYZ, taZ0, taZ1, taZ2, taZ3, taZ4, taZ5, taZ6, taZ7, taZ8, taZ9, taZa, taZb, taZc, taZd, taZe, taZf, taZg, taZh, taZi, taZj, taZk, taZl, taZm, taZn, taZo, taZp, taZq, taZr, taZs, taZt, taZu, taZv, taZw, ta10E, ta10G, ta10M, ta10N, ta10O, ta10P, ta10Q, ta10R, ta10S, ta10T, ta10U, ta10V, ta10W, ta10X, ta10Y, ta10Z, ta110, ta111, ta112, ta113, ta114, ta115, ta116, ta117, ta118, ta119, ta11a, ta11b, ta11c, ta11d, ta11e, ta11f, ta11g, ta11h, ta11i, ta11j, ta11k, ta11l, ta11m, ta11n, ta11o, ta11p, ta11q, ta11r, ta11s, ta11t, ta11u, ta11v, ta11w, ta11x, ta11y, ta11z, ta11A, ta11B, ta11C, ta11D, ta11E, ta11F, ta11G, ta11H, ta11I, ta11J, ta11K, ta11L, ta11M, ta11N]
 []
-[([taW2, taXb, taXj, taXk, taXl, taXm, taXn, taXo, taXp, taXq,
-   taXr, taXs, taXt, taXu, taXv, taXw, taXx, taXy, taXz, taXA, taXB,
-   taXC, taXD, taXE, taXF, taXG, taXH, taXI, taXJ, taXK, taXL, taXM,
-   taXN, taXO, taXP, taXQ, taXR, taXS, taXT, taXU, taXV, taXW, taXX,
-   taXY, taXZ, taY0, taY1, taY2, taY3, taY4, taY5, taY6, taY7, taY8,
-   taY9, taYa, taYb, taYc, taYd, taYe, taYf, taYg, taYh, taYi, taYj,
-   taYk, taZs, taZu, taZA, taZB, taZC, taZD, taZE, taZF, taZG, taZH,
-   taZI, taZJ, taZK, taZL, taZM, taZN, taZO, taZP, taZQ, taZR, taZS,
-   taZT, taZU, taZV, taZW, taZX, taZY, taZZ, ta100, ta101, ta102,
-   ta103, ta104, ta105, ta106, ta107, ta108, ta109, ta10a, ta10b,
-   ta10c, ta10d, ta10e, ta10f, ta10g, ta10h, ta10i, ta10j, ta10k,
-   ta10l, ta10m, ta10n, ta10o, ta10p, ta10q, ta10r, ta10s, ta10t,
-   ta10u, ta10v, ta10w, ta10x, ta10y, ta10z, ta10A, ta10B],
+[([taXe, taYn, taYv, taYw, taYx, taYy, taYz, taYA, taYB, taYC,
+   taYD, taYE, taYF, taYG, taYH, taYI, taYJ, taYK, taYL, taYM, taYN,
+   taYO, taYP, taYQ, taYR, taYS, taYT, taYU, taYV, taYW, taYX, taYY,
+   taYZ, taZ0, taZ1, taZ2, taZ3, taZ4, taZ5, taZ6, taZ7, taZ8, taZ9,
+   taZa, taZb, taZc, taZd, taZe, taZf, taZg, taZh, taZi, taZj, taZk,
+   taZl, taZm, taZn, taZo, taZp, taZq, taZr, taZs, taZt, taZu, taZv,
+   taZw, ta10E, ta10G, ta10M, ta10N, ta10O, ta10P, ta10Q, ta10R,
+   ta10S, ta10T, ta10U, ta10V, ta10W, ta10X, ta10Y, ta10Z, ta110,
+   ta111, ta112, ta113, ta114, ta115, ta116, ta117, ta118, ta119,
+   ta11a, ta11b, ta11c, ta11d, ta11e, ta11f, ta11g, ta11h, ta11i,
+   ta11j, ta11k, ta11l, ta11m, ta11n, ta11o, ta11p, ta11q, ta11r,
+   ta11s, ta11t, ta11u, ta11v, ta11w, ta11x, ta11y, ta11z, ta11A,
+   ta11B, ta11C, ta11D, ta11E, ta11F, ta11G, ta11H, ta11I, ta11J,
+   ta11K, ta11L, ta11M, ta11N],
   g_rec7{-r5M,x-},
-  g_rec7_aVv)]
-    g_rec7_aVv x_r52 y_r53 z_r54 p_r55
+  g_rec7_aWD)]
+    g_rec7_aWD x_r52 y_r53 z_r54 p_r55
               = g_rec{-r65,x-}
-                    [taYk, taXb, GHC.Void{-3T,W-}, (taXb, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), taZu, ta10B, taZs, (taZs, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taYk, (taZA, (taZB, (taZC, (taZD, (taZE, taZF, taZF), (taZE, taZG, taZG)), (taZD, (taZH, taZI, taZI), (taZH, taZJ, taZJ))), (taZC, (taZK, (taZL, taZM, taZM), (taZL, taZN, taZN)), (taZK, (taZO, taZP, taZP), (taZO, taZQ, taZQ)))), (taZB, (taZR, (taZS, (taZT, taZU, taZU), (taZT, taZV, taZV)), (taZS, (taZW, taZX, taZX), (taZW, taZY, taZY))), (taZR, (taZZ, (ta100, ta101, ta101), (ta100, ta102, ta102)), (taZZ, (ta103, ta104, ta104), (ta103, ta105, ta105))))), (taZA, (ta106, (ta107, (ta108, (ta109, ta10a, ta10a), (ta109, ta10b, ta10b)), (ta108, (ta10c, ta10d, ta10d), (ta10c, ta10e, ta10e))), (ta107, (ta10f, (ta10g, ta10h, ta10h), (ta10g, ta10i, ta10i)), (ta10f, (ta10j, ta10k, ta10k), (ta10j, ta10l, ta10l)))), (ta106, (ta10m, (ta10n, (ta10o, ta10p, ta10p), (ta10o, ta10q, ta10q)), (ta10n, (ta10r, ta10s, ta10s), (ta10r, ta10t, ta10t))), (ta10m, (ta10u, (ta10v, ta10w, ta10w), (ta10v, ta10x, ta10x)), (ta10u, (ta10y, ta10z, ta10z), (ta10y, ta10A, ta10A)))))), taW2, (taYk, (taXj, (taXk, (taXl, (taXm, (taXn, taXo, taXo), (taXn, taXp, taXp)), (taXm, (taXq, taXr, taXr), (taXq, taXs, taXs))), (taXl, (taXt, (taXu, taXv, taXv), (taXu, taXw, taXw)), (taXt, (taXx, taXy, taXy), (taXx, taXz, taXz)))), (taXk, (taXA, (taXB, (taXC, taXD, taXD), (taXC, taXE, taXE)), (taXB, (taXF, taXG, taXG), (taXF, taXH, taXH))), (taXA, (taXI, (taXJ, taXK, taXK), (taXJ, taXL, taXL)), (taXI, (taXM, taXN, taXN), (taXM, taXO, taXO))))), (taXj, (taXP, (taXQ, (taXR, (taXS, taXT, taXT), (taXS, taXU, taXU)), (taXR, (taXV, taXW, taXW), (taXV, taXX, taXX))), (taXQ, (taXY, (taXZ, taY0, taY0), (taXZ, taY1, taY1)), (taXY, (taY2, taY3, taY3), (taY2, taY4, taY4)))), (taXP, (taY5, (taY6, (taY7, taY8, taY8), (taY7, taY9, taY9)), (taY6, (taYa, taYb, taYb), (taYa, taYc, taYc))), (taY5, (taYd, (taYe, taYf, taYf), (taYe, taYg, taYg)), (taYd, (taYh, taYi, taYi), (taYh, taYj, taYj))))))] g_rec6{-r5L,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  [taYk, GHC.Void{-3T,W-}, taXk, taXl, taXm, taXn, taXo, taXp, taXq, taXr, taXs, taXt, taXu, taXv, taXw, taXx, taXy, taXz, taXA, taXB, taXC, taXD, taXE, taXF, taXG, taXH, taXI, taXJ, taXK, taXL, taXM, taXN, taXO, taXj, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taXP, taXQ, taXR, taXS, taXT, taXU, taXV, taXW, taXX, taXY, taXZ, taY0, taY1, taY2, taY3, taY4, taY5, taY6, taY7, taY8, taY9, taYa, taYb, taYc, taYd, taYe, taYf, taYg, taYh, taYi, taYj, taXb]
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              g_rec6{-r5L,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  [taYk, taZu, taZB, taZC, taZD, taZE, taZF, taZG, taZH, taZI, taZJ, taZK, taZL, taZM, taZN, taZO, taZP, taZQ, taZR, taZS, taZT, taZU, taZV, taZW, taZX, taZY, taZZ, ta100, ta101, ta102, ta103, ta104, ta105, taZA, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta106, ta107, ta108, ta109, ta10a, ta10b, ta10c, ta10d, ta10e, ta10f, ta10g, ta10h, ta10i, ta10j, ta10k, ta10l, ta10m, ta10n, ta10o, ta10p, ta10q, ta10r, ta10s, ta10t, ta10u, ta10v, ta10w, ta10x, ta10y, ta10z, ta10A, taZs]
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              x_r52
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              y_r53
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              z_r54
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              p_r55
+                    [taZw, taYn, GHC.Void{-3T,W-}, (taYn, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta10G, ta11N, ta10E, (ta10E, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (taZw, (ta10M, (ta10N, (ta10O, (ta10P, (ta10Q, ta10R, ta10R), (ta10Q, ta10S, ta10S)), (ta10P, (ta10T, ta10U, ta10U), (ta10T, ta10V, ta10V))), (ta10O, (ta10W, (ta10X, ta10Y, ta10Y), (ta10X, ta10Z, ta10Z)), (ta10W, (ta110, ta111, ta111), (ta110, ta112, ta112)))), (ta10N, (ta113, (ta114, (ta115, ta116, ta116), (ta115, ta117, ta117)), (ta114, (ta118, ta119, ta119), (ta118, ta11a, ta11a))), (ta113, (ta11b, (ta11c, ta11d, ta11d), (ta11c, ta11e, ta11e)), (ta11b, (ta11f, ta11g, ta11g), (ta11f, ta11h, ta11h))))), (ta10M, (ta11i, (ta11j, (ta11k, (ta11l, ta11m, ta11m), (ta11l, ta11n, ta11n)), (ta11k, (ta11o, ta11p, ta11p), (ta11o, ta11q, ta11q))), (ta11j, (ta11r, (ta11s, ta11t, ta11t), (ta11s, ta11u, ta11u)), (ta11r, (ta11v, ta11w, ta11w), (ta11v, ta11x, ta11x)))), (ta11i, (ta11y, (ta11z, (ta11A, ta11B, ta11B), (ta11A, ta11C, ta11C)), (ta11z, (ta11D, ta11E, ta11E), (ta11D, ta11F, ta11F))), (ta11y, (ta11G, (ta11H, ta11I, ta11I), (ta11H, ta11J, ta11J)), (ta11G, (ta11K, ta11L, ta11L), (ta11K, ta11M, ta11M)))))), taXe, (taZw, (taYv, (taYw, (taYx, (taYy, (taYz, taYA, taYA), (taYz, taYB, taYB)), (taYy, (taYC, taYD, taYD), (taYC, taYE, taYE))), (taYx, (taYF, (taYG, taYH, taYH), (taYG, taYI, taYI)), (taYF, (taYJ, taYK, taYK), (taYJ, taYL, taYL)))), (taYw, (taYM, (taYN, (taYO, taYP, taYP), (taYO, taYQ, taYQ)), (taYN, (taYR, taYS, taYS), (taYR, taYT, taYT))), (taYM, (taYU, (taYV, taYW, taYW), (taYV, taYX, taYX)), (taYU, (taYY, taYZ, taYZ), (taYY, taZ0, taZ0))))), (taYv, (taZ1, (taZ2, (taZ3, (taZ4, taZ5, taZ5), (taZ4, taZ6, taZ6)), (taZ3, (taZ7, taZ8, taZ8), (taZ7, taZ9, taZ9))), (taZ2, (taZa, (taZb, taZc, taZc), (taZb, taZd, taZd)), (taZa, (taZe, taZf, taZf), (taZe, taZg, taZg)))), (taZ1, (taZh, (taZi, (taZj, taZk, taZk), (taZj, taZl, taZl)), (taZi, (taZm, taZn, taZn), (taZm, taZo, taZo))), (taZh, (taZp, (taZq, taZr, taZr), (taZq, taZs, taZs)), (taZp, (taZt, taZu, taZu), (taZt, taZv, taZv))))))] g_rec6{-r5L,x-}
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         [taZw, GHC.Void{-3T,W-}, taYw, taYx, taYy, taYz, taYA, taYB, taYC, taYD, taYE, taYF, taYG, taYH, taYI, taYJ, taYK, taYL, taYM, taYN, taYO, taYP, taYQ, taYR, taYS, taYT, taYU, taYV, taYW, taYX, taYY, taYZ, taZ0, taYv, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, taZ1, taZ2, taZ3, taZ4, taZ5, taZ6, taZ7, taZ8, taZ9, taZa, taZb, taZc, taZd, taZe, taZf, taZg, taZh, taZi, taZj, taZk, taZl, taZm, taZn, taZo, taZp, taZq, taZr, taZs, taZt, taZu, taZv, taYn]
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     g_rec6{-r5L,x-}
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         [taZw, ta10G, ta10N, ta10O, ta10P, ta10Q, ta10R, ta10S, ta10T, ta10U, ta10V, ta10W, ta10X, ta10Y, ta10Z, ta110, ta111, ta112, ta113, ta114, ta115, ta116, ta117, ta118, ta119, ta11a, ta11b, ta11c, ta11d, ta11e, ta11f, ta11g, ta11h, ta10M, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta11i, ta11j, ta11k, ta11l, ta11m, ta11n, ta11o, ta11p, ta11q, ta11r, ta11s, ta11t, ta11u, ta11v, ta11w, ta11x, ta11y, ta11z, ta11A, ta11B, ta11C, ta11D, ta11E, ta11F, ta11G, ta11H, ta11I, ta11J, ta11K, ta11L, ta11M, ta10E]
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     x_r52
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     y_r53
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     z_r54
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     p_r55
 AbsBinds
-[ta11a, ta13l, ta13t, ta13u, ta13v, ta13w, ta13x, ta13y, ta13z, ta13A, ta13B, ta13C, ta13D, ta13E, ta13F, ta13G, ta13H, ta13I, ta13J, ta13K, ta13L, ta13M, ta13N, ta13O, ta13P, ta13Q, ta13R, ta13S, ta13T, ta13U, ta13V, ta13W, ta13X, ta13Y, ta13Z, ta140, ta141, ta142, ta143, ta144, ta145, ta146, ta147, ta148, ta149, ta14a, ta14b, ta14c, ta14d, ta14e, ta14f, ta14g, ta14h, ta14i, ta14j, ta14k, ta14l, ta14m, ta14n, ta14o, ta14p, ta14q, ta14r, ta14s, ta14t, ta14u, ta14v, ta14w, ta14x, ta14y, ta14z, ta14A, ta14B, ta14C, ta14D, ta14E, ta14F, ta14G, ta14H, ta14I, ta14J, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta17G, ta17I, ta17O, ta17P, ta17Q, ta17R, ta17S, ta17T, ta17U, ta17V, ta17W, ta17X, ta17Y, ta17Z, ta180, ta181, ta182, ta183, ta184, ta185, ta186, ta187, ta188, ta189, ta18a, ta18b, ta18c, ta18d, ta18e, ta18f, ta18g, ta18h, ta18i, ta18j, ta18k, ta18l, ta18m, ta18n, ta18o, ta18p, ta18q, ta18r, ta18s, ta18t, ta18u, ta18v, ta18w, ta18x, ta18y, ta18z, ta18A, ta18B, ta18C, ta18D, ta18E, ta18F, ta18G, ta18H, ta18I, ta18J, ta18K, ta18L, ta18M, ta18N, ta18O, ta18P, ta18Q, ta18R, ta18S, ta18T, ta18U, ta18V, ta18W, ta18X, ta18Y, ta18Z, ta190, ta191, ta192, ta193, ta194, ta195, ta196, ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta19R]
+[ta12q, ta14B, ta14J, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta15x, ta15y, ta15z, ta15A, ta15B, ta15C, ta15D, ta15E, ta15F, ta15G, ta15H, ta15I, ta15J, ta15K, ta15L, ta15M, ta15N, ta15O, ta15P, ta15Q, ta15R, ta15S, ta15T, ta15U, ta15V, ta15W, ta15X, ta15Y, ta15Z, ta160, ta161, ta162, ta163, ta164, ta165, ta166, ta167, ta168, ta169, ta16a, ta16b, ta16c, ta16d, ta16e, ta16f, ta16g, ta16h, ta16i, ta16j, ta16k, ta16l, ta16m, ta16n, ta16o, ta16p, ta16q, ta16r, ta16s, ta16t, ta16u, ta16v, ta16w, ta16x, ta16y, ta16z, ta16A, ta16B, ta16C, ta16D, ta16E, ta16F, ta16G, ta16H, ta16I, ta16J, ta16K, ta16L, ta16M, ta18W, ta18Y, ta194, ta195, ta196, ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta19R, ta19S, ta19T, ta19U, ta19V, ta19W, ta19X, ta19Y, ta19Z, ta1a0, ta1a1, ta1a2, ta1a3, ta1a4, ta1a5, ta1a6, ta1a7, ta1a8, ta1a9, ta1aa, ta1ab, ta1ac, ta1ad, ta1ae, ta1af, ta1ag, ta1ah, ta1ai, ta1aj, ta1ak, ta1al, ta1am, ta1an, ta1ao, ta1ap, ta1aq, ta1ar, ta1as, ta1at, ta1au, ta1av, ta1aw, ta1ax, ta1ay, ta1az, ta1aA, ta1aB, ta1aC, ta1aD, ta1aE, ta1aF, ta1aG, ta1aH, ta1aI, ta1aJ, ta1aK, ta1aL, ta1aM, ta1aN, ta1aO, ta1aP, ta1aQ, ta1aR, ta1aS, ta1aT, ta1aU, ta1aV, ta1aW, ta1aX, ta1aY, ta1aZ, ta1b0, ta1b1, ta1b2, ta1b3, ta1b4, ta1b5, ta1b6, ta1b7]
 []
-[([ta11a, ta13l, ta13t, ta13u, ta13v, ta13w, ta13x, ta13y, ta13z,
-   ta13A, ta13B, ta13C, ta13D, ta13E, ta13F, ta13G, ta13H, ta13I,
-   ta13J, ta13K, ta13L, ta13M, ta13N, ta13O, ta13P, ta13Q, ta13R,
-   ta13S, ta13T, ta13U, ta13V, ta13W, ta13X, ta13Y, ta13Z, ta140,
-   ta141, ta142, ta143, ta144, ta145, ta146, ta147, ta148, ta149,
-   ta14a, ta14b, ta14c, ta14d, ta14e, ta14f, ta14g, ta14h, ta14i,
-   ta14j, ta14k, ta14l, ta14m, ta14n, ta14o, ta14p, ta14q, ta14r,
-   ta14s, ta14t, ta14u, ta14v, ta14w, ta14x, ta14y, ta14z, ta14A,
-   ta14B, ta14C, ta14D, ta14E, ta14F, ta14G, ta14H, ta14I, ta14J,
-   ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S,
-   ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151,
-   ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a,
-   ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j,
-   ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s,
-   ta15t, ta15u, ta15v, ta15w, ta17G, ta17I, ta17O, ta17P, ta17Q,
-   ta17R, ta17S, ta17T, ta17U, ta17V, ta17W, ta17X, ta17Y, ta17Z,
-   ta180, ta181, ta182, ta183, ta184, ta185, ta186, ta187, ta188,
-   ta189, ta18a, ta18b, ta18c, ta18d, ta18e, ta18f, ta18g, ta18h,
-   ta18i, ta18j, ta18k, ta18l, ta18m, ta18n, ta18o, ta18p, ta18q,
-   ta18r, ta18s, ta18t, ta18u, ta18v, ta18w, ta18x, ta18y, ta18z,
-   ta18A, ta18B, ta18C, ta18D, ta18E, ta18F, ta18G, ta18H, ta18I,
-   ta18J, ta18K, ta18L, ta18M, ta18N, ta18O, ta18P, ta18Q, ta18R,
-   ta18S, ta18T, ta18U, ta18V, ta18W, ta18X, ta18Y, ta18Z, ta190,
-   ta191, ta192, ta193, ta194, ta195, ta196, ta197, ta198, ta199,
-   ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i,
-   ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r,
-   ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A,
-   ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J,
-   ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta19R],
+[([ta12q, ta14B, ta14J, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P,
+   ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y,
+   ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157,
+   ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g,
+   ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p,
+   ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta15x, ta15y,
+   ta15z, ta15A, ta15B, ta15C, ta15D, ta15E, ta15F, ta15G, ta15H,
+   ta15I, ta15J, ta15K, ta15L, ta15M, ta15N, ta15O, ta15P, ta15Q,
+   ta15R, ta15S, ta15T, ta15U, ta15V, ta15W, ta15X, ta15Y, ta15Z,
+   ta160, ta161, ta162, ta163, ta164, ta165, ta166, ta167, ta168,
+   ta169, ta16a, ta16b, ta16c, ta16d, ta16e, ta16f, ta16g, ta16h,
+   ta16i, ta16j, ta16k, ta16l, ta16m, ta16n, ta16o, ta16p, ta16q,
+   ta16r, ta16s, ta16t, ta16u, ta16v, ta16w, ta16x, ta16y, ta16z,
+   ta16A, ta16B, ta16C, ta16D, ta16E, ta16F, ta16G, ta16H, ta16I,
+   ta16J, ta16K, ta16L, ta16M, ta18W, ta18Y, ta194, ta195, ta196,
+   ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f,
+   ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o,
+   ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x,
+   ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G,
+   ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P,
+   ta19Q, ta19R, ta19S, ta19T, ta19U, ta19V, ta19W, ta19X, ta19Y,
+   ta19Z, ta1a0, ta1a1, ta1a2, ta1a3, ta1a4, ta1a5, ta1a6, ta1a7,
+   ta1a8, ta1a9, ta1aa, ta1ab, ta1ac, ta1ad, ta1ae, ta1af, ta1ag,
+   ta1ah, ta1ai, ta1aj, ta1ak, ta1al, ta1am, ta1an, ta1ao, ta1ap,
+   ta1aq, ta1ar, ta1as, ta1at, ta1au, ta1av, ta1aw, ta1ax, ta1ay,
+   ta1az, ta1aA, ta1aB, ta1aC, ta1aD, ta1aE, ta1aF, ta1aG, ta1aH,
+   ta1aI, ta1aJ, ta1aK, ta1aL, ta1aM, ta1aN, ta1aO, ta1aP, ta1aQ,
+   ta1aR, ta1aS, ta1aT, ta1aU, ta1aV, ta1aW, ta1aX, ta1aY, ta1aZ,
+   ta1b0, ta1b1, ta1b2, ta1b3, ta1b4, ta1b5, ta1b6, ta1b7],
   g_rec8{-r5N,x-},
-  g_rec8_a10D)]
-    g_rec8_a10D x_r4X y_r4Y z_r4Z p_r50
+  g_rec8_a11P)]
+    g_rec8_a11P x_r4X y_r4Y z_r4Z p_r50
                = g_rec{-r65,x-}
-                     [ta15w, ta13l, GHC.Void{-3T,W-}, (ta13l, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta17I, ta19R, ta17G, (ta17G, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (ta15w, (ta17O, (ta17P, (ta17Q, (ta17R, (ta17S, (ta17T, ta17U, ta17U), (ta17T, ta17V, ta17V)), (ta17S, (ta17W, ta17X, ta17X), (ta17W, ta17Y, ta17Y))), (ta17R, (ta17Z, (ta180, ta181, ta181), (ta180, ta182, ta182)), (ta17Z, (ta183, ta184, ta184), (ta183, ta185, ta185)))), (ta17Q, (ta186, (ta187, (ta188, ta189, ta189), (ta188, ta18a, ta18a)), (ta187, (ta18b, ta18c, ta18c), (ta18b, ta18d, ta18d))), (ta186, (ta18e, (ta18f, ta18g, ta18g), (ta18f, ta18h, ta18h)), (ta18e, (ta18i, ta18j, ta18j), (ta18i, ta18k, ta18k))))), (ta17P, (ta18l, (ta18m, (ta18n, (ta18o, ta18p, ta18p), (ta18o, ta18q, ta18q)), (ta18n, (ta18r, ta18s, ta18s), (ta18r, ta18t, ta18t))), (ta18m, (ta18u, (ta18v, ta18w, ta18w), (ta18v, ta18x, ta18x)), (ta18u, (ta18y, ta18z, ta18z), (ta18y, ta18A, ta18A)))), (ta18l, (ta18B, (ta18C, (ta18D, ta18E, ta18E), (ta18D, ta18F, ta18F)), (ta18C, (ta18G, ta18H, ta18H), (ta18G, ta18I, ta18I))), (ta18B, (ta18J, (ta18K, ta18L, ta18L), (ta18K, ta18M, ta18M)), (ta18J, (ta18N, ta18O, ta18O), (ta18N, ta18P, ta18P)))))), (ta17O, (ta18Q, (ta18R, (ta18S, (ta18T, (ta18U, ta18V, ta18V), (ta18U, ta18W, ta18W)), (ta18T, (ta18X, ta18Y, ta18Y), (ta18X, ta18Z, ta18Z))), (ta18S, (ta190, (ta191, ta192, ta192), (ta191, ta193, ta193)), (ta190, (ta194, ta195, ta195), (ta194, ta196, ta196)))), (ta18R, (ta197, (ta198, (ta199, ta19a, ta19a), (ta199, ta19b, ta19b)), (ta198, (ta19c, ta19d, ta19d), (ta19c, ta19e, ta19e))), (ta197, (ta19f, (ta19g, ta19h, ta19h), (ta19g, ta19i, ta19i)), (ta19f, (ta19j, ta19k, ta19k), (ta19j, ta19l, ta19l))))), (ta18Q, (ta19m, (ta19n, (ta19o, (ta19p, ta19q, ta19q), (ta19p, ta19r, ta19r)), (ta19o, (ta19s, ta19t, ta19t), (ta19s, ta19u, ta19u))), (ta19n, (ta19v, (ta19w, ta19x, ta19x), (ta19w, ta19y, ta19y)), (ta19v, (ta19z, ta19A, ta19A), (ta19z, ta19B, ta19B)))), (ta19m, (ta19C, (ta19D, (ta19E, ta19F, ta19F), (ta19E, ta19G, ta19G)), (ta19D, (ta19H, ta19I, ta19I), (ta19H, ta19J, ta19J))), (ta19C, (ta19K, (ta19L, ta19M, ta19M), (ta19L, ta19N, ta19N)), (ta19K, (ta19O, ta19P, ta19P), (ta19O, ta19Q, ta19Q))))))), ta11a, (ta15w, (ta13t, (ta13u, (ta13v, (ta13w, (ta13x, (ta13y, ta13z, ta13z), (ta13y, ta13A, ta13A)), (ta13x, (ta13B, ta13C, ta13C), (ta13B, ta13D, ta13D))), (ta13w, (ta13E, (ta13F, ta13G, ta13G), (ta13F, ta13H, ta13H)), (ta13E, (ta13I, ta13J, ta13J), (ta13I, ta13K, ta13K)))), (ta13v, (ta13L, (ta13M, (ta13N, ta13O, ta13O), (ta13N, ta13P, ta13P)), (ta13M, (ta13Q, ta13R, ta13R), (ta13Q, ta13S, ta13S))), (ta13L, (ta13T, (ta13U, ta13V, ta13V), (ta13U, ta13W, ta13W)), (ta13T, (ta13X, ta13Y, ta13Y), (ta13X, ta13Z, ta13Z))))), (ta13u, (ta140, (ta141, (ta142, (ta143, ta144, ta144), (ta143, ta145, ta145)), (ta142, (ta146, ta147, ta147), (ta146, ta148, ta148))), (ta141, (ta149, (ta14a, ta14b, ta14b), (ta14a, ta14c, ta14c)), (ta149, (ta14d, ta14e, ta14e), (ta14d, ta14f, ta14f)))), (ta140, (ta14g, (ta14h, (ta14i, ta14j, ta14j), (ta14i, ta14k, ta14k)), (ta14h, (ta14l, ta14m, ta14m), (ta14l, ta14n, ta14n))), (ta14g, (ta14o, (ta14p, ta14q, ta14q), (ta14p, ta14r, ta14r)), (ta14o, (ta14s, ta14t, ta14t), (ta14s, ta14u, ta14u)))))), (ta13t, (ta14v, (ta14w, (ta14x, (ta14y, (ta14z, ta14A, ta14A), (ta14z, ta14B, ta14B)), (ta14y, (ta14C, ta14D, ta14D), (ta14C, ta14E, ta14E))), (ta14x, (ta14F, (ta14G, ta14H, ta14H), (ta14G, ta14I, ta14I)), (ta14F, (ta14J, ta14K, ta14K), (ta14J, ta14L, ta14L)))), (ta14w, (ta14M, (ta14N, (ta14O, ta14P, ta14P), (ta14O, ta14Q, ta14Q)), (ta14N, (ta14R, ta14S, ta14S), (ta14R, ta14T, ta14T))), (ta14M, (ta14U, (ta14V, ta14W, ta14W), (ta14V, ta14X, ta14X)), (ta14U, (ta14Y, ta14Z, ta14Z), (ta14Y, ta150, ta150))))), (ta14v, (ta151, (ta152, (ta153, (ta154, ta155, ta155), (ta154, ta156, ta156)), (ta153, (ta157, ta158, ta158), (ta157, ta159, ta159))), (ta152, (ta15a, (ta15b, ta15c, ta15c), (ta15b, ta15d, ta15d)), (ta15a, (ta15e, ta15f, ta15f), (ta15e, ta15g, ta15g)))), (ta151, (ta15h, (ta15i, (ta15j, ta15k, ta15k), (ta15j, ta15l, ta15l)), (ta15i, (ta15m, ta15n, ta15n), (ta15m, ta15o, ta15o))), (ta15h, (ta15p, (ta15q, ta15r, ta15r), (ta15q, ta15s, ta15s)), (ta15p, (ta15t, ta15u, ta15u), (ta15t, ta15v, ta15v)))))))] g_rec7{-r5M,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              [ta15w, GHC.Void{-3T,W-}, ta13u, ta13v, ta13w, ta13x, ta13y, ta13z, ta13A, ta13B, ta13C, ta13D, ta13E, ta13F, ta13G, ta13H, ta13I, ta13J, ta13K, ta13L, ta13M, ta13N, ta13O, ta13P, ta13Q, ta13R, ta13S, ta13T, ta13U, ta13V, ta13W, ta13X, ta13Y, ta13Z, ta140, ta141, ta142, ta143, ta144, ta145, ta146, ta147, ta148, ta149, ta14a, ta14b, ta14c, ta14d, ta14e, ta14f, ta14g, ta14h, ta14i, ta14j, ta14k, ta14l, ta14m, ta14n, ta14o, ta14p, ta14q, ta14r, ta14s, ta14t, ta14u, ta13t, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta14v, ta14w, ta14x, ta14y, ta14z, ta14A, ta14B, ta14C, ta14D, ta14E, ta14F, ta14G, ta14H, ta14I, ta14J, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta13l]
+                     [ta16M, ta14B, GHC.Void{-3T,W-}, (ta14B, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta18Y, ta1b7, ta18W, (ta18W, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (ta16M, (ta194, (ta195, (ta196, (ta197, (ta198, (ta199, ta19a, ta19a), (ta199, ta19b, ta19b)), (ta198, (ta19c, ta19d, ta19d), (ta19c, ta19e, ta19e))), (ta197, (ta19f, (ta19g, ta19h, ta19h), (ta19g, ta19i, ta19i)), (ta19f, (ta19j, ta19k, ta19k), (ta19j, ta19l, ta19l)))), (ta196, (ta19m, (ta19n, (ta19o, ta19p, ta19p), (ta19o, ta19q, ta19q)), (ta19n, (ta19r, ta19s, ta19s), (ta19r, ta19t, ta19t))), (ta19m, (ta19u, (ta19v, ta19w, ta19w), (ta19v, ta19x, ta19x)), (ta19u, (ta19y, ta19z, ta19z), (ta19y, ta19A, ta19A))))), (ta195, (ta19B, (ta19C, (ta19D, (ta19E, ta19F, ta19F), (ta19E, ta19G, ta19G)), (ta19D, (ta19H, ta19I, ta19I), (ta19H, ta19J, ta19J))), (ta19C, (ta19K, (ta19L, ta19M, ta19M), (ta19L, ta19N, ta19N)), (ta19K, (ta19O, ta19P, ta19P), (ta19O, ta19Q, ta19Q)))), (ta19B, (ta19R, (ta19S, (ta19T, ta19U, ta19U), (ta19T, ta19V, ta19V)), (ta19S, (ta19W, ta19X, ta19X), (ta19W, ta19Y, ta19Y))), (ta19R, (ta19Z, (ta1a0, ta1a1, ta1a1), (ta1a0, ta1a2, ta1a2)), (ta19Z, (ta1a3, ta1a4, ta1a4), (ta1a3, ta1a5, ta1a5)))))), (ta194, (ta1a6, (ta1a7, (ta1a8, (ta1a9, (ta1aa, ta1ab, ta1ab), (ta1aa, ta1ac, ta1ac)), (ta1a9, (ta1ad, ta1ae, ta1ae), (ta1ad, ta1af, ta1af))), (ta1a8, (ta1ag, (ta1ah, ta1ai, ta1ai), (ta1ah, ta1aj, ta1aj)), (ta1ag, (ta1ak, ta1al, ta1al), (ta1ak, ta1am, ta1am)))), (ta1a7, (ta1an, (ta1ao, (ta1ap, ta1aq, ta1aq), (ta1ap, ta1ar, ta1ar)), (ta1ao, (ta1as, ta1at, ta1at), (ta1as, ta1au, ta1au))), (ta1an, (ta1av, (ta1aw, ta1ax, ta1ax), (ta1aw, ta1ay, ta1ay)), (ta1av, (ta1az, ta1aA, ta1aA), (ta1az, ta1aB, ta1aB))))), (ta1a6, (ta1aC, (ta1aD, (ta1aE, (ta1aF, ta1aG, ta1aG), (ta1aF, ta1aH, ta1aH)), (ta1aE, (ta1aI, ta1aJ, ta1aJ), (ta1aI, ta1aK, ta1aK))), (ta1aD, (ta1aL, (ta1aM, ta1aN, ta1aN), (ta1aM, ta1aO, ta1aO)), (ta1aL, (ta1aP, ta1aQ, ta1aQ), (ta1aP, ta1aR, ta1aR)))), (ta1aC, (ta1aS, (ta1aT, (ta1aU, ta1aV, ta1aV), (ta1aU, ta1aW, ta1aW)), (ta1aT, (ta1aX, ta1aY, ta1aY), (ta1aX, ta1aZ, ta1aZ))), (ta1aS, (ta1b0, (ta1b1, ta1b2, ta1b2), (ta1b1, ta1b3, ta1b3)), (ta1b0, (ta1b4, ta1b5, ta1b5), (ta1b4, ta1b6, ta1b6))))))), ta12q, (ta16M, (ta14J, (ta14K, (ta14L, (ta14M, (ta14N, (ta14O, ta14P, ta14P), (ta14O, ta14Q, ta14Q)), (ta14N, (ta14R, ta14S, ta14S), (ta14R, ta14T, ta14T))), (ta14M, (ta14U, (ta14V, ta14W, ta14W), (ta14V, ta14X, ta14X)), (ta14U, (ta14Y, ta14Z, ta14Z), (ta14Y, ta150, ta150)))), (ta14L, (ta151, (ta152, (ta153, ta154, ta154), (ta153, ta155, ta155)), (ta152, (ta156, ta157, ta157), (ta156, ta158, ta158))), (ta151, (ta159, (ta15a, ta15b, ta15b), (ta15a, ta15c, ta15c)), (ta159, (ta15d, ta15e, ta15e), (ta15d, ta15f, ta15f))))), (ta14K, (ta15g, (ta15h, (ta15i, (ta15j, ta15k, ta15k), (ta15j, ta15l, ta15l)), (ta15i, (ta15m, ta15n, ta15n), (ta15m, ta15o, ta15o))), (ta15h, (ta15p, (ta15q, ta15r, ta15r), (ta15q, ta15s, ta15s)), (ta15p, (ta15t, ta15u, ta15u), (ta15t, ta15v, ta15v)))), (ta15g, (ta15w, (ta15x, (ta15y, ta15z, ta15z), (ta15y, ta15A, ta15A)), (ta15x, (ta15B, ta15C, ta15C), (ta15B, ta15D, ta15D))), (ta15w, (ta15E, (ta15F, ta15G, ta15G), (ta15F, ta15H, ta15H)), (ta15E, (ta15I, ta15J, ta15J), (ta15I, ta15K, ta15K)))))), (ta14J, (ta15L, (ta15M, (ta15N, (ta15O, (ta15P, ta15Q, ta15Q), (ta15P, ta15R, ta15R)), (ta15O, (ta15S, ta15T, ta15T), (ta15S, ta15U, ta15U))), (ta15N, (ta15V, (ta15W, ta15X, ta15X), (ta15W, ta15Y, ta15Y)), (ta15V, (ta15Z, ta160, ta160), (ta15Z, ta161, ta161)))), (ta15M, (ta162, (ta163, (ta164, ta165, ta165), (ta164, ta166, ta166)), (ta163, (ta167, ta168, ta168), (ta167, ta169, ta169))), (ta162, (ta16a, (ta16b, ta16c, ta16c), (ta16b, ta16d, ta16d)), (ta16a, (ta16e, ta16f, ta16f), (ta16e, ta16g, ta16g))))), (ta15L, (ta16h, (ta16i, (ta16j, (ta16k, ta16l, ta16l), (ta16k, ta16m, ta16m)), (ta16j, (ta16n, ta16o, ta16o), (ta16n, ta16p, ta16p))), (ta16i, (ta16q, (ta16r, ta16s, ta16s), (ta16r, ta16t, ta16t)), (ta16q, (ta16u, ta16v, ta16v), (ta16u, ta16w, ta16w)))), (ta16h, (ta16x, (ta16y, (ta16z, ta16A, ta16A), (ta16z, ta16B, ta16B)), (ta16y, (ta16C, ta16D, ta16D), (ta16C, ta16E, ta16E))), (ta16x, (ta16F, (ta16G, ta16H, ta16H), (ta16G, ta16I, ta16I)), (ta16F, (ta16J, ta16K, ta16K), (ta16J, ta16L, ta16L)))))))] g_rec7{-r5M,x-}
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              [ta16M, GHC.Void{-3T,W-}, ta14K, ta14L, ta14M, ta14N, ta14O, ta14P, ta14Q, ta14R, ta14S, ta14T, ta14U, ta14V, ta14W, ta14X, ta14Y, ta14Z, ta150, ta151, ta152, ta153, ta154, ta155, ta156, ta157, ta158, ta159, ta15a, ta15b, ta15c, ta15d, ta15e, ta15f, ta15g, ta15h, ta15i, ta15j, ta15k, ta15l, ta15m, ta15n, ta15o, ta15p, ta15q, ta15r, ta15s, ta15t, ta15u, ta15v, ta15w, ta15x, ta15y, ta15z, ta15A, ta15B, ta15C, ta15D, ta15E, ta15F, ta15G, ta15H, ta15I, ta15J, ta15K, ta14J, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta15L, ta15M, ta15N, ta15O, ta15P, ta15Q, ta15R, ta15S, ta15T, ta15U, ta15V, ta15W, ta15X, ta15Y, ta15Z, ta160, ta161, ta162, ta163, ta164, ta165, ta166, ta167, ta168, ta169, ta16a, ta16b, ta16c, ta16d, ta16e, ta16f, ta16g, ta16h, ta16i, ta16j, ta16k, ta16l, ta16m, ta16n, ta16o, ta16p, ta16q, ta16r, ta16s, ta16t, ta16u, ta16v, ta16w, ta16x, ta16y, ta16z, ta16A, ta16B, ta16C, ta16D, ta16E, ta16F, ta16G, ta16H, ta16I, ta16J, ta16K, ta16L, ta14B]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           g_rec7{-r5M,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              [ta15w, ta17I, ta17P, ta17Q, ta17R, ta17S, ta17T, ta17U, ta17V, ta17W, ta17X, ta17Y, ta17Z, ta180, ta181, ta182, ta183, ta184, ta185, ta186, ta187, ta188, ta189, ta18a, ta18b, ta18c, ta18d, ta18e, ta18f, ta18g, ta18h, ta18i, ta18j, ta18k, ta18l, ta18m, ta18n, ta18o, ta18p, ta18q, ta18r, ta18s, ta18t, ta18u, ta18v, ta18w, ta18x, ta18y, ta18z, ta18A, ta18B, ta18C, ta18D, ta18E, ta18F, ta18G, ta18H, ta18I, ta18J, ta18K, ta18L, ta18M, ta18N, ta18O, ta18P, ta17O, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta18Q, ta18R, ta18S, ta18T, ta18U, ta18V, ta18W, ta18X, ta18Y, ta18Z, ta190, ta191, ta192, ta193, ta194, ta195, ta196, ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta17G]
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              [ta16M, ta18Y, ta195, ta196, ta197, ta198, ta199, ta19a, ta19b, ta19c, ta19d, ta19e, ta19f, ta19g, ta19h, ta19i, ta19j, ta19k, ta19l, ta19m, ta19n, ta19o, ta19p, ta19q, ta19r, ta19s, ta19t, ta19u, ta19v, ta19w, ta19x, ta19y, ta19z, ta19A, ta19B, ta19C, ta19D, ta19E, ta19F, ta19G, ta19H, ta19I, ta19J, ta19K, ta19L, ta19M, ta19N, ta19O, ta19P, ta19Q, ta19R, ta19S, ta19T, ta19U, ta19V, ta19W, ta19X, ta19Y, ta19Z, ta1a0, ta1a1, ta1a2, ta1a3, ta1a4, ta1a5, ta194, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1a6, ta1a7, ta1a8, ta1a9, ta1aa, ta1ab, ta1ac, ta1ad, ta1ae, ta1af, ta1ag, ta1ah, ta1ai, ta1aj, ta1ak, ta1al, ta1am, ta1an, ta1ao, ta1ap, ta1aq, ta1ar, ta1as, ta1at, ta1au, ta1av, ta1aw, ta1ax, ta1ay, ta1az, ta1aA, ta1aB, ta1aC, ta1aD, ta1aE, ta1aF, ta1aG, ta1aH, ta1aI, ta1aJ, ta1aK, ta1aL, ta1aM, ta1aN, ta1aO, ta1aP, ta1aQ, ta1aR, ta1aS, ta1aT, ta1aU, ta1aV, ta1aW, ta1aX, ta1aY, ta1aZ, ta1b0, ta1b1, ta1b2, ta1b3, ta1b4, ta1b5, ta1b6, ta18W]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           x_r4X
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           y_r4Y
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           z_r4Z
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           p_r50
 AbsBinds
-[ta1aq, ta1eF, ta1eN, ta1eO, ta1eP, ta1eQ, ta1eR, ta1eS, ta1eT, ta1eU, ta1eV, ta1eW, ta1eX, ta1eY, ta1eZ, ta1f0, ta1f1, ta1f2, ta1f3, ta1f4, ta1f5, ta1f6, ta1f7, ta1f8, ta1f9, ta1fa, ta1fb, ta1fc, ta1fd, ta1fe, ta1ff, ta1fg, ta1fh, ta1fi, ta1fj, ta1fk, ta1fl, ta1fm, ta1fn, ta1fo, ta1fp, ta1fq, ta1fr, ta1fs, ta1ft, ta1fu, ta1fv, ta1fw, ta1fx, ta1fy, ta1fz, ta1fA, ta1fB, ta1fC, ta1fD, ta1fE, ta1fF, ta1fG, ta1fH, ta1fI, ta1fJ, ta1fK, ta1fL, ta1fM, ta1fN, ta1fO, ta1fP, ta1fQ, ta1fR, ta1fS, ta1fT, ta1fU, ta1fV, ta1fW, ta1fX, ta1fY, ta1fZ, ta1g0, ta1g1, ta1g2, ta1g3, ta1g4, ta1g5, ta1g6, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN, ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie, ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1n8, ta1na, ta1ng, ta1nh, ta1ni, ta1nj, ta1nk, ta1nl, ta1nm, ta1nn, ta1no, ta1np, ta1nq, ta1nr, ta1ns, ta1nt, ta1nu, ta1nv, ta1nw, ta1nx, ta1ny, ta1nz, ta1nA, ta1nB, ta1nC, ta1nD, ta1nE, ta1nF, ta1nG, ta1nH, ta1nI, ta1nJ, ta1nK, ta1nL, ta1nM, ta1nN, ta1nO, ta1nP, ta1nQ, ta1nR, ta1nS, ta1nT, ta1nU, ta1nV, ta1nW, ta1nX, ta1nY, ta1nZ, ta1o0, ta1o1, ta1o2, ta1o3, ta1o4, ta1o5, ta1o6, ta1o7, ta1o8, ta1o9, ta1oa, ta1ob, ta1oc, ta1od, ta1oe, ta1of, ta1og, ta1oh, ta1oi, ta1oj, ta1ok, ta1ol, ta1om, ta1on, ta1oo, ta1op, ta1oq, ta1or, ta1os, ta1ot, ta1ou, ta1ov, ta1ow, ta1ox, ta1oy, ta1oz, ta1oA, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC, ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl, ta1rm, ta1rn]
+[ta1bK, ta1fZ, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN, ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie, ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1iV, ta1iW, ta1iX, ta1iY, ta1iZ, ta1j0, ta1j1, ta1j2, ta1j3, ta1j4, ta1j5, ta1j6, ta1j7, ta1j8, ta1j9, ta1ja, ta1jb, ta1jc, ta1jd, ta1je, ta1jf, ta1jg, ta1jh, ta1ji, ta1jj, ta1jk, ta1jl, ta1jm, ta1jn, ta1jo, ta1jp, ta1jq, ta1jr, ta1js, ta1jt, ta1ju, ta1jv, ta1jw, ta1jx, ta1jy, ta1jz, ta1jA, ta1jB, ta1jC, ta1jD, ta1jE, ta1jF, ta1jG, ta1jH, ta1jI, ta1jJ, ta1jK, ta1jL, ta1jM, ta1jN, ta1jO, ta1jP, ta1jQ, ta1jR, ta1jS, ta1jT, ta1jU, ta1jV, ta1jW, ta1jX, ta1jY, ta1jZ, ta1k0, ta1k1, ta1k2, ta1k3, ta1k4, ta1k5, ta1k6, ta1k7, ta1k8, ta1k9, ta1ka, ta1kb, ta1kc, ta1kd, ta1ke, ta1os, ta1ou, ta1oA, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC, ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl, ta1rm, ta1rn, ta1ro, ta1rp, ta1rq, ta1rr, ta1rs, ta1rt, ta1ru, ta1rv, ta1rw, ta1rx, ta1ry, ta1rz, ta1rA, ta1rB, ta1rC, ta1rD, ta1rE, ta1rF, ta1rG, ta1rH, ta1rI, ta1rJ, ta1rK, ta1rL, ta1rM, ta1rN, ta1rO, ta1rP, ta1rQ, ta1rR, ta1rS, ta1rT, ta1rU, ta1rV, ta1rW, ta1rX, ta1rY, ta1rZ, ta1s0, ta1s1, ta1s2, ta1s3, ta1s4, ta1s5, ta1s6, ta1s7, ta1s8, ta1s9, ta1sa, ta1sb, ta1sc, ta1sd, ta1se, ta1sf, ta1sg, ta1sh, ta1si, ta1sj, ta1sk, ta1sl, ta1sm, ta1sn, ta1so, ta1sp, ta1sq, ta1sr, ta1ss, ta1st, ta1su, ta1sv, ta1sw, ta1sx, ta1sy, ta1sz, ta1sA, ta1sB, ta1sC, ta1sD, ta1sE, ta1sF, ta1sG, ta1sH]
 []
-[([ta1aq, ta1eF, ta1eN, ta1eO, ta1eP, ta1eQ, ta1eR, ta1eS, ta1eT,
-   ta1eU, ta1eV, ta1eW, ta1eX, ta1eY, ta1eZ, ta1f0, ta1f1, ta1f2,
-   ta1f3, ta1f4, ta1f5, ta1f6, ta1f7, ta1f8, ta1f9, ta1fa, ta1fb,
-   ta1fc, ta1fd, ta1fe, ta1ff, ta1fg, ta1fh, ta1fi, ta1fj, ta1fk,
-   ta1fl, ta1fm, ta1fn, ta1fo, ta1fp, ta1fq, ta1fr, ta1fs, ta1ft,
-   ta1fu, ta1fv, ta1fw, ta1fx, ta1fy, ta1fz, ta1fA, ta1fB, ta1fC,
-   ta1fD, ta1fE, ta1fF, ta1fG, ta1fH, ta1fI, ta1fJ, ta1fK, ta1fL,
-   ta1fM, ta1fN, ta1fO, ta1fP, ta1fQ, ta1fR, ta1fS, ta1fT, ta1fU,
-   ta1fV, ta1fW, ta1fX, ta1fY, ta1fZ, ta1g0, ta1g1, ta1g2, ta1g3,
-   ta1g4, ta1g5, ta1g6, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc,
-   ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl,
-   ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu,
-   ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD,
-   ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM,
-   ta1gN, ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV,
-   ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4,
-   ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd,
-   ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm,
-   ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv,
-   ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE,
-   ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN,
-   ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW,
-   ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5,
-   ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie,
-   ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in,
-   ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw,
-   ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF,
-   ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO,
-   ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1n8, ta1na, ta1ng,
-   ta1nh, ta1ni, ta1nj, ta1nk, ta1nl, ta1nm, ta1nn, ta1no, ta1np,
-   ta1nq, ta1nr, ta1ns, ta1nt, ta1nu, ta1nv, ta1nw, ta1nx, ta1ny,
-   ta1nz, ta1nA, ta1nB, ta1nC, ta1nD, ta1nE, ta1nF, ta1nG, ta1nH,
-   ta1nI, ta1nJ, ta1nK, ta1nL, ta1nM, ta1nN, ta1nO, ta1nP, ta1nQ,
-   ta1nR, ta1nS, ta1nT, ta1nU, ta1nV, ta1nW, ta1nX, ta1nY, ta1nZ,
-   ta1o0, ta1o1, ta1o2, ta1o3, ta1o4, ta1o5, ta1o6, ta1o7, ta1o8,
-   ta1o9, ta1oa, ta1ob, ta1oc, ta1od, ta1oe, ta1of, ta1og, ta1oh,
-   ta1oi, ta1oj, ta1ok, ta1ol, ta1om, ta1on, ta1oo, ta1op, ta1oq,
-   ta1or, ta1os, ta1ot, ta1ou, ta1ov, ta1ow, ta1ox, ta1oy, ta1oz,
-   ta1oA, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI,
-   ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR,
-   ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0,
-   ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9,
-   ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi,
-   ta1pj, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr,
-   ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA,
-   ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ,
-   ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS,
-   ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1,
-   ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa,
-   ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj,
-   ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs,
-   ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB,
-   ta1qC, ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK,
-   ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT,
-   ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2,
-   ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb,
-   ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk,
-   ta1rl, ta1rm, ta1rn],
+[([ta1bK, ta1fZ, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd,
+   ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm,
+   ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv,
+   ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE,
+   ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN,
+   ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW,
+   ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5,
+   ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he,
+   ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn,
+   ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw,
+   ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF,
+   ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO,
+   ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX,
+   ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6,
+   ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie, ta1if,
+   ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io,
+   ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix,
+   ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG,
+   ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP,
+   ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1iV, ta1iW, ta1iX, ta1iY,
+   ta1iZ, ta1j0, ta1j1, ta1j2, ta1j3, ta1j4, ta1j5, ta1j6, ta1j7,
+   ta1j8, ta1j9, ta1ja, ta1jb, ta1jc, ta1jd, ta1je, ta1jf, ta1jg,
+   ta1jh, ta1ji, ta1jj, ta1jk, ta1jl, ta1jm, ta1jn, ta1jo, ta1jp,
+   ta1jq, ta1jr, ta1js, ta1jt, ta1ju, ta1jv, ta1jw, ta1jx, ta1jy,
+   ta1jz, ta1jA, ta1jB, ta1jC, ta1jD, ta1jE, ta1jF, ta1jG, ta1jH,
+   ta1jI, ta1jJ, ta1jK, ta1jL, ta1jM, ta1jN, ta1jO, ta1jP, ta1jQ,
+   ta1jR, ta1jS, ta1jT, ta1jU, ta1jV, ta1jW, ta1jX, ta1jY, ta1jZ,
+   ta1k0, ta1k1, ta1k2, ta1k3, ta1k4, ta1k5, ta1k6, ta1k7, ta1k8,
+   ta1k9, ta1ka, ta1kb, ta1kc, ta1kd, ta1ke, ta1os, ta1ou, ta1oA,
+   ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ,
+   ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS,
+   ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1,
+   ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa,
+   ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj,
+   ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps,
+   ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB,
+   ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK,
+   ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT,
+   ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2,
+   ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb,
+   ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk,
+   ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt,
+   ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC,
+   ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL,
+   ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU,
+   ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3,
+   ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc,
+   ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl,
+   ta1rm, ta1rn, ta1ro, ta1rp, ta1rq, ta1rr, ta1rs, ta1rt, ta1ru,
+   ta1rv, ta1rw, ta1rx, ta1ry, ta1rz, ta1rA, ta1rB, ta1rC, ta1rD,
+   ta1rE, ta1rF, ta1rG, ta1rH, ta1rI, ta1rJ, ta1rK, ta1rL, ta1rM,
+   ta1rN, ta1rO, ta1rP, ta1rQ, ta1rR, ta1rS, ta1rT, ta1rU, ta1rV,
+   ta1rW, ta1rX, ta1rY, ta1rZ, ta1s0, ta1s1, ta1s2, ta1s3, ta1s4,
+   ta1s5, ta1s6, ta1s7, ta1s8, ta1s9, ta1sa, ta1sb, ta1sc, ta1sd,
+   ta1se, ta1sf, ta1sg, ta1sh, ta1si, ta1sj, ta1sk, ta1sl, ta1sm,
+   ta1sn, ta1so, ta1sp, ta1sq, ta1sr, ta1ss, ta1st, ta1su, ta1sv,
+   ta1sw, ta1sx, ta1sy, ta1sz, ta1sA, ta1sB, ta1sC, ta1sD, ta1sE,
+   ta1sF, ta1sG, ta1sH],
   g{-r5O,x-},
-  g_a19T)]
-    g_a19T x_r4S y_r4T z_r4U p_r4V
+  g_a1b9)]
+    g_a1b9 x_r4S y_r4T z_r4U p_r4V
           = g_rec{-r65,x-}
-                [ta1iU, ta1eF, GHC.Void{-3T,W-}, (ta1eF, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta1na, ta1rn, ta1n8, (ta1n8, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (ta1iU, (ta1ng, (ta1nh, (ta1ni, (ta1nj, (ta1nk, (ta1nl, (ta1nm, ta1nn, ta1nn), (ta1nm, ta1no, ta1no)), (ta1nl, (ta1np, ta1nq, ta1nq), (ta1np, ta1nr, ta1nr))), (ta1nk, (ta1ns, (ta1nt, ta1nu, ta1nu), (ta1nt, ta1nv, ta1nv)), (ta1ns, (ta1nw, ta1nx, ta1nx), (ta1nw, ta1ny, ta1ny)))), (ta1nj, (ta1nz, (ta1nA, (ta1nB, ta1nC, ta1nC), (ta1nB, ta1nD, ta1nD)), (ta1nA, (ta1nE, ta1nF, ta1nF), (ta1nE, ta1nG, ta1nG))), (ta1nz, (ta1nH, (ta1nI, ta1nJ, ta1nJ), (ta1nI, ta1nK, ta1nK)), (ta1nH, (ta1nL, ta1nM, ta1nM), (ta1nL, ta1nN, ta1nN))))), (ta1ni, (ta1nO, (ta1nP, (ta1nQ, (ta1nR, ta1nS, ta1nS), (ta1nR, ta1nT, ta1nT)), (ta1nQ, (ta1nU, ta1nV, ta1nV), (ta1nU, ta1nW, ta1nW))), (ta1nP, (ta1nX, (ta1nY, ta1nZ, ta1nZ), (ta1nY, ta1o0, ta1o0)), (ta1nX, (ta1o1, ta1o2, ta1o2), (ta1o1, ta1o3, ta1o3)))), (ta1nO, (ta1o4, (ta1o5, (ta1o6, ta1o7, ta1o7), (ta1o6, ta1o8, ta1o8)), (ta1o5, (ta1o9, ta1oa, ta1oa), (ta1o9, ta1ob, ta1ob))), (ta1o4, (ta1oc, (ta1od, ta1oe, ta1oe), (ta1od, ta1of, ta1of)), (ta1oc, (ta1og, ta1oh, ta1oh), (ta1og, ta1oi, ta1oi)))))), (ta1nh, (ta1oj, (ta1ok, (ta1ol, (ta1om, (ta1on, ta1oo, ta1oo), (ta1on, ta1op, ta1op)), (ta1om, (ta1oq, ta1or, ta1or), (ta1oq, ta1os, ta1os))), (ta1ol, (ta1ot, (ta1ou, ta1ov, ta1ov), (ta1ou, ta1ow, ta1ow)), (ta1ot, (ta1ox, ta1oy, ta1oy), (ta1ox, ta1oz, ta1oz)))), (ta1ok, (ta1oA, (ta1oB, (ta1oC, ta1oD, ta1oD), (ta1oC, ta1oE, ta1oE)), (ta1oB, (ta1oF, ta1oG, ta1oG), (ta1oF, ta1oH, ta1oH))), (ta1oA, (ta1oI, (ta1oJ, ta1oK, ta1oK), (ta1oJ, ta1oL, ta1oL)), (ta1oI, (ta1oM, ta1oN, ta1oN), (ta1oM, ta1oO, ta1oO))))), (ta1oj, (ta1oP, (ta1oQ, (ta1oR, (ta1oS, ta1oT, ta1oT), (ta1oS, ta1oU, ta1oU)), (ta1oR, (ta1oV, ta1oW, ta1oW), (ta1oV, ta1oX, ta1oX))), (ta1oQ, (ta1oY, (ta1oZ, ta1p0, ta1p0), (ta1oZ, ta1p1, ta1p1)), (ta1oY, (ta1p2, ta1p3, ta1p3), (ta1p2, ta1p4, ta1p4)))), (ta1oP, (ta1p5, (ta1p6, (ta1p7, ta1p8, ta1p8), (ta1p7, ta1p9, ta1p9)), (ta1p6, (ta1pa, ta1pb, ta1pb), (ta1pa, ta1pc, ta1pc))), (ta1p5, (ta1pd, (ta1pe, ta1pf, ta1pf), (ta1pe, ta1pg, ta1pg)), (ta1pd, (ta1ph, ta1pi, ta1pi), (ta1ph, ta1pj, ta1pj))))))), (ta1ng, (ta1pk, (ta1pl, (ta1pm, (ta1pn, (ta1po, (ta1pp, ta1pq, ta1pq), (ta1pp, ta1pr, ta1pr)), (ta1po, (ta1ps, ta1pt, ta1pt), (ta1ps, ta1pu, ta1pu))), (ta1pn, (ta1pv, (ta1pw, ta1px, ta1px), (ta1pw, ta1py, ta1py)), (ta1pv, (ta1pz, ta1pA, ta1pA), (ta1pz, ta1pB, ta1pB)))), (ta1pm, (ta1pC, (ta1pD, (ta1pE, ta1pF, ta1pF), (ta1pE, ta1pG, ta1pG)), (ta1pD, (ta1pH, ta1pI, ta1pI), (ta1pH, ta1pJ, ta1pJ))), (ta1pC, (ta1pK, (ta1pL, ta1pM, ta1pM), (ta1pL, ta1pN, ta1pN)), (ta1pK, (ta1pO, ta1pP, ta1pP), (ta1pO, ta1pQ, ta1pQ))))), (ta1pl, (ta1pR, (ta1pS, (ta1pT, (ta1pU, ta1pV, ta1pV), (ta1pU, ta1pW, ta1pW)), (ta1pT, (ta1pX, ta1pY, ta1pY), (ta1pX, ta1pZ, ta1pZ))), (ta1pS, (ta1q0, (ta1q1, ta1q2, ta1q2), (ta1q1, ta1q3, ta1q3)), (ta1q0, (ta1q4, ta1q5, ta1q5), (ta1q4, ta1q6, ta1q6)))), (ta1pR, (ta1q7, (ta1q8, (ta1q9, ta1qa, ta1qa), (ta1q9, ta1qb, ta1qb)), (ta1q8, (ta1qc, ta1qd, ta1qd), (ta1qc, ta1qe, ta1qe))), (ta1q7, (ta1qf, (ta1qg, ta1qh, ta1qh), (ta1qg, ta1qi, ta1qi)), (ta1qf, (ta1qj, ta1qk, ta1qk), (ta1qj, ta1ql, ta1ql)))))), (ta1pk, (ta1qm, (ta1qn, (ta1qo, (ta1qp, (ta1qq, ta1qr, ta1qr), (ta1qq, ta1qs, ta1qs)), (ta1qp, (ta1qt, ta1qu, ta1qu), (ta1qt, ta1qv, ta1qv))), (ta1qo, (ta1qw, (ta1qx, ta1qy, ta1qy), (ta1qx, ta1qz, ta1qz)), (ta1qw, (ta1qA, ta1qB, ta1qB), (ta1qA, ta1qC, ta1qC)))), (ta1qn, (ta1qD, (ta1qE, (ta1qF, ta1qG, ta1qG), (ta1qF, ta1qH, ta1qH)), (ta1qE, (ta1qI, ta1qJ, ta1qJ), (ta1qI, ta1qK, ta1qK))), (ta1qD, (ta1qL, (ta1qM, ta1qN, ta1qN), (ta1qM, ta1qO, ta1qO)), (ta1qL, (ta1qP, ta1qQ, ta1qQ), (ta1qP, ta1qR, ta1qR))))), (ta1qm, (ta1qS, (ta1qT, (ta1qU, (ta1qV, ta1qW, ta1qW), (ta1qV, ta1qX, ta1qX)), (ta1qU, (ta1qY, ta1qZ, ta1qZ), (ta1qY, ta1r0, ta1r0))), (ta1qT, (ta1r1, (ta1r2, ta1r3, ta1r3), (ta1r2, ta1r4, ta1r4)), (ta1r1, (ta1r5, ta1r6, ta1r6), (ta1r5, ta1r7, ta1r7)))), (ta1qS, (ta1r8, (ta1r9, (ta1ra, ta1rb, ta1rb), (ta1ra, ta1rc, ta1rc)), (ta1r9, (ta1rd, ta1re, ta1re), (ta1rd, ta1rf, ta1rf))), (ta1r8, (ta1rg, (ta1rh, ta1ri, ta1ri), (ta1rh, ta1rj, ta1rj)), (ta1rg, (ta1rk, ta1rl, ta1rl), (ta1rk, ta1rm, ta1rm)))))))), ta1aq, (ta1iU, (ta1eN, (ta1eO, (ta1eP, (ta1eQ, (ta1eR, (ta1eS, (ta1eT, ta1eU, ta1eU), (ta1eT, ta1eV, ta1eV)), (ta1eS, (ta1eW, ta1eX, ta1eX), (ta1eW, ta1eY, ta1eY))), (ta1eR, (ta1eZ, (ta1f0, ta1f1, ta1f1), (ta1f0, ta1f2, ta1f2)), (ta1eZ, (ta1f3, ta1f4, ta1f4), (ta1f3, ta1f5, ta1f5)))), (ta1eQ, (ta1f6, (ta1f7, (ta1f8, ta1f9, ta1f9), (ta1f8, ta1fa, ta1fa)), (ta1f7, (ta1fb, ta1fc, ta1fc), (ta1fb, ta1fd, ta1fd))), (ta1f6, (ta1fe, (ta1ff, ta1fg, ta1fg), (ta1ff, ta1fh, ta1fh)), (ta1fe, (ta1fi, ta1fj, ta1fj), (ta1fi, ta1fk, ta1fk))))), (ta1eP, (ta1fl, (ta1fm, (ta1fn, (ta1fo, ta1fp, ta1fp), (ta1fo, ta1fq, ta1fq)), (ta1fn, (ta1fr, ta1fs, ta1fs), (ta1fr, ta1ft, ta1ft))), (ta1fm, (ta1fu, (ta1fv, ta1fw, ta1fw), (ta1fv, ta1fx, ta1fx)), (ta1fu, (ta1fy, ta1fz, ta1fz), (ta1fy, ta1fA, ta1fA)))), (ta1fl, (ta1fB, (ta1fC, (ta1fD, ta1fE, ta1fE), (ta1fD, ta1fF, ta1fF)), (ta1fC, (ta1fG, ta1fH, ta1fH), (ta1fG, ta1fI, ta1fI))), (ta1fB, (ta1fJ, (ta1fK, ta1fL, ta1fL), (ta1fK, ta1fM, ta1fM)), (ta1fJ, (ta1fN, ta1fO, ta1fO), (ta1fN, ta1fP, ta1fP)))))), (ta1eO, (ta1fQ, (ta1fR, (ta1fS, (ta1fT, (ta1fU, ta1fV, ta1fV), (ta1fU, ta1fW, ta1fW)), (ta1fT, (ta1fX, ta1fY, ta1fY), (ta1fX, ta1fZ, ta1fZ))), (ta1fS, (ta1g0, (ta1g1, ta1g2, ta1g2), (ta1g1, ta1g3, ta1g3)), (ta1g0, (ta1g4, ta1g5, ta1g5), (ta1g4, ta1g6, ta1g6)))), (ta1fR, (ta1g7, (ta1g8, (ta1g9, ta1ga, ta1ga), (ta1g9, ta1gb, ta1gb)), (ta1g8, (ta1gc, ta1gd, ta1gd), (ta1gc, ta1ge, ta1ge))), (ta1g7, (ta1gf, (ta1gg, ta1gh, ta1gh), (ta1gg, ta1gi, ta1gi)), (ta1gf, (ta1gj, ta1gk, ta1gk), (ta1gj, ta1gl, ta1gl))))), (ta1fQ, (ta1gm, (ta1gn, (ta1go, (ta1gp, ta1gq, ta1gq), (ta1gp, ta1gr, ta1gr)), (ta1go, (ta1gs, ta1gt, ta1gt), (ta1gs, ta1gu, ta1gu))), (ta1gn, (ta1gv, (ta1gw, ta1gx, ta1gx), (ta1gw, ta1gy, ta1gy)), (ta1gv, (ta1gz, ta1gA, ta1gA), (ta1gz, ta1gB, ta1gB)))), (ta1gm, (ta1gC, (ta1gD, (ta1gE, ta1gF, ta1gF), (ta1gE, ta1gG, ta1gG)), (ta1gD, (ta1gH, ta1gI, ta1gI), (ta1gH, ta1gJ, ta1gJ))), (ta1gC, (ta1gK, (ta1gL, ta1gM, ta1gM), (ta1gL, ta1gN, ta1gN)), (ta1gK, (ta1gO, ta1gP, ta1gP), (ta1gO, ta1gQ, ta1gQ))))))), (ta1eN, (ta1gR, (ta1gS, (ta1gT, (ta1gU, (ta1gV, (ta1gW, ta1gX, ta1gX), (ta1gW, ta1gY, ta1gY)), (ta1gV, (ta1gZ, ta1h0, ta1h0), (ta1gZ, ta1h1, ta1h1))), (ta1gU, (ta1h2, (ta1h3, ta1h4, ta1h4), (ta1h3, ta1h5, ta1h5)), (ta1h2, (ta1h6, ta1h7, ta1h7), (ta1h6, ta1h8, ta1h8)))), (ta1gT, (ta1h9, (ta1ha, (ta1hb, ta1hc, ta1hc), (ta1hb, ta1hd, ta1hd)), (ta1ha, (ta1he, ta1hf, ta1hf), (ta1he, ta1hg, ta1hg))), (ta1h9, (ta1hh, (ta1hi, ta1hj, ta1hj), (ta1hi, ta1hk, ta1hk)), (ta1hh, (ta1hl, ta1hm, ta1hm), (ta1hl, ta1hn, ta1hn))))), (ta1gS, (ta1ho, (ta1hp, (ta1hq, (ta1hr, ta1hs, ta1hs), (ta1hr, ta1ht, ta1ht)), (ta1hq, (ta1hu, ta1hv, ta1hv), (ta1hu, ta1hw, ta1hw))), (ta1hp, (ta1hx, (ta1hy, ta1hz, ta1hz), (ta1hy, ta1hA, ta1hA)), (ta1hx, (ta1hB, ta1hC, ta1hC), (ta1hB, ta1hD, ta1hD)))), (ta1ho, (ta1hE, (ta1hF, (ta1hG, ta1hH, ta1hH), (ta1hG, ta1hI, ta1hI)), (ta1hF, (ta1hJ, ta1hK, ta1hK), (ta1hJ, ta1hL, ta1hL))), (ta1hE, (ta1hM, (ta1hN, ta1hO, ta1hO), (ta1hN, ta1hP, ta1hP)), (ta1hM, (ta1hQ, ta1hR, ta1hR), (ta1hQ, ta1hS, ta1hS)))))), (ta1gR, (ta1hT, (ta1hU, (ta1hV, (ta1hW, (ta1hX, ta1hY, ta1hY), (ta1hX, ta1hZ, ta1hZ)), (ta1hW, (ta1i0, ta1i1, ta1i1), (ta1i0, ta1i2, ta1i2))), (ta1hV, (ta1i3, (ta1i4, ta1i5, ta1i5), (ta1i4, ta1i6, ta1i6)), (ta1i3, (ta1i7, ta1i8, ta1i8), (ta1i7, ta1i9, ta1i9)))), (ta1hU, (ta1ia, (ta1ib, (ta1ic, ta1id, ta1id), (ta1ic, ta1ie, ta1ie)), (ta1ib, (ta1if, ta1ig, ta1ig), (ta1if, ta1ih, ta1ih))), (ta1ia, (ta1ii, (ta1ij, ta1ik, ta1ik), (ta1ij, ta1il, ta1il)), (ta1ii, (ta1im, ta1in, ta1in), (ta1im, ta1io, ta1io))))), (ta1hT, (ta1ip, (ta1iq, (ta1ir, (ta1is, ta1it, ta1it), (ta1is, ta1iu, ta1iu)), (ta1ir, (ta1iv, ta1iw, ta1iw), (ta1iv, ta1ix, ta1ix))), (ta1iq, (ta1iy, (ta1iz, ta1iA, ta1iA), (ta1iz, ta1iB, ta1iB)), (ta1iy, (ta1iC, ta1iD, ta1iD), (ta1iC, ta1iE, ta1iE)))), (ta1ip, (ta1iF, (ta1iG, (ta1iH, ta1iI, ta1iI), (ta1iH, ta1iJ, ta1iJ)), (ta1iG, (ta1iK, ta1iL, ta1iL), (ta1iK, ta1iM, ta1iM))), (ta1iF, (ta1iN, (ta1iO, ta1iP, ta1iP), (ta1iO, ta1iQ, ta1iQ)), (ta1iN, (ta1iR, ta1iS, ta1iS), (ta1iR, ta1iT, ta1iT))))))))] g_rec8{-r5N,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         [ta1iU, GHC.Void{-3T,W-}, ta1eO, ta1eP, ta1eQ, ta1eR, ta1eS, ta1eT, ta1eU, ta1eV, ta1eW, ta1eX, ta1eY, ta1eZ, ta1f0, ta1f1, ta1f2, ta1f3, ta1f4, ta1f5, ta1f6, ta1f7, ta1f8, ta1f9, ta1fa, ta1fb, ta1fc, ta1fd, ta1fe, ta1ff, ta1fg, ta1fh, ta1fi, ta1fj, ta1fk, ta1fl, ta1fm, ta1fn, ta1fo, ta1fp, ta1fq, ta1fr, ta1fs, ta1ft, ta1fu, ta1fv, ta1fw, ta1fx, ta1fy, ta1fz, ta1fA, ta1fB, ta1fC, ta1fD, ta1fE, ta1fF, ta1fG, ta1fH, ta1fI, ta1fJ, ta1fK, ta1fL, ta1fM, ta1fN, ta1fO, ta1fP, ta1fQ, ta1fR, ta1fS, ta1fT, ta1fU, ta1fV, ta1fW, ta1fX, ta1fY, ta1fZ, ta1g0, ta1g1, ta1g2, ta1g3, ta1g4, ta1g5, ta1g6, ta1g7, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN, ta1gO, ta1gP, ta1gQ, ta1eN, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1ib, ta1ic, ta1id, ta1ie, ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1eF]
+                [ta1ke, ta1fZ, GHC.Void{-3T,W-}, (ta1fZ, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), ta1ou, ta1sH, ta1os, (ta1os, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}), (ta1ke, (ta1oA, (ta1oB, (ta1oC, (ta1oD, (ta1oE, (ta1oF, (ta1oG, ta1oH, ta1oH), (ta1oG, ta1oI, ta1oI)), (ta1oF, (ta1oJ, ta1oK, ta1oK), (ta1oJ, ta1oL, ta1oL))), (ta1oE, (ta1oM, (ta1oN, ta1oO, ta1oO), (ta1oN, ta1oP, ta1oP)), (ta1oM, (ta1oQ, ta1oR, ta1oR), (ta1oQ, ta1oS, ta1oS)))), (ta1oD, (ta1oT, (ta1oU, (ta1oV, ta1oW, ta1oW), (ta1oV, ta1oX, ta1oX)), (ta1oU, (ta1oY, ta1oZ, ta1oZ), (ta1oY, ta1p0, ta1p0))), (ta1oT, (ta1p1, (ta1p2, ta1p3, ta1p3), (ta1p2, ta1p4, ta1p4)), (ta1p1, (ta1p5, ta1p6, ta1p6), (ta1p5, ta1p7, ta1p7))))), (ta1oC, (ta1p8, (ta1p9, (ta1pa, (ta1pb, ta1pc, ta1pc), (ta1pb, ta1pd, ta1pd)), (ta1pa, (ta1pe, ta1pf, ta1pf), (ta1pe, ta1pg, ta1pg))), (ta1p9, (ta1ph, (ta1pi, ta1pj, ta1pj), (ta1pi, ta1pk, ta1pk)), (ta1ph, (ta1pl, ta1pm, ta1pm), (ta1pl, ta1pn, ta1pn)))), (ta1p8, (ta1po, (ta1pp, (ta1pq, ta1pr, ta1pr), (ta1pq, ta1ps, ta1ps)), (ta1pp, (ta1pt, ta1pu, ta1pu), (ta1pt, ta1pv, ta1pv))), (ta1po, (ta1pw, (ta1px, ta1py, ta1py), (ta1px, ta1pz, ta1pz)), (ta1pw, (ta1pA, ta1pB, ta1pB), (ta1pA, ta1pC, ta1pC)))))), (ta1oB, (ta1pD, (ta1pE, (ta1pF, (ta1pG, (ta1pH, ta1pI, ta1pI), (ta1pH, ta1pJ, ta1pJ)), (ta1pG, (ta1pK, ta1pL, ta1pL), (ta1pK, ta1pM, ta1pM))), (ta1pF, (ta1pN, (ta1pO, ta1pP, ta1pP), (ta1pO, ta1pQ, ta1pQ)), (ta1pN, (ta1pR, ta1pS, ta1pS), (ta1pR, ta1pT, ta1pT)))), (ta1pE, (ta1pU, (ta1pV, (ta1pW, ta1pX, ta1pX), (ta1pW, ta1pY, ta1pY)), (ta1pV, (ta1pZ, ta1q0, ta1q0), (ta1pZ, ta1q1, ta1q1))), (ta1pU, (ta1q2, (ta1q3, ta1q4, ta1q4), (ta1q3, ta1q5, ta1q5)), (ta1q2, (ta1q6, ta1q7, ta1q7), (ta1q6, ta1q8, ta1q8))))), (ta1pD, (ta1q9, (ta1qa, (ta1qb, (ta1qc, ta1qd, ta1qd), (ta1qc, ta1qe, ta1qe)), (ta1qb, (ta1qf, ta1qg, ta1qg), (ta1qf, ta1qh, ta1qh))), (ta1qa, (ta1qi, (ta1qj, ta1qk, ta1qk), (ta1qj, ta1ql, ta1ql)), (ta1qi, (ta1qm, ta1qn, ta1qn), (ta1qm, ta1qo, ta1qo)))), (ta1q9, (ta1qp, (ta1qq, (ta1qr, ta1qs, ta1qs), (ta1qr, ta1qt, ta1qt)), (ta1qq, (ta1qu, ta1qv, ta1qv), (ta1qu, ta1qw, ta1qw))), (ta1qp, (ta1qx, (ta1qy, ta1qz, ta1qz), (ta1qy, ta1qA, ta1qA)), (ta1qx, (ta1qB, ta1qC, ta1qC), (ta1qB, ta1qD, ta1qD))))))), (ta1oA, (ta1qE, (ta1qF, (ta1qG, (ta1qH, (ta1qI, (ta1qJ, ta1qK, ta1qK), (ta1qJ, ta1qL, ta1qL)), (ta1qI, (ta1qM, ta1qN, ta1qN), (ta1qM, ta1qO, ta1qO))), (ta1qH, (ta1qP, (ta1qQ, ta1qR, ta1qR), (ta1qQ, ta1qS, ta1qS)), (ta1qP, (ta1qT, ta1qU, ta1qU), (ta1qT, ta1qV, ta1qV)))), (ta1qG, (ta1qW, (ta1qX, (ta1qY, ta1qZ, ta1qZ), (ta1qY, ta1r0, ta1r0)), (ta1qX, (ta1r1, ta1r2, ta1r2), (ta1r1, ta1r3, ta1r3))), (ta1qW, (ta1r4, (ta1r5, ta1r6, ta1r6), (ta1r5, ta1r7, ta1r7)), (ta1r4, (ta1r8, ta1r9, ta1r9), (ta1r8, ta1ra, ta1ra))))), (ta1qF, (ta1rb, (ta1rc, (ta1rd, (ta1re, ta1rf, ta1rf), (ta1re, ta1rg, ta1rg)), (ta1rd, (ta1rh, ta1ri, ta1ri), (ta1rh, ta1rj, ta1rj))), (ta1rc, (ta1rk, (ta1rl, ta1rm, ta1rm), (ta1rl, ta1rn, ta1rn)), (ta1rk, (ta1ro, ta1rp, ta1rp), (ta1ro, ta1rq, ta1rq)))), (ta1rb, (ta1rr, (ta1rs, (ta1rt, ta1ru, ta1ru), (ta1rt, ta1rv, ta1rv)), (ta1rs, (ta1rw, ta1rx, ta1rx), (ta1rw, ta1ry, ta1ry))), (ta1rr, (ta1rz, (ta1rA, ta1rB, ta1rB), (ta1rA, ta1rC, ta1rC)), (ta1rz, (ta1rD, ta1rE, ta1rE), (ta1rD, ta1rF, ta1rF)))))), (ta1qE, (ta1rG, (ta1rH, (ta1rI, (ta1rJ, (ta1rK, ta1rL, ta1rL), (ta1rK, ta1rM, ta1rM)), (ta1rJ, (ta1rN, ta1rO, ta1rO), (ta1rN, ta1rP, ta1rP))), (ta1rI, (ta1rQ, (ta1rR, ta1rS, ta1rS), (ta1rR, ta1rT, ta1rT)), (ta1rQ, (ta1rU, ta1rV, ta1rV), (ta1rU, ta1rW, ta1rW)))), (ta1rH, (ta1rX, (ta1rY, (ta1rZ, ta1s0, ta1s0), (ta1rZ, ta1s1, ta1s1)), (ta1rY, (ta1s2, ta1s3, ta1s3), (ta1s2, ta1s4, ta1s4))), (ta1rX, (ta1s5, (ta1s6, ta1s7, ta1s7), (ta1s6, ta1s8, ta1s8)), (ta1s5, (ta1s9, ta1sa, ta1sa), (ta1s9, ta1sb, ta1sb))))), (ta1rG, (ta1sc, (ta1sd, (ta1se, (ta1sf, ta1sg, ta1sg), (ta1sf, ta1sh, ta1sh)), (ta1se, (ta1si, ta1sj, ta1sj), (ta1si, ta1sk, ta1sk))), (ta1sd, (ta1sl, (ta1sm, ta1sn, ta1sn), (ta1sm, ta1so, ta1so)), (ta1sl, (ta1sp, ta1sq, ta1sq), (ta1sp, ta1sr, ta1sr)))), (ta1sc, (ta1ss, (ta1st, (ta1su, ta1sv, ta1sv), (ta1su, ta1sw, ta1sw)), (ta1st, (ta1sx, ta1sy, ta1sy), (ta1sx, ta1sz, ta1sz))), (ta1ss, (ta1sA, (ta1sB, ta1sC, ta1sC), (ta1sB, ta1sD, ta1sD)), (ta1sA, (ta1sE, ta1sF, ta1sF), (ta1sE, ta1sG, ta1sG)))))))), ta1bK, (ta1ke, (ta1g7, (ta1g8, (ta1g9, (ta1ga, (ta1gb, (ta1gc, (ta1gd, ta1ge, ta1ge), (ta1gd, ta1gf, ta1gf)), (ta1gc, (ta1gg, ta1gh, ta1gh), (ta1gg, ta1gi, ta1gi))), (ta1gb, (ta1gj, (ta1gk, ta1gl, ta1gl), (ta1gk, ta1gm, ta1gm)), (ta1gj, (ta1gn, ta1go, ta1go), (ta1gn, ta1gp, ta1gp)))), (ta1ga, (ta1gq, (ta1gr, (ta1gs, ta1gt, ta1gt), (ta1gs, ta1gu, ta1gu)), (ta1gr, (ta1gv, ta1gw, ta1gw), (ta1gv, ta1gx, ta1gx))), (ta1gq, (ta1gy, (ta1gz, ta1gA, ta1gA), (ta1gz, ta1gB, ta1gB)), (ta1gy, (ta1gC, ta1gD, ta1gD), (ta1gC, ta1gE, ta1gE))))), (ta1g9, (ta1gF, (ta1gG, (ta1gH, (ta1gI, ta1gJ, ta1gJ), (ta1gI, ta1gK, ta1gK)), (ta1gH, (ta1gL, ta1gM, ta1gM), (ta1gL, ta1gN, ta1gN))), (ta1gG, (ta1gO, (ta1gP, ta1gQ, ta1gQ), (ta1gP, ta1gR, ta1gR)), (ta1gO, (ta1gS, ta1gT, ta1gT), (ta1gS, ta1gU, ta1gU)))), (ta1gF, (ta1gV, (ta1gW, (ta1gX, ta1gY, ta1gY), (ta1gX, ta1gZ, ta1gZ)), (ta1gW, (ta1h0, ta1h1, ta1h1), (ta1h0, ta1h2, ta1h2))), (ta1gV, (ta1h3, (ta1h4, ta1h5, ta1h5), (ta1h4, ta1h6, ta1h6)), (ta1h3, (ta1h7, ta1h8, ta1h8), (ta1h7, ta1h9, ta1h9)))))), (ta1g8, (ta1ha, (ta1hb, (ta1hc, (ta1hd, (ta1he, ta1hf, ta1hf), (ta1he, ta1hg, ta1hg)), (ta1hd, (ta1hh, ta1hi, ta1hi), (ta1hh, ta1hj, ta1hj))), (ta1hc, (ta1hk, (ta1hl, ta1hm, ta1hm), (ta1hl, ta1hn, ta1hn)), (ta1hk, (ta1ho, ta1hp, ta1hp), (ta1ho, ta1hq, ta1hq)))), (ta1hb, (ta1hr, (ta1hs, (ta1ht, ta1hu, ta1hu), (ta1ht, ta1hv, ta1hv)), (ta1hs, (ta1hw, ta1hx, ta1hx), (ta1hw, ta1hy, ta1hy))), (ta1hr, (ta1hz, (ta1hA, ta1hB, ta1hB), (ta1hA, ta1hC, ta1hC)), (ta1hz, (ta1hD, ta1hE, ta1hE), (ta1hD, ta1hF, ta1hF))))), (ta1ha, (ta1hG, (ta1hH, (ta1hI, (ta1hJ, ta1hK, ta1hK), (ta1hJ, ta1hL, ta1hL)), (ta1hI, (ta1hM, ta1hN, ta1hN), (ta1hM, ta1hO, ta1hO))), (ta1hH, (ta1hP, (ta1hQ, ta1hR, ta1hR), (ta1hQ, ta1hS, ta1hS)), (ta1hP, (ta1hT, ta1hU, ta1hU), (ta1hT, ta1hV, ta1hV)))), (ta1hG, (ta1hW, (ta1hX, (ta1hY, ta1hZ, ta1hZ), (ta1hY, ta1i0, ta1i0)), (ta1hX, (ta1i1, ta1i2, ta1i2), (ta1i1, ta1i3, ta1i3))), (ta1hW, (ta1i4, (ta1i5, ta1i6, ta1i6), (ta1i5, ta1i7, ta1i7)), (ta1i4, (ta1i8, ta1i9, ta1i9), (ta1i8, ta1ia, ta1ia))))))), (ta1g7, (ta1ib, (ta1ic, (ta1id, (ta1ie, (ta1if, (ta1ig, ta1ih, ta1ih), (ta1ig, ta1ii, ta1ii)), (ta1if, (ta1ij, ta1ik, ta1ik), (ta1ij, ta1il, ta1il))), (ta1ie, (ta1im, (ta1in, ta1io, ta1io), (ta1in, ta1ip, ta1ip)), (ta1im, (ta1iq, ta1ir, ta1ir), (ta1iq, ta1is, ta1is)))), (ta1id, (ta1it, (ta1iu, (ta1iv, ta1iw, ta1iw), (ta1iv, ta1ix, ta1ix)), (ta1iu, (ta1iy, ta1iz, ta1iz), (ta1iy, ta1iA, ta1iA))), (ta1it, (ta1iB, (ta1iC, ta1iD, ta1iD), (ta1iC, ta1iE, ta1iE)), (ta1iB, (ta1iF, ta1iG, ta1iG), (ta1iF, ta1iH, ta1iH))))), (ta1ic, (ta1iI, (ta1iJ, (ta1iK, (ta1iL, ta1iM, ta1iM), (ta1iL, ta1iN, ta1iN)), (ta1iK, (ta1iO, ta1iP, ta1iP), (ta1iO, ta1iQ, ta1iQ))), (ta1iJ, (ta1iR, (ta1iS, ta1iT, ta1iT), (ta1iS, ta1iU, ta1iU)), (ta1iR, (ta1iV, ta1iW, ta1iW), (ta1iV, ta1iX, ta1iX)))), (ta1iI, (ta1iY, (ta1iZ, (ta1j0, ta1j1, ta1j1), (ta1j0, ta1j2, ta1j2)), (ta1iZ, (ta1j3, ta1j4, ta1j4), (ta1j3, ta1j5, ta1j5))), (ta1iY, (ta1j6, (ta1j7, ta1j8, ta1j8), (ta1j7, ta1j9, ta1j9)), (ta1j6, (ta1ja, ta1jb, ta1jb), (ta1ja, ta1jc, ta1jc)))))), (ta1ib, (ta1jd, (ta1je, (ta1jf, (ta1jg, (ta1jh, ta1ji, ta1ji), (ta1jh, ta1jj, ta1jj)), (ta1jg, (ta1jk, ta1jl, ta1jl), (ta1jk, ta1jm, ta1jm))), (ta1jf, (ta1jn, (ta1jo, ta1jp, ta1jp), (ta1jo, ta1jq, ta1jq)), (ta1jn, (ta1jr, ta1js, ta1js), (ta1jr, ta1jt, ta1jt)))), (ta1je, (ta1ju, (ta1jv, (ta1jw, ta1jx, ta1jx), (ta1jw, ta1jy, ta1jy)), (ta1jv, (ta1jz, ta1jA, ta1jA), (ta1jz, ta1jB, ta1jB))), (ta1ju, (ta1jC, (ta1jD, ta1jE, ta1jE), (ta1jD, ta1jF, ta1jF)), (ta1jC, (ta1jG, ta1jH, ta1jH), (ta1jG, ta1jI, ta1jI))))), (ta1jd, (ta1jJ, (ta1jK, (ta1jL, (ta1jM, ta1jN, ta1jN), (ta1jM, ta1jO, ta1jO)), (ta1jL, (ta1jP, ta1jQ, ta1jQ), (ta1jP, ta1jR, ta1jR))), (ta1jK, (ta1jS, (ta1jT, ta1jU, ta1jU), (ta1jT, ta1jV, ta1jV)), (ta1jS, (ta1jW, ta1jX, ta1jX), (ta1jW, ta1jY, ta1jY)))), (ta1jJ, (ta1jZ, (ta1k0, (ta1k1, ta1k2, ta1k2), (ta1k1, ta1k3, ta1k3)), (ta1k0, (ta1k4, ta1k5, ta1k5), (ta1k4, ta1k6, ta1k6))), (ta1jZ, (ta1k7, (ta1k8, ta1k9, ta1k9), (ta1k8, ta1ka, ta1ka)), (ta1k7, (ta1kb, ta1kc, ta1kc), (ta1kb, ta1kd, ta1kd))))))))] g_rec8{-r5N,x-}
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         [ta1ke, GHC.Void{-3T,W-}, ta1g8, ta1g9, ta1ga, ta1gb, ta1gc, ta1gd, ta1ge, ta1gf, ta1gg, ta1gh, ta1gi, ta1gj, ta1gk, ta1gl, ta1gm, ta1gn, ta1go, ta1gp, ta1gq, ta1gr, ta1gs, ta1gt, ta1gu, ta1gv, ta1gw, ta1gx, ta1gy, ta1gz, ta1gA, ta1gB, ta1gC, ta1gD, ta1gE, ta1gF, ta1gG, ta1gH, ta1gI, ta1gJ, ta1gK, ta1gL, ta1gM, ta1gN, ta1gO, ta1gP, ta1gQ, ta1gR, ta1gS, ta1gT, ta1gU, ta1gV, ta1gW, ta1gX, ta1gY, ta1gZ, ta1h0, ta1h1, ta1h2, ta1h3, ta1h4, ta1h5, ta1h6, ta1h7, ta1h8, ta1h9, ta1ha, ta1hb, ta1hc, ta1hd, ta1he, ta1hf, ta1hg, ta1hh, ta1hi, ta1hj, ta1hk, ta1hl, ta1hm, ta1hn, ta1ho, ta1hp, ta1hq, ta1hr, ta1hs, ta1ht, ta1hu, ta1hv, ta1hw, ta1hx, ta1hy, ta1hz, ta1hA, ta1hB, ta1hC, ta1hD, ta1hE, ta1hF, ta1hG, ta1hH, ta1hI, ta1hJ, ta1hK, ta1hL, ta1hM, ta1hN, ta1hO, ta1hP, ta1hQ, ta1hR, ta1hS, ta1hT, ta1hU, ta1hV, ta1hW, ta1hX, ta1hY, ta1hZ, ta1i0, ta1i1, ta1i2, ta1i3, ta1i4, ta1i5, ta1i6, ta1i7, ta1i8, ta1i9, ta1ia, ta1g7, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1ib, ta1ic, ta1id, ta1ie, ta1if, ta1ig, ta1ih, ta1ii, ta1ij, ta1ik, ta1il, ta1im, ta1in, ta1io, ta1ip, ta1iq, ta1ir, ta1is, ta1it, ta1iu, ta1iv, ta1iw, ta1ix, ta1iy, ta1iz, ta1iA, ta1iB, ta1iC, ta1iD, ta1iE, ta1iF, ta1iG, ta1iH, ta1iI, ta1iJ, ta1iK, ta1iL, ta1iM, ta1iN, ta1iO, ta1iP, ta1iQ, ta1iR, ta1iS, ta1iT, ta1iU, ta1iV, ta1iW, ta1iX, ta1iY, ta1iZ, ta1j0, ta1j1, ta1j2, ta1j3, ta1j4, ta1j5, ta1j6, ta1j7, ta1j8, ta1j9, ta1ja, ta1jb, ta1jc, ta1jd, ta1je, ta1jf, ta1jg, ta1jh, ta1ji, ta1jj, ta1jk, ta1jl, ta1jm, ta1jn, ta1jo, ta1jp, ta1jq, ta1jr, ta1js, ta1jt, ta1ju, ta1jv, ta1jw, ta1jx, ta1jy, ta1jz, ta1jA, ta1jB, ta1jC, ta1jD, ta1jE, ta1jF, ta1jG, ta1jH, ta1jI, ta1jJ, ta1jK, ta1jL, ta1jM, ta1jN, ta1jO, ta1jP, ta1jQ, ta1jR, ta1jS, ta1jT, ta1jU, ta1jV, ta1jW, ta1jX, ta1jY, ta1jZ, ta1k0, ta1k1, ta1k2, ta1k3, ta1k4, ta1k5, ta1k6, ta1k7, ta1k8, ta1k9, ta1ka, ta1kb, ta1kc, ta1kd, ta1fZ]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      g_rec8{-r5N,x-}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         [ta1iU, ta1na, ta1nh, ta1ni, ta1nj, ta1nk, ta1nl, ta1nm, ta1nn, ta1no, ta1np, ta1nq, ta1nr, ta1ns, ta1nt, ta1nu, ta1nv, ta1nw, ta1nx, ta1ny, ta1nz, ta1nA, ta1nB, ta1nC, ta1nD, ta1nE, ta1nF, ta1nG, ta1nH, ta1nI, ta1nJ, ta1nK, ta1nL, ta1nM, ta1nN, ta1nO, ta1nP, ta1nQ, ta1nR, ta1nS, ta1nT, ta1nU, ta1nV, ta1nW, ta1nX, ta1nY, ta1nZ, ta1o0, ta1o1, ta1o2, ta1o3, ta1o4, ta1o5, ta1o6, ta1o7, ta1o8, ta1o9, ta1oa, ta1ob, ta1oc, ta1od, ta1oe, ta1of, ta1og, ta1oh, ta1oi, ta1oj, ta1ok, ta1ol, ta1om, ta1on, ta1oo, ta1op, ta1oq, ta1or, ta1os, ta1ot, ta1ou, ta1ov, ta1ow, ta1ox, ta1oy, ta1oz, ta1oA, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj, ta1ng, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC, ta1qD, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl, ta1rm, ta1n8]
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         [ta1ke, ta1ou, ta1oB, ta1oC, ta1oD, ta1oE, ta1oF, ta1oG, ta1oH, ta1oI, ta1oJ, ta1oK, ta1oL, ta1oM, ta1oN, ta1oO, ta1oP, ta1oQ, ta1oR, ta1oS, ta1oT, ta1oU, ta1oV, ta1oW, ta1oX, ta1oY, ta1oZ, ta1p0, ta1p1, ta1p2, ta1p3, ta1p4, ta1p5, ta1p6, ta1p7, ta1p8, ta1p9, ta1pa, ta1pb, ta1pc, ta1pd, ta1pe, ta1pf, ta1pg, ta1ph, ta1pi, ta1pj, ta1pk, ta1pl, ta1pm, ta1pn, ta1po, ta1pp, ta1pq, ta1pr, ta1ps, ta1pt, ta1pu, ta1pv, ta1pw, ta1px, ta1py, ta1pz, ta1pA, ta1pB, ta1pC, ta1pD, ta1pE, ta1pF, ta1pG, ta1pH, ta1pI, ta1pJ, ta1pK, ta1pL, ta1pM, ta1pN, ta1pO, ta1pP, ta1pQ, ta1pR, ta1pS, ta1pT, ta1pU, ta1pV, ta1pW, ta1pX, ta1pY, ta1pZ, ta1q0, ta1q1, ta1q2, ta1q3, ta1q4, ta1q5, ta1q6, ta1q7, ta1q8, ta1q9, ta1qa, ta1qb, ta1qc, ta1qd, ta1qe, ta1qf, ta1qg, ta1qh, ta1qi, ta1qj, ta1qk, ta1ql, ta1qm, ta1qn, ta1qo, ta1qp, ta1qq, ta1qr, ta1qs, ta1qt, ta1qu, ta1qv, ta1qw, ta1qx, ta1qy, ta1qz, ta1qA, ta1qB, ta1qC, ta1qD, ta1oA, GHC.Void{-3T,W-}, GHC.Void{-3T,W-}, ta1qE, ta1qF, ta1qG, ta1qH, ta1qI, ta1qJ, ta1qK, ta1qL, ta1qM, ta1qN, ta1qO, ta1qP, ta1qQ, ta1qR, ta1qS, ta1qT, ta1qU, ta1qV, ta1qW, ta1qX, ta1qY, ta1qZ, ta1r0, ta1r1, ta1r2, ta1r3, ta1r4, ta1r5, ta1r6, ta1r7, ta1r8, ta1r9, ta1ra, ta1rb, ta1rc, ta1rd, ta1re, ta1rf, ta1rg, ta1rh, ta1ri, ta1rj, ta1rk, ta1rl, ta1rm, ta1rn, ta1ro, ta1rp, ta1rq, ta1rr, ta1rs, ta1rt, ta1ru, ta1rv, ta1rw, ta1rx, ta1ry, ta1rz, ta1rA, ta1rB, ta1rC, ta1rD, ta1rE, ta1rF, ta1rG, ta1rH, ta1rI, ta1rJ, ta1rK, ta1rL, ta1rM, ta1rN, ta1rO, ta1rP, ta1rQ, ta1rR, ta1rS, ta1rT, ta1rU, ta1rV, ta1rW, ta1rX, ta1rY, ta1rZ, ta1s0, ta1s1, ta1s2, ta1s3, ta1s4, ta1s5, ta1s6, ta1s7, ta1s8, ta1s9, ta1sa, ta1sb, ta1sc, ta1sd, ta1se, ta1sf, ta1sg, ta1sh, ta1si, ta1sj, ta1sk, ta1sl, ta1sm, ta1sn, ta1so, ta1sp, ta1sq, ta1sr, ta1ss, ta1st, ta1su, ta1sv, ta1sw, ta1sx, ta1sy, ta1sz, ta1sA, ta1sB, ta1sC, ta1sD, ta1sE, ta1sF, ta1sG, ta1os]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      x_r4S
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      y_r4T
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      z_r4U
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      p_r4V
 
-NOTE: Simplifier still going after 4 iterations; bailing out.
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc090.stderr b/ghc/tests/typecheck/should_compile/tc090.stderr
index 6ba1b2e..a19921f 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc090.stderr
+++ b/ghc/tests/typecheck/should_compile/tc090.stderr
@@ -1,17 +1,15 @@
-
-
-================================================================================
-Typechecked:
+==================== Typechecked ====================
 AbsBinds
-[taBh]
-[d.Ord_aBq]
-[([taBh], a{-r3h,x-}, a_aBf), ([taBh], b{-r3i,x-}, b_aBg)]
-    d.Ord_aBs = d.Ord_aBq
-    b_aBv = b{-r3i,x-} taBh d.Ord_aBs
-    d.Ord_aBu = d.Ord_aBq
-    a_aBw = a{-r3h,x-} taBh d.Ord_aBu
-    a_aBf = b_aBv
-    b_aBg = a_aBw
+[taBp]
+[d.Ord_aBy]
+[([taBp], a{-r3h,x-}, a_aBn), ([taBp], b{-r3i,x-}, b_aBo)]
+    d.Ord_aBA = d.Ord_aBy
+    b_aBE = b{-r3i,x-} taBp d.Ord_aBA
+    d.Ord_aBC = d.Ord_aBy
+    a_aBD = a{-r3h,x-} taBp d.Ord_aBC
+    a_aBn = b_aBE
+    b_aBo = a_aBD
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_compile/tc091.stderr b/ghc/tests/typecheck/should_compile/tc091.stderr
index 333fba8..1e9e50d 100644 (file)
--- a/ghc/tests/typecheck/should_compile/tc091.stderr
+++ b/ghc/tests/typecheck/should_compile/tc091.stderr
@@ -1,44 +1,43 @@
-
-
-================================================================================
-Typechecked:
-AbsBinds [taW8] [] [([taW8], init_last{-r3m,x-}, init_last_aW5)]
-    init_last_aW5 a_r3E b_r3F = (a_r3E, a_r3E)
-AbsBinds [taWl] [d.Ord_aWp] [([taWl], merge{-r3l,x-}, merge_aWi)]
-    merge_aWi xs_r3B ys_r3C = xs_r3B
-AbsBinds [taWw] [d.Ord_aXv] [([taWw], sort{-r3k,x-}, sort_aWt)]
-    d.Ord_aXt = d.Ord_aXv
-    sort_aWt xs_r3o
-            = s_aXJ xs_r3o PrelList.length{-rhD,p-} taWw xs_r3o
+==================== Typechecked ====================
+AbsBinds [taWg] [] [([taWg], init_last{-r3m,x-}, init_last_aWd)]
+    init_last_aWd a_r3E b_r3F = (a_r3E, a_r3E)
+AbsBinds [taWp] [d.Ord_aWt] [([taWp], merge{-r3l,x-}, merge_aWm)]
+    merge_aWm xs_r3B ys_r3C = xs_r3B
+AbsBinds [taWA] [d.Ord_aXy] [([taWA], sort{-r3k,x-}, sort_aWx)]
+    d.Ord_aXw = d.Ord_aXy
+    sort_aWx xs_r3o
+            = s_aXL xs_r3o PrelList.length{-rhD,p-} taWA xs_r3o
             where
                 {- nonrec -}
-                AbsBinds [taWD] [d.Ord_aXe] [([taWD], s_r3q, s_aWA)]
-                    d.Ord_aXi = d.Ord_aXe
-                    merge_aXK = merge{-r3l,x-} taWD d.Ord_aXi
-                    d.Ord_aXk = d.Ord_aXe
-                    sort_aXL = sort{-r3k,x-} taWD d.Ord_aXk
-                    sort_aXM = sort_aXL
-                    s_aWA xs_r3u k_r3v
-                          = if k_r3v <=_aXF lit_aXG then
+                AbsBinds [taWH] [d.Ord_aXh] [([taWH], s_r3q, s_aWE)]
+                    d.Ord_aXl = d.Ord_aXh
+                    merge_aXO = merge{-r3l,x-} taWH d.Ord_aXl
+                    d.Ord_aXn = d.Ord_aXh
+                    sort_aXN = sort{-r3k,x-} taWH d.Ord_aXn
+                    sort_aXM = sort_aXN
+                    s_aWE xs_r3u k_r3v
+                          = if k_r3v <=_aXK lit_aXJ then
                                 xs_r3u
                             else
-                                merge_aXK sort_aXL ys_r3x sort_aXM zs_r3y
+                                merge_aXO sort_aXN ys_r3x sort_aXM zs_r3y
                           where
                               {- nonrec -}
-                              AbsBinds [] [] [([], ys_r3x, ys_aWG), ([], zs_r3y, zs_aWH)]
-                                  (ys_aWG, zs_aWH)
-                                      = init_last{-r3m,x-} taWD xs_r3u k_r3v div_aXH lit_aXI
+                              AbsBinds [] [] [([], ys_r3x, ys_aWK), ([], zs_r3y, zs_aWL)]
+                                  (ys_aWK, zs_aWL)
+                                      = init_last{-r3m,x-} taWH xs_r3u
+                                                                k_r3v
+                                                                div_aXI (PrelBase.I#{-5b,w-}{i} 2#)
                               {- nonrec -}
                               {- nonrec -}
                 {- nonrec -}
-                s_aXJ = s_r3q taWw d.Ord_aXt
+                s_aXL = s_r3q taWA d.Ord_aXw
                 {- nonrec -}
-d.Ord_aXB = PrelBase.$d7{-rrR,p-}
-<=_aXF = PrelBase.<={-rqO,p-} PrelBase.Int{-3g,W-} d.Ord_aXB
-lit_aXG = PrelBase.I#{-5b,w-}{i} 1#
-d.Integral_aXE = PrelNum.$d36{-rFA,p-}
-div_aXH = PrelNum.div{-ry2,p-} PrelBase.Int{-3g,W-} d.Integral_aXE
-lit_aXI = PrelBase.I#{-5b,w-}{i} 2#
+d.Ord_aXE = PrelBase.$d7{-rrR,p-}
+<=_aXK = PrelBase.<={-rqO,p-} PrelBase.Int{-3g,W-} d.Ord_aXE
+lit_aXJ = PrelBase.I#{-5b,w-}{i} 1#
+d.Integral_aXH = PrelNum.$d36{-rFA,p-}
+div_aXI = PrelNum.div{-ry2,p-} PrelBase.Int{-3g,W-} d.Integral_aXH
+
 ghc: module version changed to 1; reason: no old .hi file
 _interface_ ShouldSucceed 1
 _instance_modules_

diff --git a/ghc/tests/typecheck/should_fail/Digraph.stderr b/ghc/tests/typecheck/should_fail/Digraph.stderr
index 01c4bbe..48a75b8 100644 (file)
--- a/ghc/tests/typecheck/should_fail/Digraph.stderr
+++ b/ghc/tests/typecheck/should_fail/Digraph.stderr
@@ -1,7 +1,7 @@
  
 Digraph.hs:19: A type signature is more polymorphic than the inferred type
-                  Can't for-all the type variable(s) `taWg'
-                  in the inferred type `[Edge taWg]'
+                  Can't for-all the type variable(s) `taW8'
+                  in the inferred type `[Edge taW8]'
     When checking signature for `reversed_edges'
     In an equation for function `stronglyConnComp':
        `stronglyConnComp es vs
@@ -29,5 +29,4 @@ Digraph.hs:19: A type signature is more polymorphic than the inferred type
                              reversed_edges :: _forall_ [v] (PrelBase.Eq v) => [Edge v]
                              reversed_edges = PrelBase.map swap es'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail001.stderr b/ghc/tests/typecheck/should_fail/tcfail001.stderr
index 56f538b..d0042ad 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail001.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail001.stderr
@@ -2,8 +2,10 @@
 tcfail001.hs:9:warning:
     Duplicated class assertion `A a' in context: `(A a, A a)'
  
-tcfail001.hs:9: Function type expected, but found the type `[takz]'
+tcfail001.hs:9: Couldn't match the type
+                   `GHC.-> oakH' against `PrelBase.[]'
+    Expected: `oakH -> oakI'
+    Inferred: `[takF]'
     In an equation for function `op': `op PrelBase.[] = PrelBase.[]'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail002.stderr b/ghc/tests/typecheck/should_fail/tcfail002.stderr
index a9e6a95..ee23cc0 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail002.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail002.stderr
@@ -1,9 +1,8 @@
  
 tcfail002.hs:4: Cannot construct the infinite type (occur check)
-                   `take' = `[take]'
-    Expected: `[take]'
-    Inferred: `take'
+                   `takl' = `[takl]'
+    Expected: `[takl]'
+    Inferred: `takl'
     In an equation for function `c': `c z = z'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail003.stderr b/ghc/tests/typecheck/should_fail/tcfail003.stderr
index 8b9128c..0d60923 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail003.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail003.stderr
@@ -2,5 +2,4 @@
 tcfail003.hs:3: No instance for: `PrelBase.Num PrelBase.Char'
     arising from the literal 1 at tcfail003.hs:3
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail004.stderr b/ghc/tests/typecheck/should_fail/tcfail004.stderr
index 80f2006..e89c848 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail004.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail004.stderr
@@ -1,9 +1,8 @@
  
 tcfail004.hs:3: Couldn't match the type
-                   `PrelTup.(,,) taS7' against `PrelTup.(,)'
-    Expected: `(taS7, taS9, taSb)'
-    Inferred: `(taS1, taS4)'
+                   `PrelTup.(,,) taSf' against `PrelTup.(,)'
+    Expected: `(taSf, taSh, taSj)'
+    Inferred: `(taS9, taSc)'
     In a pattern binding: `(f, g) = (1, 2, 3)'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail005.stderr b/ghc/tests/typecheck/should_fail/tcfail005.stderr
index bbadcad..4b84b4c 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail005.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail005.stderr
@@ -1,9 +1,8 @@
  
 tcfail005.hs:3: Couldn't match the type
-                   `PrelTup.(,) taRl' against `PrelBase.[]'
-    Expected: `(taRl, taRn)'
-    Inferred: `[taRh]'
+                   `PrelTup.(,) taRt' against `PrelBase.[]'
+    Expected: `(taRt, taRv)'
+    Inferred: `[taRp]'
     In a pattern binding: `(h PrelBase.: i) = (1, ('a'))'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail006.stderr b/ghc/tests/typecheck/should_fail/tcfail006.stderr
index 8ec9dda..adc03d6 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail006.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail006.stderr
@@ -2,5 +2,4 @@
 tcfail006.hs:4: No instance for: `PrelBase.Num PrelBase.Bool'
     arising from the literal 1 at tcfail006.hs:4
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail007.stderr b/ghc/tests/typecheck/should_fail/tcfail007.stderr
index 070501c..9cbed26 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail007.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail007.stderr
@@ -2,5 +2,4 @@
 tcfail007.hs:4: No instance for: `PrelBase.Num PrelBase.Bool'
     arising from use of `PrelBase.+' at tcfail007.hs:4
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail008.stderr b/ghc/tests/typecheck/should_fail/tcfail008.stderr
index f392870..b0e401c 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail008.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail008.stderr
@@ -1,12 +1,11 @@
  
-tcfail008.hs:3: No instance for: `PrelBase.Num [taBM]'
+tcfail008.hs:3: No instance for: `PrelBase.Num [taBU]'
     arising from the literal 2 at tcfail008.hs:3
  
-tcfail008.hs:3: No instance for: `PrelBase.Num [taBM]'
+tcfail008.hs:3: No instance for: `PrelBase.Num [taBU]'
     arising from the literal 2 at tcfail008.hs:3
  
 tcfail008.hs:3: No instance for: `PrelBase.Num [PrelBase.Int]'
     arising from the literal 2 at tcfail008.hs:3
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail009.stderr b/ghc/tests/typecheck/should_fail/tcfail009.stderr
index 1f4d4b2..212a966 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail009.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail009.stderr
@@ -5,5 +5,4 @@ tcfail009.hs:3: Couldn't match the type
     Inferred: `PrelBase.Int'
     In an expression with a type signature: `2 :: PrelBase.Integer'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail010.stderr b/ghc/tests/typecheck/should_fail/tcfail010.stderr
index d707740..fe1e652 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail010.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail010.stderr
@@ -1,9 +1,8 @@
  
-tcfail010.hs:3: No instance for: `PrelBase.Num [taBS]'
+tcfail010.hs:3: No instance for: `PrelBase.Num [taC3]'
     arising from use of `PrelBase.+' at tcfail010.hs:3
  
-tcfail010.hs:3: No instance for: `PrelBase.Num [taBS]'
+tcfail010.hs:3: No instance for: `PrelBase.Num [taC3]'
     arising from use of `PrelBase.+' at tcfail010.hs:3
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail011.stderr b/ghc/tests/typecheck/should_fail/tcfail011.stderr
index 6367312..56d927f 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail011.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail011.stderr
@@ -1,5 +1,4 @@
  
 tcfail011.hs:3: Value not in scope: `y'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail012.stderr b/ghc/tests/typecheck/should_fail/tcfail012.stderr
index a6a4f8b..017841b 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail012.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail012.stderr
@@ -1,9 +1,8 @@
  
 tcfail012.hs:3: Couldn't match the type
-                   `[tak1]' against `PrelBase.Bool'
-    Expected: `[tak1]'
+                   `[tak5]' against `PrelBase.Bool'
+    Expected: `[tak5]'
     Inferred: `PrelBase.Bool'
     In a pattern binding: `PrelBase.True = PrelBase.[]'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail013.stderr b/ghc/tests/typecheck/should_fail/tcfail013.stderr
index 2907a74..4bbf2b1 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail013.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail013.stderr
@@ -1,9 +1,8 @@
  
 tcfail013.hs:4: Couldn't match the type
-                   `[taBQ]' against `PrelBase.Bool'
+                   `[taC0]' against `PrelBase.Bool'
     Expected: `PrelBase.Bool'
-    Inferred: `[taBQ]'
+    Inferred: `[taC0]'
     In an equation for function `f': `f PrelBase.True = 2'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail014.stderr b/ghc/tests/typecheck/should_fail/tcfail014.stderr
index 993aef6..b4ed254 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail014.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail014.stderr
@@ -1,8 +1,8 @@
  
 tcfail014.hs:5: Cannot construct the infinite type (occur check)
-                   `oaCj' = `oaCj -> oaCi'
-    Expected: `oaCj -> oaCi'
-    Inferred: `oaCj'
+                   `oaCu' = `oaCu -> oaCw'
+    Expected: `oaCu -> oaCw'
+    Inferred: `oaCu'
     In an equation for function `h': `h z = z z'
     In an equation for function `g':
        `g y
@@ -18,8 +18,7 @@ tcfail014.hs:5: Cannot construct the infinite type (occur check)
                 where
                     h z = z z'
  
-tcfail014.hs:5: No instance for: `PrelBase.Num (taCG -> taCI)'
+tcfail014.hs:5: No instance for: `PrelBase.Num (taCQ -> taCS)'
     arising from use of `PrelBase.+' at tcfail014.hs:5
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail015.stderr b/ghc/tests/typecheck/should_fail/tcfail015.stderr
index 719e366..554045b 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail015.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail015.stderr
@@ -2,5 +2,4 @@
 tcfail015.hs:7: No instance for: `PrelBase.Num PrelBase.Bool'
     arising from the literal 2 at tcfail015.hs:7
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail016.stderr b/ghc/tests/typecheck/should_fail/tcfail016.stderr
index 196761a..71fb52b 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail016.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail016.stderr
@@ -1,10 +1,9 @@
  
 tcfail016.hs:9: Couldn't match the type
-                   `Expr' against `PrelTup.(,) taRx'
-    Expected: `AnnExpr taRx'
-    Inferred: `Expr taRx'
+                   `Expr' against `PrelTup.(,) taRG'
+    Expected: `AnnExpr taRG'
+    Inferred: `Expr taRG'
     In an equation for function `g':
        `g (App e1 e2) = (g e1) PrelBase.++ (g e2)'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail017.stderr b/ghc/tests/typecheck/should_fail/tcfail017.stderr
index 3e61ca5..13becd1 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail017.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail017.stderr
@@ -1,7 +1,6 @@
  
-tcfail017.hs:11: No instance for: `C [takH]'
+tcfail017.hs:11: No instance for: `C [takL]'
     arising from an instance declaration at tcfail017.hs:11
     When checking superclass constraints of an instance declaration
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail018.stderr b/ghc/tests/typecheck/should_fail/tcfail018.stderr
index bbfa188..f23ff10 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail018.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail018.stderr
@@ -1,9 +1,8 @@
  
-tcfail018.hs:5: No instance for: `PrelBase.Num [taBO]'
+tcfail018.hs:5: No instance for: `PrelBase.Num [taBW]'
     arising from the literal 1 at tcfail018.hs:5
  
-tcfail018.hs:5: No instance for: `PrelBase.Num [taBO]'
+tcfail018.hs:5: No instance for: `PrelBase.Num [taBW]'
     arising from the literal 1 at tcfail018.hs:5
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail019.stderr b/ghc/tests/typecheck/should_fail/tcfail019.stderr
index 5862a64..c4534e6 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail019.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail019.stderr
@@ -1,19 +1,18 @@
  
-tcfail019.hs:20: No instance for: `B [tale]'
+tcfail019.hs:20: No instance for: `B [tali]'
     arising from an instance declaration at tcfail019.hs:20
     When checking methods of an instance declaration
  
-tcfail019.hs:20: No instance for: `C [tale]'
+tcfail019.hs:20: No instance for: `C [tali]'
     arising from an instance declaration at tcfail019.hs:20
     When checking methods of an instance declaration
  
-tcfail019.hs:20: No instance for: `B [tale]'
+tcfail019.hs:20: No instance for: `B [tali]'
     arising from an instance declaration at tcfail019.hs:20
     When checking superclass constraints of an instance declaration
  
-tcfail019.hs:20: No instance for: `C [tale]'
+tcfail019.hs:20: No instance for: `C [tali]'
     arising from an instance declaration at tcfail019.hs:20
     When checking superclass constraints of an instance declaration
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail020.stderr b/ghc/tests/typecheck/should_fail/tcfail020.stderr
index d6c26e4..cad885a 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail020.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail020.stderr
@@ -1,7 +1,6 @@
  
-tcfail020.hs:12: No instance for: `A [taBD]'
+tcfail020.hs:12: No instance for: `A [taBL]'
     arising from an instance declaration at tcfail020.hs:12
     When checking superclass constraints of an instance declaration
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail021.stderr b/ghc/tests/typecheck/should_fail/tcfail021.stderr
index 08702aa..85e52d3 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail021.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail021.stderr
@@ -3,5 +3,4 @@ tcfail021.hs:8:
     Can't handle multiple methods defined by one pattern binding
        `(==, /=) = (\ x -> \ y -> True, (\ x -> \ y -> False))'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail023.stderr b/ghc/tests/typecheck/should_fail/tcfail023.stderr
index 3b73a64..6451879 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail023.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail023.stderr
@@ -2,6 +2,12 @@
 tcfail023.hs:2: Duplicate or overlapping instance declarations
     for `A B' at tcfail023.hs:8 and tcfail023.hs:11
  
+tcfail023.hs:2: Duplicate or overlapping instance declarations
+    for `A B' at tcfail023.hs:8 and tcfail023.hs:11
+ 
+tcfail023.hs:2: Duplicate or overlapping instance declarations
+    for `A B' at tcfail023.hs:8 and tcfail023.hs:11
+ 
 tcfail023.hs:11: Couldn't match the type
                     `PrelBase.Bool' against `B'
     Expected: `PrelBase.Bool'
@@ -15,5 +21,4 @@ tcfail023.hs:8: Couldn't match the type `PrelBase.Bool' against `B'
  
 tcfail023.hs:2: Module Main must include a definition for `Main.main'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail027.stderr b/ghc/tests/typecheck/should_fail/tcfail027.stderr
index 617dd4b..a6f1b97 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail027.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail027.stderr
@@ -3,5 +3,4 @@ tcfail027.hs:3: Cycle in class declarations ...
                    `A' tcfail027.hs:4
                    `B' tcfail027.hs:7
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail028.stderr b/ghc/tests/typecheck/should_fail/tcfail028.stderr
index a58a80d..1f259fa 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail028.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail028.stderr
@@ -1,7 +1,6 @@
  
-tcfail028.hs:4: Couldn't match the kind `ka2551 -> *' against `*'
-    When unifying two kinds `ka2551 -> *' and `*'
+tcfail028.hs:4: Couldn't match the kind `ka2559 -> *' against `*'
+    When unifying two kinds `ka2559 -> *' and `*'
     In the data declaration for `A'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail029.stderr b/ghc/tests/typecheck/should_fail/tcfail029.stderr
index a431a65..b068961 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail029.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail029.stderr
@@ -2,5 +2,4 @@
 tcfail029.hs:6: No instance for: `PrelBase.Ord Foo'
     arising from use of `PrelBase.>' at tcfail029.hs:6
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail030.stderr b/ghc/tests/typecheck/should_fail/tcfail030.stderr
index 3dbe460..9feab77 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail030.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail030.stderr
@@ -1,5 +1,4 @@
  
 tcfail030.hs:0: Module Main must include a definition for `Main.main'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail031.stderr b/ghc/tests/typecheck/should_fail/tcfail031.stderr
index 2f528f6..7fd3b04 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail031.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail031.stderr
@@ -6,5 +6,4 @@ tcfail031.hs:3: Couldn't match the type
     In the predicate expression `'a''
     In an equation for function `f': `f x = if 'a' then 1 else 2'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail032.stderr b/ghc/tests/typecheck/should_fail/tcfail032.stderr
index 3048623..41a51e5 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail032.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail032.stderr
@@ -1,9 +1,8 @@
  
 tcfail032.hs:14: A type signature is more polymorphic than the inferred type
-                    Can't for-all the type variable(s) `taAO'
-                    in the inferred type `taAO -> PrelBase.Int'
+                    Can't for-all the type variable(s) `taAX'
+                    in the inferred type `taAX -> PrelBase.Int'
     In an expression with a type signature:
        `x :: _forall_ [a] (PrelBase.Eq a) => a -> PrelBase.Int'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail033.stderr b/ghc/tests/typecheck/should_fail/tcfail033.stderr
index 4e664ee..505c942 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail033.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail033.stderr
@@ -1,9 +1,8 @@
  
 tcfail033.hs:4: Cannot construct the infinite type (occur check)
-                   `taGA' = `(taGA, taGD)'
-    Expected: `aaGF taGA'
-    Inferred: `aaGF (taGA, taGD)'
+                   `taGE' = `(taGE, taGH)'
+    Expected: `aaGJ taGE'
+    Inferred: `aaGJ (taGE, taGH)'
     In a pattern binding: `buglet = [x | (x, y) <- buglet]'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail034.stderr b/ghc/tests/typecheck/should_fail/tcfail034.stderr
index 783c4d6..10f3972 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail034.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail034.stderr
@@ -1,8 +1,7 @@
  
-tcfail034.hs:13: Context `{PrelNum.Integral taTY}'
+tcfail034.hs:13: Context `{PrelNum.Integral taU6}'
                     required by inferred type, but missing on a type signature
-                    `PrelNum.Integral taTY' arising from use of `PrelNum.mod' at tcfail034.hs:17
+                    `PrelNum.Integral taU6' arising from use of `PrelNum.mod' at tcfail034.hs:17
     When checking signature(s) for: `test'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail035.stderr b/ghc/tests/typecheck/should_fail/tcfail035.stderr
index d1cc374..c5b3cdb 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail035.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail035.stderr
@@ -1,7 +1,4 @@
  
-tcfail035.hs:3: Duplicate or overlapping instance declarations
-    for `PrelBase.Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
- 
 tcfail035.hs:9: No explicit method nor default method for `PrelBase.showsPrec'
                in an instance declaration for `PrelBase.Show'
  
@@ -43,5 +40,30 @@ tcfail035.hs:6: No explicit method nor default method for `PrelBase.signum'
  
 tcfail035.hs:6: No explicit method nor default method for `PrelBase.fromInteger'
                in an instance declaration for `PrelBase.Num'
+ 
+tcfail035.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
+ 
+tcfail035.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
+ 
+tcfail035.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Num NUM' at tcfail035.hs:6 and tcfail035.hs:7
+ 
+tcfail035.hs:7: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail035.hs:7
+    When checking methods of an instance declaration
+ 
+tcfail035.hs:7: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail035.hs:7
+    When checking superclass constraints of an instance declaration
+ 
+tcfail035.hs:6: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail035.hs:6
+    When checking methods of an instance declaration
+ 
+tcfail035.hs:6: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail035.hs:6
+    When checking superclass constraints of an instance declaration
 
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail036.stderr b/ghc/tests/typecheck/should_fail/tcfail036.stderr
index 8fdfea4..8b34ed7 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail036.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail036.stderr
@@ -1,9 +1,48 @@
  
+tcfail036.hs:8: No explicit method nor default method for `PrelBase.+'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:8: No explicit method nor default method for `PrelBase.*'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:8: No explicit method nor default method for `PrelBase.negate'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:8: No explicit method nor default method for `PrelBase.abs'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:8: No explicit method nor default method for `PrelBase.signum'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:8: No explicit method nor default method for `PrelBase.fromInteger'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:7: No explicit method nor default method for `PrelBase.*'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:7: No explicit method nor default method for `PrelBase.negate'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:7: No explicit method nor default method for `PrelBase.abs'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:7: No explicit method nor default method for `PrelBase.signum'
+               in an instance declaration for `PrelBase.Num'
+ 
+tcfail036.hs:7: No explicit method nor default method for `PrelBase.fromInteger'
+               in an instance declaration for `PrelBase.Num'
+ 
 tcfail036.hs:9: Class used as a type constructor: `PrelBase.Num'
  
 tcfail036.hs:3: Duplicate or overlapping instance declarations
     for `PrelBase.Num NUM' at tcfail036.hs:7 and tcfail036.hs:8
  
+tcfail036.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Num NUM' at tcfail036.hs:7 and tcfail036.hs:8
+ 
+tcfail036.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Num NUM' at tcfail036.hs:7 and tcfail036.hs:8
+ 
 tcfail036.hs:8: No instance for: `PrelBase.Eq NUM'
     arising from an instance declaration at tcfail036.hs:8
     When checking methods of an instance declaration
@@ -12,6 +51,10 @@ tcfail036.hs:8: No instance for: `PrelBase.Show NUM'
     arising from an instance declaration at tcfail036.hs:8
     When checking methods of an instance declaration
  
+tcfail036.hs:8: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail036.hs:8
+    When checking methods of an instance declaration
+ 
 tcfail036.hs:8: No instance for: `PrelBase.Eq NUM'
     arising from an instance declaration at tcfail036.hs:8
     When checking superclass constraints of an instance declaration
@@ -20,6 +63,10 @@ tcfail036.hs:8: No instance for: `PrelBase.Show NUM'
     arising from an instance declaration at tcfail036.hs:8
     When checking superclass constraints of an instance declaration
  
+tcfail036.hs:8: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail036.hs:8
+    When checking superclass constraints of an instance declaration
+ 
 tcfail036.hs:7: No instance for: `PrelBase.Eq NUM'
     arising from an instance declaration at tcfail036.hs:7
     When checking methods of an instance declaration
@@ -28,6 +75,10 @@ tcfail036.hs:7: No instance for: `PrelBase.Show NUM'
     arising from an instance declaration at tcfail036.hs:7
     When checking methods of an instance declaration
  
+tcfail036.hs:7: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail036.hs:7
+    When checking methods of an instance declaration
+ 
 tcfail036.hs:7: No instance for: `PrelBase.Eq NUM'
     arising from an instance declaration at tcfail036.hs:7
     When checking superclass constraints of an instance declaration
@@ -36,37 +87,8 @@ tcfail036.hs:7: No instance for: `PrelBase.Show NUM'
     arising from an instance declaration at tcfail036.hs:7
     When checking superclass constraints of an instance declaration
  
-tcfail036.hs:8: No explicit method nor default method for `PrelBase.+'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:8: No explicit method nor default method for `PrelBase.*'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:8: No explicit method nor default method for `PrelBase.negate'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:8: No explicit method nor default method for `PrelBase.abs'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:8: No explicit method nor default method for `PrelBase.signum'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:8: No explicit method nor default method for `PrelBase.fromInteger'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:7: No explicit method nor default method for `PrelBase.*'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:7: No explicit method nor default method for `PrelBase.negate'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:7: No explicit method nor default method for `PrelBase.abs'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:7: No explicit method nor default method for `PrelBase.signum'
-               in an instance declaration for `PrelBase.Num'
- 
-tcfail036.hs:7: No explicit method nor default method for `PrelBase.fromInteger'
-               in an instance declaration for `PrelBase.Num'
+tcfail036.hs:7: No instance for: `PrelBase.Eval NUM'
+    arising from an instance declaration at tcfail036.hs:7
+    When checking superclass constraints of an instance declaration
 
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail037.stderr b/ghc/tests/typecheck/should_fail/tcfail037.stderr
index 17d7580..857681f 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail037.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail037.stderr
@@ -4,5 +4,4 @@ tcfail037.hs:3:
        Imported from Prelude at tcfail037.hs:3
        Defined at tcfail037.hs:10
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail038.stderr b/ghc/tests/typecheck/should_fail/tcfail038.stderr
index 84e74e1..5b8c3e8 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail038.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail038.stderr
@@ -5,5 +5,4 @@ tcfail038.hs:8:
 tcfail038.hs:7:
     Conflicting definitions for `==' in the bindings in an instance declaration
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail039.stderr b/ghc/tests/typecheck/should_fail/tcfail039.stderr
index 497555c..86e1fd8 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail039.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail039.stderr
@@ -4,5 +4,4 @@ tcfail039.hs:3:
        Imported from Prelude at tcfail039.hs:3
        Defined at tcfail039.hs:7
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail040.stderr b/ghc/tests/typecheck/should_fail/tcfail040.stderr
index 4ca6097..9bdf273 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail040.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail040.stderr
@@ -1,6 +1,5 @@
  
-tcfail040.hs:3: Ambiguous context `{ORD taBH}'
-                   `ORD taBH' arising from use of `<<' at tcfail040.hs:19
-
+tcfail040.hs:3: Ambiguous context `{ORD taBP}'
+                   `ORD taBP' arising from use of `<<' at tcfail040.hs:19
 
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail042.stderr b/ghc/tests/typecheck/should_fail/tcfail042.stderr
index d7de5bd..9b822e2 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail042.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail042.stderr
@@ -1,10 +1,9 @@
  
-tcfail042.hs:16: Context `{PrelBase.Num taHz}'
+tcfail042.hs:16: Context `{PrelBase.Num taHH}'
                     required by inferred type, but missing on a type signature
-                    `PrelBase.Num taHz' arising from an instance declaration at tcfail042.hs:16
+                    `PrelBase.Num taHH' arising from an instance declaration at tcfail042.hs:16
     When checking superclass constraints of an instance declaration
  
 tcfail042.hs:4: Module Main must include a definition for `Main.main'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail043.stderr b/ghc/tests/typecheck/should_fail/tcfail043.stderr
index ad7df72..db1353d 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail043.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail043.stderr
@@ -9,5 +9,4 @@ tcfail043.hs:16:
        Imported from Prelude at tcfail043.hs:16
        Defined at tcfail043.hs:57
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail044.stderr b/ghc/tests/typecheck/should_fail/tcfail044.stderr
index 6971308..07e4b0b 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail044.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail044.stderr
@@ -11,5 +11,4 @@ tcfail044.hs:20: No instance for: `PrelBase.Num (PrelBase.Float
                                                 -> PrelBase.Float)'
     arising from use of `PrelBase.+' at tcfail044.hs:20
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail045.stderr b/ghc/tests/typecheck/should_fail/tcfail045.stderr
index d2920bd..aab4038 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail045.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail045.stderr
@@ -1,5 +1,4 @@
  
 tcfail045.hs:10: Type constructor or class not in scope: `PrimIO'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail046.stderr b/ghc/tests/typecheck/should_fail/tcfail046.stderr
index 1d2c87d..7c9e941 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail046.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail046.stderr
@@ -1,19 +1,14 @@
  
-tcfail046.hs:4: No instance for `PrelBase.Eq Process a'
+tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
+    When deriving classes for `Message'
  
-tcfail046.hs:4: No instance for `PrelBase.Eq Process a'
+tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
+    When deriving classes for `Continuation'
  
-tcfail046.hs:4: No instance for `PrelBase.Eq Process a'
+tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
+    When deriving classes for `Message'
  
-tcfail046.hs:4: No instance for `PrelBase.Eq Process a'
- 
-tcfail046.hs:15: No instance for: `PrelBase.Eq (Process taW3)'
-    arising from use of `PrelBase.==' at tcfail046.hs:15
-    When checking methods of an instance declaration
- 
-tcfail046.hs:23: No instance for: `PrelBase.Eq (Process taXh)'
-    arising from use of `PrelBase.==' at tcfail046.hs:23
-    When checking methods of an instance declaration
-
+tcfail046.hs:4: No instance for: `PrelBase.Eq (Process a)'
+    When deriving classes for `Continuation'
 
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail047.stderr b/ghc/tests/typecheck/should_fail/tcfail047.stderr
index 0e001d3..1ef8be5 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail047.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail047.stderr
@@ -5,5 +5,4 @@ tcfail047.hs:6: The type
  
 tcfail047.hs:2: Module Main must include a definition for `Main.main'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail048.stderr b/ghc/tests/typecheck/should_fail/tcfail048.stderr
index fd7bc0b..79f5db2 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail048.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail048.stderr
@@ -1,5 +1,4 @@
  
 tcfail048.hs:4: Type constructor or class not in scope: `B'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail049.stderr b/ghc/tests/typecheck/should_fail/tcfail049.stderr
index 972ab29..2876a84 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail049.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail049.stderr
@@ -1,5 +1,4 @@
  
 tcfail049.hs:3: Value not in scope: `g'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail050.stderr b/ghc/tests/typecheck/should_fail/tcfail050.stderr
index e468e08..b7c7be2 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail050.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail050.stderr
@@ -1,5 +1,4 @@
  
 tcfail050.hs:3: Data constructor not in scope: `B'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail051.stderr b/ghc/tests/typecheck/should_fail/tcfail051.stderr
index 9f4e645..fe2120f 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail051.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail051.stderr
@@ -1,5 +1,4 @@
  
 tcfail051.hs:4: Type constructor or class not in scope: `B'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail052.stderr b/ghc/tests/typecheck/should_fail/tcfail052.stderr
index 8f15089..dd169a9 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail052.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail052.stderr
@@ -1,5 +1,4 @@
  
 tcfail052.hs:4: Type variable not in scope: `c'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail053.stderr b/ghc/tests/typecheck/should_fail/tcfail053.stderr
index 6c9d899..b6a0499 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail053.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail053.stderr
@@ -1,5 +1,4 @@
  
 tcfail053.hs:3: Type constructor or class not in scope: `A'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail054.stderr b/ghc/tests/typecheck/should_fail/tcfail054.stderr
index a2dc363..6ac1fee 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail054.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail054.stderr
@@ -1,5 +1,4 @@
  
 tcfail054.hs:3: Data constructor not in scope: `B'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail055.stderr b/ghc/tests/typecheck/should_fail/tcfail055.stderr
index 85c3b77..c3987fb 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail055.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail055.stderr
@@ -1,10 +1,9 @@
  
 tcfail055.hs:3: Couldn't match the type
-                   `PrelBase.Float' against `PrelBase.Int'
+                   `PrelBase.Int' against `PrelBase.Float'
     Expected: `PrelBase.Int'
     Inferred: `PrelBase.Float'
     In an expression with a type signature:
        `x PrelBase.+ 1 :: PrelBase.Int'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail056.stderr b/ghc/tests/typecheck/should_fail/tcfail056.stderr
index 7939827..472e425 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail056.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail056.stderr
@@ -1,10 +1,16 @@
  
+tcfail056.hs:10: No explicit method nor default method for `PrelBase.=='
+                in an instance declaration for `PrelBase.Eq'
+ 
 tcfail056.hs:1: Duplicate or overlapping instance declarations
     for `PrelBase.Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
  
-tcfail056.hs:10: Class `PrelBase.Eq' does not have a method `<='
+tcfail056.hs:1: Duplicate or overlapping instance declarations
+    for `PrelBase.Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
  
-tcfail056.hs:10: No explicit method nor default method for `PrelBase.=='
-                in an instance declaration for `PrelBase.Eq'
+tcfail056.hs:1: Duplicate or overlapping instance declarations
+    for `PrelBase.Eq Foo' at tcfail056.hs:6 and tcfail056.hs:10
+ 
+tcfail056.hs:10: Class `PrelBase.Eq' does not have a method `<='
 
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail057.stderr b/ghc/tests/typecheck/should_fail/tcfail057.stderr
index 96199e7..afa3763 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail057.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail057.stderr
@@ -1,5 +1,4 @@
  
 tcfail057.hs:5: Class used as a type constructor: `PrelNum.RealFrac'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail058.stderr b/ghc/tests/typecheck/should_fail/tcfail058.stderr
index d771e0e..89073ed 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail058.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail058.stderr
@@ -1,5 +1,4 @@
  
 tcfail058.hs:6: Type constructor used as a class: `ArrBase.Array'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail061.stderr b/ghc/tests/typecheck/should_fail/tcfail061.stderr
index bf03794..ce06645 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail061.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail061.stderr
@@ -7,5 +7,4 @@ tcfail061.hs:5: Type variable not in scope: `b'
  
 tcfail061.hs:5: Type variable not in scope: `b'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail062.stderr b/ghc/tests/typecheck/should_fail/tcfail062.stderr
index 7cffa7b..a7e622e 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail062.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail062.stderr
@@ -5,5 +5,4 @@ tcfail062.hs:33:
 tcfail062.hs:33:
     Type variable not in scope: `behaviouralExpression'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail064.stderr b/ghc/tests/typecheck/should_fail/tcfail064.stderr
index 1709a47..dde7f8b 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail064.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail064.stderr
@@ -1,5 +1,4 @@
  
 tcfail064.hs:0: Module Main must include a definition for `Main.main'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail065.stderr b/ghc/tests/typecheck/should_fail/tcfail065.stderr
index 1168708..7e1ca9b 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail065.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail065.stderr
@@ -1,8 +1,7 @@
  
 tcfail065.hs:29: A type signature is more polymorphic than the inferred type
-                    Can't for-all the type variable(s) `taI7'
-                    in the inferred type `taI7 -> X taI7 -> X taI7'
+                    Can't for-all the type variable(s) `taIg'
+                    in the inferred type `taIg -> X taIg -> X taIg'
     When checking signature for `setX'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail067.stderr b/ghc/tests/typecheck/should_fail/tcfail067.stderr
index 9e754a2..8a61b77 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail067.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail067.stderr
@@ -1,18 +1,18 @@
  
-tcfail067.hs:1: Context `{PrelBase.Ord ta179}'
-                   required by inferred type, but missing on a type signature
-                   `PrelBase.Ord ta179' arising from use of `SubRange' at tcfail067.hs:76
-    When checking signature(s) for: `numSubRangeBinOp'
- 
-tcfail067.hs:65: Context `{PrelBase.Ord ta18O}'
-                    required by inferred type, but missing on a type signature
-                    `PrelBase.Ord ta18O' arising from use of `numSubRangeNegate' at tcfail067.hs:61
-    When checking methods of an instance declaration
- 
 tcfail067.hs:65: No explicit method nor default method for `PrelBase.abs'
                 in an instance declaration for `PrelBase.Num'
  
 tcfail067.hs:65: No explicit method nor default method for `PrelBase.signum'
                 in an instance declaration for `PrelBase.Num'
+ 
+tcfail067.hs:1: Context `{PrelBase.Ord ta174}'
+                   required by inferred type, but missing on a type signature
+                   `PrelBase.Ord ta174' arising from use of `SubRange' at tcfail067.hs:76
+    When checking signature(s) for: `numSubRangeBinOp'
+ 
+tcfail067.hs:65: Context `{PrelBase.Ord ta18F}'
+                    required by inferred type, but missing on a type signature
+                    `PrelBase.Ord ta18F' arising from use of `numSubRangeNegate' at tcfail067.hs:61
+    When checking methods of an instance declaration
 
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail068.stderr b/ghc/tests/typecheck/should_fail/tcfail068.stderr
index 26dc356..d69518f 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail068.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail068.stderr
@@ -40,5 +40,4 @@ tcfail068.hs:42: Value not in scope: `seqStrictlyST'
  
 tcfail068.hs:41: Value not in scope: `thenStrictlyST'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail069.stderr b/ghc/tests/typecheck/should_fail/tcfail069.stderr
index 03413b8..290c009 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail069.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail069.stderr
@@ -1,7 +1,7 @@
  
 tcfail069.hs:21: Couldn't match the type
-                    `PrelTup.(,) taCl' against `PrelBase.[]'
-    Expected: `[taCp]'
+                    `PrelTup.(,) taCp' against `PrelBase.[]'
+    Expected: `[taCt]'
     Inferred: `([PrelBase.Int], [PrelBase.Int])'
     In a "case" branch: `PrelBase.[]' -> `IOBase.error "foo"'
     In the case expression
@@ -13,5 +13,4 @@ tcfail069.hs:21: Couldn't match the type
                      list2 = ds
                      list1 = ds'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail070.stderr b/ghc/tests/typecheck/should_fail/tcfail070.stderr
index 7083356..13ee2e2 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail070.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail070.stderr
@@ -1,7 +1,6 @@
  
-tcfail070.hs:13: Couldn't match the kind `*' against `* -> ka1932'
-    When unifying two kinds `*' and `* -> ka1932'
+tcfail070.hs:13: Couldn't match the kind `*' against `* -> ka1936'
+    When unifying two kinds `*' and `* -> ka1936'
     In the type declaration for `State'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail071.stderr b/ghc/tests/typecheck/should_fail/tcfail071.stderr
index afc1de8..9681c40 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail071.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail071.stderr
@@ -1,8 +1,8 @@
  
 tcfail071.hs:10: Couldn't match the signature/existential type variable
-                    `taCS' with the type `taD6 -> taD3 -> taD3'
-    Expected: `taCS'
-    Inferred: `taD6 -> taD3 -> taD3'
+                    `taD0' with the type `taDe -> taDb -> taDb'
+    Expected: `taD0'
+    Inferred: `taDe -> taDb -> taDb'
     In a pattern binding:
        `p = PrelBase.foldr (f c) PrelBase.[] PrelBase.[]'
     In an equation for function `g':
@@ -15,5 +15,4 @@ tcfail071.hs:8: Mismatched contexts
     When matching the contexts of the signatures for `f' and `g'
        (the signature contexts in a mutually recursive group should all be identical)
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail072.stderr b/ghc/tests/typecheck/should_fail/tcfail072.stderr
index 0b9ed10..08d5d5a 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail072.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail072.stderr
@@ -1,7 +1,6 @@
  
-tcfail072.hs:17: Ambiguous context `{PrelBase.Ord taDf}'
-                    `PrelBase.Ord taDf' arising from use of `g' at tcfail072.hs:23
+tcfail072.hs:17: Ambiguous context `{PrelBase.Ord taDn}'
+                    `PrelBase.Ord taDn' arising from use of `g' at tcfail072.hs:23
     When checking signature(s) for: `g'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail073.stderr b/ghc/tests/typecheck/should_fail/tcfail073.stderr
index b2a9cb7..3c43c91 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail073.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail073.stderr
@@ -2,10 +2,15 @@
 tcfail073.hs:3: Duplicate or overlapping instance declarations
     for `PrelBase.Eq (a, b)' at tcfail073.hs:8 and <NoSrcLoc>
  
-tcfail073.hs:8: Context `{PrelBase.Eq taQT}'
+tcfail073.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Eq (a, b)' at tcfail073.hs:8 and <NoSrcLoc>
+ 
+tcfail073.hs:3: Duplicate or overlapping instance declarations
+    for `PrelBase.Eq (a, b)' at tcfail073.hs:8 and <NoSrcLoc>
+ 
+tcfail073.hs:8: Context `{PrelBase.Eq taR4}'
                    required by inferred type, but missing on a type signature
-                   `PrelBase.Eq taQT' arising from use of `PrelBase.==' at tcfail073.hs:8
+                   `PrelBase.Eq taR4' arising from use of `PrelBase.==' at tcfail073.hs:8
     When checking methods of an instance declaration
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail074.stderr b/ghc/tests/typecheck/should_fail/tcfail074.stderr
index 8c0740d..5ee4326 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail074.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail074.stderr
@@ -4,5 +4,4 @@ tcfail074.hs:7:
        Defined at tcfail074.hs:8
        Defined at tcfail074.hs:7
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_fail/tcfail076.stderr b/ghc/tests/typecheck/should_fail/tcfail076.stderr
index c10f44b..f0df276 100644 (file)
--- a/ghc/tests/typecheck/should_fail/tcfail076.stderr
+++ b/ghc/tests/typecheck/should_fail/tcfail076.stderr
@@ -1,12 +1,11 @@
  
 tcfail076.hs:21: A type signature is more polymorphic than the inferred type
-                    Can't for-all the type variable(s) `taCc'
-                    in the inferred type `(taC2 -> aaC1 taCc) -> aaC1 taCc'
+                    Can't for-all the type variable(s) `taCl'
+                    in the inferred type `(taCb -> aaCa taCl) -> aaCa taCl'
     In a polymorphic function argument `(\ cont' -> cont a)'
     In an equation for function `callcc':
        `callcc f
                = KContT (\ cont
                            -> unKContT (f (\ a -> KContT (\ cont' -> cont a))) cont)'
 
-
 Compilation had errors

diff --git a/ghc/tests/typecheck/should_run/Makefile b/ghc/tests/typecheck/should_run/Makefile
index 065ce32..7202fd5 100644 (file)
--- a/ghc/tests/typecheck/should_run/Makefile
+++ b/ghc/tests/typecheck/should_run/Makefile
@@ -3,14 +3,17 @@ include $(TOP)/mk/boilerplate.mk
 
 HS_SRCS = $(wildcard *.hs)
 BINS = $(patsubst %.o,%,$(HS_OBJS))
+RUNTESTS = $(patsubst %,%.run,$(BINS))
 
 SRC_RUNTEST_OPTS += -o1 $*.stdout -o2 $*.stderr -x 0
-HC_OPTS += -noC -dcore-lint
+HC_OPTS += -dcore-lint
 
-all :: $(BINS)
+all :: $(BINS) $(RUNTESTS)
+
+%.run : %
+       $(RUNTEST) $< $(RUNTEST_OPTS)
 
 % : %.o
        $(HC) $(HC_OPTS) $< -o $@
 
-
 include $(TOP)/mk/target.mk

diff --git a/ghc/tests/typecheck/should_run/tcrun001.hs b/ghc/tests/typecheck/should_run/tcrun001.hs
index f45f506..00b4945 100644 (file)
--- a/ghc/tests/typecheck/should_run/tcrun001.hs
+++ b/ghc/tests/typecheck/should_run/tcrun001.hs
@@ -1,6 +1,6 @@
 --!! Test for (->) instances
 
-module ShouldRun where
+module Main where
 
 class Flob k where
   twice :: k a a  -> k a a

diff --git a/ghc/tests/typecheck/should_run/tcrun001.stdout b/ghc/tests/typecheck/should_run/tcrun001.stdout
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/ghc/tests/typecheck/should_run/tcrun001.stdout
@@ -0,0 +1 @@
+4