improve pretty print

17 files changed, 78 insertions, 73 deletions

diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index 314c01c4..8730e52a 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -1494,7 +1494,8 @@ mapPrimitives
 'ListElem :: Type -> Type
 fetchArrays
   :: forall (a :: PrimitiveType) (b :: [Type]) (c :: [Type])
-    . (b ~ map Type Type ListElem c) => HList c -> PrimitiveStream a (HList b)
+    . (b ~ (map Type Type ListElem c :: [Type]))
+      => HList c -> PrimitiveStream a (HList b)
 fetch
   :: forall (a :: PrimitiveType) (b :: [Type])
     . String -> HList b -> PrimitiveStream a (HList b)
@@ -1503,7 +1504,7 @@ fetchStream
   :: forall (a :: PrimitiveType) (b :: [Type])
     . String
       -> forall (c :: [String])
-        -> (len String c ~ len Type b) => PrimitiveStream a (HList b)
+        -> (len String c ~ (len Type b :: Int)) => PrimitiveStream a (HList b)
 'SimpleFragment :: Type -> Type
 SimpleFragment :: forall a . Vec 3 Float -> a -> SimpleFragment a
 case'SimpleFragment
@@ -1855,7 +1856,8 @@ match'Interpolated
     -> (forall b -> a (Interpolated b)) -> forall c -> a c -> a c
 rasterizePrimitive
   :: forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-    . (map Type Type Interpolated a ~ b, c ~ Vec 4 Float : a)
+    . (map Type Type Interpolated a ~ (b :: [Type]), c
+          ~ (Vec 4 Float : a :: [Type]))
       => HList b
         -> RasterContext (HList c) d
           -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -1880,7 +1882,7 @@ imageType' :: [ImageKind] -> [Type]
 'FragmentOperationKind :: Type -> ImageKind
 Accumulate
   :: forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-    . (a ~ map Type ImageKind FragmentOperationKind c)
+    . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
       => HList c
         -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 accumulateWith :: forall a b . a -> b -> (a, b)
@@ -5297,7 +5299,8 @@ testdata/Builtins.lc 255:45-255:46
     Type
 testdata/Builtins.lc 260:1-260:12
     forall (a :: PrimitiveType) (b :: [Type]) (c :: [Type])
-      . (b ~ map Type Type ListElem c) => HList c -> PrimitiveStream a (HList b)
+      . (b ~ (map Type Type ListElem c :: [Type]))
+        => HList c -> PrimitiveStream a (HList b)
 testdata/Builtins.lc 260:32-260:119
     Type | Type | Type
 testdata/Builtins.lc 260:56-260:57
@@ -5381,7 +5384,7 @@ testdata/Builtins.lc 266:1-266:12
     forall (a :: PrimitiveType) (b :: [Type])
       . String
         -> forall (c :: [String])
-          -> (len String c ~ len Type b) => PrimitiveStream a (HList b)
+          -> (len String c ~ (len Type b :: Int)) => PrimitiveStream a (HList b)
 testdata/Builtins.lc 266:31-266:37
     Type
 testdata/Builtins.lc 266:31-266:123
@@ -6595,7 +6598,8 @@ testdata/Builtins.lc 478:55-478:56
     Type
 testdata/Builtins.lc 480:1-480:19
     forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-      . (map Type Type Interpolated a ~ b, c ~ Vec 4 Float : a)
+      . (map Type Type Interpolated a ~ (b :: [Type]), c
+            ~ (Vec 4 Float : a :: [Type]))
         => HList b
           -> RasterContext (HList c) d
             -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -6719,7 +6723,8 @@ testdata/Builtins.lc 488:40-488:73
     [[Fragment 1 (HList _b)]]
 testdata/Builtins.lc 488:45-488:63
     forall (a :: [Type]) (b :: [Type]) (c :: [Type]) (d :: PrimitiveType)
-      . (map Type Type Interpolated a ~ b, c ~ Vec 4 Float : a)
+      . (map Type Type Interpolated a ~ (b :: [Type]), c
+            ~ (Vec 4 Float : a :: [Type]))
         => HList b
           -> RasterContext (HList c) d
             -> Primitive (HList c) d -> FragmentStream 1 (HList a)
@@ -6858,7 +6863,7 @@ testdata/Builtins.lc 515:102-515:103
     ImageKind
 testdata/Builtins.lc 517:1-517:11
     forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-      . (a ~ map Type ImageKind FragmentOperationKind c)
+      . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
         => HList c
           -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 517:15-517:174
@@ -6958,7 +6963,7 @@ testdata/Builtins.lc 520:1-520:8
           -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
 testdata/Builtins.lc 520:25-520:35
     forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-      . (a ~ map Type ImageKind FragmentOperationKind c)
+      . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
         => HList c
           -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 520:25-520:39
@@ -7058,7 +7063,7 @@ testdata/Builtins.lc 534:1-534:11
               -> FrameBuffer a (map Type ImageKind FragmentOperationKind b)
 testdata/Builtins.lc 534:34-534:44
     forall (a :: [ImageKind]) (b :: Nat) (c :: [Type])
-      . (a ~ map Type ImageKind FragmentOperationKind c)
+      . (a ~ (map Type ImageKind FragmentOperationKind c :: [ImageKind]))
         => HList c
           -> FragmentStream b (HList (imageType' a)) -> FrameBuffer b a -> FrameBuffer b a
 testdata/Builtins.lc 534:34-534:48
diff --git a/testdata/framebuffer02.reject.out b/testdata/framebuffer02.reject.out
index 3280dc3c..92a5c846 100644
--- a/testdata/framebuffer02.reject.out
+++ b/testdata/framebuffer02.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-0
+0
 with
-1
+1
 
 in testdata/framebuffer02.reject.lc:2:17:
     let frame = FrameBuffer (colorImage1 (V4 0.0 0.0 0.4 1.0)
@@ -10,9 +10,9 @@ in testdata/framebuffer02.reject.lc:2:17:
                             )
 ------------ trace
 !type error: can not unify
-0
+0
 with
-1
+1
 
 in testdata/framebuffer02.reject.lc:2:17:
     let frame = FrameBuffer (colorImage1 (V4 0.0 0.0 0.4 1.0)
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index 155444a2..9be810e4 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -1,7 +1,7 @@
 type error: can not unify
-'Bool
+'Bool
 with
-'Int
+'Int
 
 in proj
 ------------ trace
@@ -15,9 +15,9 @@ case'Data3
         -> forall (h :: Data3) -> a h
 match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
 !type error: can not unify
-'Bool
+'Bool
 with
-'Int
+'Int
 
 in proj
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list07.reject.out b/testdata/language-features/basic-list/list07.reject.out
index a40c8c73..106e8c65 100644
--- a/testdata/language-features/basic-list/list07.reject.out
+++ b/testdata/language-features/basic-list/list07.reject.out
@@ -1,14 +1,14 @@
 type error: can not unify
-'Float
+'Float
 with
-'Char
+'Char
 
 in builtin Nil
 ------------ trace
 !type error: can not unify
-'Float
+'Float
 with
-'Char
+'Char
 
 in builtin Nil
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list10.reject.out b/testdata/language-features/basic-list/list10.reject.out
index 0ce8bd30..f84914ac 100644
--- a/testdata/language-features/basic-list/list10.reject.out
+++ b/testdata/language-features/basic-list/list10.reject.out
@@ -1,14 +1,14 @@
 type error: can not unify
-'Int
+'Int
 with
-'Float
+'Float
 
 in builtin Nil
 ------------ trace
 !type error: can not unify
-'Int
+'Int
 with
-'Float
+'Float
 
 in builtin Nil
 ------------ tooltips
diff --git a/testdata/language-features/basic-list/list14.reject.out b/testdata/language-features/basic-list/list14.reject.out
index a8d86a22..65cfb9e0 100644
--- a/testdata/language-features/basic-list/list14.reject.out
+++ b/testdata/language-features/basic-list/list14.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-['Char]
+['Char]
 with
-()
+()
 
 in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
                 ^^
 ------------ trace
 !type error: can not unify
-['Char]
+['Char]
 with
-()
+()
 
 in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
diff --git a/testdata/language-features/basic-list/list15.reject.out b/testdata/language-features/basic-list/list15.reject.out
index 4260adbe..c64dccf4 100644
--- a/testdata/language-features/basic-list/list15.reject.out
+++ b/testdata/language-features/basic-list/list15.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
                    ^^
 ------------ trace
 !type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
diff --git a/testdata/language-features/basic-list/list16.reject.out b/testdata/language-features/basic-list/list16.reject.out
index 912f567c..be6468cb 100644
--- a/testdata/language-features/basic-list/list16.reject.out
+++ b/testdata/language-features/basic-list/list16.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-['Char]
+['Char]
 with
-'Char
+'Char
 
 in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
             ^^^
 ------------ trace
 !type error: can not unify
-['Char]
+['Char]
 with
-'Char
+'Char
 
 in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
diff --git a/testdata/language-features/basic-list/listcomp08.reject.out b/testdata/language-features/basic-list/listcomp08.reject.out
index 6ecdfd71..1313a611 100644
--- a/testdata/language-features/basic-list/listcomp08.reject.out
+++ b/testdata/language-features/basic-list/listcomp08.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'Bool
+'Bool
 with
-'String
+'String
 
 in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
                       ^^^^^^^^^^
 ------------ trace
 !type error: can not unify
-'Bool
+'Bool
 with
-'String
+'String
 
 in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
diff --git a/testdata/language-features/basic-values/case04.reject.out b/testdata/language-features/basic-values/case04.reject.out
index 00cb4f39..55011f4d 100644
--- a/testdata/language-features/basic-values/case04.reject.out
+++ b/testdata/language-features/basic-values/case04.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
        ^^^
 ------------ trace
 !type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
diff --git a/testdata/language-features/basic-values/if03.reject.out b/testdata/language-features/basic-values/if03.reject.out
index 9ba86d9c..d72492c4 100644
--- a/testdata/language-features/basic-values/if03.reject.out
+++ b/testdata/language-features/basic-values/if03.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
             ^^
 ------------ trace
 !type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
diff --git a/testdata/language-features/basic-values/if04.reject.out b/testdata/language-features/basic-values/if04.reject.out
index c0df8c35..795be098 100644
--- a/testdata/language-features/basic-values/if04.reject.out
+++ b/testdata/language-features/basic-values/if04.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
                               ^^^
 ------------ trace
 !type error: can not unify
-()
+()
 with
-'Char
+'Char
 
 in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
diff --git a/testdata/language-features/guard/guard02.reject.out b/testdata/language-features/guard/guard02.reject.out
index c46ac690..262f63a1 100644
--- a/testdata/language-features/guard/guard02.reject.out
+++ b/testdata/language-features/guard/guard02.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'String
+'String
 with
-()
+()
 
 in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
            ^^
 ------------ trace
 !type error: can not unify
-'String
+'String
 with
-()
+()
 
 in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
diff --git a/testdata/language-features/guard/guard05.reject.out b/testdata/language-features/guard/guard05.reject.out
index fa30af80..07cea5f5 100644
--- a/testdata/language-features/guard/guard05.reject.out
+++ b/testdata/language-features/guard/guard05.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
         ^^
 ------------ trace
 !type error: can not unify
-'Bool
+'Bool
 with
-()
+()
 
 in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
diff --git a/testdata/language-features/guard/guard12.reject.out b/testdata/language-features/guard/guard12.reject.out
index 7ac38fa8..1225b2b3 100644
--- a/testdata/language-features/guard/guard12.reject.out
+++ b/testdata/language-features/guard/guard12.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
             ^^
 ------------ trace
 !type error: can not unify
-'Char
+'Char
 with
-()
+()
 
 in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
diff --git a/testdata/record01.reject.out b/testdata/record01.reject.out
index 39ad1ab3..2f8fb3af 100644
--- a/testdata/record01.reject.out
+++ b/testdata/record01.reject.out
@@ -1,16 +1,16 @@
 type error: can not unify
-'FrameBuffer _b _a
+'FrameBuffer _b _a
 with
-'Float
+'Float
 
 in testdata/record01.reject.lc:26:15:
  in ScreenOut record.fieldA
               ^^^^^^
 ------------ trace
 !type error: can not unify
-'FrameBuffer _b _a
+'FrameBuffer _b _a
 with
-'Float
+'Float
 
 in testdata/record01.reject.lc:26:15:
  in ScreenOut record.fieldA
diff --git a/testdata/typesig.reject.out b/testdata/typesig.reject.out
index 27b06da5..3e0ba61d 100644
--- a/testdata/typesig.reject.out
+++ b/testdata/typesig.reject.out
@@ -1,4 +1,4 @@
-focus checkMetas: \(a :: Type) -> (\b -> primFix a b)
+focus checkMetas: \(a :: Type) -> ((\b -> primFix a b) :: (a -> a) -> a)
   let a = Type in \(c :: Type) -> <<HERE>>
 \(a :: Type ~ _a) (b :: _a ~ X) -> typeAnn _a (_rhs X)
 ------------ trace
@@ -6,7 +6,7 @@ focus checkMetas: \(a :: Type) -> (\b -> primFix a b)
 X :: X
 case'X :: forall (a :: X -> Type) -> a 'X -> forall (b :: X) -> a b
 match'X :: forall (a :: Type -> Type) -> a X -> forall b -> a b -> a b
-!focus checkMetas: \(a :: Type) -> (\b -> primFix a b)
+!focus checkMetas: \(a :: Type) -> ((\b -> primFix a b) :: (a -> a) -> a)
   let a = Type in \(c :: Type) -> <<HERE>>
 \(a :: Type ~ _a) (b :: _a ~ X) -> typeAnn _a (_rhs X)
 ------------ tooltips