diff --git a/Data/Text/Buildable.hs b/Data/Text/Buildable.hs --- a/Data/Text/Buildable.hs +++ b/Data/Text/Buildable.hs @@ -16,6 +16,7 @@ Buildable(..) ) where +import Data.Monoid (mempty) import Data.Int (Int8, Int16, Int32, Int64) import Data.Ratio (Ratio, denominator, numerator) import Data.Text.Format.Functions ((<>)) @@ -139,6 +140,11 @@ build = fromString . show . shown {-# INLINE build #-} +instance (Buildable a) => Buildable (Maybe a) where + build Nothing = mempty + build (Just v) = build v + {-# INLINE build #-} + instance Buildable TimeOfDay where build = build . Shown {-# INLINE build #-} @@ -163,3 +169,7 @@ instance Buildable (Ptr a) where build = build . ptrToWordPtr + +instance Buildable Bool where + build True = fromText "True" + build False = fromText "False" diff --git a/Data/Text/Format/Params.hs b/Data/Text/Format/Params.hs --- a/Data/Text/Format/Params.hs +++ b/Data/Text/Format/Params.hs @@ -82,3 +82,104 @@ buildParams (a,b,c,d,e,f,g,h,i,j) = [build a, build b, build c, build d, build e, build f, build g, build h, build i, build j] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k) + => Params (a,b,c,d,e,f,g,h,i,j,k) where + buildParams (a,b,c,d,e,f,g,h,i,j,k) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l) + => Params (a,b,c,d,e,f,g,h,i,j,k,l) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n, Buildable o) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n, build o] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n, Buildable o, + Buildable p) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n, build o, + build p] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n, Buildable o, + Buildable p, Buildable r) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n, build o, + build p, build r] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n, Buildable o, + Buildable p, Buildable r, Buildable s) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r,s) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r,s) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n, build o, + build p, build r, build s] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n, Buildable o, + Buildable p, Buildable r, Buildable s, Buildable t) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r,s,t) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r,s,t) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n, build o, + build p, build r, build s, build t] + +instance (Buildable a, Buildable b, Buildable c, Buildable d, Buildable e, + Buildable f, Buildable g, Buildable h, Buildable i, Buildable j, + Buildable k, Buildable l, Buildable m, Buildable n, Buildable o, + Buildable p, Buildable r, Buildable s, Buildable t, Buildable u) + => Params (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r,s,t,u) where + buildParams (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,r,s,t,u) = + [build a, build b, build c, build d, build e, + build f, build g, build h, build i, build j, + build k, build l, build m, build n, build o, + build p, build r, build s, build t, build u] + diff --git a/text-format.cabal b/text-format.cabal --- a/text-format.cabal +++ b/text-format.cabal @@ -1,5 +1,5 @@ name: text-format -version: 0.3.0.8 +version: 0.3.1.0 license: BSD3 license-file: LICENSE homepage: https://github.com/bos/text-format