1 files changed, 71 insertions, 66 deletions

diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index c42c81d0..90f52a55 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -36,13 +36,13 @@ uncurry
     _
     (\(d :: _) (e :: _) -> hlistConsCase
       _
-      (\(f :: _) (g :: _) -> hlistNilCase _ (_rhs (HCons (a d) (HCons (b f) HNil))) g)
+      (\(f :: _) (g :: _) -> hlistNilCase _ (_rhs (a d, b f)) g)
       e)
     c
 
 pi = _rhs 3.141592653589793
 
-zip :: forall (a :: _) (b :: _) . [a] -> [b] -> [HList (a : b : '[])]
+zip :: forall (a :: _) (b :: _) . [a] -> [b] -> [(a, b)]
 zip
   = \(a :: _) (b :: _) -> case'List
     (\_ -> _)
@@ -50,16 +50,15 @@ zip
     (\(c :: _) (d :: _) -> case'List
       (\_ -> _)
       (_rhs [])
-      (\(e :: _) (f :: _) -> _rhs (HCons c (HCons e HNil) : zip d f))
+      (\(e :: _) (f :: _) -> _rhs ((c, e) : zip d f))
       b)
     a
 
-unzip
-  :: forall (a :: _) (b :: _) . [HList (a : b : '[])] -> HList ([a] : [b] : '[])
+unzip :: forall (a :: _) (b :: _) . [(a, b)] -> ([a], [b])
 unzip
   = \(a :: _) -> case'List
     (\_ -> _)
-    (_rhs (HCons [] (HCons [] HNil)))
+    (_rhs ([], []))
     (\(b :: _) (c :: _) -> hlistConsCase
       _
       (\(d :: _) (e :: _) -> hlistConsCase
@@ -67,19 +66,23 @@ unzip
         (\(f :: _) (g :: _) -> hlistNilCase
           _
           (_rhs
-            let h = _rhs (unzip c) in let i
-              = _rhs
-                ((\(j :: _) -> hlistConsCase
-                    _
-                    (\_ (k :: _) -> hlistConsCase _ (\(l :: _) (m :: _) -> hlistNilCase _ l m) k)
-                    j)
-                  h) in let n
-              = _rhs
-                ((\(o :: _) -> hlistConsCase
-                    _
-                    (\(p :: _) (q :: _) -> hlistConsCase _ (\_ (r :: _) -> hlistNilCase _ p r) q)
-                    o)
-                  h) in HCons (d : n) (HCons (f : i) HNil))
+            let
+              h = _rhs (unzip c);
+              i
+                = _rhs
+                  ((\(k :: _) -> hlistConsCase
+                      _
+                      (\_ (l :: _) -> hlistConsCase _ (\(m :: _) (n :: _) -> hlistNilCase _ m n) l)
+                      k)
+                    h);
+              j
+                = _rhs
+                  ((\(o :: _) -> hlistConsCase
+                      _
+                      (\(p :: _) (q :: _) -> hlistConsCase _ (\_ (r :: _) -> hlistNilCase _ p r) q)
+                      o)
+                    h)
+              in (d : j, f : i))
           g)
         e)
       b)
@@ -97,7 +100,7 @@ tail :: forall (a :: _) . [a] -> [a]
 tail
   = \(a :: _) -> case'List (\_ -> _) (_rhs undefined) (\_ (b :: _) -> _rhs b) a
 
-pairs :: forall (a :: _) . [a] -> [HList (a : a : '[])]
+pairs :: forall (a :: _) . [a] -> [(a, a)]
 pairs = \(a :: _) -> _rhs (zip a (tail a))
 
 foldl'
@@ -117,21 +120,25 @@ foldr1
 split
   = \(a :: _) -> case'List
     (\_ -> _)
-    (_rhs (HCons [] (HCons [] HNil)))
+    (_rhs ([], []))
     (\(b :: _) (c :: _) -> _rhs
-      let d = _rhs (split c) in let e
-        = _rhs
-          ((\(f :: _) -> hlistConsCase
-              _
-              (\_ (g :: _) -> hlistConsCase _ (\(h :: _) (i :: _) -> hlistNilCase _ h i) g)
-              f)
-            d) in let j
-        = _rhs
-          ((\(k :: _) -> hlistConsCase
-              _
-              (\(l :: _) (m :: _) -> hlistConsCase _ (\_ (n :: _) -> hlistNilCase _ l n) m)
-              k)
-            d) in HCons (b : e) (HCons j HNil))
+      let
+        d = _rhs (split c);
+        e
+          = _rhs
+            ((\(g :: _) -> hlistConsCase
+                _
+                (\_ (h :: _) -> hlistConsCase _ (\(i :: _) (j :: _) -> hlistNilCase _ i j) h)
+                g)
+              d);
+        f
+          = _rhs
+            ((\(k :: _) -> hlistConsCase
+                _
+                (\(l :: _) (m :: _) -> hlistConsCase _ (\_ (n :: _) -> hlistNilCase _ l n) m)
+                k)
+              d)
+        in (b : e, f))
     a
 
 mergeBy
@@ -158,7 +165,7 @@ sortBy
     (_rhs [])
     (\(c :: _) (d :: _) -> case'List
       (\_ -> _)
-      (_rhs (c : []))
+      (_rhs [c])
       (\_ _ -> _rhs (uncurry (mergeBy a) ((sortBy a *** sortBy a) (split b))))
       d)
     b
@@ -217,7 +224,7 @@ sndTup = _rhs (hlistConsCase (_ :: _) \_ (a :: _) -> a)
 
 project
   :: forall (a :: _) (b :: [RecItem])
-    . forall (c :: String) -> CW (isKeyC c a b) => RecordC b -> a
+    . forall (c :: String) -> isKeyC c a b => RecordC b -> a
 project
   = \ @(a :: _) @(b :: _) (c :: _) @_ (d :: _) -> case'List
     (\_ -> _)
@@ -543,8 +550,12 @@ perspective
   :: Float -> Float -> Float -> Float -> Mat (fromInt 4) (fromInt 4) Float
 perspective
   = \(a :: _) (b :: _) (c :: _) (d :: _) -> _rhs
-    let e = _rhs (a * tan (c / fromInt 2)) in let f = _rhs (fromInt 0 - e) in let g
-      = _rhs (d * e) in let h = _rhs (fromInt 0 - g) in M44F
+    let
+      e = _rhs (a * tan (c / fromInt 2));
+      f = _rhs (fromInt 0 - e);
+      g = _rhs (d * e);
+      h = _rhs (fromInt 0 - g)
+      in M44F
       (V4 (fromInt 2 * a / (g - h)) (fromInt 0) (fromInt 0) (fromInt 0))
       (V4 (fromInt 0) (fromInt 2 * a / (e - f)) (fromInt 0) (fromInt 0))
       (V4
@@ -560,7 +571,7 @@ perspective
 
 rotMatrixZ
   = \(a :: _) -> _rhs
-    let b = _rhs (cos a) in let c = _rhs (sin a) in M44F
+    let b = _rhs (cos a); c = _rhs (sin a) in M44F
       (V4 b c (fromInt 0) (fromInt 0))
       (V4 (fromInt 0 - c) b (fromInt 0) (fromInt 0))
       (V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0))
@@ -568,7 +579,7 @@ rotMatrixZ
 
 rotMatrixY
   = \(a :: _) -> _rhs
-    let b = _rhs (cos a) in let c = _rhs (sin a) in M44F
+    let b = _rhs (cos a); c = _rhs (sin a) in M44F
       (V4 b (fromInt 0) (fromInt 0 - c) (fromInt 0))
       (V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0))
       (V4 c (fromInt 0) b (fromInt 0))
@@ -576,7 +587,7 @@ rotMatrixY
 
 rotMatrixX
   = \(a :: _) -> _rhs
-    let b = _rhs (cos a) in let c = _rhs (sin a) in M44F
+    let b = _rhs (cos a); c = _rhs (sin a) in M44F
       (V4 (fromInt 1) (fromInt 0) (fromInt 0) (fromInt 0))
       (V4 (fromInt 0) b c (fromInt 0))
       (V4 (fromInt 0) (fromInt 0 - c) b (fromInt 0))
@@ -589,15 +600,13 @@ rotationEuler
 translateBefore4 :: Vec (fromInt 3) Float -> Mat (fromInt 4) (fromInt 4) Float
 translateBefore4
   = \(a :: _) -> _rhs
-    let b = _rhs (V4 (fromInt 1) (fromInt 0) (fromInt 0) (fromInt 0)) in let c
-      = _rhs (V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0)) in let d
-      = _rhs (V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0)) in let e
-      = _rhs
-        (V4
-          (swizzscalar a Sx)
-          (swizzscalar a Sy)
-          (swizzscalar a Sz)
-          (fromInt 1)) in M44F b c d e
+    let
+      b = _rhs (V4 (fromInt 1) (fromInt 0) (fromInt 0) (fromInt 0));
+      c = _rhs (V4 (fromInt 0) (fromInt 1) (fromInt 0) (fromInt 0));
+      d = _rhs (V4 (fromInt 0) (fromInt 0) (fromInt 1) (fromInt 0));
+      e
+        = _rhs (V4 (swizzscalar a Sx) (swizzscalar a Sy) (swizzscalar a Sz) (fromInt 1))
+      in M44F b c d e
 
 lookat
   :: Vec (fromInt 3) Float
@@ -605,22 +614,18 @@ lookat
       -> Vec (fromInt 3) Float -> Mat (fromInt 4) (fromInt 4) Float
 lookat
   = \(a :: _) (b :: _) (c :: _) -> _rhs
-    let d
-      = \(e :: _) -> _rhs
-        (V4
-          (swizzscalar e Sx)
-          (swizzscalar e Sy)
-          (swizzscalar e Sz)
-          (fromInt 0)) in let f = _rhs (normalize $ a - b) in let g
-      = _rhs (normalize $ c `cross` f) in let h = _rhs (f `cross` g) in let i
-      = _rhs
-        (transpose
-          $ M44F
-            (d g)
-            (d h)
-            (d f)
-            (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1))) in i
-      .*. translateBefore4 (neg a)
+    let
+      d
+        = \(i :: _) -> _rhs
+          (V4 (swizzscalar i Sx) (swizzscalar i Sy) (swizzscalar i Sz) (fromInt 0));
+      e = _rhs (normalize $ a - b);
+      f = _rhs (normalize $ c `cross` e);
+      g = _rhs (e `cross` f);
+      h
+        = _rhs
+          (transpose
+            $ M44F (d f) (d g) (d e) (V4 (fromInt 0) (fromInt 0) (fromInt 0) (fromInt 1)))
+      in h .*. translateBefore4 (neg a)
 
 scale = \(a :: _) (b :: _) -> _rhs (b * V4 a a a 1.0)