improve pretty print layout & show desugared source code in .out files

50 files changed, 328 insertions, 5 deletions

diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index 3fd03cdf..125ed17a 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+value1 = _rhs True
+value2 = _rhs False
 main is not found
 ------------ trace
 value1 :: Bool
diff --git a/testdata/language-features/basic-values/case01.out b/testdata/language-features/basic-values/case01.out
index 1cbce892..1fc0f7f0 100644
--- a/testdata/language-features/basic-values/case01.out
+++ b/testdata/language-features/basic-values/case01.out
@@ -1,3 +1,10 @@
+------------ desugared source code
+value1 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
+value2 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
+value3 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
+value4 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
+value5 = _rhs ((\(a :: _) -> hlistNilCase (_ :: _) HNil a) HNil)
+value6 = _rhs ((\_ -> HNil) HNil)
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index 974b56da..146ad059 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,3 +1,15 @@
+------------ desugared source code
+value1
+  = _rhs
+    ((\(a :: _) -> 'BoolCase \_ -> _ :: _ HNil HNil (fromInt 1 == a)) (fromInt 1))
+value2
+  = _rhs
+    ((\(a :: _) -> 'BoolCase
+        \_ -> _ :: _
+        ('BoolCase \_ -> _ :: _ "_" "2" (fromInt 2 == a))
+        "1"
+        (fromInt 1 == a))
+      (fromInt 2))
 main is not found
 ------------ trace
 value1 :: forall a . (Eq a, Num a) => ()
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index e77a1024..7b58c84f 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,3 +1,7 @@
+------------ desugared source code
+value
+  = \(a :: _) -> _rhs
+    ((\(b :: _) -> 'BoolCase \_ -> _ :: _ undefined '1' (fromInt 1 == b)) a)
 main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index d2524007..92b5e196 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,3 +1,7 @@
+------------ desugared source code
+value
+  = \(a :: _) -> _rhs
+    ((\(b :: _) -> 'BoolCase \_ -> _ :: _ '_' '1' (fromInt 1 == b)) a)
 main is not found
 ------------ trace
 value :: forall a . (Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index 294c3b86..aa1f0c31 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -1,22 +1,40 @@
+------------ desugared source code
+data A :: Type where
+    B :: A
+    C :: A
+    D :: A
+data E :: Type where
+    F :: E
+    G :: HList 'Nil -> E
+    H :: E
+data D1 :: Type where
+    C1 :: D1
+    C2 :: HList 'Nil -> D1
+    C3 :: D1
 main is not found
 ------------ trace
 'A :: Type
 B :: A
 C :: A
 D :: A
-'ACase :: forall (a :: A -> Type) -> a 'B -> a 'C -> a 'D -> forall (b :: A) -> a b
+'ACase
+  :: forall (a :: A -> Type) -> a 'B -> a 'C -> a 'D -> forall (b :: A) -> a b
 match'A :: forall (a :: Type -> Type) -> a A -> forall b -> a b -> a b
 'E :: Type
 F :: E
 G :: () -> E
 H :: E
-'ECase :: forall (a :: E -> Type) -> a 'F -> (forall (b :: ()) -> a ('G b)) -> a 'H -> forall (c :: E) -> a c
+'ECase
+  :: forall (a :: E -> Type)
+    -> a 'F -> (forall (b :: ()) -> a ('G b)) -> a 'H -> forall (c :: E) -> a c
 match'E :: forall (a :: Type -> Type) -> a E -> forall b -> a b -> a b
 'D1 :: Type
 C1 :: D1
 C2 :: () -> D1
 C3 :: D1
-'D1Case :: forall (a :: D1 -> Type) -> a 'C1 -> (forall (b :: ()) -> a ('C2 b)) -> a 'C3 -> forall (c :: D1) -> a c
+'D1Case
+  :: forall (a :: D1 -> Type)
+    -> a 'C1 -> (forall (b :: ()) -> a ('C2 b)) -> a 'C3 -> forall (c :: D1) -> a c
 match'D1 :: forall (a :: Type -> Type) -> a D1 -> forall b -> a b -> a b
 ------------ tooltips
 testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 712cd657..7519f75e 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,3 +1,7 @@
+------------ desugared source code
+unit = _rhs HNil
+fun1 = \_ -> _rhs (fromInt 1)
+fun2 = \_ -> \_ -> \_ -> \_ -> \_ -> _rhs 'c'
 main is not found
 ------------ trace
 unit :: ()
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index 38bae81f..1dca3720 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,3 +1,10 @@
+------------ desugared source code
+fun
+  = \(a :: _) -> 'BoolCase
+    \_ -> _ :: _
+    ('BoolCase \_ -> _ :: _ (_rhs undefined) (_rhs '2') (fromInt 2 == a))
+    (_rhs '1')
+    (fromInt 1 == a)
 main is not found
 ------------ trace
 fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 977601b2..8c4b3f46 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,3 +1,16 @@
+------------ desugared source code
+fun
+  = \(a :: _) -> 'BoolCase
+    \_ -> _ :: _
+    ('BoolCase \_ -> _ :: _ (_rhs '_') (_rhs '2') (fromInt 2 == a))
+    (_rhs '1')
+    (fromInt 1 == a)
+fun2
+  = \(a :: _) -> \_ -> 'BoolCase
+    \_ -> _ :: _
+    ('BoolCase \_ -> _ :: _ (_rhs '_') (_rhs '2') (fromInt 2 == a))
+    (_rhs '1')
+    (fromInt 1 == a)
 main is not found
 ------------ trace
 fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index 325f4361..be9385d0 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+x = _rhs '1'
+y = _rhs x
 main is not found
 ------------ trace
 x :: Char
diff --git a/testdata/language-features/basic-values/deforder02.out b/testdata/language-features/basic-values/deforder02.out
index 9f79a9bd..b8990ab3 100644
--- a/testdata/language-features/basic-values/deforder02.out
+++ b/testdata/language-features/basic-values/deforder02.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+x = _rhs '1'
+y = _rhs x
 main is not found
 ------------ trace
 x :: Char
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index d98597f6..e6f8794d 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
 value :: Char
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index 5d6e1d80..ec663000 100644
--- a/testdata/language-features/basic-values/deforder04.out
+++ b/testdata/language-features/basic-values/deforder04.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
 value :: Char
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index 73897e36..58a3f0fc 100644
--- a/testdata/language-features/basic-values/deforder05.out
+++ b/testdata/language-features/basic-values/deforder05.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
 value :: Char
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 794432d6..48f45d42 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+value = _rhs \(a := _rhs HNil) (b := _rhs a) -> '1'
 main is not found
 ------------ trace
 value :: Char
diff --git a/testdata/language-features/basic-values/fixity01.out b/testdata/language-features/basic-values/fixity01.out
index f30cd6fa..2274b6a6 100644
--- a/testdata/language-features/basic-values/fixity01.out
+++ b/testdata/language-features/basic-values/fixity01.out
@@ -1,3 +1,12 @@
+------------ desugared source code
+funL = \(a :: _) -> \_ -> _rhs a
+funR = \(a :: _) -> \_ -> _rhs a
+<<<< = \(a :: _) -> \_ -> _rhs a
+>>>> = \_ (a :: _) -> _rhs a
+infixr 7 funL
+infixr 7 <<<<
+infixr 6 >>>>
+infixr 6 funR
 main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index e16184f0..38f4bea0 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -1,3 +1,28 @@
+------------ desugared source code
+funL = \(a :: _) -> \_ -> _rhs a
+funR = \_ (a :: _) -> _rhs a
+<@ = \(a :: _) -> \_ -> _rhs a
+@> = \_ (a :: _) -> _rhs a
+infixr 7 funL
+infixr 7 <@
+infixr 6 @>
+infixr 6 funR
+value1 = _rhs (HNil @> 'c' @> "hi" @> 1.2 :: Float)
+value2 = _rhs (HNil @> 'c' <@ "hi" @> 1.2 :: Float)
+value3 = _rhs (HNil <@ 'c' @> "hi" @> 1.2 :: Float)
+value4 = _rhs (HNil <@ 'c' <@ "hi" @> 1.2 :: Float)
+value5 = _rhs (HNil @> 'c' @> "hi" <@ 1.2 :: String)
+value6 = _rhs (HNil @> 'c' <@ "hi" <@ 1.2 :: Char)
+value7 = _rhs (HNil <@ 'c' @> "hi" <@ 1.2 :: String)
+value8 = _rhs (HNil <@ 'c' <@ "hi" <@ 1.2 :: HList 'Nil)
+funValue1 = _rhs (HNil `funR` 'c' `funR` "hi" `funR` 1.2 :: Float)
+funValue2 = _rhs (HNil `funR` 'c' `funL` "hi" `funR` 1.2 :: Float)
+funValue3 = _rhs (HNil `funL` 'c' `funR` "hi" `funR` 1.2 :: Float)
+funValue4 = _rhs (HNil `funL` 'c' `funL` "hi" `funR` 1.2 :: Float)
+funValue5 = _rhs (HNil `funR` 'c' `funR` "hi" `funL` 1.2 :: String)
+funValue6 = _rhs (HNil `funR` 'c' `funL` "hi" `funL` 1.2 :: Char)
+funValue7 = _rhs (HNil `funL` 'c' `funR` "hi" `funL` 1.2 :: String)
+funValue8 = _rhs (HNil `funL` 'c' `funL` "hi" `funL` 1.2 :: HList 'Nil)
 main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index b68d03e3..1e472faf 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+value1 = _rhs (primIfThenElse True HNil HNil)
+value2 = _rhs (primIfThenElse False 1.0 2.0)
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/indentation01.out b/testdata/language-features/basic-values/indentation01.out
index 3893683c..0540da3c 100644
--- a/testdata/language-features/basic-values/indentation01.out
+++ b/testdata/language-features/basic-values/indentation01.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+tuple1 = _rhs HNil
+tuple2 = _rhs HNil
 main is not found
 ------------ trace
 tuple1 :: ()
diff --git a/testdata/language-features/basic-values/indentation02.out b/testdata/language-features/basic-values/indentation02.out
index c6fd7aad..8fa11e6c 100644
--- a/testdata/language-features/basic-values/indentation02.out
+++ b/testdata/language-features/basic-values/indentation02.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+tuple1 = _rhs HNil
+tuple2 = _rhs HNil
 main is not found
 ------------ trace
 tuple1 :: ()
diff --git a/testdata/language-features/basic-values/infix01.out b/testdata/language-features/basic-values/infix01.out
index 33ab245c..ec2b9ce7 100644
--- a/testdata/language-features/basic-values/infix01.out
+++ b/testdata/language-features/basic-values/infix01.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+fun = \_ -> \_ -> _rhs HNil
+value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
 main is not found
 ------------ trace
 fun :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/infix02.out b/testdata/language-features/basic-values/infix02.out
index 11e17685..2db04d26 100644
--- a/testdata/language-features/basic-values/infix02.out
+++ b/testdata/language-features/basic-values/infix02.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+fun = \_ -> \_ -> \_ -> _rhs HNil
+value = \(a :: _) (b :: _) -> _rhs (a `fun` b)
 main is not found
 ------------ trace
 fun :: forall a b c . a -> b -> c -> ()
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 213d9e06..d089f79d 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -1,9 +1,19 @@
+------------ desugared source code
+data D :: Type where
+    D2 :: HList 'Nil -> HList 'Nil -> D
+    D3 :: HList 'Nil -> HList 'Nil -> HList 'Nil -> D
+d2 = \(a :: _) (b :: _) -> _rhs (a `D2` b)
+d3 = \(a :: _) (b :: _) -> _rhs (a `D3` b)
 main is not found
 ------------ trace
 'D :: Type
 D2 :: () -> () -> D
 D3 :: () -> () -> () -> D
-'DCase :: forall (a :: D -> Type) -> (forall (b :: ()) (c :: ()) -> a ('D2 b c)) -> (forall (d :: ()) (e :: ()) (f :: ()) -> a ('D3 d e f)) -> forall (g :: D) -> a g
+'DCase
+  :: forall (a :: D -> Type)
+    -> (forall (b :: ()) (c :: ()) -> a ('D2 b c))
+      -> (forall (d :: ()) (e :: ()) (f :: ()) -> a ('D3 d e f))
+        -> forall (g :: D) -> a g
 match'D :: forall (a :: Type -> Type) -> a D -> forall b -> a b -> a b
 d2 :: () -> () -> D
 d3 :: () -> () -> () -> D
diff --git a/testdata/language-features/basic-values/lambda01.out b/testdata/language-features/basic-values/lambda01.out
index e2c51312..5d57cdfd 100644
--- a/testdata/language-features/basic-values/lambda01.out
+++ b/testdata/language-features/basic-values/lambda01.out
@@ -1,9 +1,15 @@
+------------ desugared source code
+fun1 = _rhs \_ -> HNil
+fun2 = _rhs \_ -> HNil
+fun3 = _rhs \_ -> HNil
+fun4 = _rhs \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> \_ -> HNil
 main is not found
 ------------ trace
 fun1 :: forall a . a -> ()
 fun2 :: forall a . a -> ()
 fun3 :: forall a . a -> ()
-fun4 :: forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
+fun4
+  :: forall a b c d e f g h i . a -> b -> c -> d -> e -> f -> g -> h -> i -> ()
 ------------ tooltips
 testdata/language-features/basic-values/lambda01.lc 1:1-1:5  forall a . a -> ()
 testdata/language-features/basic-values/lambda01.lc 1:14-1:16  ()
diff --git a/testdata/language-features/basic-values/lambda03.out b/testdata/language-features/basic-values/lambda03.out
index 902fdc98..33988c84 100644
--- a/testdata/language-features/basic-values/lambda03.out
+++ b/testdata/language-features/basic-values/lambda03.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+fun1 = _rhs \_ (a :: _) -> \_ -> a
+fun2 = \(a :: _) -> _rhs \_ -> \_ -> \_ -> a
 main is not found
 ------------ trace
 fun1 :: forall a b c . a -> b -> c -> b
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 36ecf369..24948a10 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,3 +1,9 @@
+------------ desugared source code
+value1 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
+value2 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
+value3 = _rhs \(a := _rhs (fromInt 1)) (b := _rhs 'c') -> fromInt 1
+value4 = _rhs \(a := _rhs (fromInt 1)) -> fromInt 1
+value5 = _rhs \(a := _rhs (fromInt 1)) (b := _rhs (fromInt 2)) -> fromInt 1
 main is not found
 ------------ trace
 value1 :: forall a . Num a => a
diff --git a/testdata/language-features/basic-values/let02.out b/testdata/language-features/basic-values/let02.out
index bee7d640..92afbe41 100644
--- a/testdata/language-features/basic-values/let02.out
+++ b/testdata/language-features/basic-values/let02.out
@@ -1,3 +1,11 @@
+------------ desugared source code
+value
+  = _rhs
+    \(a := _rhs HNil)
+      (b := _rhs \(d := _rhs 'A') -> HNil)
+        (c
+          := _rhs
+            \(e := _rhs HNil) (f := _rhs (fromInt 1)) (g := _rhs "hello") -> 'B') -> HNil
 main is not found
 ------------ trace
 value :: ()
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index abaca3a7..a8328841 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,3 +1,12 @@
+------------ desugared source code
+intValue1 = _rhs (fromInt 0)
+intValue2 = _rhs (fromInt 1)
+intValue3 = _rhs (fromInt 12345)
+floatValue1 = _rhs 2.0
+floatValue2 = _rhs 123400.0
+charValue = _rhs 'A'
+stringValue1 = _rhs "Hello World"
+stringValue2 = _rhs "\nHello World\tagain!\r\n"
 main is not found
 ------------ trace
 intValue1 :: forall a . Num a => a
diff --git a/testdata/language-features/basic-values/operator01.out b/testdata/language-features/basic-values/operator01.out
index 597a3a00..deae312b 100644
--- a/testdata/language-features/basic-values/operator01.out
+++ b/testdata/language-features/basic-values/operator01.out
@@ -1,3 +1,8 @@
+------------ desugared source code
+#$# = \_ -> \_ -> _rhs HNil
+$$# = \_ -> \_ -> _rhs HNil
+$$$# = \_ -> \_ -> _rhs HNil
+$$$ = \_ -> \_ -> _rhs HNil
 main is not found
 ------------ trace
 #$# :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/operator05.out b/testdata/language-features/basic-values/operator05.out
index 30b3fcac..d6ef392d 100644
--- a/testdata/language-features/basic-values/operator05.out
+++ b/testdata/language-features/basic-values/operator05.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+value1 = _rhs \(a := \_ -> \_ -> _rhs HNil) -> a HNil HNil
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/operator06.out b/testdata/language-features/basic-values/operator06.out
index 4fa5381e..0252f155 100644
--- a/testdata/language-features/basic-values/operator06.out
+++ b/testdata/language-features/basic-values/operator06.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+value1 = _rhs \(a := \_ -> \_ -> _rhs HNil) -> a HNil HNil
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 9a8f5f22..6bddb912 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -1,3 +1,15 @@
+------------ desugared source code
+value
+  = _rhs
+    \(a := _rhs 'A')
+      (b := _rhs "hello")
+        (c
+          := _rhs
+            \(d := _rhs (fromInt 1))
+              (e := _rhs 2.12)
+                (f
+                  := _rhs
+                    \(g := _rhs HNil) (h := _rhs 'C') (i := _rhs 3.12) -> "world") -> HNil) -> '7'
 main is not found
 ------------ trace
 value :: Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index d4d4373b..e5eaf957 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,3 +1,19 @@
+------------ desugared source code
+c = _rhs (fromInt 7)
+world = _rhs "world"
+value2
+  = _rhs
+    \(a := _rhs 'A')
+      (b := _rhs "hello")
+        (c := _rhs (fromInt 123))
+          (d
+            := _rhs
+              \(e := _rhs (fromInt 1))
+                (f := _rhs 2.12)
+                  (g
+                    := _rhs
+                      \(h := _rhs HNil)
+                        (i := _rhs 'C') (j := _rhs 3.12) (k := _rhs c) -> world) -> HNil) -> '7'
 main is not found
 ------------ trace
 c :: forall a . Num a => a
diff --git a/testdata/language-features/basic-values/shadowing03.out b/testdata/language-features/basic-values/shadowing03.out
index 23d28466..7c734e30 100644
--- a/testdata/language-features/basic-values/shadowing03.out
+++ b/testdata/language-features/basic-values/shadowing03.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+x = \_ -> \_ -> _rhs HNil
 main is not found
 ------------ trace
 x :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/shadowing04.out b/testdata/language-features/basic-values/shadowing04.out
index 70a54caa..8cd2c778 100644
--- a/testdata/language-features/basic-values/shadowing04.out
+++ b/testdata/language-features/basic-values/shadowing04.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+__ = \_ -> \_ -> _rhs HNil
 main is not found
 ------------ trace
 __ :: forall a b . a -> b -> ()
diff --git a/testdata/language-features/basic-values/tuple01.out b/testdata/language-features/basic-values/tuple01.out
index d3a27511..b1208a3a 100644
--- a/testdata/language-features/basic-values/tuple01.out
+++ b/testdata/language-features/basic-values/tuple01.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+unit = _rhs HNil
 main is not found
 ------------ trace
 unit :: ()
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 4e15f913..0419494e 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,3 +1,9 @@
+------------ desugared source code
+tuple1
+  = _rhs
+    (HCons (fromInt 1) (HCons 2.3 (HCons 'D' (HCons "string" (HCons HNil HNil)))))
+tuple2 = _rhs (HCons HNil (HCons HNil HNil))
+tuple3 = _rhs (HCons (HCons "name" (HCons 'c' HNil)) (HCons HNil HNil))
 main is not found
 ------------ trace
 tuple1 :: forall a . Num a => (a, Float, Char, String, ())
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index c473b40c..491eb5f1 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+value1 = _rhs 'a' :: Char
+value2 = _rhs 'a' :: Char
 main is not found
 ------------ trace
 value1 :: Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index c1e6361e..e7b64644 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,3 +1,6 @@
+------------ desugared source code
+value1 = _rhs ('a' :: Char)
+value2 = _rhs ('a' :: Char)
 main is not found
 ------------ trace
 value1 :: Char
diff --git a/testdata/language-features/basic-values/typesig03.out b/testdata/language-features/basic-values/typesig03.out
index 68d312c9..393824b3 100644
--- a/testdata/language-features/basic-values/typesig03.out
+++ b/testdata/language-features/basic-values/typesig03.out
@@ -1,3 +1,10 @@
+------------ desugared source code
+fun1
+  = (\_ -> \_ -> \_ -> _rhs HNil)
+    :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList 'Nil
+fun2
+  = (\_ -> \_ -> \_ -> _rhs HNil)
+    :: forall (a :: _) (b :: _) (c :: _) . a -> b -> c -> HList 'Nil
 main is not found
 ------------ trace
 fun1 :: forall a b c . a -> b -> c -> ()
diff --git a/testdata/language-features/basic-values/typesig04.out b/testdata/language-features/basic-values/typesig04.out
index 3059a3ac..e6fbc596 100644
--- a/testdata/language-features/basic-values/typesig04.out
+++ b/testdata/language-features/basic-values/typesig04.out
@@ -1,3 +1,10 @@
+------------ desugared source code
+fun1
+  = (\_ -> \_ -> _rhs HNil)
+    :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList 'Nil
+fun2
+  = (\_ -> \_ -> _rhs HNil)
+    :: forall (a :: _) (b :: _) (c :: _) . a -> (b -> c) -> HList 'Nil
 main is not found
 ------------ trace
 fun1 :: forall a b c . a -> (b -> c) -> ()
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index d107f4eb..1f40f653 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -1,3 +1,10 @@
+------------ desugared source code
+funL = \(a :: _) -> \_ -> _rhs a
+funR = \_ (a :: _) -> _rhs a
+value1 = _rhs (funL 'a' "b" :: Char)
+value2 = _rhs (funR 'a' "b" :: String)
+value3 = _rhs (funL 'a' "b") :: Char
+value4 = _rhs (funR 'a' "b") :: String
 main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index c249026f..6c86ce15 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -1,3 +1,8 @@
+------------ desugared source code
+funL = \(a :: _) -> \_ -> _rhs a
+<@ = \(a :: _) -> \_ -> _rhs a
+value1 = _rhs ("hi" <@ 1.2 :: String)
+value2 = _rhs ("hi" `funL` 1.2 :: String)
 main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index 65ce8df7..08742feb 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,3 +1,10 @@
+------------ desugared source code
+value1 = _rhs (fromInt 1) :: Int
+value2 = _rhs (fromInt 2) :: Int
+value3 = _rhs (fromInt 3) :: Int
+value4 = (\_ -> \_ -> _rhs HNil) :: HList 'Nil -> HList 'Nil -> HList 'Nil
+@@@ = (\_ -> \_ -> _rhs HNil) :: HList 'Nil -> HList 'Nil -> HList 'Nil
+value6 = (\_ -> \_ -> _rhs HNil) :: HList 'Nil -> HList 'Nil -> HList 'Nil
 main is not found
 ------------ trace
 value1 :: Int
diff --git a/testdata/language-features/basic-values/typesyn01.out b/testdata/language-features/basic-values/typesyn01.out
index f5bf60cf..3d10ddaa 100644
--- a/testdata/language-features/basic-values/typesyn01.out
+++ b/testdata/language-features/basic-values/typesyn01.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+'MyUnit = _rhs ('HList Nil)
 main is not found
 ------------ trace
 'MyUnit :: Type
diff --git a/testdata/language-features/basic-values/typesyn02.out b/testdata/language-features/basic-values/typesyn02.out
index 858e7b33..615d97eb 100644
--- a/testdata/language-features/basic-values/typesyn02.out
+++ b/testdata/language-features/basic-values/typesyn02.out
@@ -1,3 +1,8 @@
+------------ desugared source code
+'MyUnit = _rhs ('HList Nil)
+fun
+  = (\_ (a :: _) -> hlistNilCase (_ :: _) (_rhs HNil) a)
+    :: forall (b :: _) . b -> MyUnit -> MyUnit
 main is not found
 ------------ trace
 'MyUnit :: Type
diff --git a/testdata/language-features/basic-values/where01.out b/testdata/language-features/basic-values/where01.out
index 11498269..0008aa6a 100644
--- a/testdata/language-features/basic-values/where01.out
+++ b/testdata/language-features/basic-values/where01.out
@@ -1,3 +1,15 @@
+------------ desugared source code
+value1 = _rhs \(a := _rhs HNil) -> HNil
+value2 = _rhs \(a := _rhs HNil) -> a
+value3 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+value4 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> b
+value5 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+value6 = _rhs HNil
+value7 = _rhs HNil
+value8 = _rhs HNil
+value9 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+value10 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
+value11 = _rhs \(a := _rhs HNil) (b := _rhs HNil) -> a
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/where04.out b/testdata/language-features/basic-values/where04.out
index 8649acfa..36bc3969 100644
--- a/testdata/language-features/basic-values/where04.out
+++ b/testdata/language-features/basic-values/where04.out
@@ -1,3 +1,7 @@
+------------ desugared source code
+value1 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
+value2 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
+value3 = _rhs \(a := _rhs \(b := _rhs HNil) -> b) -> a
 main is not found
 ------------ trace
 value1 :: ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index 11743f93..ee42956d 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,3 +1,36 @@
+------------ desugared source code
+value1
+  = _rhs
+    ((\(a :: _) -> 'BoolCase
+        \_ -> _ :: _
+        HNil
+        \(b := _rhs HNil) -> b
+        (fromInt 1 == a))
+      (fromInt 1))
+value2
+  = _rhs
+    ((\(a :: _) -> 'BoolCase
+        \_ -> _ :: _
+        HNil
+        \(b := _rhs HNil) -> b
+        (fromInt 1 == a))
+      (fromInt 1))
+value3
+  = _rhs
+    ((\(a :: _) -> 'BoolCase
+        \_ -> _ :: _
+        HNil
+        \(b := _rhs HNil) -> b
+        (fromInt 1 == a))
+      (fromInt 1))
+value4
+  = _rhs
+    \(a := _rhs HNil) -> (\(b :: _) -> 'BoolCase
+        \_ -> _ :: _
+        HNil
+        a
+        (fromInt 1 == b))
+      (fromInt 1)
 main is not found
 ------------ trace
 value1 :: forall a . (Eq a, Num a) => ()
diff --git a/testdata/language-features/basic-values/wildcard01.out b/testdata/language-features/basic-values/wildcard01.out
index 891a7edd..86b6cae7 100644
--- a/testdata/language-features/basic-values/wildcard01.out
+++ b/testdata/language-features/basic-values/wildcard01.out
@@ -1,3 +1,5 @@
+------------ desugared source code
+funUnit = \_ -> _rhs HNil
 main is not found
 ------------ trace
 funUnit :: forall a . a -> ()