apply hlint hints

Author: jrp2014

src/Eval.hs

@@ -35,7 +35,7 @@ import System.Directory ( doesFileExist )
 import Text.Parsec ( ParseError )
 
 import Control.Monad.Reader
- ( MonadIO(liftIO), MonadReader(local, ask), ReaderT(runReaderT) )
+ ( asks, MonadIO(liftIO), MonadReader(local, ask), ReaderT(runReaderT) )
 import Control.Exception
  ( try, throw, Exception(fromException), SomeException )
 
@@ -76,7 +76,7 @@ lineToEvalForm input = either (throw . PError . show ) eval $ readExpr input
 
 
 evalFile :: FilePath -> T.Text -> IO () --program file
-evalFile filePath fileExpr = (runASTinEnv basicEnv $ fileToEvalForm filePath fileExpr) >>= print
+evalFile filePath fileExpr = runASTinEnv basicEnv (fileToEvalForm filePath fileExpr) >>= print
 
 fileToEvalForm :: FilePath -> T.Text -> Eval LispVal
 fileToEvalForm filePath input = either (throw . PError . show ) evalBody $ readExprFile filePath input
@@ -198,8 +198,7 @@ eval (List (Atom "let":_) ) = throw $ BadSpecialForm "let function expects list
 
 
 eval (List [Atom "lambda", List params, expr]) = do
- ctx <- ask
- return $ Lambda (IFunc $ applyLambda expr params) ctx
+ asks (Lambda (IFunc $ applyLambda expr params))
 eval (List (Atom "lambda":_) ) = throw $ BadSpecialForm "lambda function expects list of parameters and S-Expression body\n(lambda <params> <s-expr>)"
 
 
@@ -215,12 +214,12 @@ eval all@(List [Atom "cdr", arg@(List (x:xs))]) =
 
 
 eval all@(List [Atom "car", List [Atom "quote", List (x:xs)]]) =
- return $ x
+ return x
 eval all@(List [Atom "car", arg@(List (x:xs))]) =
  case x of
  Atom _ -> do val <- eval arg
  eval $ List [Atom "car", val]
- _ -> return $ x
+ _ -> return x
 
 
 eval all@(List ((:) x xs)) = do

src/Parser.hs

@@ -28,6 +28,7 @@ import Text.Parsec.Text ( Parser )
 import qualified Text.Parsec.Token as Tok
 import qualified Text.Parsec.Language as Lang
 
+import Data.Functor (($>))
 import Data.Functor.Identity (Identity)
 import qualified Data.Text as T
 import Data.Char (digitToInt)
@@ -84,8 +85,8 @@ decimal = Tok.decimal lexer
 -- | Parse a sign, return either @id@ or @negate@ based on the sign parsed.
 -- Copied from Text.Parsec.Token
 sign :: Parser (Integer -> Integer)
-sign = char '-' *> return negate
- <|> char '+' *> return id
+sign = char '-' $> negate
+ <|> char '+' $> id
  <|> return id
 
 intRadix :: Radix -> Parser Integer
@@ -95,12 +96,12 @@ textLiteral :: Parser T.Text
 textLiteral = T.pack <$> Tok.stringLiteral lexer
 
 nil :: Parser ()
-nil = try ((char '\'') *> string "()") *> return () <?> "nil"
+nil = try (char '\'' *> string "()") *> return () <?> "nil"
 
 hashVal :: Parser LispVal
 hashVal = lexeme $ char '#'
- *> (char 't' *> return (Bool True)
- <|> char 'f' *> return (Bool False)
+ *> (char 't' $> Bool True
+ <|> char 'f' $> Bool False
  <|> char 'b' *> (Number <$> intRadix (2, oneOf "01"))
  <|> char 'o' *> (Number <$> intRadix (8, octDigit))
  <|> char 'd' *> (Number <$> intRadix (10, digit))

src/Prim.hs

@@ -8,6 +8,7 @@ import LispVal
  LispVal(Atom, Fun, Number, String, Bool, Nil, List),
  Eval )
 
+import Data.Functor ((<&>))
 import Data.Text as T ( Text, concat, pack, unpack )
 import Data.Text.IO as TIO ( hGetContents, hPutStr )
 import System.Directory ( doesFileExist )
@@ -45,11 +46,11 @@ primEnv = [
  , ("bl-eq?", mkF $ binop $ eqOp (==))
  , ("and" , mkF $ binopFold (eqOp (&&)) (Bool True))
  , ("or" , mkF $ binopFold (eqOp (||)) (Bool False))
- , ("not" , mkF $ unop $ notOp)
- , ("cons" , mkF $ Prim.cons)
- , ("cdr" , mkF $ Prim.cdr)
- , ("car" , mkF $ Prim.car)
- , ("quote" , mkF $ quote)
+ , ("not" , mkF $ unop notOp)
+ , ("cons" , mkF Prim.cons)
+ , ("cdr" , mkF Prim.cdr)
+ , ("car" , mkF Prim.car)
+ , ("quote" , mkF quote)
  , ("file?" , mkF $ unop fileExists)
  , ("slurp" , mkF $ unop slurp)
  , ("wslurp", mkF $ unop wSlurp)
@@ -90,7 +91,7 @@ readTextFile :: T.Text -> Handle -> IO LispVal
 readTextFile fileName handle = do
  exists <- doesFileExist $ T.unpack fileName
  if exists
- then (TIO.hGetContents handle) >>= (return . String)
+ then TIO.hGetContents handle <&> String
  else throw $ IOError $ T.concat [" file does not exits: ", fileName]
 
 put :: LispVal -> LispVal -> Eval LispVal
@@ -106,7 +107,7 @@ putTextFile :: T.Text -> T.Text -> Handle -> IO LispVal
 putTextFile fileName msg handle = do
  canWrite <- hIsWritable handle
  if canWrite
- then (TIO.hPutStr handle msg) >> (return $ String msg)
+ then TIO.hPutStr handle msg >> return (String msg)
  else throw $ IOError $ T.concat [" file does not exits: ", fileName]
 
 binopFold :: Binary -> LispVal -> [LispVal] -> Eval LispVal

test-hs/Golden/Main.hs

@@ -52,7 +52,7 @@ tastyGoldenRun testName testFile correct =
 tastyGoldenFail :: TestName -> T.Text -> FilePath -> TestTree
 tastyGoldenFail testName testFile correct =
  goldenVsString testName correct $
- (safeExec $ evalTextTest "lib/stdlib.scm" testFile) <&>
+ safeExec (evalTextTest "lib/stdlib.scm" testFile) <&>
  either C.pack (C.pack . show)
 
 evalTextTest :: T.Text -> T.Text -> IO LispVal --REPL

test-hs/Spec/Main.hs

@@ -21,70 +21,70 @@ main = do
  hspec $ describe "src/Parser.hs" $ do
 
  it "Atom" $
- readExpr "bb-8?" `shouldBe` (Right $ Atom "bb-8?")
+ readExpr "bb-8?" `shouldBe` Right (Atom "bb-8?")
 
  it "Num Negative" $
- readExpr "-2187" `shouldBe` (Right $ Number (-2187))
+ readExpr "-2187" `shouldBe` Right (Number (-2187))
 
  it "Num Positive" $
- readExpr "112233" `shouldBe` (Right $ Number 112233)
+ readExpr "112233" `shouldBe` Right (Number 112233)
 
  it "Num Positive with Sign" $
- readExpr "+12345" `shouldBe` (Right $ Number 12345)
+ readExpr "+12345" `shouldBe` Right (Number 12345)
 
  it "String" $
- readExpr "\"Gen L Organa\"" `shouldBe` (Right $ String "Gen L Organa")
+ readExpr "\"Gen L Organa\"" `shouldBe` Right (String "Gen L Organa")
 
  it "Bool True" $
- readExpr "#t" `shouldBe` (Right $ Bool True)
+ readExpr "#t" `shouldBe` Right (Bool True)
 
  it "Bool False" $
- readExpr "#f" `shouldBe` (Right $ Bool False)
+ readExpr "#f" `shouldBe` Right (Bool False)
 
  it "Nil" $
- readExpr "'()" `shouldBe` (Right $ Nil)
+ readExpr "'()" `shouldBe` Right Nil
 
  it "S-Expr: homogenous list" $
  readExpr "(2 1 87)" `shouldBe`
- (Right $ List [Number 2, Number 1,Number 87])
+ Right (List [Number 2, Number 1,Number 87])
 
  it "S-Expr: homogenous list quoted" $
  readExpr "'(2 1 87)" `shouldBe`
- (Right $ List [Atom "quote",List [Number 2, Number 1,Number 87]])
+ Right (List [Atom "quote",List [Number 2, Number 1,Number 87]])
 
  it "S-Expr: heterogenous list" $
  readExpr "(stromTrooper \"Fn\" 2 1 87)" `shouldBe`
- (Right $ List [Atom "stromTrooper", String "Fn", Number 2, Number 1,Number 87])
+ Right (List [Atom "stromTrooper", String "Fn", Number 2, Number 1,Number 87])
 
  it "S-Expr: heterogenous list quoted" $
  readExpr "'(stromTrooper \"Fn\" 2 1 87)" `shouldBe`
- (Right $ List [Atom "quote", List [Atom "stromTrooper", String "Fn", Number 2, Number 1,Number 87]])
+ Right (List [Atom "quote", List [Atom "stromTrooper", String "Fn", Number 2, Number 1,Number 87]])
 
  it "S-Expr: single negative" $
- readExpr "(-42)" `shouldBe` (Right $ List [Number (-42)])
+ readExpr "(-42)" `shouldBe` Right (List [Number (-42)])
 
  it "S-Expr: (- num)" $
- readExpr "(- 42)" `shouldBe` (Right $ List [Atom "-", Number 42])
+ readExpr "(- 42)" `shouldBe` Right (List [Atom "-", Number 42])
 
  it "S-Expr: prim call: numbers" $
  readExpr "(+ 1 2)" `shouldBe`
- (Right $ List [Atom "+", Number 1, Number 2])
+ Right (List [Atom "+", Number 1, Number 2])
 
  it "S-Expr: prim call: neg nums" $
  readExpr "(- -42 -42)" `shouldBe`
- (Right $ List [Atom "-", Number (-42), Number (-42)])
+ Right (List [Atom "-", Number (-42), Number (-42)])
 
  it "S-Expr: prim call: atoms" $
  readExpr "(- rogue squadron)" `shouldBe`
- (Right $ List [Atom "-", Atom "rogue", Atom "squadron"])
+ Right (List [Atom "-", Atom "rogue", Atom "squadron"])
 
  it "S-Expr: nested list" $
  readExpr "(lambda (x x) (+ x x))" `shouldBe`
- (Right $ List [Atom "lambda", List [Atom "x", Atom "x"], List [Atom "+", Atom "x", Atom "x"]])
+ Right (List [Atom "lambda", List [Atom "x", Atom "x"], List [Atom "+", Atom "x", Atom "x"]])
  it "Comment: end-of/single line" $
- readExpr ";skip\nartoodetoo ;extra will throw\n;skip" `shouldBe` (Right $ Atom "artoodetoo")
+ readExpr ";skip\nartoodetoo ;extra will throw\n;skip" `shouldBe` Right (Atom "artoodetoo")
  it "Comment: multi-line line" $
- readExpr "{-Han\nShot\nFirst\n-} (c3 {- these are not the droids you're looking for-} po)\n {-Jar Jar Binks =?= Sith Lord -}" `shouldBe` (Right $ List [Atom "c3",Atom "po"])
+ readExpr "{-Han\nShot\nFirst\n-} (c3 {- these are not the droids you're looking for-} po)\n {-Jar Jar Binks =?= Sith Lord -}" `shouldBe` Right (List [Atom "c3",Atom "po"])
 
  hspec $ describe "src/Eval.hs" $ do
  wStd "test/add.scm" $ Number 3
@@ -126,7 +126,7 @@ wStd = runExpr (Just "test/stdlib_mod.scm")
 tExpr :: T.Text -> T.Text -> LispVal -> SpecWith ()
 tExpr note expr val =
  it (T.unpack note) $ evalVal `shouldBe` val
- where evalVal = (unsafePerformIO $ runASTinEnv basicEnv $ fileToEvalForm "" expr)
+ where evalVal = unsafePerformIO $ runASTinEnv basicEnv $ fileToEvalForm "" expr
 
 
 runExpr :: Maybe T.Text -> T.Text -> LispVal -> SpecWith ()