Skip to content

Commit bf99e6a

Browse files
authored
Merge pull request #26 from purescript/ps-0.11
Update for PureScript 0.11
2 parents 6f04722 + 13f4698 commit bf99e6a

File tree

4 files changed

+15
-20
lines changed

4 files changed

+15
-20
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js: 6
4+
node_js: stable
55
env:
66
- PATH=$HOME/purescript:$PATH
77
install:

bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"package.json"
1919
],
2020
"dependencies": {
21-
"purescript-either": "^2.0.0",
22-
"purescript-strings": "^2.0.0",
23-
"purescript-unfoldable": "^2.0.0"
21+
"purescript-either": "^3.0.0",
22+
"purescript-strings": "^3.0.0",
23+
"purescript-unfoldable": "^3.0.0"
2424
},
2525
"devDependencies": {
26-
"purescript-assert": "^2.0.0",
27-
"purescript-console": "^2.0.0"
26+
"purescript-assert": "^3.0.0",
27+
"purescript-console": "^3.0.0"
2828
}
2929
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "pulp build --censor-lib --strict",
5+
"build": "pulp build -- --censor-lib --strict",
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"pulp": "^9.0.1",
10-
"purescript-psa": "^0.3.9",
11-
"rimraf": "^2.5.0"
9+
"pulp": "^10.0.4",
10+
"purescript-psa": "^0.5.0-rc.1",
11+
"rimraf": "^2.6.1"
1212
}
1313
}

src/Data/Enum.purs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ defaultPred toEnum' fromEnum' a = toEnum' (fromEnum' a - 1)
101101

102102
-- | Returns a successive sequence of elements from the lower bound to
103103
-- | the upper bound (inclusive).
104-
enumFromTo :: forall a u. (Enum a, Unfoldable u) => a -> a -> u a
104+
enumFromTo :: forall a u. Enum a => Unfoldable u => a -> a -> u a
105105
enumFromTo from to = unfoldr go (Just from)
106106
where
107107
go mx = do
@@ -129,10 +129,10 @@ intStepFromTo step from to =
129129
diag :: forall a. a -> Tuple a a
130130
diag a = Tuple a a
131131

132-
upFrom :: forall a u. (Enum a, Unfoldable u) => a -> u a
132+
upFrom :: forall a u. Enum a => Unfoldable u => a -> u a
133133
upFrom = unfoldr (map diag <<< succ)
134134

135-
downFrom :: forall a u. (Enum a, Unfoldable u) => a -> u a
135+
downFrom :: forall a u. Enum a => Unfoldable u => a -> u a
136136
downFrom = unfoldr (map diag <<< pred)
137137

138138
-- | Type class for finite enumerations.
@@ -165,11 +165,6 @@ instance boundedEnumBoolean :: BoundedEnum Boolean where
165165
fromEnum false = 0
166166
fromEnum true = 1
167167

168-
instance boundedEnumInt :: BoundedEnum Int where
169-
cardinality = Cardinality (top - bottom)
170-
toEnum = Just
171-
fromEnum = id
172-
173168
instance boundedEnumChar :: BoundedEnum Char where
174169
cardinality = Cardinality (toCharCode top - toCharCode bottom)
175170
toEnum = charToEnum
@@ -227,12 +222,12 @@ instance boundedEnumTuple :: (BoundedEnum a, BoundedEnum b) => BoundedEnum (Tupl
227222
from (Cardinality cb) (Tuple a b) = fromEnum a * cb + fromEnum b
228223

229224
-- | Runs in `O(n)` where `n` is `fromEnum top`
230-
defaultCardinality :: forall a. (Bounded a, Enum a) => Cardinality a
225+
defaultCardinality :: forall a. Bounded a => Enum a => Cardinality a
231226
defaultCardinality = Cardinality $ defaultCardinality' 1 (bottom :: a) where
232227
defaultCardinality' i = maybe i (defaultCardinality' $ i + 1) <<< succ
233228

234229
-- | Runs in `O(n)` where `n` is `fromEnum a`
235-
defaultToEnum :: forall a. (Bounded a, Enum a) => Int -> Maybe a
230+
defaultToEnum :: forall a. Bounded a => Enum a => Int -> Maybe a
236231
defaultToEnum n
237232
| n < 0 = Nothing
238233
| n == 0 = Just bottom

0 commit comments

Comments
 (0)