formatting 3.0.1 → 3.0.2

raw patch · 2 files changed

+18/−1 lines, 2 filesdep ~base

Dependency ranges changed: base

Files

• formatting.cabal +1/−1
• src/Formatting/Formatters.hs +17/−0

@@ -1,5 +1,5 @@ name:                formatting-version:             3.0.1+version:             3.0.2 synopsis:            Combinator-based type-safe formatting (like printf() or FORMAT) description:         Combinator-based type-safe formatting (like printf() or FORMAT), modelled from the HoleyMonoids package. license:             BSD3

@@ -27,6 +27,7 @@   fixed,   prec,   shortest,+  commas,   -- * Padding   left,   right,@@ -39,12 +40,14 @@  import           Formatting.Holey +import           Data.Monoid import qualified Data.Text as S import qualified Data.Text as T import           Data.Text.Buildable    (Buildable) import qualified Data.Text.Buildable    as B (build) import qualified Data.Text.Format       as T import           Data.Text.Lazy (Text)+import qualified Data.Text.Lazy as LT import           Data.Text.Lazy.Builder (Builder) import qualified Data.Text.Lazy.Builder as T @@ -111,3 +114,17 @@ -- wide, if necessary filling with character c. right :: Buildable a => Int -> Char -> Format a right i c = later (T.right i c)++-- | Add commas to an integral, e.g 12000 -> \ "12,000".+commas :: (Buildable n,Integral n) => Format n+commas = later (commaize) where+  commaize = T.fromLazyText .+             LT.reverse .+             foldr merge "" .+             LT.zip ("000" <> cycle' ",00") .+             LT.reverse .+             T.toLazyText .+             B.build+  merge (f,c) rest | f == ',' = "," <> LT.singleton c <> rest+                   | otherwise = LT.singleton c <> rest+  cycle' xs = xs <> cycle' xs