572c598 · vty · git.iko.soy

git.iko.soy/vty

Merge pull request #203 from hapytex/hlint/use-fmap

make use of <$>

commit572c59881b0bc0ca98a22b4187f9dafbf33e3fc4 authorJonathan Daugherty <cygnus@foobox.com> dateTue 16 Feb 2021, 09:44 (6 years ago) parentdfa4c1e f2c58a1

4 files changed+7−8

compare with master

unifiedsplit

src/Codec/Binary/UTF8/Debug.hs+1−2 src/Data/Terminfo/Eval.hs+2−2 src/Data/Terminfo/Parse.hs+3−3 src/Graphics/Vty/Input/Loop.hs+1−1

src/Codec/Binary/UTF8/Debug.hs+1−2

@@ -14,5 +14,4 @@ utf8FromIso :: [Int] -> [Word8]

1414utf8FromIso = encode . map toEnum

1515

1616ppUtf8 :: [Int] -> IO ()

17−ppUtf8 = print . map (\f -> f "") . map showHex . utf8FromIso

18−

17+ppUtf8 = print . map (`showHex` "") . utf8FromIso

src/Data/Terminfo/Eval.hs+2−2

@@ -42,7 +42,7 @@ pop = do

4242

4343readParam :: Word -> Eval CapParam

4444readParam pn = do

45− !params <- get >>= return . evalParams

45+ !params <- evalParams <$> get

4646 return $! genericIndex params pn

4747

4848push :: CapParam -> Eval ()

@@ -68,7 +68,7 @@ writeCapOps ops = mapM_ writeCapOp ops

6868

6969writeCapOp :: CapOp -> Eval ()

7070writeCapOp (Bytes !offset !count) = do

71− !cap <- get >>= return . evalExpression

71+ !cap <- evalExpression <$> get

7272 let bytes = Vector.take count $ Vector.drop offset (capBytes cap)

7373 Vector.forM_ bytes $ tell.writeWord8

7474writeCapOp DecOut = do

src/Data/Terminfo/Parse.hs+3−3

@@ -128,7 +128,7 @@ paramEscapeParser = do

128128literalPercentParser :: CapParser BuildResults

129129literalPercentParser = do

130130 _ <- char '%'

131− startOffset <- getState >>= return . nextOffset

131+ startOffset <- nextOffset <$> getState

132132 incOffset 1

133133 return $ BuildResults 0 [Bytes startOffset 1] []

134134

@@ -154,7 +154,7 @@ incrementOpParser = do

154154pushOpParser :: CapParser BuildResults

155155pushOpParser = do

156156 _ <- char 'p'

157− paramN <- digit >>= return . (\d -> read [d])

157+ paramN <- read . pure <$> digit

158158 incOffset 2

159159 return $ BuildResults (fromEnum paramN) [PushParam $ paramN - 1] []

160160

@@ -299,7 +299,7 @@ compareOpParser

299299bytesOpParser :: CapParser BuildResults

300300bytesOpParser = do

301301 bytes <- many1 $ satisfy (/= '%')

302− startOffset <- getState >>= return . nextOffset

302+ startOffset <- nextOffset <$> getState

303303 let !c = length bytes

304304 !s <- getState

305305 let s' = s { nextOffset = startOffset + c }

src/Graphics/Vty/Input/Loop.hs+1−1

@@ -137,7 +137,7 @@ readFromDevice = do

137137 threadWaitRead fd

138138 bytesRead <- fdReadBuf fd bufferPtr (fromIntegral maxBytes)

139139 if bytesRead > 0

140− then fmap (map $ chr . fromIntegral) $ peekArray (fromIntegral bytesRead) bufferPtr

140+ then map (chr . fromIntegral) <$> peekArray (fromIntegral bytesRead) bufferPtr

141141 else return []

142142 when (not $ null stringRep) $ logMsg $ "input bytes: " ++ show stringRep

143143 return stringRep