Ticket #3058: prettyNumeric.patch

Mon Mar  2 10:40:22 PST 2009  Thomas.DuBuisson@gmail.com
  * Remove commented out code - that is what a repository is for.

Mon Mar  2 17:10:01 PST 2009  Thomas.DuBuisson@gmail.com
  * Add the equivilant of the Numeric.show* functions (hex, oct, intAtBase, {e,f,g}float, and padded versions.

Mon Mar  2 17:50:09 PST 2009  Thomas.DuBuisson@gmail.com
  * Rework float functions from Numeric

Sat Mar 14 17:22:41 PDT 2009  Thomas.DuBuisson@gmail.com
  * Dumb typo variable 'l' does not equal numeric '1'.

New patches:

[Remove commented out code - that is what a repository is for.
Thomas.DuBuisson@gmail.com**20090302184022
 Ignore-this: b1b1cbdd0b639ed819587b4c73ae5789
] hunk ./Text/PrettyPrint/HughesPJ.hs 485
 float    n = text (show n)
 double   n = text (show n)
 rational n = text (show n)
--- SIGBJORN wrote instead:
--- rational n = text (show (fromRationalX n))
 
 quotes p        = char '\'' <> p <> char '\''
 doubleQuotes p  = char '"' <> p <> char '"'
[Add the equivilant of the Numeric.show* functions (hex, oct, intAtBase, {e,f,g}float, and padded versions.
Thomas.DuBuisson@gmail.com**20090303011001
 Ignore-this: c761b6fb8848e191523921e5ed97eda1
] {
hunk ./Text/PrettyPrint/HughesPJ.hs 180
         char, text, ptext, zeroWidthText,
         int, integer, float, double, rational,
 
+       hex, hexPad, oct, octPad, intAtBase, intAtBasePad,
+       efloat, ffloat, gfloat,
+
        -- ** Simple derived documents
         semi, comma, colon, space, equals,
         lparen, rparen, lbrack, rbrack, lbrace, rbrace,
hunk ./Text/PrettyPrint/HughesPJ.hs 220
 
 
 import Prelude
+import Numeric
 
 infixl 6 <> 
 infixl 6 <+>
hunk ./Text/PrettyPrint/HughesPJ.hs 489
 float    n = text (show n)
 double   n = text (show n)
 rational n = text (show n)
+hex      n = text (showHex n "")
+efloat   n = text (showEFloat Nothing n "")
+ffloat   n = text (showFFloat Nothing n "")
+gfloat   n = text (showGFloat Nothing n "")
+intAtBase b r n = text (showIntAtBase b r n "")
+oct      n = text (showOct n "")
+
+hexPad n p = text . pad p '0' . showHex n $ ""
+octPad n p = text . pad p '0' . showOct n $ ""
+intAtBasePad b r n p = text . pad p '0' . showIntAtBase b r n $ ""
+pad n c s = let l = length s in if l < n then replicate (n - 1) c ++ s else drop (l - n) s
 
 quotes p        = char '\'' <> p <> char '\''
 doubleQuotes p  = char '"' <> p <> char '"'
}
[Rework float functions from Numeric
Thomas.DuBuisson@gmail.com**20090303015009
 Ignore-this: 437277a9b534b8a7765d8fa0714c609d
] {
hunk ./Text/PrettyPrint/HughesPJ.hs 490
 double   n = text (show n)
 rational n = text (show n)
 hex      n = text (showHex n "")
-efloat   n = text (showEFloat Nothing n "")
-ffloat   n = text (showFFloat Nothing n "")
-gfloat   n = text (showGFloat Nothing n "")
 intAtBase b r n = text (showIntAtBase b r n "")
 oct      n = text (showOct n "")
 
hunk ./Text/PrettyPrint/HughesPJ.hs 493
+-- |Shows floats in scientific notation with precision p
+efloat   p n = text (showEFloat p n "")
+
+-- |Shows floats in decimal notation with precision p
+ffloat   p n = text (showFFloat p n "")
+
+-- |Shows floats in decimal notation when between 0.1 and 9,999,999.  Scientific notation otherwise.
+gfloat   p n = text (showGFloat p n "")
+
+-- |Shows a potentially signed value, n, up to precision p.  The function 'f' is used for unsigned values.
+signed f p n = text (showSigned f p n "")
+
+-- |Shows 'n' in base 16, padding (with 0) the result to 'p' characters.  When the result is over 'p' characters
+-- only 'p' least significate nibbles are returned.
 hexPad n p = text . pad p '0' . showHex n $ ""
hunk ./Text/PrettyPrint/HughesPJ.hs 508
+
+-- |Shows 'n' in base 8, with padding or roll-over behavior matching 'hexPad'.
+-- only 'p' least significate nibbles are returned.
 octPad n p = text . pad p '0' . showOct n $ ""
hunk ./Text/PrettyPrint/HughesPJ.hs 512
+
+-- |Shows 'n' in base 'b' using function 'r' to translate the values to characters.
+-- The number of digits is trunkated or padded to 'p' characters, as in hexPad and octPad.
 intAtBasePad b r n p = text . pad p '0' . showIntAtBase b r n $ ""
hunk ./Text/PrettyPrint/HughesPJ.hs 516
+
 pad n c s = let l = length s in if l < n then replicate (n - 1) c ++ s else drop (l - n) s
 
 quotes p        = char '\'' <> p <> char '\''
}
[Dumb typo variable 'l' does not equal numeric '1'.
Thomas.DuBuisson@gmail.com**20090315002241
 Ignore-this: 7b79f8ce8cbc8556fb6b0a66e203c196
] hunk ./Text/PrettyPrint/HughesPJ.hs 517
 -- The number of digits is trunkated or padded to 'p' characters, as in hexPad and octPad.
 intAtBasePad b r n p = text . pad p '0' . showIntAtBase b r n $ ""
 
-pad n c s = let l = length s in if l < n then replicate (n - 1) c ++ s else drop (l - n) s
+pad n c s = let l = length s in if l < n then replicate (n - l) c ++ s else drop (l - n) s
 
 quotes p        = char '\'' <> p <> char '\''
 doubleQuotes p  = char '"' <> p <> char '"'

Context:

[Require Cabal version >= 1.6
Ian Lynagh <igloo@earth.li>**20090122011320] 
[Add "bug-reports" and "source-repository" info to the Cabal file
Ian Lynagh <igloo@earth.li>**20090121182635
 Also switched to the modern Cabal file format
] 
[Bump version number to 1.0.1.0
Ian Lynagh <igloo@earth.li>**20080920160835] 
[TAG 6.10 branch has been forked
Ian Lynagh <igloo@earth.li>**20080919123438] 
[add category field
Ross Paterson <ross@soi.city.ac.uk>**20080824003013] 
[Fix warnings and change a comment that was confusing haddock
Ian Lynagh <igloo@earth.li>**20080706151335] 
[Merge the rest of Benedikt Huber's "Fix HughesPJ developer documentation."
Ian Lynagh <igloo@earth.li>**20080706134923] 
[Merge the rest of Benedikt Huber's "Fix bug #1337, #2391 1,2"
Ian Lynagh <igloo@earth.li>**20080706133005] 
[Adds a `zeroWidthText' primitive to the library, in order to create text
benedikt.huber@gmail.com**20080626161647
 which occupies no space (e.g. html or latex tags).
] 
[Add a type-sig - fixes validating
Ian Lynagh <igloo@earth.li>**20080629225420] 
[fillNB bug, lazy vcat
benedikt.huber@gmail.com**20080624113715] 
[Fix warnings
Ian Lynagh <igloo@earth.li>**20080620135156] 
[TAG 2008-05-28
Ian Lynagh <igloo@earth.li>**20080528004408] 
Patch bundle hash:
0a8ae49f52f1f1a72d866fa89c0eef58d9d35ed8