572c598 · vty · git.iko.soy

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

compare with master

unifiedsplit

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

14utf8FromIso = encode . map toEnum

15

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

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

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

18−

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

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

42

43readParam :: Word -> Eval CapParam

44readParam pn = do

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

45+ !params <- evalParams <$> get

46 return $! genericIndex params pn

47

48push :: CapParam -> Eval ()

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

68

69writeCapOp :: CapOp -> Eval ()

70writeCapOp (Bytes !offset !count) = do

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

71+ !cap <- evalExpression <$> get

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

73 Vector.forM_ bytes $ tell.writeWord8

74writeCapOp DecOut = do

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

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

128literalPercentParser :: CapParser BuildResults

129literalPercentParser = do

130 _ <- char '%'

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

131+ startOffset <- nextOffset <$> getState

132 incOffset 1

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

134

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

154pushOpParser :: CapParser BuildResults

155pushOpParser = do

156 _ <- char 'p'

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

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

158 incOffset 2

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

160

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

299bytesOpParser :: CapParser BuildResults

300bytesOpParser = do

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

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

302+ startOffset <- nextOffset <$> getState

303 let !c = length bytes

304 !s <- getState

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

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

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

137 threadWaitRead fd

138 bytesRead <- fdReadBuf fd bufferPtr (fromIntegral maxBytes)

139 if bytesRead > 0

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

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

141 else return []

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

143 return stringRep