better namespace handling in pretty print

29 files changed, 94 insertions, 94 deletions

diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index a78cfe8f..3fd03cdf 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'Bool
-value2 :: 'Bool
+value1 :: Bool
+value2 :: Bool
 ------------ tooltips
 testdata/language-features/basic-values/bool01.lc 1:1-1:7  Bool
 testdata/language-features/basic-values/bool01.lc 1:10-1:14  Bool
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index e1b5a2e5..974b56da 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: forall a . ('Eq a, 'Num a) => ()
-value2 :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => 'String
+value1 :: forall a . (Eq a, Num a) => ()
+value2 :: forall a . (Eq a, Num a, Eq a, Num a) => String
 ------------ tooltips
 testdata/language-features/basic-values/case02.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/case02.lc 1:10-3:10  ()
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 717b0920..e77a1024 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . ('Eq a, 'Num a) => a -> 'Char
+value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/basic-values/case05.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 40e7db3b..d2524007 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: forall a . ('Eq a, 'Num a) => a -> 'Char
+value :: forall a . (Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/basic-values/case06.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index b429a33b..294c3b86 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -1,23 +1,23 @@
 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
-match'A :: forall (a :: Type -> Type) -> a 'A -> forall b -> a b -> a b
+B :: A
+C :: A
+D :: A
+'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
-match'E :: forall (a :: Type -> Type) -> a 'E -> forall b -> a b -> a b
+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
+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
-match'D1 :: forall (a :: Type -> Type) -> a 'D1 -> forall b -> a b -> a b
+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
+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
 testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 6c174057..712cd657 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
 unit :: ()
-fun1 :: forall a b . 'Num b => a -> b
-fun2 :: forall a b c d e . a -> b -> c -> d -> e -> 'Char
+fun1 :: forall a b . Num b => a -> b
+fun2 :: forall a b c d e . a -> b -> c -> d -> e -> Char
 ------------ tooltips
 testdata/language-features/basic-values/def01.lc 1:1-1:5  ()
 testdata/language-features/basic-values/def01.lc 1:8-1:10  ()
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index bd9e7133..38bae81f 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 ------------ tooltips
 testdata/language-features/basic-values/def03.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 1f3fbeb7..977601b2 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
-fun2 :: forall a b . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> b -> 'Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun2 :: forall a b . (Eq a, Num a, Eq a, Num a) => a -> b -> Char
 ------------ tooltips
 testdata/language-features/basic-values/def04.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def04.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index c52ecc70..8cb5a1a4 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -5,9 +5,9 @@ and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ trace
-fun :: forall a . ('Eq a, 'Num a, 'Eq a, 'Num a) => a -> 'Char
-fun2 :: forall a b . ('Eq a, 'Num a) => a -> b -> 'Char
-fun :: forall a . a -> 'Char
+fun :: forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
+fun2 :: forall a b . (Eq a, Num a) => a -> b -> Char
+fun :: forall a . a -> Char
 !already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index 5dd94137..325f4361 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-x :: 'Char
-y :: 'Char
+x :: Char
+y :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder01.lc 1:1-1:2  Char
 testdata/language-features/basic-values/deforder01.lc 1:5-1:8  Char
diff --git a/testdata/language-features/basic-values/deforder02.out b/testdata/language-features/basic-values/deforder02.out
index 473b93ff..9f79a9bd 100644
--- a/testdata/language-features/basic-values/deforder02.out
+++ b/testdata/language-features/basic-values/deforder02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-x :: 'Char
-y :: 'Char
+x :: Char
+y :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder02.lc 1:1-1:2  Char
 testdata/language-features/basic-values/deforder02.lc 1:5-1:6  Char
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index f7c5fa08..d98597f6 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder03.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder03.lc 1:17-1:19  ()
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index 430a18c3..5d6e1d80 100644
--- a/testdata/language-features/basic-values/deforder04.out
+++ b/testdata/language-features/basic-values/deforder04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder04.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder04.lc 1:17-1:18  ()
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index 59230da2..73897e36 100644
--- a/testdata/language-features/basic-values/deforder05.out
+++ b/testdata/language-features/basic-values/deforder05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder05.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder05.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 55bffe51..794432d6 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/deforder06.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder06.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index 2f87c92d..e16184f0 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -4,21 +4,21 @@ funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> b
 <@ :: forall a b . a -> b -> a
 @> :: forall a b . a -> b -> b
-value1 :: 'Float
-value2 :: 'Float
-value3 :: 'Float
-value4 :: 'Float
-value5 :: 'String
-value6 :: 'Char
-value7 :: 'String
+value1 :: Float
+value2 :: Float
+value3 :: Float
+value4 :: Float
+value5 :: String
+value6 :: Char
+value7 :: String
 value8 :: ()
-funValue1 :: 'Float
-funValue2 :: 'Float
-funValue3 :: 'Float
-funValue4 :: 'Float
-funValue5 :: 'String
-funValue6 :: 'Char
-funValue7 :: 'String
+funValue1 :: Float
+funValue2 :: Float
+funValue3 :: Float
+funValue4 :: Float
+funValue5 :: String
+funValue6 :: Char
+funValue7 :: String
 funValue8 :: ()
 ------------ tooltips
 testdata/language-features/basic-values/fixity02.lc 1:1-1:5  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 991efd46..b68d03e3 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 value1 :: ()
-value2 :: 'Float
+value2 :: Float
 ------------ tooltips
 testdata/language-features/basic-values/if01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/if01.lc 1:10-1:33  ()
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 3420e35e..213d9e06 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -1,12 +1,12 @@
 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
-match'D :: forall (a :: Type -> Type) -> a 'D -> forall b -> a b -> a b
-d2 :: () -> () -> 'D
-d3 :: () -> () -> () -> 'D
+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
+match'D :: forall (a :: Type -> Type) -> a D -> forall b -> a b -> a b
+d2 :: () -> () -> D
+d3 :: () -> () -> () -> D
 ------------ tooltips
 testdata/language-features/basic-values/infix03.lc 1:6-1:7  Type
 testdata/language-features/basic-values/infix03.lc 1:6-1:18  Type
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 8ab8c8e0..36ecf369 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,10 +1,10 @@
 main is not found
 ------------ trace
-value1 :: forall a . 'Num a => a
-value2 :: forall a . 'Num a => a
-value3 :: forall a . 'Num a => a
-value4 :: forall a . 'Num a => a
-value5 :: forall a . 'Num a => a
+value1 :: forall a . Num a => a
+value2 :: forall a . Num a => a
+value3 :: forall a . Num a => a
+value4 :: forall a . Num a => a
+value5 :: forall a . Num a => a
 ------------ tooltips
 testdata/language-features/basic-values/let01.lc 1:1-1:7  forall a . Num a => a
 testdata/language-features/basic-values/let01.lc 1:18-1:19  _b
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 0f7b3dbf..abaca3a7 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,13 +1,13 @@
 main is not found
 ------------ trace
-intValue1 :: forall a . 'Num a => a
-intValue2 :: forall a . 'Num a => a
-intValue3 :: forall a . 'Num a => a
-floatValue1 :: 'Float
-floatValue2 :: 'Float
-charValue :: 'Char
-stringValue1 :: 'String
-stringValue2 :: 'String
+intValue1 :: forall a . Num a => a
+intValue2 :: forall a . Num a => a
+intValue3 :: forall a . Num a => a
+floatValue1 :: Float
+floatValue2 :: Float
+charValue :: Char
+stringValue1 :: String
+stringValue2 :: String
 ------------ tooltips
 testdata/language-features/basic-values/literal01.lc 1:1-1:10  forall a . Num a => a
 testdata/language-features/basic-values/literal01.lc 1:13-1:14  _b
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 8956a8a3..9a8f5f22 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: 'Char
+value :: Char
 ------------ tooltips
 testdata/language-features/basic-values/shadowing01.lc 1:1-1:6  Char
 testdata/language-features/basic-values/shadowing01.lc 2:11-2:14  Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 201f5f75..d4d4373b 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-c :: forall a . 'Num a => a
-world :: 'String
-value2 :: 'Char
+c :: forall a . Num a => a
+world :: String
+value2 :: Char
 ------------ tooltips
 testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  forall a . Num a => a
 testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  _b
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 649fc85f..4e15f913 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-tuple1 :: forall a . 'Num a => (a, 'Float, 'Char, 'String, ())
+tuple1 :: forall a . Num a => (a, Float, Char, String, ())
 tuple2 :: ((), ())
-tuple3 :: (('String, 'Char), ())
+tuple3 :: ((String, Char), ())
 ------------ tooltips
 testdata/language-features/basic-values/tuple02.lc 1:1-1:7  forall a . Num a => (a, Float, Char, String, ())
 testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (_b, Float, Char, String, ())
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index cd018c6f..c473b40c 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'Char
-value2 :: 'Char
+value1 :: Char
+value2 :: Char
 ------------ tooltips
 testdata/language-features/basic-values/typesig01.lc 1:11-1:15  Type
 testdata/language-features/basic-values/typesig01.lc 2:1-2:7  Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index bbaa5075..c1e6361e 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: 'Char
-value2 :: 'Char
+value1 :: Char
+value2 :: Char
 ------------ tooltips
 testdata/language-features/basic-values/typesig02.lc 1:1-1:7  Char
 testdata/language-features/basic-values/typesig02.lc 1:10-1:13  Char
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 1e8fa0f6..d107f4eb 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -2,10 +2,10 @@ main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 funR :: forall a b . a -> b -> b
-value1 :: 'Char
-value2 :: 'String
-value3 :: 'Char
-value4 :: 'String
+value1 :: Char
+value2 :: String
+value3 :: Char
+value4 :: String
 ------------ tooltips
 testdata/language-features/basic-values/typesig05.lc 1:1-1:5  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig05.lc 1:12-1:13  _d
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index a5bcd427..c249026f 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -2,8 +2,8 @@ main is not found
 ------------ trace
 funL :: forall a b . a -> b -> a
 <@ :: forall a b . a -> b -> a
-value1 :: 'String
-value2 :: 'String
+value1 :: String
+value2 :: String
 ------------ tooltips
 testdata/language-features/basic-values/typesig06.lc 1:1-1:5  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig06.lc 1:12-1:13  _d
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index d8beb681..65ce8df7 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: 'Int
-value2 :: 'Int
-value3 :: 'Int
+value1 :: Int
+value2 :: Int
+value3 :: Int
 value4 :: () -> () -> ()
 @@@ :: () -> () -> ()
 value6 :: () -> () -> ()
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index a0785fa9..11743f93 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-value1 :: forall a . ('Eq a, 'Num a) => ()
-value2 :: forall a . ('Eq a, 'Num a) => ()
-value3 :: forall a . ('Eq a, 'Num a) => ()
-value4 :: forall a . ('Eq a, 'Num a) => ()
+value1 :: forall a . (Eq a, Num a) => ()
+value2 :: forall a . (Eq a, Num a) => ()
+value3 :: forall a . (Eq a, Num a) => ()
+value4 :: forall a . (Eq a, Num a) => ()
 ------------ tooltips
 testdata/language-features/basic-values/where05.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 1:10-3:10  ()