6 files changed, 167 insertions, 98 deletions
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index ee25f4ed..0b4b0ba4 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -5,15 +5,15 @@ with
 in proj
 ------------ trace
-'Data3 :: [32mType[0m
+'Data3 :: Type
-Data3 :: [32mBool -> Char -> Bool -> Data3[0m
+Data3 :: Bool -> Char -> Bool -> Data3
-Data31 :: [32mInt -> String -> Int -> Data3[0m
+Data31 :: Int -> String -> Int -> Data3
 'Data3Case
-  :: [32mforall (a :: Data3 -> Type)
+  :: forall (a :: Data3 -> Type)
-    -> (forall (b :: Bool) (c :: Char) (d :: Bool) -> [32m[32ma[0;32m [32m('Data3 [32mb[0;32m [32mc[0;32m [32md[0;32m)[0;32m[0;32m)
+    -> (forall (b :: Bool) (c :: Char) (d :: Bool) -> a ('Data3 b c d))
-      -> (forall (e :: Int) (f :: String) (g :: Int) -> [32m[32ma[0;32m [32m('Data31 [32me[0;32m [32mf[0;32m [32mg[0;32m)[0;32m[0;32m)
+      -> (forall (e :: Int) (f :: String) (g :: Int) -> a ('Data31 e f g))
-        -> forall (h :: Data3) -> [32m[32ma[0;32m [32m[32mh[0;32m[0;32m[0;32m[0m
+        -> forall (h :: Data3) -> a h
-match'Data3 :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mData3[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
 !type error: can not unify
 [32m'Bool[0m
 with
@@ -21,15 +21,27 @@ with
 in proj
 ------------ tooltips
-testdata/language-features/adt/adt02.reject.lc 2:6-2:11  Type
+testdata/language-features/adt/adt02.reject.lc 2:6-2:11
-testdata/language-features/adt/adt02.reject.lc 2:6-5:25  Type
+    Type | Type | Type | Type | Type | Type | Type | Type
-testdata/language-features/adt/adt02.reject.lc 2:6-7:11  Type
+testdata/language-features/adt/adt02.reject.lc 2:6-5:25
-testdata/language-features/adt/adt02.reject.lc 2:6-10:20  Type
+    Type | Type
-testdata/language-features/adt/adt02.reject.lc 3:5-3:10  Bool -> Char -> Bool -> Data3 | Data3 | Type
+testdata/language-features/adt/adt02.reject.lc 2:6-7:11
-testdata/language-features/adt/adt02.reject.lc 3:21-3:25  Type
+    Type | Type
-testdata/language-features/adt/adt02.reject.lc 4:21-4:25  Type
+testdata/language-features/adt/adt02.reject.lc 2:6-10:20
-testdata/language-features/adt/adt02.reject.lc 5:21-5:25  Type
+    Type | Type
-testdata/language-features/adt/adt02.reject.lc 7:5-7:11  Data3 | Int -> String -> Int -> Data3 | Type
+testdata/language-features/adt/adt02.reject.lc 3:5-3:10
-testdata/language-features/adt/adt02.reject.lc 8:17-8:20  Type
+    Bool -> Char -> Bool -> Data3 | Data3 | Type | Type | Type | Type
-testdata/language-features/adt/adt02.reject.lc 9:17-9:23  Type
+testdata/language-features/adt/adt02.reject.lc 3:21-3:25
-testdata/language-features/adt/adt02.reject.lc 10:17-10:20  Type
+    Type
+testdata/language-features/adt/adt02.reject.lc 4:21-4:25
+    Type
+testdata/language-features/adt/adt02.reject.lc 5:21-5:25
+    Type
+testdata/language-features/adt/adt02.reject.lc 7:5-7:11
+    Int -> String -> Int -> Data3 | Data3 | Type | Type | Type | Type
+testdata/language-features/adt/adt02.reject.lc 8:17-8:20
+    Type
+testdata/language-features/adt/adt02.reject.lc 9:17-9:23
+    Type
+testdata/language-features/adt/adt02.reject.lc 10:17-10:20
+    Type
+\ No newline at end of file
diff --git a/testdata/language-features/adt/adt03.reject.out b/testdata/language-features/adt/adt03.reject.out
index 70c0c4e7..d579a3d5 100644
--- a/testdata/language-features/adt/adt03.reject.out
+++ b/testdata/language-features/adt/adt03.reject.out
@@ -2,9 +2,10 @@ can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
 data Data3 = Data3 a b c
                   ^
 ------------ trace
-'Data3 :: [32mType[0m
+'Data3 :: Type
 !can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
 data Data3 = Data3 a b c
                   ^
 ------------ tooltips
-testdata/language-features/adt/adt03.reject.lc 2:6-2:11  Type
+testdata/language-features/adt/adt03.reject.lc 2:6-2:11
+    Type
+\ No newline at end of file
diff --git a/testdata/language-features/adt/adt04.reject.out b/testdata/language-features/adt/adt04.reject.out
index 85b91c2c..0dd18b2f 100644
--- a/testdata/language-features/adt/adt04.reject.out
+++ b/testdata/language-features/adt/adt04.reject.out
@@ -2,9 +2,10 @@ can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
 data Data3 = Data3 { x :: a , y :: b , z :: c }
                          ^
 ------------ trace
-'Data3 :: [32mType[0m
+'Data3 :: Type
 !can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
 data Data3 = Data3 { x :: a , y :: b , z :: c }
                          ^
 ------------ tooltips
-testdata/language-features/adt/adt04.reject.lc 2:6-2:11  Type
+testdata/language-features/adt/adt04.reject.lc 2:6-2:11
+    Type
+\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt01.reject.out b/testdata/language-features/adt/gadt01.reject.out
index 48732b7d..ce6834db 100644
--- a/testdata/language-features/adt/gadt01.reject.out
+++ b/testdata/language-features/adt/gadt01.reject.out
@@ -1,8 +1,11 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M3 :: [32mType -> String -> Type[0m
+'M3 :: Type -> String -> Type
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
-testdata/language-features/adt/gadt01.reject.lc 5:6-5:8  Type -> String -> Type
+testdata/language-features/adt/gadt01.reject.lc 5:6-5:8
-testdata/language-features/adt/gadt01.reject.lc 5:15-5:19  Type
+    Type -> String -> Type
-testdata/language-features/adt/gadt01.reject.lc 5:27-5:33  Type
+testdata/language-features/adt/gadt01.reject.lc 5:15-5:19
+    Type
+testdata/language-features/adt/gadt01.reject.lc 5:27-5:33
+    Type | Type
+\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt03.reject.out b/testdata/language-features/adt/gadt03.reject.out
index 36261981..38a50a8a 100644
--- a/testdata/language-features/adt/gadt03.reject.out
+++ b/testdata/language-features/adt/gadt03.reject.out
@@ -1,36 +1,58 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M2 :: [32mType -> String -> Type[0m
+'M2 :: Type -> String -> Type
-Value2 :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M2 [32ma[0;32m [32mb[0;32m[0m
+Value2 :: forall a . a -> forall (b :: String) . M2 a b
 'M2Case
-  :: [32mforall a
+  :: forall a
-    . forall (b :: forall (c :: String) -> M2 [32ma[0;32m [32mc[0;32m -> Type)
+    . forall (b :: forall (c :: String) -> M2 a c -> Type)
-      -> (forall (d :: [32ma[0;32m) -> forall (e :: String) . [32m[32m[32mb[0;32m [32m[32me[0;32m[0;32m[0;32m [32m('Value2 [32md[0;32m [32me[0;32m)[0;32m[0;32m)
+      -> (forall (d :: a) -> forall (e :: String) . b e ('Value2 d e))
-        -> forall (f :: String) . forall (g :: M2 [32ma[0;32m [32mf[0;32m) -> [32m[32m[32mb[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m[32mg[0;32m[0;32m[0;32m[0m
+        -> forall (f :: String) . forall (g :: M2 a f) -> b f g
 match'M2
-  :: [32mforall (a :: Type -> Type)
+  :: forall (a :: Type -> Type)
-    -> (forall b (c :: String) -> [32m[32ma[0;32m [32m(M2 [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m
+    -> (forall b (c :: String) -> a (M2 b c)) -> forall d -> a d -> a d
-'M3 :: [32mType -> String -> Type[0m
+'M3 :: Type -> String -> Type
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
-testdata/language-features/adt/gadt03.reject.lc 2:6-2:8  Type | Type -> String -> Type
+testdata/language-features/adt/gadt03.reject.lc 2:6-2:8
-testdata/language-features/adt/gadt03.reject.lc 2:6-3:35  Type
+    Type -> String -> Type | Type -> String -> Type | Type | Type
-testdata/language-features/adt/gadt03.reject.lc 2:15-2:19  Type
+      -> String -> Type | Type | Type
-testdata/language-features/adt/gadt03.reject.lc 2:24-2:30  Type
+testdata/language-features/adt/gadt03.reject.lc 2:6-3:35
-testdata/language-features/adt/gadt03.reject.lc 2:24-2:38  Type
+    Type | Type
-testdata/language-features/adt/gadt03.reject.lc 2:34-2:38  Type
+testdata/language-features/adt/gadt03.reject.lc 2:15-2:19
-testdata/language-features/adt/gadt03.reject.lc 3:3-3:9  M2 _d _a | forall a . a -> forall (b :: String) . M2 a b
+    Type | Type | Type
-testdata/language-features/adt/gadt03.reject.lc 3:3-3:35  Type
+testdata/language-features/adt/gadt03.reject.lc 2:24-2:30
-testdata/language-features/adt/gadt03.reject.lc 3:13-3:14  Type
+    Type
-testdata/language-features/adt/gadt03.reject.lc 3:13-3:35  Type
+testdata/language-features/adt/gadt03.reject.lc 2:24-2:38
-testdata/language-features/adt/gadt03.reject.lc 3:18-3:35  Type
+    Type
-testdata/language-features/adt/gadt03.reject.lc 3:29-3:31  Type -> String -> Type
+testdata/language-features/adt/gadt03.reject.lc 2:34-2:38
-testdata/language-features/adt/gadt03.reject.lc 3:29-3:33  String -> Type
+    Type | Type
-testdata/language-features/adt/gadt03.reject.lc 3:29-3:35  Type
+testdata/language-features/adt/gadt03.reject.lc 3:3-3:9
-testdata/language-features/adt/gadt03.reject.lc 3:32-3:33  Type
+    forall a . a -> forall (b :: String) . M2 a b | M2 _d _a
-testdata/language-features/adt/gadt03.reject.lc 3:34-3:35  String | _b
+testdata/language-features/adt/gadt03.reject.lc 3:3-3:35
-testdata/language-features/adt/gadt03.reject.lc 5:6-5:8  Type -> String -> Type
+    Type | Type | Type
-testdata/language-features/adt/gadt03.reject.lc 5:15-5:19  Type
+testdata/language-features/adt/gadt03.reject.lc 3:13-3:14
-testdata/language-features/adt/gadt03.reject.lc 5:24-5:30  Type
+    Type
-testdata/language-features/adt/gadt03.reject.lc 5:24-5:38  Type
+testdata/language-features/adt/gadt03.reject.lc 3:13-3:35
-testdata/language-features/adt/gadt03.reject.lc 5:34-5:38  Type
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:18-3:35
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:29-3:31
+    Type -> String -> Type
+testdata/language-features/adt/gadt03.reject.lc 3:29-3:33
+    String -> Type
+testdata/language-features/adt/gadt03.reject.lc 3:29-3:35
+    Type | Type
+testdata/language-features/adt/gadt03.reject.lc 3:32-3:33
+    Type
+testdata/language-features/adt/gadt03.reject.lc 3:34-3:35
+    _b | String
+testdata/language-features/adt/gadt03.reject.lc 5:6-5:8
+    Type -> String -> Type
+testdata/language-features/adt/gadt03.reject.lc 5:15-5:19
+    Type
+testdata/language-features/adt/gadt03.reject.lc 5:24-5:30
+    Type
+testdata/language-features/adt/gadt03.reject.lc 5:24-5:38
+    Type
+testdata/language-features/adt/gadt03.reject.lc 5:34-5:38
+    Type | Type
+\ No newline at end of file
diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out
index 22338d9b..0d911620 100644
--- a/testdata/language-features/adt/gadt04.reject.out
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -5,17 +5,17 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
  Value :: a -> forall m . M a m
  ^^^^^
 ------------ trace
-'M :: [32mType -> String -> Type[0m
+'M :: Type -> String -> Type
-Value :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M [32ma[0;32m [32mb[0;32m[0m
+Value :: forall a . a -> forall (b :: String) . M a b
 'MCase
-  :: [32mforall (a :: forall b (c :: String) -> M [32mb[0;32m [32mc[0;32m -> Type)
+  :: forall (a :: forall b (c :: String) -> M b c -> Type)
-    -> (forall d . forall (e :: [32md[0;32m) -> forall (f :: String) . [32m[32m[32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m('Value [32md[0;32m [32me[0;32m [32mf[0;32m)[0;32m[0;32m)
+    -> (forall d . forall (e :: d) -> forall (f :: String) . a d f ('Value d e f))
-      -> forall g (h :: String) . forall (i :: M [32mg[0;32m [32mh[0;32m) -> [32m[32m[32m[32ma[0;32m [32m[32mg[0;32m[0;32m[0;32m [32m[32mh[0;32m[0;32m[0;32m [32m[32mi[0;32m[0;32m[0;32m[0m
+      -> forall g (h :: String) . forall (i :: M g h) -> a g h i
 match'M
-  :: [32mforall (a :: Type -> Type)
+  :: forall (a :: Type -> Type)
-    -> (forall b (c :: String) -> [32m[32ma[0;32m [32m(M [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m
+    -> (forall b (c :: String) -> a (M b c)) -> forall d -> a d -> a d
-'M2 :: [32mType -> String -> Type[0m
+'M2 :: Type -> String -> Type
-Value :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M2 [32ma[0;32m [32mb[0;32m[0m
+Value :: forall a . a -> forall (b :: String) . M2 a b
 !already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
  Value :: a -> forall m . M2 a m
  ^^^^^
@@ -23,34 +23,64 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
  Value :: a -> forall m . M a m
  ^^^^^
 ------------ tooltips
-testdata/language-features/adt/gadt04.reject.lc 2:6-2:7  Type | Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 2:6-2:7
-testdata/language-features/adt/gadt04.reject.lc 2:6-3:33  Type
+    Type -> String -> Type | Type -> String -> Type | Type | Type | Type
-testdata/language-features/adt/gadt04.reject.lc 2:11-2:15  Type
+      -> String -> Type | Type | Type | Type
-testdata/language-features/adt/gadt04.reject.lc 2:19-2:25  Type
+testdata/language-features/adt/gadt04.reject.lc 2:6-3:33
-testdata/language-features/adt/gadt04.reject.lc 2:19-2:33  Type
+    Type
-testdata/language-features/adt/gadt04.reject.lc 2:29-2:33  Type
+testdata/language-features/adt/gadt04.reject.lc 2:11-2:15
-testdata/language-features/adt/gadt04.reject.lc 3:3-3:8  M _c _a | forall a . a -> forall (b :: String) . M a b
+    Type
-testdata/language-features/adt/gadt04.reject.lc 3:3-3:33  Type
+testdata/language-features/adt/gadt04.reject.lc 2:19-2:25
-testdata/language-features/adt/gadt04.reject.lc 3:12-3:13  _b
+    Type
-testdata/language-features/adt/gadt04.reject.lc 3:12-3:33  Type
+testdata/language-features/adt/gadt04.reject.lc 2:19-2:33
-testdata/language-features/adt/gadt04.reject.lc 3:17-3:33  Type
+    Type
-testdata/language-features/adt/gadt04.reject.lc 3:28-3:29  Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 2:29-2:33
-testdata/language-features/adt/gadt04.reject.lc 3:28-3:31  String -> Type
+    Type | Type
-testdata/language-features/adt/gadt04.reject.lc 3:28-3:33  Type
+testdata/language-features/adt/gadt04.reject.lc 3:3-3:8
-testdata/language-features/adt/gadt04.reject.lc 3:30-3:31  Type
+    forall a . a -> forall (b :: String) . M a b | M _c _a
-testdata/language-features/adt/gadt04.reject.lc 3:30-3:33  M _c _a -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:3-3:33
-testdata/language-features/adt/gadt04.reject.lc 3:32-3:33  String | _b
+    Type | Type | Type | Type
-testdata/language-features/adt/gadt04.reject.lc 5:6-5:8  Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:12-3:13
-testdata/language-features/adt/gadt04.reject.lc 5:12-5:16  Type
+    _b
-testdata/language-features/adt/gadt04.reject.lc 5:20-5:26  Type
+testdata/language-features/adt/gadt04.reject.lc 3:12-3:33
-testdata/language-features/adt/gadt04.reject.lc 5:20-5:34  Type
+    Type
-testdata/language-features/adt/gadt04.reject.lc 5:30-5:34  Type
+testdata/language-features/adt/gadt04.reject.lc 3:17-3:33
-testdata/language-features/adt/gadt04.reject.lc 6:3-6:8  forall a . a -> forall (b :: String) . M2 a b
+    Type
-testdata/language-features/adt/gadt04.reject.lc 6:12-6:13  _b
+testdata/language-features/adt/gadt04.reject.lc 3:28-3:29
-testdata/language-features/adt/gadt04.reject.lc 6:12-6:34  Type
+    Type -> String -> Type
-testdata/language-features/adt/gadt04.reject.lc 6:17-6:34  Type
+testdata/language-features/adt/gadt04.reject.lc 3:28-3:31
-testdata/language-features/adt/gadt04.reject.lc 6:28-6:30  Type -> String -> Type
+    String -> Type
-testdata/language-features/adt/gadt04.reject.lc 6:28-6:32  String -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:28-3:33
-testdata/language-features/adt/gadt04.reject.lc 6:28-6:34  Type
+    Type | Type
-testdata/language-features/adt/gadt04.reject.lc 6:31-6:32  Type
+testdata/language-features/adt/gadt04.reject.lc 3:30-3:31
-testdata/language-features/adt/gadt04.reject.lc 6:33-6:34  _b
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 3:30-3:33
+    M _c _a -> Type
+testdata/language-features/adt/gadt04.reject.lc 3:32-3:33
+    _b | String
+testdata/language-features/adt/gadt04.reject.lc 5:6-5:8
+    Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 5:12-5:16
+    Type
+testdata/language-features/adt/gadt04.reject.lc 5:20-5:26
+    Type
+testdata/language-features/adt/gadt04.reject.lc 5:20-5:34
+    Type
+testdata/language-features/adt/gadt04.reject.lc 5:30-5:34
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 6:12-6:13
+    _b
+testdata/language-features/adt/gadt04.reject.lc 6:12-6:34
+    Type
+testdata/language-features/adt/gadt04.reject.lc 6:17-6:34
+    Type
+testdata/language-features/adt/gadt04.reject.lc 6:28-6:30
+    Type -> String -> Type
+testdata/language-features/adt/gadt04.reject.lc 6:28-6:32
+    String -> Type
+testdata/language-features/adt/gadt04.reject.lc 6:28-6:34
+    Type | Type
+testdata/language-features/adt/gadt04.reject.lc 6:31-6:32
+    Type
+testdata/language-features/adt/gadt04.reject.lc 6:33-6:34
+    _b
+\ No newline at end of file

diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out index ee25f4ed..0b4b0ba4 100644 --- a/testdata/language-features/adt/adt02.reject.out +++ b/testdata/language-features/adt/adt02.reject.out
@@ -5,15 +5,15 @@ with
5		5
6	in proj	6	in proj
7	------------ trace	7	------------ trace
8	'Data3 :: [32mType[0m	8	'Data3 :: Type
9	Data3 :: [32mBool -> Char -> Bool -> Data3[0m	9	Data3 :: Bool -> Char -> Bool -> Data3
10	Data31 :: [32mInt -> String -> Int -> Data3[0m	10	Data31 :: Int -> String -> Int -> Data3
11	'Data3Case	11	'Data3Case
12	:: [32mforall (a :: Data3 -> Type)	12	:: forall (a :: Data3 -> Type)
13	-> (forall (b :: Bool) (c :: Char) (d :: Bool) -> [32m[32ma[0;32m [32m('Data3 [32mb[0;32m [32mc[0;32m [32md[0;32m)[0;32m[0;32m)	13	-> (forall (b :: Bool) (c :: Char) (d :: Bool) -> a ('Data3 b c d))
14	-> (forall (e :: Int) (f :: String) (g :: Int) -> [32m[32ma[0;32m [32m('Data31 [32me[0;32m [32mf[0;32m [32mg[0;32m)[0;32m[0;32m)	14	-> (forall (e :: Int) (f :: String) (g :: Int) -> a ('Data31 e f g))
15	-> forall (h :: Data3) -> [32m[32ma[0;32m [32m[32mh[0;32m[0;32m[0;32m[0m	15	-> forall (h :: Data3) -> a h
16	match'Data3 :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mData3[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m	16	match'Data3 :: forall (a :: Type -> Type) -> a Data3 -> forall b -> a b -> a b
17	!type error: can not unify	17	!type error: can not unify
18	[32m'Bool[0m	18	[32m'Bool[0m
19	with	19	with
@@ -21,15 +21,27 @@ with
21		21
22	in proj	22	in proj
23	------------ tooltips	23	------------ tooltips
24	testdata/language-features/adt/adt02.reject.lc 2:6-2:11 Type	24	testdata/language-features/adt/adt02.reject.lc 2:6-2:11
25	testdata/language-features/adt/adt02.reject.lc 2:6-5:25 Type	25	Type \| Type \| Type \| Type \| Type \| Type \| Type \| Type
26	testdata/language-features/adt/adt02.reject.lc 2:6-7:11 Type	26	testdata/language-features/adt/adt02.reject.lc 2:6-5:25
27	testdata/language-features/adt/adt02.reject.lc 2:6-10:20 Type	27	Type \| Type
28	testdata/language-features/adt/adt02.reject.lc 3:5-3:10 Bool -> Char -> Bool -> Data3 \| Data3 \| Type	28	testdata/language-features/adt/adt02.reject.lc 2:6-7:11
29	testdata/language-features/adt/adt02.reject.lc 3:21-3:25 Type	29	Type \| Type
30	testdata/language-features/adt/adt02.reject.lc 4:21-4:25 Type	30	testdata/language-features/adt/adt02.reject.lc 2:6-10:20
31	testdata/language-features/adt/adt02.reject.lc 5:21-5:25 Type	31	Type \| Type
32	testdata/language-features/adt/adt02.reject.lc 7:5-7:11 Data3 \| Int -> String -> Int -> Data3 \| Type	32	testdata/language-features/adt/adt02.reject.lc 3:5-3:10
33	testdata/language-features/adt/adt02.reject.lc 8:17-8:20 Type	33	Bool -> Char -> Bool -> Data3 \| Data3 \| Type \| Type \| Type \| Type
34	testdata/language-features/adt/adt02.reject.lc 9:17-9:23 Type	34	testdata/language-features/adt/adt02.reject.lc 3:21-3:25
35	testdata/language-features/adt/adt02.reject.lc 10:17-10:20 Type	35	Type
		36	testdata/language-features/adt/adt02.reject.lc 4:21-4:25
		37	Type
		38	testdata/language-features/adt/adt02.reject.lc 5:21-5:25
		39	Type
		40	testdata/language-features/adt/adt02.reject.lc 7:5-7:11
		41	Int -> String -> Int -> Data3 \| Data3 \| Type \| Type \| Type \| Type
		42	testdata/language-features/adt/adt02.reject.lc 8:17-8:20
		43	Type
		44	testdata/language-features/adt/adt02.reject.lc 9:17-9:23
		45	Type
		46	testdata/language-features/adt/adt02.reject.lc 10:17-10:20
		47	Type \ No newline at end of file


diff --git a/testdata/language-features/adt/adt03.reject.out b/testdata/language-features/adt/adt03.reject.out index 70c0c4e7..d579a3d5 100644 --- a/testdata/language-features/adt/adt03.reject.out +++ b/testdata/language-features/adt/adt03.reject.out
@@ -2,9 +2,10 @@ can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
2	data Data3 = Data3 a b c	2	data Data3 = Data3 a b c
3	^	3	^
4	------------ trace	4	------------ trace
5	'Data3 :: [32mType[0m	5	'Data3 :: Type
6	!can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:	6	!can't find: a in testdata/language-features/adt/adt03.reject.lc:2:20:
7	data Data3 = Data3 a b c	7	data Data3 = Data3 a b c
8	^	8	^
9	------------ tooltips	9	------------ tooltips
10	testdata/language-features/adt/adt03.reject.lc 2:6-2:11 Type	10	testdata/language-features/adt/adt03.reject.lc 2:6-2:11
		11	Type \ No newline at end of file


diff --git a/testdata/language-features/adt/adt04.reject.out b/testdata/language-features/adt/adt04.reject.out index 85b91c2c..0dd18b2f 100644 --- a/testdata/language-features/adt/adt04.reject.out +++ b/testdata/language-features/adt/adt04.reject.out
@@ -2,9 +2,10 @@ can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
2	data Data3 = Data3 { x :: a , y :: b , z :: c }	2	data Data3 = Data3 { x :: a , y :: b , z :: c }
3	^	3	^
4	------------ trace	4	------------ trace
5	'Data3 :: [32mType[0m	5	'Data3 :: Type
6	!can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:	6	!can't find: a in testdata/language-features/adt/adt04.reject.lc:2:27:
7	data Data3 = Data3 { x :: a , y :: b , z :: c }	7	data Data3 = Data3 { x :: a , y :: b , z :: c }
8	^	8	^
9	------------ tooltips	9	------------ tooltips
10	testdata/language-features/adt/adt04.reject.lc 2:6-2:11 Type	10	testdata/language-features/adt/adt04.reject.lc 2:6-2:11
		11	Type \ No newline at end of file


diff --git a/testdata/language-features/adt/gadt01.reject.out b/testdata/language-features/adt/gadt01.reject.out index 48732b7d..ce6834db 100644 --- a/testdata/language-features/adt/gadt01.reject.out +++ b/testdata/language-features/adt/gadt01.reject.out
@@ -1,8 +1,11 @@
1	illegal data definition (parameters are not uniform)	1	illegal data definition (parameters are not uniform)
2	------------ trace	2	------------ trace
3	'M3 :: [32mType -> String -> Type[0m	3	'M3 :: Type -> String -> Type
4	!illegal data definition (parameters are not uniform)	4	!illegal data definition (parameters are not uniform)
5	------------ tooltips	5	------------ tooltips
6	testdata/language-features/adt/gadt01.reject.lc 5:6-5:8 Type -> String -> Type	6	testdata/language-features/adt/gadt01.reject.lc 5:6-5:8
7	testdata/language-features/adt/gadt01.reject.lc 5:15-5:19 Type	7	Type -> String -> Type
8	testdata/language-features/adt/gadt01.reject.lc 5:27-5:33 Type	8	testdata/language-features/adt/gadt01.reject.lc 5:15-5:19
		9	Type
		10	testdata/language-features/adt/gadt01.reject.lc 5:27-5:33
		11	Type \| Type \ No newline at end of file


diff --git a/testdata/language-features/adt/gadt03.reject.out b/testdata/language-features/adt/gadt03.reject.out index 36261981..38a50a8a 100644 --- a/testdata/language-features/adt/gadt03.reject.out +++ b/testdata/language-features/adt/gadt03.reject.out
@@ -1,36 +1,58 @@
1	illegal data definition (parameters are not uniform)	1	illegal data definition (parameters are not uniform)
2	------------ trace	2	------------ trace
3	'M2 :: [32mType -> String -> Type[0m	3	'M2 :: Type -> String -> Type
4	Value2 :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M2 [32ma[0;32m [32mb[0;32m[0m	4	Value2 :: forall a . a -> forall (b :: String) . M2 a b
5	'M2Case	5	'M2Case
6	:: [32mforall a	6	:: forall a
7	. forall (b :: forall (c :: String) -> M2 [32ma[0;32m [32mc[0;32m -> Type)	7	. forall (b :: forall (c :: String) -> M2 a c -> Type)
8	-> (forall (d :: [32ma[0;32m) -> forall (e :: String) . [32m[32m[32mb[0;32m [32m[32me[0;32m[0;32m[0;32m [32m('Value2 [32md[0;32m [32me[0;32m)[0;32m[0;32m)	8	-> (forall (d :: a) -> forall (e :: String) . b e ('Value2 d e))
9	-> forall (f :: String) . forall (g :: M2 [32ma[0;32m [32mf[0;32m) -> [32m[32m[32mb[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m[32mg[0;32m[0;32m[0;32m[0m	9	-> forall (f :: String) . forall (g :: M2 a f) -> b f g
10	match'M2	10	match'M2
11	:: [32mforall (a :: Type -> Type)	11	:: forall (a :: Type -> Type)
12	-> (forall b (c :: String) -> [32m[32ma[0;32m [32m(M2 [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m	12	-> (forall b (c :: String) -> a (M2 b c)) -> forall d -> a d -> a d
13	'M3 :: [32mType -> String -> Type[0m	13	'M3 :: Type -> String -> Type
14	!illegal data definition (parameters are not uniform)	14	!illegal data definition (parameters are not uniform)
15	------------ tooltips	15	------------ tooltips
16	testdata/language-features/adt/gadt03.reject.lc 2:6-2:8 Type \| Type -> String -> Type	16	testdata/language-features/adt/gadt03.reject.lc 2:6-2:8
17	testdata/language-features/adt/gadt03.reject.lc 2:6-3:35 Type	17	Type -> String -> Type \| Type -> String -> Type \| Type \| Type
18	testdata/language-features/adt/gadt03.reject.lc 2:15-2:19 Type	18	-> String -> Type \| Type \| Type
19	testdata/language-features/adt/gadt03.reject.lc 2:24-2:30 Type	19	testdata/language-features/adt/gadt03.reject.lc 2:6-3:35
20	testdata/language-features/adt/gadt03.reject.lc 2:24-2:38 Type	20	Type \| Type
21	testdata/language-features/adt/gadt03.reject.lc 2:34-2:38 Type	21	testdata/language-features/adt/gadt03.reject.lc 2:15-2:19
22	testdata/language-features/adt/gadt03.reject.lc 3:3-3:9 M2 _d _a \| forall a . a -> forall (b :: String) . M2 a b	22	Type \| Type \| Type
23	testdata/language-features/adt/gadt03.reject.lc 3:3-3:35 Type	23	testdata/language-features/adt/gadt03.reject.lc 2:24-2:30
24	testdata/language-features/adt/gadt03.reject.lc 3:13-3:14 Type	24	Type
25	testdata/language-features/adt/gadt03.reject.lc 3:13-3:35 Type	25	testdata/language-features/adt/gadt03.reject.lc 2:24-2:38
26	testdata/language-features/adt/gadt03.reject.lc 3:18-3:35 Type	26	Type
27	testdata/language-features/adt/gadt03.reject.lc 3:29-3:31 Type -> String -> Type	27	testdata/language-features/adt/gadt03.reject.lc 2:34-2:38
28	testdata/language-features/adt/gadt03.reject.lc 3:29-3:33 String -> Type	28	Type \| Type
29	testdata/language-features/adt/gadt03.reject.lc 3:29-3:35 Type	29	testdata/language-features/adt/gadt03.reject.lc 3:3-3:9
30	testdata/language-features/adt/gadt03.reject.lc 3:32-3:33 Type	30	forall a . a -> forall (b :: String) . M2 a b \| M2 _d _a
31	testdata/language-features/adt/gadt03.reject.lc 3:34-3:35 String \| _b	31	testdata/language-features/adt/gadt03.reject.lc 3:3-3:35
32	testdata/language-features/adt/gadt03.reject.lc 5:6-5:8 Type -> String -> Type	32	Type \| Type \| Type
33	testdata/language-features/adt/gadt03.reject.lc 5:15-5:19 Type	33	testdata/language-features/adt/gadt03.reject.lc 3:13-3:14
34	testdata/language-features/adt/gadt03.reject.lc 5:24-5:30 Type	34	Type
35	testdata/language-features/adt/gadt03.reject.lc 5:24-5:38 Type	35	testdata/language-features/adt/gadt03.reject.lc 3:13-3:35
36	testdata/language-features/adt/gadt03.reject.lc 5:34-5:38 Type	36	Type
		37	testdata/language-features/adt/gadt03.reject.lc 3:18-3:35
		38	Type
		39	testdata/language-features/adt/gadt03.reject.lc 3:29-3:31
		40	Type -> String -> Type
		41	testdata/language-features/adt/gadt03.reject.lc 3:29-3:33
		42	String -> Type
		43	testdata/language-features/adt/gadt03.reject.lc 3:29-3:35
		44	Type \| Type
		45	testdata/language-features/adt/gadt03.reject.lc 3:32-3:33
		46	Type
		47	testdata/language-features/adt/gadt03.reject.lc 3:34-3:35
		48	_b \| String
		49	testdata/language-features/adt/gadt03.reject.lc 5:6-5:8
		50	Type -> String -> Type
		51	testdata/language-features/adt/gadt03.reject.lc 5:15-5:19
		52	Type
		53	testdata/language-features/adt/gadt03.reject.lc 5:24-5:30
		54	Type
		55	testdata/language-features/adt/gadt03.reject.lc 5:24-5:38
		56	Type
		57	testdata/language-features/adt/gadt03.reject.lc 5:34-5:38
		58	Type \| Type \ No newline at end of file


diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out index 22338d9b..0d911620 100644 --- a/testdata/language-features/adt/gadt04.reject.out +++ b/testdata/language-features/adt/gadt04.reject.out
@@ -5,17 +5,17 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
5	Value :: a -> forall m . M a m	5	Value :: a -> forall m . M a m
6	^^^^^	6	^^^^^
7	------------ trace	7	------------ trace
8	'M :: [32mType -> String -> Type[0m	8	'M :: Type -> String -> Type
9	Value :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M [32ma[0;32m [32mb[0;32m[0m	9	Value :: forall a . a -> forall (b :: String) . M a b
10	'MCase	10	'MCase
11	:: [32mforall (a :: forall b (c :: String) -> M [32mb[0;32m [32mc[0;32m -> Type)	11	:: forall (a :: forall b (c :: String) -> M b c -> Type)
12	-> (forall d . forall (e :: [32md[0;32m) -> forall (f :: String) . [32m[32m[32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m('Value [32md[0;32m [32me[0;32m [32mf[0;32m)[0;32m[0;32m)	12	-> (forall d . forall (e :: d) -> forall (f :: String) . a d f ('Value d e f))
13	-> forall g (h :: String) . forall (i :: M [32mg[0;32m [32mh[0;32m) -> [32m[32m[32m[32ma[0;32m [32m[32mg[0;32m[0;32m[0;32m [32m[32mh[0;32m[0;32m[0;32m [32m[32mi[0;32m[0;32m[0;32m[0m	13	-> forall g (h :: String) . forall (i :: M g h) -> a g h i
14	match'M	14	match'M
15	:: [32mforall (a :: Type -> Type)	15	:: forall (a :: Type -> Type)
16	-> (forall b (c :: String) -> [32m[32ma[0;32m [32m(M [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m	16	-> (forall b (c :: String) -> a (M b c)) -> forall d -> a d -> a d
17	'M2 :: [32mType -> String -> Type[0m	17	'M2 :: Type -> String -> Type
18	Value :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M2 [32ma[0;32m [32mb[0;32m[0m	18	Value :: forall a . a -> forall (b :: String) . M2 a b
19	!already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:	19	!already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
20	Value :: a -> forall m . M2 a m	20	Value :: a -> forall m . M2 a m
21	^^^^^	21	^^^^^
@@ -23,34 +23,64 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
23	Value :: a -> forall m . M a m	23	Value :: a -> forall m . M a m
24	^^^^^	24	^^^^^
25	------------ tooltips	25	------------ tooltips
26	testdata/language-features/adt/gadt04.reject.lc 2:6-2:7 Type \| Type -> String -> Type	26	testdata/language-features/adt/gadt04.reject.lc 2:6-2:7
27	testdata/language-features/adt/gadt04.reject.lc 2:6-3:33 Type	27	Type -> String -> Type \| Type -> String -> Type \| Type \| Type \| Type
28	testdata/language-features/adt/gadt04.reject.lc 2:11-2:15 Type	28	-> String -> Type \| Type \| Type \| Type
29	testdata/language-features/adt/gadt04.reject.lc 2:19-2:25 Type	29	testdata/language-features/adt/gadt04.reject.lc 2:6-3:33
30	testdata/language-features/adt/gadt04.reject.lc 2:19-2:33 Type	30	Type
31	testdata/language-features/adt/gadt04.reject.lc 2:29-2:33 Type	31	testdata/language-features/adt/gadt04.reject.lc 2:11-2:15
32	testdata/language-features/adt/gadt04.reject.lc 3:3-3:8 M _c _a \| forall a . a -> forall (b :: String) . M a b	32	Type
33	testdata/language-features/adt/gadt04.reject.lc 3:3-3:33 Type	33	testdata/language-features/adt/gadt04.reject.lc 2:19-2:25
34	testdata/language-features/adt/gadt04.reject.lc 3:12-3:13 _b	34	Type
35	testdata/language-features/adt/gadt04.reject.lc 3:12-3:33 Type	35	testdata/language-features/adt/gadt04.reject.lc 2:19-2:33
36	testdata/language-features/adt/gadt04.reject.lc 3:17-3:33 Type	36	Type
37	testdata/language-features/adt/gadt04.reject.lc 3:28-3:29 Type -> String -> Type	37	testdata/language-features/adt/gadt04.reject.lc 2:29-2:33
38	testdata/language-features/adt/gadt04.reject.lc 3:28-3:31 String -> Type	38	Type \| Type
39	testdata/language-features/adt/gadt04.reject.lc 3:28-3:33 Type	39	testdata/language-features/adt/gadt04.reject.lc 3:3-3:8
40	testdata/language-features/adt/gadt04.reject.lc 3:30-3:31 Type	40	forall a . a -> forall (b :: String) . M a b \| M _c _a
41	testdata/language-features/adt/gadt04.reject.lc 3:30-3:33 M _c _a -> Type	41	testdata/language-features/adt/gadt04.reject.lc 3:3-3:33
42	testdata/language-features/adt/gadt04.reject.lc 3:32-3:33 String \| _b	42	Type \| Type \| Type \| Type
43	testdata/language-features/adt/gadt04.reject.lc 5:6-5:8 Type -> String -> Type	43	testdata/language-features/adt/gadt04.reject.lc 3:12-3:13
44	testdata/language-features/adt/gadt04.reject.lc 5:12-5:16 Type	44	_b
45	testdata/language-features/adt/gadt04.reject.lc 5:20-5:26 Type	45	testdata/language-features/adt/gadt04.reject.lc 3:12-3:33
46	testdata/language-features/adt/gadt04.reject.lc 5:20-5:34 Type	46	Type
47	testdata/language-features/adt/gadt04.reject.lc 5:30-5:34 Type	47	testdata/language-features/adt/gadt04.reject.lc 3:17-3:33
48	testdata/language-features/adt/gadt04.reject.lc 6:3-6:8 forall a . a -> forall (b :: String) . M2 a b	48	Type
49	testdata/language-features/adt/gadt04.reject.lc 6:12-6:13 _b	49	testdata/language-features/adt/gadt04.reject.lc 3:28-3:29
50	testdata/language-features/adt/gadt04.reject.lc 6:12-6:34 Type	50	Type -> String -> Type
51	testdata/language-features/adt/gadt04.reject.lc 6:17-6:34 Type	51	testdata/language-features/adt/gadt04.reject.lc 3:28-3:31
52	testdata/language-features/adt/gadt04.reject.lc 6:28-6:30 Type -> String -> Type	52	String -> Type
53	testdata/language-features/adt/gadt04.reject.lc 6:28-6:32 String -> Type	53	testdata/language-features/adt/gadt04.reject.lc 3:28-3:33
54	testdata/language-features/adt/gadt04.reject.lc 6:28-6:34 Type	54	Type \| Type
55	testdata/language-features/adt/gadt04.reject.lc 6:31-6:32 Type	55	testdata/language-features/adt/gadt04.reject.lc 3:30-3:31
56	testdata/language-features/adt/gadt04.reject.lc 6:33-6:34 _b	56	Type \| Type
		57	testdata/language-features/adt/gadt04.reject.lc 3:30-3:33
		58	M _c _a -> Type
		59	testdata/language-features/adt/gadt04.reject.lc 3:32-3:33
		60	_b \| String
		61	testdata/language-features/adt/gadt04.reject.lc 5:6-5:8
		62	Type -> String -> Type
		63	testdata/language-features/adt/gadt04.reject.lc 5:12-5:16
		64	Type
		65	testdata/language-features/adt/gadt04.reject.lc 5:20-5:26
		66	Type
		67	testdata/language-features/adt/gadt04.reject.lc 5:20-5:34
		68	Type
		69	testdata/language-features/adt/gadt04.reject.lc 5:30-5:34
		70	Type \| Type
		71	testdata/language-features/adt/gadt04.reject.lc 6:12-6:13
		72	_b
		73	testdata/language-features/adt/gadt04.reject.lc 6:12-6:34
		74	Type
		75	testdata/language-features/adt/gadt04.reject.lc 6:17-6:34
		76	Type
		77	testdata/language-features/adt/gadt04.reject.lc 6:28-6:30
		78	Type -> String -> Type
		79	testdata/language-features/adt/gadt04.reject.lc 6:28-6:32
		80	String -> Type
		81	testdata/language-features/adt/gadt04.reject.lc 6:28-6:34
		82	Type \| Type
		83	testdata/language-features/adt/gadt04.reject.lc 6:31-6:32
		84	Type
		85	testdata/language-features/adt/gadt04.reject.lc 6:33-6:34
		86	_b \ No newline at end of file