From acbaba078294109cbb69b2231fd6cc1918d13983 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Wed, 12 Apr 2017 14:53:47 +0200 Subject: [PATCH] Omit output syntax test for fix-point tests --- src-literatetests/Main.hs | 4 +++- src/Language/Haskell/Brittany.hs | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src-literatetests/Main.hs b/src-literatetests/Main.hs index a2b2807..b96ffc1 100644 --- a/src-literatetests/Main.hs +++ b/src-literatetests/Main.hs @@ -154,7 +154,9 @@ defaultTestConfig = Config , _lconfig_altChooser = coerce $ AltChooserBoundedSearch 3 , _lconfig_columnAlignMode = coerce (ColumnAlignModeMajority 0.7) } - , _conf_errorHandling = _conf_errorHandling staticDefaultConfig + , _conf_errorHandling = (_conf_errorHandling staticDefaultConfig) + { _econf_omit_output_valid_check = coerce True + } , _conf_forward = ForwardOptions { _options_ghc = Identity [] } diff --git a/src/Language/Haskell/Brittany.hs b/src/Language/Haskell/Brittany.hs index 6eeea5d..d45ef98 100644 --- a/src/Language/Haskell/Brittany.hs +++ b/src/Language/Haskell/Brittany.hs @@ -115,7 +115,10 @@ parsePrintModule conf filename input = do case parseResult of Left (_ , s ) -> return $ Left $ "parsing error: " ++ s Right (anns, parsedModule) -> do - (errs, ltext) <- pPrintModuleAndCheck conf anns parsedModule + let omitCheck = conf & _conf_errorHandling .> _econf_omit_output_valid_check .> confUnpack + (errs, ltext) <- if omitCheck + then return $ pPrintModule conf anns parsedModule + else pPrintModuleAndCheck conf anns parsedModule return $ if null errs then Right $ TextL.toStrict $ ltext else