From af104f78cf7f05adfafbda0a19fc3f8e5ae6bef9 Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Mon, 13 Mar 2017 00:18:42 +0000 Subject: [PATCH 1/2] Update for PureScript 0.11 --- .travis.yml | 2 +- bower.json | 10 +++++----- package.json | 8 ++++---- src/Data/Enum.purs | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index c33fb6f..a9f23ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js dist: trusty sudo: required -node_js: 6 +node_js: stable env: - PATH=$HOME/purescript:$PATH install: diff --git a/bower.json b/bower.json index 7707af1..1ea79a6 100644 --- a/bower.json +++ b/bower.json @@ -18,12 +18,12 @@ "package.json" ], "dependencies": { - "purescript-either": "^2.0.0", - "purescript-strings": "^2.0.0", - "purescript-unfoldable": "^2.0.0" + "purescript-either": "^3.0.0", + "purescript-strings": "^3.0.0", + "purescript-unfoldable": "^3.0.0" }, "devDependencies": { - "purescript-assert": "^2.0.0", - "purescript-console": "^2.0.0" + "purescript-assert": "^3.0.0", + "purescript-console": "^3.0.0" } } diff --git a/package.json b/package.json index 5054554..bf77170 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,12 @@ "private": true, "scripts": { "clean": "rimraf output && rimraf .pulp-cache", - "build": "pulp build --censor-lib --strict", + "build": "pulp build -- --censor-lib --strict", "test": "pulp test" }, "devDependencies": { - "pulp": "^9.0.1", - "purescript-psa": "^0.3.9", - "rimraf": "^2.5.0" + "pulp": "^10.0.4", + "purescript-psa": "^0.5.0-rc.1", + "rimraf": "^2.6.1" } } diff --git a/src/Data/Enum.purs b/src/Data/Enum.purs index d7f9577..3bf4616 100644 --- a/src/Data/Enum.purs +++ b/src/Data/Enum.purs @@ -101,7 +101,7 @@ defaultPred toEnum' fromEnum' a = toEnum' (fromEnum' a - 1) -- | Returns a successive sequence of elements from the lower bound to -- | the upper bound (inclusive). -enumFromTo :: forall a u. (Enum a, Unfoldable u) => a -> a -> u a +enumFromTo :: forall a u. Enum a => Unfoldable u => a -> a -> u a enumFromTo from to = unfoldr go (Just from) where go mx = do @@ -129,10 +129,10 @@ intStepFromTo step from to = diag :: forall a. a -> Tuple a a diag a = Tuple a a -upFrom :: forall a u. (Enum a, Unfoldable u) => a -> u a +upFrom :: forall a u. Enum a => Unfoldable u => a -> u a upFrom = unfoldr (map diag <<< succ) -downFrom :: forall a u. (Enum a, Unfoldable u) => a -> u a +downFrom :: forall a u. Enum a => Unfoldable u => a -> u a downFrom = unfoldr (map diag <<< pred) -- | Type class for finite enumerations. @@ -227,12 +227,12 @@ instance boundedEnumTuple :: (BoundedEnum a, BoundedEnum b) => BoundedEnum (Tupl from (Cardinality cb) (Tuple a b) = fromEnum a * cb + fromEnum b -- | Runs in `O(n)` where `n` is `fromEnum top` -defaultCardinality :: forall a. (Bounded a, Enum a) => Cardinality a +defaultCardinality :: forall a. Bounded a => Enum a => Cardinality a defaultCardinality = Cardinality $ defaultCardinality' 1 (bottom :: a) where defaultCardinality' i = maybe i (defaultCardinality' $ i + 1) <<< succ -- | Runs in `O(n)` where `n` is `fromEnum a` -defaultToEnum :: forall a. (Bounded a, Enum a) => Int -> Maybe a +defaultToEnum :: forall a. Bounded a => Enum a => Int -> Maybe a defaultToEnum n | n < 0 = Nothing | n == 0 = Just bottom From 13f4698ec4e4ebe8c18fbc71c4f40384090dbb21 Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Sun, 26 Mar 2017 21:30:05 +0100 Subject: [PATCH 2/2] Remove broken `BoundedEnum` instance for `Int` --- src/Data/Enum.purs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Data/Enum.purs b/src/Data/Enum.purs index 3bf4616..7cd99f0 100644 --- a/src/Data/Enum.purs +++ b/src/Data/Enum.purs @@ -165,11 +165,6 @@ instance boundedEnumBoolean :: BoundedEnum Boolean where fromEnum false = 0 fromEnum true = 1 -instance boundedEnumInt :: BoundedEnum Int where - cardinality = Cardinality (top - bottom) - toEnum = Just - fromEnum = id - instance boundedEnumChar :: BoundedEnum Char where cardinality = Cardinality (toCharCode top - toCharCode bottom) toEnum = charToEnum