From 342cf16c564962a13c56665627cac301bb092923 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Fri, 3 Jan 2020 11:58:53 +0100 Subject: [PATCH] Improve error message printing - Omit unnecessary show-invocation - Use showOutputable for the error span (location) before/after: "RealSrcSpan SrcSpanPoint \"stdin\" 2 1: parse error (possibly incorrect indentation or mismatched brackets)" stdin:2:1: parse error (possibly incorrect indentation or mismatched brackets) --- src-brittany/Main.hs | 2 +- src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-brittany/Main.hs b/src-brittany/Main.hs index 527d2e8..423320b 100644 --- a/src-brittany/Main.hs +++ b/src-brittany/Main.hs @@ -325,7 +325,7 @@ coreIO putErrorLnIO config suppressOutput inputPathM outputPathM = case parseResult of Left left -> do putErrorLn "parse error:" - putErrorLn $ show left + putErrorLn left ExceptT.throwE 60 Right (anns, parsedSource, hasCPP) -> do (inlineConf, perItemConf) <- diff --git a/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs b/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs index 1fabf9c..0273d85 100644 --- a/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs +++ b/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs @@ -123,7 +123,7 @@ parseModuleFromString args fp dynCheck str = dynCheckRes <- ExceptT.ExceptT $ liftIO $ dynCheck dflags1 let res = ExactPrint.parseModuleFromStringInternal dflags1 fp str case res of - Left (span, err) -> ExceptT.throwE $ show span ++ ": " ++ err + Left (span, err) -> ExceptT.throwE $ showOutputable span ++ ": " ++ err Right (a , m ) -> pure (a, m, dynCheckRes)