Skip to content

Commit 203bb4c

Browse files
abacosharkdp
authored andcommitted
Update for PureScript 0.12
1 parent a3f4f7b commit 203bb4c

3 files changed

Lines changed: 14 additions & 19 deletions

File tree

bower.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
"output"
1818
],
1919
"dependencies": {
20-
"purescript-lists": "^4.0.1",
21-
"purescript-foldable-traversable": "^3.6.0",
22-
"purescript-monoid": "^3.0.0",
23-
"purescript-numbers": "^5.0.0",
24-
"purescript-pairs": "^5.0.0",
25-
"purescript-decimals": "^3.1.0"
20+
"purescript-lists": "^5.0.0",
21+
"purescript-foldable-traversable": "^4.0.0",
22+
"purescript-numbers": "^6.0.0",
23+
"purescript-pairs": "^6.0.0",
24+
"purescript-decimals": "^4.0.0"
2625
},
2726
"devDependencies": {
28-
"purescript-psci-support": "^3.0.0",
29-
"purescript-test-unit": "^11.0.0"
27+
"purescript-psci-support": "^4.0.0",
28+
"purescript-test-unit": "^14.0.0"
3029
}
3130
}

src/Data/Units.purs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import Data.List (List(Nil), filter, findIndex, modifyAt,
5656
singleton, sortBy, span, (:), concat, uncons)
5757
import Data.List.NonEmpty (NonEmptyList(..), head, toList)
5858
import Data.Maybe (Maybe(..), fromMaybe)
59-
import Data.Monoid (class Monoid)
6059
import Data.Monoid.Additive (Additive(..))
6160
import Data.Newtype (un)
6261
import Data.NonEmpty ((:|))
@@ -312,8 +311,8 @@ baseRepresentation du
312311
_ → u
313312

314313
instance eqDerivedUnitEq DerivedUnit where
315-
eq u1 u2 = (_.baseUnit <$> list1' == _.baseUnit <$> list2')
316-
&& (_.exponent <$> list1' == _.exponent <$> list2')
314+
eq u1 u2 = ((_.baseUnit <$> list1') == (_.baseUnit <$> list2'))
315+
&& ((_.exponent <$> list1') == (_.exponent <$> list2'))
317316
&& globalPrefix list1 == globalPrefix list2
318317
where
319318
prepare = simplify

test/Main.purs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,23 @@ import Data.Quantity (Quantity, (.*), prettyPrint, (⊕), (⊖), (⊗), (⊘),
3535
import Data.Quantity as Q
3636
import Data.Quantity.Math (sin, asin, pi, modulo, max, min, mean, atan2)
3737

38-
import Control.Monad.Eff (Eff)
39-
import Control.Monad.Eff.Console (CONSOLE)
40-
import Control.Monad.Aff.AVar (AVAR)
38+
import Effect (Effect)
4139

4240
import Math as Math
4341

4442
import Test.Unit (Test, suite, test, success, failure)
4543
import Test.Unit.Main (runTest)
46-
import Test.Unit.Console (TESTOUTPUT)
4744
import Test.Unit.Assert (assert, assertFalse, equal)
4845

49-
almostEqualNumbers e. Number Number Test e
46+
almostEqualNumbers Number Number Test
5047
almostEqualNumbers x y = do
5148
if x ≅ y
5249
then success
5350
else failure $ "expected " <> show x <> ", got " <> show y
5451

5552
-- | Test if two quantities are almost equal, i.e. if the units match and the
5653
-- | numerical value is approximately the same.
57-
almostEqual e. Quantity Quantity Test e
54+
almostEqual Quantity Quantity Test
5855
almostEqual expected actual = do
5956
if expected `approximatelyEqual` actual
6057
then success
@@ -64,13 +61,13 @@ almostEqual expected actual = do
6461
approximatelyEqual = Q.approximatelyEqual tolerance
6562
tolerance = 1.0e-6
6663

67-
almostEqual' e err. Quantity Either err Quantity Test e
64+
almostEqual' err. Quantity Either err Quantity Test
6865
almostEqual' expected actual =
6966
case actual of
7067
Left _ → failure "Conversion error"
7168
Right actual' → almostEqual expected actual'
7269

73-
main Eff (console CONSOLE, testOutput TESTOUTPUT, avar AVAR) Unit
70+
main Effect Unit
7471
main = runTest do
7572
let
7673
meters = meter

0 commit comments

Comments
 (0)