@@ -25,11 +25,11 @@ import Data.Generic.Rep (class Generic)
2525import Data.Int as Int
2626import Data.Maybe (Maybe (..), fromMaybe , isJust )
2727import Data.Newtype (class Newtype )
28+ import Data.Number as Number
2829import Data.Show.Generic (genericShow )
2930import Data.String as Str
3031import Data.String.CodeUnits as CU
3132import Data.Traversable (for )
32- import Math as Math
3333import Text.Parsing.Parser as P
3434import Text.Parsing.Parser.Combinators as PC
3535import Text.Parsing.Parser.String as PS
@@ -95,9 +95,9 @@ foreign import showNumberAsInt :: Number -> String
9595format :: Formatter -> Number -> String
9696format (Formatter f) num = do
9797 let
98- absed = Math .abs num
98+ absed = Number .abs num
9999 tens
100- | absed > 0.0 = max (Int .floor $ Math .log absed / Math .ln10) 0
100+ | absed > 0.0 = max (Int .floor $ Number .log absed / Number .ln10) 0
101101 | otherwise = 0
102102
103103 if f.abbreviations then do
@@ -114,17 +114,17 @@ format (Formatter f) num = do
114114 | thousands == 7 = " Z"
115115 | thousands == 8 = " Y"
116116 | otherwise = " 10e+" <> show (thousands * 3 )
117- newNum = if thousands < 1 then num else num / Math .pow 1000.0 (Int .toNumber thousands)
117+ newNum = if thousands < 1 then num else num / Number .pow 1000.0 (Int .toNumber thousands)
118118
119119 format (Formatter f { abbreviations = false }) newNum <> abbr
120120 else do
121121 let
122122 zeros = f.before - tens - one
123- factor = Math .pow 10.0 (Int .toNumber (max 0 f.after))
124- rounded = Math .round (absed * factor) / factor
125- integer = Math .floor rounded
123+ factor = Number .pow 10.0 (Int .toNumber (max 0 f.after))
124+ rounded = Number .round (absed * factor) / factor
125+ integer = Number .floor rounded
126126 leftoverDecimal = rounded - integer
127- leftover = Math .round $ leftoverDecimal * factor
127+ leftover = Number .round $ leftoverDecimal * factor
128128
129129 leftoverWithZeros = do
130130 let
@@ -232,9 +232,9 @@ unformatParser (Formatter f) = do
232232 else pure 0
233233
234234 pure $
235- Math .pow 10.0 (Int .toNumber abbr)
235+ Number .pow 10.0 (Int .toNumber abbr)
236236 * sign
237- * (before + after / Math .pow 10.0 (Int .toNumber f.after))
237+ * (before + after / Number .pow 10.0 (Int .toNumber f.after))
238238
239239formatNumber :: String -> Number -> Either String String
240240formatNumber pattern number = parseFormatString pattern <#> flip format number
0 commit comments