Skip to content

Commit f144f6e

Browse files
authored
Merge pull request #11 from JordanMartinez/updateTo14
Update to v0.14.0-rc3
2 parents 20ca891 + 542748d commit f144f6e

File tree

7 files changed

+30
-28
lines changed

7 files changed

+30
-28
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ node_js: stable
55
env:
66
- PATH=$HOME/purescript:$PATH
77
install:
8-
- TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
8+
# - TAG=$(basename $(curl --location --silent --output /dev/null -w %{url_effective} https://github.com/purescript/purescript/releases/latest))
9+
- TAG=v0.14.0-rc3
10+
- curl --location --output $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
911
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
1012
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
1113
- chmod a+x $HOME/purescript

bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
"output"
1717
],
1818
"dependencies": {
19-
"purescript-math": "^2.1.0",
20-
"purescript-globals": "^4.0.0",
21-
"purescript-maybe": "^4.0.0"
19+
"purescript-math": "master",
20+
"purescript-globals": "master",
21+
"purescript-maybe": "master"
2222
},
2323
"devDependencies": {
24-
"purescript-console": "^4.2.0",
25-
"purescript-assert": "^4.1.0"
24+
"purescript-console": "master",
25+
"purescript-assert": "master"
2626
}
2727
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"pulp": "^12.2.0",
10-
"purescript-psa": "^0.6.0",
9+
"pulp": "^15.0.0",
10+
"purescript-psa": "^0.8.0",
1111
"rimraf": "^2.6.1"
1212
}
1313
}

src/Data/Number.purs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,24 @@ import Global as G
3939
-- | > fromString " 1.2 ??"
4040
-- | (Just 1.2)
4141
-- | ```
42-
fromString String Maybe Number
42+
fromString :: String -> Maybe Number
4343
fromString = G.readFloat >>> check
4444
where
4545
check num | isFinite num = Just num
4646
| otherwise = Nothing
4747

4848
-- | Not a number (NaN).
49-
nan Number
49+
nan :: Number
5050
nan = G.nan
5151

5252
-- | Test whether a `Number` is NaN.
53-
isNaN Number Boolean
53+
isNaN :: Number -> Boolean
5454
isNaN = G.isNaN
5555

5656
-- | Positive infinity.
57-
infinity Number
57+
infinity :: Number
5858
infinity = G.infinity
5959

6060
-- | Test whether a number is finite.
61-
isFinite Number Boolean
61+
isFinite :: Number -> Boolean
6262
isFinite = G.isFinite

src/Data/Number/Approximate.purs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ newtype Fraction = Fraction Number
4141
-- | > (eqRelative (Fraction 0.01)) (0.1 + 0.2) 0.3
4242
-- | true
4343
-- | ```
44-
eqRelative Fraction Number Number Boolean
44+
eqRelative :: Fraction -> Number -> Number -> Boolean
4545
eqRelative (Fraction frac) 0.0 y = abs y <= frac
4646
eqRelative (Fraction frac) x 0.0 = abs x <= frac
4747
eqRelative (Fraction frac) x y = abs (x - y) <= frac * abs (x + y) / 2.0
@@ -60,17 +60,17 @@ eqRelative (Fraction frac) x y = abs (x - y) <= frac * abs (x + y) / 2.0
6060
-- | > 0.1 + 0.2 ≅ 0.3
6161
-- | true
6262
-- | ```
63-
eqApproximate Number Number Boolean
63+
eqApproximate :: Number -> Number -> Boolean
6464
eqApproximate = eqRelative onePPM
6565
where
66-
onePPM Fraction
66+
onePPM :: Fraction
6767
onePPM = Fraction 1.0e-6
6868

6969
infix 4 eqApproximate as ~=
7070
infix 4 eqApproximate as
7171

7272
-- | The complement of `eqApproximate`.
73-
neqApproximate Number Number Boolean
73+
neqApproximate :: Number -> Number -> Boolean
7474
neqApproximate x y = not (x ≅ y)
7575

7676
infix 4 neqApproximate as
@@ -91,6 +91,6 @@ newtype Tolerance = Tolerance Number
9191
-- | > (eqAbsolute (Tolerance 0.1)) 133.7 133.0
9292
-- | false
9393
-- | ```
94-
eqAbsolute Tolerance Number Number Boolean
94+
eqAbsolute :: Tolerance -> Number -> Number -> Boolean
9595
eqAbsolute (Tolerance tolerance) x y = abs (x - y) <= tolerance
9696

src/Data/Number/Format.purs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ module Data.Number.Format
3030

3131
import Prelude
3232

33-
foreign import toPrecisionNative Int Number String
34-
foreign import toFixedNative Int Number String
35-
foreign import toExponentialNative Int Number String
33+
foreign import toPrecisionNative :: Int -> Number -> String
34+
foreign import toFixedNative :: Int -> Number -> String
35+
foreign import toExponentialNative :: Int -> Number -> String
3636

3737
-- | The `Format` data type specifies how a number will be formatted.
3838
data Format
@@ -42,21 +42,21 @@ data Format
4242

4343
-- | Create a `toPrecision`-based format from an integer. Values smaller than
4444
-- | `1` and larger than `21` will be clamped.
45-
precision Int Format
45+
precision :: Int -> Format
4646
precision = Precision <<< clamp 1 21
4747

4848
-- | Create a `toFixed`-based format from an integer. Values smaller than `0`
4949
-- | and larger than `20` will be clamped.
50-
fixed Int Format
50+
fixed :: Int -> Format
5151
fixed = Fixed <<< clamp 0 20
5252

5353
-- | Create a `toExponential`-based format from an integer. Values smaller than
5454
-- | `0` and larger than `20` will be clamped.
55-
exponential Int Format
55+
exponential :: Int -> Format
5656
exponential = Exponential <<< clamp 0 20
5757

5858
-- | Convert a number to a string with a given format.
59-
toStringWith Format Number String
59+
toStringWith :: Format -> Number -> String
6060
toStringWith (Precision p) = toPrecisionNative p
6161
toStringWith (Fixed p) = toFixedNative p
6262
toStringWith (Exponential p) = toExponentialNative p
@@ -73,4 +73,4 @@ toStringWith (Exponential p) = toExponentialNative p
7373
-- | > toString 1.2e-10
7474
-- | "1.2e-10"
7575
-- | ```
76-
foreign import toString Number String
76+
foreign import toString :: Number -> String

test/Main.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import Test.Assert (assertTrue', assertFalse', assertEqual)
1515

1616

1717
-- | Comparison up to 10% relative error.
18-
eqRelative' Number Number Boolean
18+
eqRelative' :: Number -> Number -> Boolean
1919
eqRelative' = eqRelative (Fraction 0.1)
2020

2121
infix 1 eqRelative' as ~=
2222

2323
-- | Comparison up to 0.1 absolute error.
24-
eqAbsolute' Number Number Boolean
24+
eqAbsolute' :: Number -> Number -> Boolean
2525
eqAbsolute' = eqAbsolute (Tolerance 0.1)
2626

2727
infix 1 eqAbsolute' as =~=

0 commit comments

Comments
 (0)