Skip to content

Commit 7e0251e

Browse files
Fix math imports; drop Math (#80)
* Fix math imports; drop Math * Add changelog entry
1 parent a3e651c commit 7e0251e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Bugfixes:
1313

1414
Other improvements:
1515
- Added `purs-tidy` formatter (#77 by @thomashoneyman)
16+
- Drop `math` dependency; update imports (#80 by @JordanMartinez)
1617

1718
## [v6.0.0](https://github.com/purescript-contrib/purescript-formatters/releases/tag/v6.0.0) - 2021-10-16
1819

spago.dhall

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
, "foldable-traversable"
1414
, "integers"
1515
, "lists"
16-
, "math"
1716
, "maybe"
1817
, "newtype"
1918
, "numbers"

src/Data/Formatter/Number.purs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import Data.Generic.Rep (class Generic)
2525
import Data.Int as Int
2626
import Data.Maybe (Maybe(..), fromMaybe, isJust)
2727
import Data.Newtype (class Newtype)
28+
import Data.Number as Number
2829
import Data.Show.Generic (genericShow)
2930
import Data.String as Str
3031
import Data.String.CodeUnits as CU
3132
import Data.Traversable (for)
32-
import Math as Math
3333
import Text.Parsing.Parser as P
3434
import Text.Parsing.Parser.Combinators as PC
3535
import Text.Parsing.Parser.String as PS
@@ -95,9 +95,9 @@ foreign import showNumberAsInt :: Number -> String
9595
format :: Formatter -> Number -> String
9696
format (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

239239
formatNumber :: String -> Number -> Either String String
240240
formatNumber pattern number = parseFormatString pattern <#> flip format number

0 commit comments

Comments
 (0)