hlint and formatting

Author: sfultong

src/Telomare/Eval.hs

@@ -33,14 +33,14 @@ import Telomare (AbstractRunTime, BreakState, BreakState', ExprA (..),
                  RunTimeError (..), TelomareLike (..), Term3 (Term3),
                  Term4 (Term4), UnprocessedParsedTerm (..),
                  UnprocessedParsedTermF (..), UnsizedRecursionToken (..), app,
-                 appF, convertAbortMessage, deferF, eval,
-                 forget, g2s, innerChurchF, insertAndGetKey, pairF, rootFrag,
-                 s2g, setEnvF, tag, unFragExprUR)
+                 appF, convertAbortMessage, deferF, eval, forget, g2s,
+                 innerChurchF, insertAndGetKey, pairF, rootFrag, s2g, setEnvF,
+                 tag, unFragExprUR)
 import Telomare.Parser (AnnotatedUPT, parseModule, parseOneExprOrTopLevelDefs,
                         parsePrelude)
-import Telomare.Possible (abortExprToTerm4, abortPossibilities, appB,
-                          deferB, evalStaticCheck, getSizesM,
-                          sizeTermM, term3ToUnsizedExpr, term4toAbortExpr, evalStaticCheck)
+import Telomare.Possible (abortExprToTerm4, abortPossibilities, appB, deferB,
+                          evalStaticCheck, getSizesM, sizeTermM,
+                          term3ToUnsizedExpr, term4toAbortExpr)
 import Telomare.PossibleData (AbortExpr, CompiledExpr (..), SizedRecursion (..),
                               VoidF, envB, leftB, pairB, pattern AbortFW,
                               rightB, setEnvB)
@@ -110,9 +110,9 @@ data SizingOption
 findChurchSizeD :: SizingOption -> Term3 -> Either EvalError Term4
 findChurchSizeD so t3 = case so of
   -- _ -> pure (convertPT (const 255) t3)
-  NoSizing -> pure (convertPT (const 255) t3)
+  NoSizing       -> pure (convertPT (const 255) t3)
   UnitTestSizing -> calculateRecursionLimits False t3
-  MainSizing -> calculateRecursionLimits True t3
+  MainSizing     -> calculateRecursionLimits True t3
 
 -- rather than remove checks, we should extract them so that they can be run separately, if that gives a performance benefit
 {-

src/Telomare/Possible.hs

@@ -17,9 +17,9 @@ import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader (Reader, ReaderT, ask, local, runReaderT)
 import qualified Control.Monad.Reader as Reader
+import qualified Control.Monad.State.Lazy as StateL
 import Control.Monad.State.Strict (State, StateT)
 import qualified Control.Monad.State.Strict as State
-import qualified Control.Monad.State.Lazy as StateL
 import Control.Monad.Trans.Class
 import Data.Bifunctor
 import Data.Char (chr)
@@ -661,7 +661,7 @@ unsizedStepM''' maxSize zeros recursionTest handleOther x = f x where
                                           (appB (appB argThree (unsizedEE $ SizeStepStubF tok 1 envB)) argOne)
                                           (dbt tok . unsizedEE . SizeStageF (SizedRecursion . Map.singleton tok $ pure 1) $ appB argTwo argOne))
               result = pairB zeroB (pairB zeroB (pairB zeroB (pairB (pairB rf trb) zeroB)))
-          in pure $ result
+          in pure result
     UnsizedFW (SizeStepStubF tok n e@(BasicEE (PairSF _ es))) ->
       let dbti = id
       in pure $ pairB (deferB unsizedStepMrfa $ dbtisss (iteB (dbti $ appB argFour argTOne)
@@ -1321,8 +1321,8 @@ instance {-# OVERLAPPING #-} PrettyPrintable (PPOut CompiledExpr) where
       BasicEE (PairSF a b) -> liftA2 (<>) (doLet a) (f b)
       z -> indentWithTwoChildren' "#!#" (pure "") (showP z)
     doLet x = case cata lf x of
-      Just n -> pure $ chr n : []
-      _ -> indentWithTwoChildren' "#/#" (pure "") (showP x)
+      Just n -> pure [chr n]
+      _      -> indentWithTwoChildren' "#/#" (pure "") (showP x)
     lf = \case
       BasicFW ZeroSF -> Just 0
       BasicFW (PairSF n (Just 0)) -> succ <$> n

src/Telomare/Resolver.hs

@@ -20,6 +20,7 @@ import qualified Data.ByteArray as BA
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
 import Data.Char (ord)
+import Data.Fix (Fix)
 import qualified Data.Foldable as F
 import Data.Functor.Foldable (Base, Corecursive (ana, apo), Recursive (cata))
 import Data.List (delete, elem, elemIndex, find, foldl', intercalate, nubBy,
@@ -33,7 +34,6 @@ import PrettyPrint (TypeDebugInfo (..), prettyPrint, showTypeDebugInfo)
 import Telomare
 import Telomare.Parser (AnnotatedUPT, TelomareParser)
 import Text.Megaparsec (errorBundlePretty, runParser)
-import Data.Fix (Fix)
 
 debug :: Bool
 debug = False
@@ -503,8 +503,8 @@ letsToApps term =
                             (name', (def, _)) <- nBindings, name == name']
                 makeBinding (n,d) inner = anno :< TAppF (makeLambda n inner) d
             sortedBindings >>= \sb -> let trans = getTransitive' dependencies refs
-                                          sb' = [x | x <- sb, elem (fst x) trans]
-                                      in pure (foldr makeBinding nInner sb', Set.difference trans (Set.fromList $ map fst sb'))
+                                          sb' = [x | x <- sb, fst x `elem` trans]
+                                      in pure (foldr makeBinding nInner sb', Set.difference trans (Set.fromList $ fmap fst sb'))
         x -> WriterT . fmap (first ((anno :<) . brt)) . runWriterT $ sequence x where
           brt = \case
             ITEUPF i t e -> TITEF i t e