X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FFormat.hs;h=93c2cda9ea065214d84463c40a434dfbf4759cf2;hp=f017f5e6a81ef1093354d0efb9970948fae1d1a1;hb=f62b6f07bbf1eefcf552163d8f7daa6e0862ed5d;hpb=b0efa668bb881d1c9db4b852b1b9063a2db12b3d diff --git a/Network/HTTP/Lucu/Format.hs b/Network/HTTP/Lucu/Format.hs index f017f5e..93c2cda 100644 --- a/Network/HTTP/Lucu/Format.hs +++ b/Network/HTTP/Lucu/Format.hs @@ -24,7 +24,7 @@ fmtInt base upperCase minWidth pad forceSign n where fmt' :: Int -> String fmt' m - | m < base = (intToChar upperCase m) : [] + | m < base = [intToChar upperCase m] | otherwise = (intToChar upperCase $! m `mod` base) : fmt' (m `div` base) @@ -40,50 +40,54 @@ fmtDec minWidth n fmtDec2 :: Int -> String fmtDec2 n | n < 0 || n >= 100 = fmtInt 10 undefined 2 '0' False n -- fallback - | n < 10 = '0' - : intToChar undefined n - : [] - | otherwise = intToChar undefined (n `div` 10) - : intToChar undefined (n `mod` 10) - : [] + | n < 10 = [ '0' + , intToChar undefined n + ] + | otherwise = [ intToChar undefined (n `div` 10) + , intToChar undefined (n `mod` 10) + ] fmtDec3 :: Int -> String fmtDec3 n | n < 0 || n >= 1000 = fmtInt 10 undefined 3 '0' False n -- fallback - | n < 10 = '0' : '0' - : intToChar undefined n - : [] - | n < 100 = '0' - : intToChar undefined ((n `div` 10) `mod` 10) - : intToChar undefined ( n `mod` 10) - : [] - | otherwise = intToChar undefined ((n `div` 100) `mod` 10) - : intToChar undefined ((n `div` 10) `mod` 10) - : intToChar undefined ( n `mod` 10) - : [] + | n < 10 = [ '0' + , '0' + , intToChar undefined n + ] + | n < 100 = [ '0' + , intToChar undefined ((n `div` 10) `mod` 10) + , intToChar undefined ( n `mod` 10) + ] + | otherwise = [ intToChar undefined ((n `div` 100) `mod` 10) + , intToChar undefined ((n `div` 10) `mod` 10) + , intToChar undefined ( n `mod` 10) + ] fmtDec4 :: Int -> String fmtDec4 n | n < 0 || n >= 10000 = fmtInt 10 undefined 4 '0' False n -- fallback - | n < 10 = '0' : '0' : '0' - : intToChar undefined n - : [] - | n < 100 = '0' : '0' - : intToChar undefined ((n `div` 10) `mod` 10) - : intToChar undefined ( n `mod` 10) - : [] - | n < 1000 = '0' - : intToChar undefined ((n `div` 100) `mod` 10) - : intToChar undefined ((n `div` 10) `mod` 10) - : intToChar undefined ( n `mod` 10) - : [] - | otherwise = intToChar undefined ((n `div` 1000) `mod` 10) - : intToChar undefined ((n `div` 100) `mod` 10) - : intToChar undefined ((n `div` 10) `mod` 10) - : intToChar undefined ( n `mod` 10) - : [] + | n < 10 = [ '0' + , '0' + , '0' + , intToChar undefined n + ] + | n < 100 = [ '0' + , '0' + , intToChar undefined ((n `div` 10) `mod` 10) + , intToChar undefined ( n `mod` 10) + ] + | n < 1000 = [ '0' + , intToChar undefined ((n `div` 100) `mod` 10) + , intToChar undefined ((n `div` 10) `mod` 10) + , intToChar undefined ( n `mod` 10) + ] + | otherwise = [ intToChar undefined ((n `div` 1000) `mod` 10) + , intToChar undefined ((n `div` 100) `mod` 10) + , intToChar undefined ((n `div` 10) `mod` 10) + , intToChar undefined ( n `mod` 10) + ] fmtHex :: Bool -> Int -> Int -> String