@@ -25,11 +25,11 @@ import Data.Generic.Rep (class Generic)
25
25
import Data.Int as Int
26
26
import Data.Maybe (Maybe (..), fromMaybe , isJust )
27
27
import Data.Newtype (class Newtype )
28
+ import Data.Number as Number
28
29
import Data.Show.Generic (genericShow )
29
30
import Data.String as Str
30
31
import Data.String.CodeUnits as CU
31
32
import Data.Traversable (for )
32
- import Math as Math
33
33
import Text.Parsing.Parser as P
34
34
import Text.Parsing.Parser.Combinators as PC
35
35
import Text.Parsing.Parser.String as PS
@@ -95,9 +95,9 @@ foreign import showNumberAsInt :: Number -> String
95
95
format :: Formatter -> Number -> String
96
96
format (Formatter f) num = do
97
97
let
98
- absed = Math .abs num
98
+ absed = Number .abs num
99
99
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
101
101
| otherwise = 0
102
102
103
103
if f.abbreviations then do
@@ -114,17 +114,17 @@ format (Formatter f) num = do
114
114
| thousands == 7 = " Z"
115
115
| thousands == 8 = " Y"
116
116
| 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)
118
118
119
119
format (Formatter f { abbreviations = false }) newNum <> abbr
120
120
else do
121
121
let
122
122
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
126
126
leftoverDecimal = rounded - integer
127
- leftover = Math .round $ leftoverDecimal * factor
127
+ leftover = Number .round $ leftoverDecimal * factor
128
128
129
129
leftoverWithZeros = do
130
130
let
@@ -232,9 +232,9 @@ unformatParser (Formatter f) = do
232
232
else pure 0
233
233
234
234
pure $
235
- Math .pow 10.0 (Int .toNumber abbr)
235
+ Number .pow 10.0 (Int .toNumber abbr)
236
236
* sign
237
- * (before + after / Math .pow 10.0 (Int .toNumber f.after))
237
+ * (before + after / Number .pow 10.0 (Int .toNumber f.after))
238
238
239
239
formatNumber :: String -> Number -> Either String String
240
240
formatNumber pattern number = parseFormatString pattern <#> flip format number
0 commit comments