use Doc instead of String is several places

47 files changed, 134 insertions, 180 deletions

diff --git a/backendtest/EditorExamplesTest.hs b/backendtest/EditorExamplesTest.hs
index 0bbdb572..a4434d2d 100644
--- a/backendtest/EditorExamplesTest.hs
+++ b/backendtest/EditorExamplesTest.hs
@@ -80,7 +80,7 @@ getRenderJob = do
   ppls <- forM tests $ \name -> do
     putStrLn $ "compile: " ++ name
     LambdaCube.compileMain [path] OpenGL33 name >>= \case
-      Left err  -> fail $ "compile error:\n" ++ err
+      Left err  -> fail $ "compile error:\n" ++ show err
       Right ppl -> return $ PipelineInfo
         { pipelineName = path </> name
         , pipeline = ppl
diff --git a/src/LambdaCube/Compiler.hs b/src/LambdaCube/Compiler.hs
index 017d629c..4c1b7fd8 100644
--- a/src/LambdaCube/Compiler.hs
+++ b/src/LambdaCube/Compiler.hs
@@ -118,14 +118,14 @@ moduleNameToFileName n = hn n ++ ".lc"
     h acc ('.':cs) = reverse acc </> hn cs
     h acc (c: cs) = h (c: acc) cs
 
-type ModuleFetcher m = Maybe FilePath -> Either FilePath MName -> m (Either String (FilePath, MName, m SourceCode))
+type ModuleFetcher m = Maybe FilePath -> Either FilePath MName -> m (Either Doc (FilePath, MName, m SourceCode))
 
 ioFetch :: MonadIO m => [FilePath] -> ModuleFetcher (MMT m x)
 ioFetch paths' imp n = do
     preludePath <- (</> "lc") <$> liftIO getDataDir
     let paths = paths' ++ [preludePath]
         find ((x, mn): xs) = liftIO (readFile' x) >>= maybe (find xs) (\src -> return $ Right (x, mn, liftIO src))
-        find [] = return $ Left $ show $ "can't find " <+> either (("lc file" <+>) . text) (("module" <+>) . text) n
+        find [] = return $ Left $ "can't find" <+> either (("lc file" <+>) . text) (("module" <+>) . text) n
                                   <+> "in path" <+> hsep (map text (paths' ++ ["<<installed-prelude-path>>"]{-todo-}))
     find $ nubBy ((==) `on` fst) $ map (first normalise . lcModuleFile) paths
   where
@@ -160,7 +160,7 @@ removeFromCache f = modify $ \m@(Modules nm im ni) -> case Map.lookup f nm of
     Nothing -> m
     Just i -> Modules (Map.delete f nm) (IM.delete i im) ni
 
-type Module' x = (SourceCode, Either String{-error msg-} (Module, x, Either String{-error msg-} (DesugarInfo, GlobalEnv)))
+type Module' x = (SourceCode, Either Doc{-error msg-} (Module, x, Either Doc{-error msg-} (DesugarInfo, GlobalEnv)))
 
 data Modules x = Modules
     { moduleIds :: !(Map FilePath Int)
@@ -170,7 +170,7 @@ data Modules x = Modules
 
 (<&>) = flip (<$>)
 
-loadModule :: MonadMask m => ((Infos, [Stmt]) -> x) -> Maybe FilePath -> Either FilePath MName -> MMT m x (Either String (FilePath, Module' x))
+loadModule :: MonadMask m => ((Infos, [Stmt]) -> x) -> Maybe FilePath -> Either FilePath MName -> MMT m x (Either Doc (FilePath, Module' x))
 loadModule ex imp mname_ = do
   r <- ask >>= \fetch -> fetch imp mname_
   case r of
@@ -184,34 +184,34 @@ loadModule ex imp mname_ = do
         fid <- gets nextMId
         modify $ \(Modules nm im ni) -> Modules (Map.insert fname fid nm) im $ ni+1
         res <- case parseLC $ FileInfo fid fname src of
-          Left e -> return $ Left $ show e
+          Left e -> return $ Left $ text $ show e
           Right e -> do
-            modify $ \(Modules nm im ni) -> Modules nm (IM.insert fid (fname, (src, Right (e, ex mempty, Left $ show $ "cycles in module imports:" <+> pShow mname <+> pShow (fst <$> moduleImports e)))) im) ni
+            modify $ \(Modules nm im ni) -> Modules nm (IM.insert fid (fname, (src, Right (e, ex mempty, Left $ "cycles in module imports:" <+> pShow mname <+> pShow (fst <$> moduleImports e)))) im) ni
             ms <- forM (moduleImports e) $ \(m, is) -> loadModule ex (Just fname) (Right $ sName m) <&> \r -> case r of
-                      Left err -> Left $ sName m ++ " couldn't be found"
+                      Left err -> Left $ pShow m <+> "is not found"
                       Right (fb, (src, dsge)) ->
-                         either (Left . const (sName m ++ " couldn't be parsed"))
+                         either (Left . const (pShow m <+> "couldn't be parsed"))
                                 (\(pm, x, e) -> either
-                                    (Left . const (sName m ++ " couldn't be typechecked"))
+                                    (Left . const (pShow m <+> "couldn't be typechecked"))
                                     (\(ds, ge) -> Right (ds{-todo: filter-}, Map.filterWithKey (\k _ -> filterImports is k) ge))
                                     e)
                                 dsge
 
             let (res, err) = case sequence ms of
-                  Left err -> (ex mempty, Left err)
+                  Left err -> (ex mempty, Left $ pShow err)
                   Right ms@(mconcat -> (ds, ge)) -> case runExcept $ runDefParser ds $ definitions e of
-                    Left err -> (ex mempty, Left $ show err)
+                    Left err -> (ex mempty, Left $ pShow err)
                     Right (defs, warnings, dsinfo) -> (,) (ex (map ParseWarning warnings ++ is, defs)) $ case res of
-                      Left err -> Left (show err)
+                      Left err -> Left $ pShow err
                       Right (mconcat -> newge) ->
                         right mconcat $ forM (fromMaybe [ExportModule $ SIName mempty mname] $ moduleExports e) $ \case
                             ExportId (sName -> d) -> case Map.lookup d newge of
                                 Just def -> Right (mempty{-TODO-}, Map.singleton d def)
-                                Nothing  -> Left $ d ++ " is not defined"
+                                Nothing  -> Left $ text d <+> "is not defined"
                             ExportModule (sName -> m) | m == mname -> Right (dsinfo, newge)
                             ExportModule m -> case [ x | ((m', _), x) <- zip (moduleImports e) ms, m' == m] of
                                 [x] -> Right x
-                                []  -> Left $ "empty export list: " ++ show (fname, m, map fst $ moduleImports e, mname)
+                                []  -> Left $ "empty export list in module" <+> text fname -- m, map fst $ moduleImports e, mname)
                                 _   -> error "export list: internal error"
                      where
                         (res, is) = runWriter . flip runReaderT (extensions e, initEnv <> ge) . runExceptT $ inference defs
@@ -224,7 +224,7 @@ loadModule ex imp mname_ = do
     filterImports (ImportJust ns) = (`elem` map sName ns)
 
 -- used in runTests
-getDef :: MonadMask m => FilePath -> SName -> Maybe Exp -> MMT m Infos (Infos, Either String (FilePath, Either String (Exp, Exp)))
+getDef :: MonadMask m => FilePath -> SName -> Maybe Exp -> MMT m Infos (Infos, Either Doc (FilePath, Either Doc (Exp, Exp)))
 getDef = getDef_ fst
 
 getDef_ ex m d ty = loadModule ex Nothing (Left m) <&> \case
@@ -236,37 +236,37 @@ getDef_ ex m d ty = loadModule ex Nothing (Left m) <&> \case
         , case Map.lookup d ge of
           Just (e, thy, si)
             | Just False <- (== thy) <$> ty          -- TODO: better type comparison
-                -> Left $ "type of " ++ d ++ " should be " ++ show ty ++ " instead of " ++ ppShow thy
+                -> Left $ "type of" <+> text d <+> "should be" <+> pShow ty <+> "instead of" <+> pShow thy
             | otherwise -> Right (e, thy)
-          Nothing -> Left $ d ++ " is not found"
+          Nothing -> Left $ text d <+> "is not found"
         )
 
 compilePipeline' ex backend m
     = second (either Left (fmap (compilePipeline backend) . snd)) <$> getDef_ ex m "main" (Just outputType)
 
 -- | most commonly used interface for end users
-compileMain :: [FilePath] -> IR.Backend -> MName -> IO (Either String IR.Pipeline)
+compileMain :: [FilePath] -> IR.Backend -> MName -> IO (Either Doc IR.Pipeline)
 compileMain path backend fname
     = fmap snd $ runMM (ioFetch path) $ compilePipeline' (const ()) backend fname
 
-parseModule :: [FilePath] -> MName -> IO (Either String String)
+parseModule :: [FilePath] -> MName -> IO (Either Doc String)
 parseModule path fname = runMM (ioFetch path) $ loadModule snd Nothing (Left fname) <&> \case
     Left err -> Left err
     Right (fname, (src, Left err)) -> Left err
     Right (fname, (src, Right (pm, infos, _))) -> Right $ pPrintStmts infos
 
 -- used by the compiler-service of the online editor
-preCompile :: (MonadMask m, MonadIO m) => [FilePath] -> [FilePath] -> Backend -> FilePath -> IO (String -> m (Either String IR.Pipeline, (Infos, String)))
+preCompile :: (MonadMask m, MonadIO m) => [FilePath] -> [FilePath] -> Backend -> FilePath -> IO (String -> m (Either Doc IR.Pipeline, (Infos, String)))
 preCompile paths paths' backend mod = do
   res <- runMM (ioFetch paths) $ loadModule ex Nothing $ Left mod
   case res of
-    Left err -> error $ "Prelude could not compiled: " ++ err
+    Left err -> error $ "Prelude could not compiled:" ++ show err
     Right (src, prelude) -> return compile
       where
         compile src = runMM fetch $ do
             let pname = "." </> "Prelude.lc"
             modify $ \(Modules nm im ni) -> Modules (Map.insert pname ni nm) (IM.insert ni (pname, prelude) im) (ni+1)
-            ((left plainShow . snd) &&& fst) <$> compilePipeline' ex backend "Main"
+            (snd &&& fst) <$> compilePipeline' ex backend "Main"
           where
             fetch imp = \case
                 Left "Prelude" -> return $ Right ("./Prelude.lc", "Prelude", undefined)
diff --git a/src/LambdaCube/Compiler/DesugaredSource.hs b/src/LambdaCube/Compiler/DesugaredSource.hs
index c2317615..6fb1cbaa 100644
--- a/src/LambdaCube/Compiler/DesugaredSource.hs
+++ b/src/LambdaCube/Compiler/DesugaredSource.hs
@@ -136,9 +136,10 @@ instance PShow SI where
     pShow (RangeSI r) = pShow r
 
 -- long version
+-- TODO: merge with pShow
 showSI x = case sourceInfo x of
-    RangeSI r -> show $ showRange r
-    x -> ppShow x
+    RangeSI r -> showRange r
+    x -> pShow x
 
 hashPos :: FileInfo -> SPos -> Int
 hashPos fn (SPos r c) = fileId fn `shiftL` 32 .|. r `shiftL` 16 .|. c
diff --git a/src/LambdaCube/Compiler/Infer.hs b/src/LambdaCube/Compiler/Infer.hs
index 74e0c4d6..e7c52d9a 100644
--- a/src/LambdaCube/Compiler/Infer.hs
+++ b/src/LambdaCube/Compiler/Infer.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE PatternSynonyms #-}
@@ -881,30 +882,31 @@ appTy t x = error $ "appTy: " ++ show t
 -------------------------------------------------------------------------------- error messages
 
 data ErrorMsg
-    = ErrorMsg String
+    = ErrorMsg Doc
     | ECantFind SName SI
-    | ETypeError String SI
+    | ETypeError Doc SI
     | ERedefined SName SI SI
 
-instance NFData ErrorMsg where
+instance NFData ErrorMsg where rnf = rnf . ppShow
+{-
     rnf = \case
         ErrorMsg m -> rnf m
         ECantFind a b -> rnf (a, b)
         ETypeError a b -> rnf (a, b)
         ERedefined a b c -> rnf (a, b, c)
-
+-}
 errorRange_ = \case
     ErrorMsg s -> []
     ECantFind s si -> [si]
     ETypeError msg si -> [si]
     ERedefined s si si' -> [si, si']
 
-instance Show ErrorMsg where
-    show = \case
+instance PShow ErrorMsg where
+    pShow = \case
         ErrorMsg s -> s
-        ECantFind s si -> "can't find: " ++ s ++ " in " ++ showSI si
-        ETypeError msg si -> "type error: " ++ msg ++ "\nin " ++ showSI si ++ "\n"
-        ERedefined s si si' -> "already defined " ++ s ++ " at " ++ showSI si ++ "\n and at " ++ showSI si'
+        ECantFind s si -> "can't find:" <+> text s <+> "in" <+> showSI si
+        ETypeError msg si -> "type error:" <+> msg <$$> "in" <+> showSI si
+        ERedefined s si si' -> "already defined" <+> text s <+> "at" <+> showSI si <$$> "and at" <+> showSI si'
 
 
 -------------------------------------------------------------------------------- inference
@@ -1051,7 +1053,7 @@ inferN_ tellTrace = infer  where
         EBind2_ si BMeta tt_ te
             | ELabelEnd te'   <- te -> refocus (ELabelEnd $ EBind2_ si BMeta tt_ te') eet
             | Unit <- tt    -> refocus te $ subst 0 TT eet
-            | Empty msg <- tt -> throwError' $ ETypeError msg si
+            | Empty msg <- tt -> throwError' $ ETypeError (text msg) si
             | T2 x y <- tt, let te' = EBind2_ si BMeta (up 1 y) $ EBind2_ si BMeta x te
                             -> refocus te' $ subst 2 (t2C (Var 1) (Var 0)) $ up 2 eet
             | CstrT t a b <- tt, Just r <- cst (a, t) b -> r
@@ -1117,8 +1119,8 @@ inferN_ tellTrace = infer  where
 
         EGlobal{} -> return eet
         _ -> case eet of
-            MEnd x -> throwError' $ ErrorMsg $ "focus todo: " ++ ppShow x
-            _ -> throwError' $ ErrorMsg $ "focus checkMetas: " ++ ppShow env ++ "\n" ++ ppShow (fst <$> eet)
+            MEnd x -> throwError' $ ErrorMsg $ "focus todo:" <+> pShow x
+            _ -> throwError' $ ErrorMsg $ "focus checkMetas:" <+> pShow env <$$> pShow (fst <$> eet)
       where
         refocus_ :: (Env -> CEnv ExpType -> IM m ExpType') -> Env -> CEnv ExpType -> IM m ExpType'
         refocus_ _ e (MEnd at) = focus_ e at
@@ -1255,12 +1257,13 @@ initEnv = Map.fromList
 
 data Info
     = Info Range String
-    | IType String String
+    | IType SIName Exp
     | ITrace String String
     | IError ErrorMsg
     | ParseWarning ParseWarning
 
-instance NFData Info
+instance NFData Info where rnf = rnf . ppShow
+{-
  where
     rnf = \case
         Info r s -> rnf (r, s)
@@ -1268,14 +1271,14 @@ instance NFData Info
         ITrace i s -> rnf (i, s)
         IError x -> rnf x
         ParseWarning w -> rnf w
-
-instance Show Info where
-    show = \case
-        Info r s -> ppShow r ++ "  " ++ s
-        IType a b -> a ++ " :: " ++ b
-        ITrace i s -> i ++ ":  " ++ s
-        IError e -> "!" ++ show e
-        ParseWarning w -> show w
+-}
+instance PShow Info where
+    pShow = \case
+        Info r s -> pShow r <+> "" <+> text s
+        IType a b -> shAnn False (pShow a) (pShow b)
+        ITrace i s -> text i <> ": " <+> text s
+        IError e -> "!" <> pShow e
+        ParseWarning w -> pShow w
 
 errorRange is = [r | IError e <- is, RangeSI r <- errorRange_ e ]
 
@@ -1288,12 +1291,12 @@ mkInfoItem _ _ = mempty
 
 listAllInfos m = h "trace"  (listTraceInfos m)
              ++  h "tooltips" [ ppShow r ++ "  " ++ intercalate " | " is | (r, is) <- listTypeInfos m ]
-             ++  h "warnings" [ show w | ParseWarning w <- m ]
+             ++  h "warnings" [ ppShow w | ParseWarning w <- m ]
   where
     h x [] = []
     h x xs = ("------------ " ++ x) : xs
 
-listTraceInfos m = [show i | i <- m, case i of Info{} -> False; ParseWarning{} -> False; _ -> True]
+listTraceInfos m = [ppShow i | i <- m, case i of Info{} -> False; ParseWarning{} -> False; _ -> True]
 listTypeInfos m = map (second Set.toList) $ Map.toList $ Map.unionsWith (<>) [Map.singleton r $ Set.singleton i | Info r i <- m]
 
 -------------------------------------------------------------------------------- inference for statements
@@ -1428,10 +1431,10 @@ inferType :: Monad m => SExp2 -> IM m Type
 inferType t = fmap (closedExp . fst . recheck "inferType" EGlobal . flip (,) TType . replaceMetas (Pi Hidden) . fmap fst) $ inferN (CheckType_ (debugSI "inferType CheckType_") TType EGlobal) t
 
 addToEnv :: Monad m => SIName -> ExpType -> IM m GlobalEnv
-addToEnv (SIName si s) (x, t) = do
+addToEnv sn@(SIName si s) (x, t) = do
 --    maybe (pure ()) throwError_ $ ambiguityCheck s t      -- TODO
 --    b <- asks $ (TraceTypeCheck `elem`) . fst
-    tell [IType s $ ppShow t]
+    tell [IType sn t]
     v <- asks $ Map.lookup s . snd
     case v of
       Nothing -> return $ Map.singleton s (closedExp x, closedExp t, si)
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index ce830f2a..a4dfa229 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -67,24 +67,21 @@ instance NFData ParseWarning
         Unreachable r -> rnf r
         Uncovered si r -> rnf si -- TODO --rnf r
 
-instance Show LCParseError where
-    show = \case
-        MultiplePatternVars xs -> unlines $ "multiple pattern vars:":
-            concat [(sName (head ns) ++ " is defined at"): map showSI ns | ns <- xs]
-        OperatorMismatch op op' -> "Operator precedences don't match:\n" ++ show (fromJust $ getFixity_ op) ++ " at " ++ showSI op ++ "\n" ++ show (fromJust $ getFixity_ op') ++ " at " ++ showSI op'
-        UndefinedConstructor n -> "Constructor " ++ show n ++ " is not defined at " ++ showSI n
-        ParseError p -> show p
-
-instance Show ParseWarning where
-    show = \case
-        Unreachable si -> "Source code is not reachable: " ++ show (showRange si)
-        Uncovered si pss -> "Uncovered pattern(s) at " ++ showSI si ++ "\nMissing case(s):\n" ++
-            unlines ["  " ++ unwords (map ppShow ps) ++
-                     " | " +++ intercalate ", " [ppShow p ++ " <- " ++ ppShow e | (p, e) <- gs]
+instance PShow LCParseError where
+    pShow = \case
+        MultiplePatternVars xs -> vcat $ "multiple pattern vars:":
+            concat [(pShow (head ns) <+> "is defined at"): map showSI ns | ns <- xs]
+        OperatorMismatch op op' -> "Operator precedences don't match:" <$$> pShow (fromJust $ getFixity_ op) <+> "at" <+> showSI op <$$> pShow (fromJust $ getFixity_ op') <+> "at" <+> showSI op'
+        UndefinedConstructor n -> "Constructor" <+> pShow n <+> "is not defined at" <+> showSI n
+        ParseError p -> text $ show p
+
+instance PShow ParseWarning where
+    pShow = \case
+        Unreachable si -> "Source code is not reachable:" <+> showRange si
+        Uncovered si pss -> "Uncovered pattern(s) at" <+> showSI si <$$> "Missing case(s):" <$$>
+               vcat ["  " <> hsep (map pShow ps) <+> 
+                     hsep [se <+> pShow p <+> "<-" <+> pShow e | (se, (p, e)) <- zip ("|": repeat ",") gs]
                     | (ps, gs) <- pss]
-      where
-        s +++ "" = ""
-        s +++ s' = s ++ s'
 
 trackSI p = do
     x <- p
diff --git a/src/LambdaCube/Compiler/Pretty.hs b/src/LambdaCube/Compiler/Pretty.hs
index a8fdf851..42e06ad3 100644
--- a/src/LambdaCube/Compiler/Pretty.hs
+++ b/src/LambdaCube/Compiler/Pretty.hs
@@ -17,6 +17,7 @@ import Data.String
 --import qualified Data.Map as Map
 import Control.Monad.Reader
 import Control.Monad.State
+import Control.DeepSeq
 --import Debug.Trace
 
 import qualified Text.PrettyPrint.ANSI.Leijen as P
@@ -66,6 +67,12 @@ data Fixity
     | InfixR !Int
     deriving (Eq, Show)
 
+instance PShow Fixity where
+    pShow = \case
+        Infix  i -> "infix"  `DApp` pShow i
+        InfixL i -> "infixl" `DApp` pShow i
+        InfixR i -> "infixr" `DApp` pShow i
+
 precedence, leftPrecedence, rightPrecedence :: Fixity -> Int
 
 precedence = \case
@@ -107,6 +114,9 @@ instance Monoid Doc where
     mempty = text ""
     a `mappend` b = DDoc $ DOHCat a b
 
+instance NFData Doc where
+    rnf x = rnf $ show x    -- TODO
+
 pattern DColor c a = DDoc (DOColor c a)
 
 strip :: Doc -> Doc
diff --git a/test/runTests.hs b/test/runTests.hs
index a0edf147..77ed43ea 100644
--- a/test/runTests.hs
+++ b/test/runTests.hs
@@ -204,15 +204,15 @@ doTest Config{..} (i, fn) = do
           Right (fname, x@Right{}) -> Right (fname, x) <$ removeFromCache fname
 
     f (i, e) | not $ isReject fn = case e of
-        Left e                   -> Left (unlines $ tab "!Failed" e: listTraceInfos i, Failed)
-        Right (fname, Left e)    -> Right ("typechecked module" , unlines $ e: listAllInfos i)
+        Left (show -> e)         -> Left (unlines $ tab "!Failed" e: listTraceInfos i, Failed)
+        Right (fname, Left (show -> e)) -> Right ("typechecked module" , unlines $ e: listAllInfos i)
         Right (fname, Right (e, te))
             | te == outputType   -> Right ("compiled pipeline", prettyShowUnlines $ compilePipeline OpenGL33 (e, te))
             | e == trueExp       -> Right ("reducted main", ppShow $ unfixlabel e)
             | te == boolType     -> Left (tab "!Failed" $ "main should be True but it is \n" ++ ppShow e, Failed)
             | otherwise          -> Right ("reduced main " ++ ppShow te, ppShow e)
       | otherwise = case e of
-        Left e                   -> Right ("error message", unlines $ e: listAllInfos i)
+        Left (show -> e)         -> Right ("error message", unlines $ e: listAllInfos i)
         Right _                  -> Left (tab "!Failed" "failed to catch error", Failed)
 
     tab msg
diff --git a/testdata/Builtins.out b/testdata/Builtins.out
index e5e3cf55..31c370e3 100644
--- a/testdata/Builtins.out
+++ b/testdata/Builtins.out
@@ -2983,8 +2983,7 @@ Uncovered pattern(s) at testdata/Builtins.lc:201:1:
 head (x: _) = x
 ^^^^
 Missing case(s):
-  Nil
-
+  Nil 
 Uncovered pattern(s) at testdata/Builtins.lc:340:1:
 swizzscalar (V2 x y) Sx = x
 swizzscalar (V2 x y) Sy = y
@@ -2996,13 +2995,11 @@ swizzscalar (V4 x y z w) Sy = y
 swizzscalar (V4 x y z w) Sz = z
 swizzscalar (V4 x y z w) Sw = w
 Missing case(s):
-  V2 Sz
-  V2 Sw
-  V3 Sw
-
+  V2 Sz 
+  V2 Sw 
+  V3 Sw 
 Uncovered pattern(s) at testdata/Builtins.lc:357:1:
 swizzvector v w | definedVec v = mapVec (swizzscalar v) w
 ^^^^^^^^^^^
 Missing case(s):
   _ _ | False <- definedVec _b
-
diff --git a/testdata/Prelude.out b/testdata/Prelude.out
index 7299d40d..23dd4a4a 100644
--- a/testdata/Prelude.out
+++ b/testdata/Prelude.out
@@ -1594,23 +1594,19 @@ Uncovered pattern(s) at testdata/Prelude.lc:50:1:
 tail (_: xs) = xs
 ^^^^
 Missing case(s):
-  Nil
-
+  Nil 
 Uncovered pattern(s) at testdata/Prelude.lc:58:1:
 foldr1 f (x: xs) = foldr f x xs
 ^^^^^^
 Missing case(s):
-  _ Nil
-
+  _ Nil 
 Uncovered pattern(s) at testdata/Prelude.lc:137:1:
 project @a @('RecItem s' a': xs) s @_ (RecordCons ts) | s == s' = fstTup (unsafeCoerce @_ @(HList '(a : map recItemType xs)) ts)
 project @a @('RecItem s' a': xs) s @_ (RecordCons ts) = project @a @xs s @(undefined @(isKeyC s a xs)) (RecordCons (sndTup (unsafeCoerce @_ @(HList '(a : map recItemType xs)) ts)))
 Missing case(s):
-  _ Nil _ _ _
-
+  _ Nil _ _ _ 
 Uncovered pattern(s) at testdata/Prelude.lc:388:10:
 (x : _)  !! 0  =  x
 (_ : xs) !! n  =  xs !! (n-1)
 Missing case(s):
-  Nil _
-
+  Nil _ 
diff --git a/testdata/adhoc.reject.out b/testdata/adhoc.reject.out
index f9fa8c49..511e62b1 100644
--- a/testdata/adhoc.reject.out
+++ b/testdata/adhoc.reject.out
@@ -2,7 +2,6 @@ type error: no instance of 'Component on ???
 in testdata/adhoc.reject.lc:4:5:
 x = one :: Vec 4 A
     ^^^
-
 ------------ trace
 'A :: Type
 A :: 'A
@@ -12,7 +11,6 @@ match'A :: (a :: Type -> Type) -> a 'A[0
 in testdata/adhoc.reject.lc:4:5:
 x = one :: Vec 4 A
     ^^^
-
 ------------ tooltips
 testdata/adhoc.reject.lc 2:6-2:7  Type
 testdata/adhoc.reject.lc 2:6-2:11  Type
diff --git a/testdata/complex.out b/testdata/complex.out
index c7a8df09..43a60b85 100644
--- a/testdata/complex.out
+++ b/testdata/complex.out
@@ -383,13 +383,11 @@ Uncovered pattern(s) at testdata/complex.lc:114:1:
 add @'Normal @'Normal (Complex a b) (Complex c d) = Complex (a + c) (b + d)
 ^^^
 Missing case(s):
-  Normal Polar _ _
-  Polar _ _ _
-
+  Normal Polar _ _ 
+  Polar _ _ _ 
 Uncovered pattern(s) at testdata/complex.lc:129:1:
 mul @'Normal @'Normal (Complex a b) (Complex c d) = Complex (a*c - b*d) (b*c + a*d)
 ^^^
 Missing case(s):
-  Normal Polar _ _
-  Polar _ _ _
-
+  Normal Polar _ _ 
+  Polar _ _ _ 
diff --git a/testdata/data.out b/testdata/data.out
index 3d54c617..ac7874a8 100644
--- a/testdata/data.out
+++ b/testdata/data.out
@@ -87,34 +87,29 @@ Uncovered pattern(s) at testdata/data.lc:6:23:
            | Data22 { x :: Int, y::Int }
                       ^
 Missing case(s):
-  Data21
-  Data24
-
+  Data21 
+  Data24 
 Uncovered pattern(s) at testdata/data.lc:6:33:
            | Data22 { x :: Int, y::Int }
                                 ^
 Missing case(s):
-  Data21
-  Data23
-  Data24
-
+  Data21 
+  Data23 
+  Data24 
 Uncovered pattern(s) at testdata/data.lc:10:32:
 data Data5 a5 b5 c5 = Data51 { a5::a5}
                                ^^
 Missing case(s):
-  Data53
-
+  Data53 
 Uncovered pattern(s) at testdata/data.lc:11:40:
                     | Data52 { a5::a5, b5::b5, c5::c5 }
                                        ^^
 Missing case(s):
-  Data51
-  Data53
-
+  Data51 
+  Data53 
 Uncovered pattern(s) at testdata/data.lc:11:48:
                     | Data52 { a5::a5, b5::b5, c5::c5 }
                                                ^^
 Missing case(s):
-  Data51
-  Data53
-
+  Data51 
+  Data53 
diff --git a/testdata/framebuffer02.reject.out b/testdata/framebuffer02.reject.out
index 9ae2b9aa..f9650704 100644
--- a/testdata/framebuffer02.reject.out
+++ b/testdata/framebuffer02.reject.out
@@ -8,7 +8,6 @@ in testdata/framebuffer02.reject.lc:2:17:
                             ,ColorImage @2 (V4 1.0 1.0 1.0 1.0)
                             ,colorImage1 1.0
                             )
-
 ------------ trace
 !type error: can not unify
 0
@@ -20,7 +19,6 @@ in testdata/framebuffer02.reject.lc:2:17:
                             ,ColorImage @2 (V4 1.0 1.0 1.0 1.0)
                             ,colorImage1 1.0
                             )
-
 ------------ tooltips
 testdata/framebuffer02.reject.lc 2:17-2:28  forall (a :: List Type) . 'sameLayerCounts a => HList a -> FrameBuffer (ImageLC ('head Type a)) ('map Type ImageKind GetImageKind a)
 testdata/framebuffer02.reject.lc 2:17-5:30  FrameBuffer 1 ('map Type ImageKind GetImageKind ('Cons (Image 1 ('Color (VecScalar 4 Float))) ('Cons (Image 2 ('Color (VecScalar 4 Float))) ('Cons (Image 1 ('Color (VecScalar 1 Float))) 'Nil))))
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index 34674b0a..44db093f 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -4,7 +4,6 @@ with
 'Int
 
 in proj
-
 ------------ trace
 'Data3 :: Type
 Data3 :: 'Bool -> 'Char -> 'Bool -> 'Data3
@@ -17,7 +16,6 @@ with
 'Int
 
 in proj
-
 ------------ tooltips
 testdata/language-features/adt/adt02.reject.lc 2:6-2:11  Type
 testdata/language-features/adt/adt02.reject.lc 2:6-5:25  Type
diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out
index 425f7213..fc2b7c30 100644
--- a/testdata/language-features/adt/gadt04.reject.out
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -1,7 +1,7 @@
 already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
   Value :: a -> forall m . M2 a m
   ^^^^^
- and at testdata/language-features/adt/gadt04.reject.lc:3:3:
+and at testdata/language-features/adt/gadt04.reject.lc:3:3:
   Value :: a -> forall m . M a m
   ^^^^^
 ------------ trace
@@ -14,7 +14,7 @@ Value :: forall a . a -> forall (b :: 'String) . 'M2 a[0;
 !already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
   Value :: a -> forall m . M2 a m
   ^^^^^
- and at testdata/language-features/adt/gadt04.reject.lc:3:3:
+and at testdata/language-features/adt/gadt04.reject.lc:3:3:
   Value :: a -> forall m . M a m
   ^^^^^
 ------------ tooltips
diff --git a/testdata/language-features/as-pattern/as-pattern02.reject.out b/testdata/language-features/as-pattern/as-pattern02.reject.out
index cca9bd79..9e6ac4ce 100644
--- a/testdata/language-features/as-pattern/as-pattern02.reject.out
+++ b/testdata/language-features/as-pattern/as-pattern02.reject.out
@@ -6,4 +6,3 @@ f x@[x:xs] = x:xs
 testdata/language-features/as-pattern/as-pattern02.reject.lc:2:6:
 f x@[x:xs] = x:xs
      ^
-
diff --git a/testdata/language-features/basic-list/list07.reject.out b/testdata/language-features/basic-list/list07.reject.out
index 01bf6d20..27c8a2e3 100644
--- a/testdata/language-features/basic-list/list07.reject.out
+++ b/testdata/language-features/basic-list/list07.reject.out
@@ -4,7 +4,6 @@ with
 'Char
 
 in builtin Nil
-
 ------------ trace
 !type error: can not unify
 'Float
@@ -12,7 +11,6 @@ with
 'Char
 
 in builtin Nil
-
 ------------ tooltips
 testdata/language-features/basic-list/list07.reject.lc 1:10-1:11  _b
 testdata/language-features/basic-list/list07.reject.lc 1:12-1:15  Float
diff --git a/testdata/language-features/basic-list/list10.reject.out b/testdata/language-features/basic-list/list10.reject.out
index 0855f067..186dc9c6 100644
--- a/testdata/language-features/basic-list/list10.reject.out
+++ b/testdata/language-features/basic-list/list10.reject.out
@@ -4,7 +4,6 @@ with
 'Float
 
 in builtin Nil
-
 ------------ trace
 !type error: can not unify
 'Int
@@ -12,7 +11,6 @@ with
 'Float
 
 in builtin Nil
-
 ------------ tooltips
 testdata/language-features/basic-list/list10.reject.lc 1:10-1:11  _b
 testdata/language-features/basic-list/list10.reject.lc 1:12-1:15  Float
diff --git a/testdata/language-features/basic-list/list14.reject.out b/testdata/language-features/basic-list/list14.reject.out
index bfd60997..c8abf9be 100644
--- a/testdata/language-features/basic-list/list14.reject.out
+++ b/testdata/language-features/basic-list/list14.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
                 ^^
-
 ------------ trace
 !type error: can not unify
 'List 'Char
@@ -16,7 +15,6 @@ with
 in testdata/language-features/basic-list/list14.reject.lc:1:17:
 value = 'h':'i':()
                 ^^
-
 ------------ tooltips
 testdata/language-features/basic-list/list14.reject.lc 1:9-1:12  Char
 testdata/language-features/basic-list/list14.reject.lc 1:9-1:13  List Char -> List Char
diff --git a/testdata/language-features/basic-list/list15.reject.out b/testdata/language-features/basic-list/list15.reject.out
index 081eabad..96a8907d 100644
--- a/testdata/language-features/basic-list/list15.reject.out
+++ b/testdata/language-features/basic-list/list15.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
                    ^^
-
 ------------ trace
 !type error: can not unify
 'Char
@@ -16,7 +15,6 @@ with
 in testdata/language-features/basic-list/list15.reject.lc:1:20:
 value = 'h':'i':():[]
                    ^^
-
 ------------ tooltips
 testdata/language-features/basic-list/list15.reject.lc 1:9-1:12  Char
 testdata/language-features/basic-list/list15.reject.lc 1:9-1:13  List Char -> List Char
diff --git a/testdata/language-features/basic-list/list16.reject.out b/testdata/language-features/basic-list/list16.reject.out
index 4f8d50a1..e109192d 100644
--- a/testdata/language-features/basic-list/list16.reject.out
+++ b/testdata/language-features/basic-list/list16.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
             ^^^
-
 ------------ trace
 !type error: can not unify
 'List 'Char
@@ -16,7 +15,6 @@ with
 in testdata/language-features/basic-list/list16.reject.lc:1:13:
 value = 'h':'i'
             ^^^
-
 ------------ tooltips
 testdata/language-features/basic-list/list16.reject.lc 1:9-1:12  Char
 testdata/language-features/basic-list/list16.reject.lc 1:9-1:13  List Char -> List Char
diff --git a/testdata/language-features/basic-list/listcomp08.reject.out b/testdata/language-features/basic-list/listcomp08.reject.out
index 35f2448e..3a989de0 100644
--- a/testdata/language-features/basic-list/listcomp08.reject.out
+++ b/testdata/language-features/basic-list/listcomp08.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
                       ^^^^^^^^^^
-
 ------------ trace
 !type error: can not unify
 'Bool
@@ -16,7 +15,6 @@ with
 in testdata/language-features/basic-list/listcomp08.reject.lc:1:23:
 value = [x | x <- [], "not Bool"]
                       ^^^^^^^^^^
-
 ------------ tooltips
 testdata/language-features/basic-list/listcomp08.reject.lc 1:10-1:33  _b -> List _a
 testdata/language-features/basic-list/listcomp08.reject.lc 1:23-1:33  String
diff --git a/testdata/language-features/basic-values/case03.reject.out b/testdata/language-features/basic-values/case03.reject.out
index 314fa80e..a964eb15 100644
--- a/testdata/language-features/basic-values/case03.reject.out
+++ b/testdata/language-features/basic-values/case03.reject.out
@@ -3,14 +3,12 @@ in testdata/language-features/basic-values/case03.reject.lc:1:10:
 value1 = case () of
   1 -> ()
   _ -> ()
-
 ------------ trace
 !type error: no instance of 'Num on ???
 in testdata/language-features/basic-values/case03.reject.lc:1:10:
 value1 = case () of
   1 -> ()
   _ -> ()
-
 ------------ tooltips
 testdata/language-features/basic-values/case03.reject.lc 1:10-3:10  ()
 testdata/language-features/basic-values/case03.reject.lc 1:15-1:17  ()
diff --git a/testdata/language-features/basic-values/case04.reject.out b/testdata/language-features/basic-values/case04.reject.out
index 7bb41248..ff2abacc 100644
--- a/testdata/language-features/basic-values/case04.reject.out
+++ b/testdata/language-features/basic-values/case04.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
        ^^^
-
 ------------ trace
 !type error: can not unify
 ()
@@ -16,7 +15,6 @@ with
 in testdata/language-features/basic-values/case04.reject.lc:2:8:
   1 -> '1'
        ^^^
-
 ------------ tooltips
 testdata/language-features/basic-values/case04.reject.lc 2:8-2:11  Char
 testdata/language-features/basic-values/case04.reject.lc 3:8-3:10  ()
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index cfd1d9af..717b0920 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -12,4 +12,3 @@ value x = case x of
                ^
 Missing case(s):
   _ | False <- fromInt 1 == _a
-
diff --git a/testdata/language-features/basic-values/def02.reject.out b/testdata/language-features/basic-values/def02.reject.out
index 615d9afa..eca7cb70 100644
--- a/testdata/language-features/basic-values/def02.reject.out
+++ b/testdata/language-features/basic-values/def02.reject.out
@@ -6,4 +6,3 @@ fun1 x x = 'c'
 testdata/language-features/basic-values/def02.reject.lc:1:8:
 fun1 x x = 'c'
        ^
-
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index 02db7cba..bd9e7133 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -11,5 +11,4 @@ Uncovered pattern(s) at testdata/language-features/basic-values/def03.lc:1:1:
 fun 1 = '1'
 fun 2 = '2'
 Missing case(s):
-  _ | False <- fromInt 1 == _a, False <- fromInt 2 == _a
-
+  _ | False <- fromInt 1 == _a , False <- fromInt 2 == _a
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index be624025..c52ecc70 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -1,7 +1,7 @@
 already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
- and at testdata/language-features/basic-values/def07.reject.lc:1:1:
+and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ trace
@@ -11,7 +11,7 @@ fun :: forall a . a -> 'Char
 !already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
- and at testdata/language-features/basic-values/def07.reject.lc:1:1:
+and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ tooltips
@@ -28,11 +28,9 @@ Uncovered pattern(s) at testdata/language-features/basic-values/def07.reject.lc:
 fun 1 = '1'
 fun 2 = '2'
 Missing case(s):
-  _ | False <- fromInt 1 == _a, False <- fromInt 2 == _a
-
+  _ | False <- fromInt 1 == _a , False <- fromInt 2 == _a
 Uncovered pattern(s) at testdata/language-features/basic-values/def07.reject.lc:3:1:
 fun2 1 _ = '1'
 ^^^^
 Missing case(s):
   _ _ | False <- fromInt 1 == _b
-
diff --git a/testdata/language-features/basic-values/if03.reject.out b/testdata/language-features/basic-values/if03.reject.out
index 83ed5e90..125dd5b5 100644
--- a/testdata/language-features/basic-values/if03.reject.out
+++ b/testdata/language-features/basic-values/if03.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
             ^^
-
 ------------ trace
 !type error: can not unify
 'Bool
@@ -16,6 +15,5 @@ with
 in testdata/language-features/basic-values/if03.reject.lc:1:13:
 value1 = if () then () else ()
             ^^
-
 ------------ tooltips
 testdata/language-features/basic-values/if03.reject.lc 1:13-1:15  ()
diff --git a/testdata/language-features/basic-values/if04.reject.out b/testdata/language-features/basic-values/if04.reject.out
index 23a77a44..6313eddc 100644
--- a/testdata/language-features/basic-values/if04.reject.out
+++ b/testdata/language-features/basic-values/if04.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
                               ^^^
-
 ------------ trace
 !type error: can not unify
 ()
@@ -16,7 +15,6 @@ with
 in testdata/language-features/basic-values/if04.reject.lc:1:31:
 value1 = if True then () else '_'
                               ^^^
-
 ------------ tooltips
 testdata/language-features/basic-values/if04.reject.lc 1:13-1:17  Bool
 testdata/language-features/basic-values/if04.reject.lc 1:13-1:25  () -> ()
diff --git a/testdata/language-features/basic-values/operator02.reject.out b/testdata/language-features/basic-values/operator02.reject.out
index 93092e52..cbf2cb0f 100644
--- a/testdata/language-features/basic-values/operator02.reject.out
+++ b/testdata/language-features/basic-values/operator02.reject.out
@@ -1,7 +1,7 @@
 already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3:
 a #$# b = ()
   ^^^
- and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
+and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
 a #$# b = ()
   ^^^
 ------------ trace
@@ -11,7 +11,7 @@ fun :: forall a . a -> ()
 !already defined #$# at testdata/language-features/basic-values/operator02.reject.lc:3:3:
 a #$# b = ()
   ^^^
- and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
+and at testdata/language-features/basic-values/operator02.reject.lc:1:3:
 a #$# b = ()
   ^^^
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/operator07.reject.out b/testdata/language-features/basic-values/operator07.reject.out
index be6ea8f3..bc594c9e 100644
--- a/testdata/language-features/basic-values/operator07.reject.out
+++ b/testdata/language-features/basic-values/operator07.reject.out
@@ -1,7 +1,7 @@
 Operator precedences don't match:
-Infix 5 at testdata/language-features/basic-values/operator07.reject.lc:11:11:
+infix 5 at testdata/language-features/basic-values/operator07.reject.lc:11:11:
 main = () @&> () <@& ()
           ^^^
-InfixL 5 at testdata/language-features/basic-values/operator07.reject.lc:11:18:
+infixl 5 at testdata/language-features/basic-values/operator07.reject.lc:11:18:
 main = () @&> () <@& ()
                  ^^^
diff --git a/testdata/language-features/basic-values/operator08.reject.out b/testdata/language-features/basic-values/operator08.reject.out
index 8721d19f..eb50a28a 100644
--- a/testdata/language-features/basic-values/operator08.reject.out
+++ b/testdata/language-features/basic-values/operator08.reject.out
@@ -1,7 +1,7 @@
 Operator precedences don't match:
-Infix 5 at testdata/language-features/basic-values/operator08.reject.lc:10:6:
+infix 5 at testdata/language-features/basic-values/operator08.reject.lc:10:6:
 x = (@&> () <@& ())
      ^^^
-InfixL 5 at testdata/language-features/basic-values/operator08.reject.lc:10:13:
+infixl 5 at testdata/language-features/basic-values/operator08.reject.lc:10:13:
 x = (@&> () <@& ())
             ^^^
diff --git a/testdata/language-features/basic-values/redefine01.reject.out b/testdata/language-features/basic-values/redefine01.reject.out
index 04a3868f..5bd93d2a 100644
--- a/testdata/language-features/basic-values/redefine01.reject.out
+++ b/testdata/language-features/basic-values/redefine01.reject.out
@@ -1,7 +1,7 @@
 already defined unit at testdata/language-features/basic-values/redefine01.reject.lc:3:1:
 unit = ()
 ^^^^
- and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
+and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
 unit = ()
 ^^^^
 ------------ trace
@@ -11,7 +11,7 @@ unit :: ()
 !already defined unit at testdata/language-features/basic-values/redefine01.reject.lc:3:1:
 unit = ()
 ^^^^
- and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
+and at testdata/language-features/basic-values/redefine01.reject.lc:1:1:
 unit = ()
 ^^^^
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/typesyn03.reject.out b/testdata/language-features/basic-values/typesyn03.reject.out
index c0fb5268..cf08db7a 100644
--- a/testdata/language-features/basic-values/typesyn03.reject.out
+++ b/testdata/language-features/basic-values/typesyn03.reject.out
@@ -1,7 +1,7 @@
 already defined 'MyUnit at testdata/language-features/basic-values/typesyn03.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
+and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
@@ -10,7 +10,7 @@ type MyUnit = ()
 !already defined 'MyUnit at testdata/language-features/basic-values/typesyn03.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
+and at testdata/language-features/basic-values/typesyn03.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
diff --git a/testdata/language-features/basic-values/typesyn04.reject.out b/testdata/language-features/basic-values/typesyn04.reject.out
index c903ddb8..94fc1e8c 100644
--- a/testdata/language-features/basic-values/typesyn04.reject.out
+++ b/testdata/language-features/basic-values/typesyn04.reject.out
@@ -1,7 +1,7 @@
 already defined 'MyUnit at testdata/language-features/basic-values/typesyn04.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
+and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
@@ -10,7 +10,7 @@ type MyUnit = ()
 !already defined 'MyUnit at testdata/language-features/basic-values/typesyn04.reject.lc:2:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
+and at testdata/language-features/basic-values/typesyn04.reject.lc:1:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
diff --git a/testdata/language-features/guard/guard02.reject.out b/testdata/language-features/guard/guard02.reject.out
index 3cff76bd..cd5b17c1 100644
--- a/testdata/language-features/guard/guard02.reject.out
+++ b/testdata/language-features/guard/guard02.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
            ^^
-
 ------------ trace
 !type error: can not unify
 'String
@@ -16,7 +15,6 @@ with
 in testdata/language-features/guard/guard02.reject.lc:2:12:
   | True = ()
            ^^
-
 ------------ tooltips
 testdata/language-features/guard/guard02.reject.lc 2:12-2:14  ()
 testdata/language-features/guard/guard02.reject.lc 3:5-3:10  Bool
diff --git a/testdata/language-features/guard/guard05.reject.out b/testdata/language-features/guard/guard05.reject.out
index 99275e00..23bf1739 100644
--- a/testdata/language-features/guard/guard05.reject.out
+++ b/testdata/language-features/guard/guard05.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
         ^^
-
 ------------ trace
 !type error: can not unify
 'Bool
@@ -16,7 +15,6 @@ with
 in testdata/language-features/guard/guard05.reject.lc:1:9:
 value | () = "wrong"
         ^^
-
 ------------ tooltips
 testdata/language-features/guard/guard05.reject.lc 1:9-1:11  ()
 testdata/language-features/guard/guard05.reject.lc 1:14-1:21  String
diff --git a/testdata/language-features/guard/guard12.reject.out b/testdata/language-features/guard/guard12.reject.out
index ca6c50ab..f1f024d7 100644
--- a/testdata/language-features/guard/guard12.reject.out
+++ b/testdata/language-features/guard/guard12.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
             ^^
-
 ------------ trace
 !type error: can not unify
 'Char
@@ -16,7 +15,6 @@ with
 in testdata/language-features/guard/guard12.reject.lc:1:13:
 fun x | x = () | otherwise = 'a'
             ^^
-
 ------------ tooltips
 testdata/language-features/guard/guard12.reject.lc 1:13-1:15  ()
 testdata/language-features/guard/guard12.reject.lc 1:30-1:33  Char
diff --git a/testdata/language-features/module/import04.reject.out b/testdata/language-features/module/import04.reject.out
index 82543ceb..85752b47 100644
--- a/testdata/language-features/module/import04.reject.out
+++ b/testdata/language-features/module/import04.reject.out
@@ -1,7 +1,7 @@
 already defined hello at testdata/language-features/module/import04.reject.lc:4:1:
 hello = "hello"
 ^^^^^
- and at testdata/language-features/module/Hello01.lc:3:1:
+and at testdata/language-features/module/Hello01.lc:3:1:
 hello = "hello"
 ^^^^^
 ------------ trace
@@ -9,7 +9,7 @@ hello :: 'String
 !already defined hello at testdata/language-features/module/import04.reject.lc:4:1:
 hello = "hello"
 ^^^^^
- and at testdata/language-features/module/Hello01.lc:3:1:
+and at testdata/language-features/module/Hello01.lc:3:1:
 hello = "hello"
 ^^^^^
 ------------ tooltips
diff --git a/testdata/language-features/module/import10.reject.out b/testdata/language-features/module/import10.reject.out
index 7f8c8d2d..5a61239c 100644
--- a/testdata/language-features/module/import10.reject.out
+++ b/testdata/language-features/module/import10.reject.out
@@ -1,7 +1,7 @@
 already defined 'MyUnit at testdata/language-features/module/import10.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
+and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
@@ -9,7 +9,7 @@ type MyUnit = ()
 !already defined 'MyUnit at testdata/language-features/module/import10.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
+and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
diff --git a/testdata/language-features/module/import11.reject.out b/testdata/language-features/module/import11.reject.out
index 531e98a6..f686f7e8 100644
--- a/testdata/language-features/module/import11.reject.out
+++ b/testdata/language-features/module/import11.reject.out
@@ -1,7 +1,7 @@
 already defined 'MyUnit at testdata/language-features/module/import11.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
+and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ trace
@@ -9,7 +9,7 @@ type MyUnit = ()
 !already defined 'MyUnit at testdata/language-features/module/import11.reject.lc:3:6:
 type MyUnit = ()
      ^^^^^^
- and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
+and at testdata/language-features/module/TypeSyn01Mod.lc:2:6:
 type MyUnit = ()
      ^^^^^^
 ------------ tooltips
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index e24ca6ec..f51d2e84 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -15,6 +15,5 @@ f _ True False = 0
 f False _ True = 1
 f True False _ = 2
 Missing case(s):
-  False False False
-  True True True
-
+  False False False 
+  True True True 
diff --git a/testdata/record01.reject.out b/testdata/record01.reject.out
index 01aefa45..b03f9397 100644
--- a/testdata/record01.reject.out
+++ b/testdata/record01.reject.out
@@ -6,7 +6,6 @@ with
 in testdata/record01.reject.lc:26:15:
  in ScreenOut record.fieldA
               ^^^^^^
-
 ------------ trace
 !type error: can not unify
 'FrameBuffer _b _a
@@ -16,7 +15,6 @@ with
 in testdata/record01.reject.lc:26:15:
  in ScreenOut record.fieldA
               ^^^^^^
-
 ------------ tooltips
 testdata/record01.reject.lc 2:16-2:21  (BlendEquation, BlendEquation) -> ((BlendingFactor, BlendingFactor), (BlendingFactor, BlendingFactor)) -> Vec 4 Float -> Blending Float
 testdata/record01.reject.lc 2:16-2:23  ((BlendingFactor, BlendingFactor), (BlendingFactor, BlendingFactor)) -> Vec 4 Float -> Blending Float
diff --git a/testdata/typesig.reject.out b/testdata/typesig.reject.out
index 1b78a5c8..cc45ae6e 100644
--- a/testdata/typesig.reject.out
+++ b/testdata/typesig.reject.out
@@ -1,12 +1,12 @@
 focus checkMetas: \a -> (\(b :: Type) -> primFix a b) (\(a := Type) -> \(c :: Type) -> <<HERE>>)
-\(a :: Type ~ _a) (b :: _a ~ 'X) -> typeAnn _a (labend X)
+\(d :: Type ~ _a) (e :: _a ~ 'X) -> typeAnn _a (labend X)
 ------------ trace
 'X :: Type
 X :: 'X
 'XCase :: (a :: 'X -> Type) -> a X -> (b :: 'X) -> a b
 match'X :: (a :: Type -> Type) -> a 'X -> (b :: Type) -> a b -> a b
 !focus checkMetas: \a -> (\(b :: Type) -> primFix a b) (\(a := Type) -> \(c :: Type) -> <<HERE>>)
-\(a :: Type ~ _a) (b :: _a ~ 'X) -> typeAnn _a (labend X)
+\(d :: Type ~ _a) (e :: _a ~ 'X) -> typeAnn _a (labend X)
 ------------ tooltips
 testdata/typesig.reject.lc 4:6-4:7  Type
 testdata/typesig.reject.lc 4:6-4:11  Type
diff --git a/testdata/typesigctx.reject.out b/testdata/typesigctx.reject.out
index 3d32979e..a1052bcd 100644
--- a/testdata/typesigctx.reject.out
+++ b/testdata/typesigctx.reject.out
@@ -1,6 +1,5 @@
 type error: no instance of 'Show' on ???
 in Wildcard2 builtin 'Type
-
 ------------ trace
 'X :: Type
 X :: 'X
@@ -10,7 +9,6 @@ match'X :: (a :: Type -> Type) -> a 'X[0
 show' :: forall a . 'Show' a => a -> 'X
 !type error: no instance of 'Show' on ???
 in Wildcard2 builtin 'Type
-
 ------------ tooltips
 testdata/typesigctx.reject.lc 1:6-1:7  Type
 testdata/typesigctx.reject.lc 1:6-1:11  Type
diff --git a/tool/Compiler.hs b/tool/Compiler.hs
index 359b23d6..e3fdd7a3 100644
--- a/tool/Compiler.hs
+++ b/tool/Compiler.hs
@@ -46,7 +46,7 @@ prettyPrint srcName output = do
 parse srcName backend includePaths output = do
     pplRes <- parseModule includePaths srcName
     case pplRes of
-        Left err -> fail err
+        Left err -> fail $ show err
         Right ppl -> maybe (putStrLn ppl) (`writeFile` ppl) output
 
 compile srcName backend includePaths output = do
@@ -57,7 +57,7 @@ compile srcName backend includePaths output = do
   do
       pplRes <- compileMain includePaths backend srcName
       case pplRes of
-        Left err -> fail err
+        Left err -> fail $ show err
         Right ppl -> B.writeFile (withOutName $ baseName <> ".json") $ encode ppl
 --          True -> writeFile (withOutName $ baseName <> ".ppl") $ prettyShowUnlines ppl