Skip to content
This repository was archived by the owner on Mar 25, 2021. It is now read-only.

Commit 00f3c44

Browse files
authored
Merge pull request #8 from purescript/ps-0.11
Update for PureScript 0.11
2 parents 6e43a67 + 41e8500 commit 00f3c44

13 files changed

+51
-61
lines changed

.eslintrc.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"parserOptions": {
3+
"ecmaVersion": 5
4+
},
5+
"extends": "eslint:recommended",
6+
"env": {
7+
"commonjs": true
8+
},
9+
"rules": {
10+
"strict": [2, "global"],
11+
"block-scoped-var": 2,
12+
"consistent-return": 2,
13+
"eqeqeq": [2, "smart"],
14+
"guard-for-in": 2,
15+
"no-caller": 2,
16+
"no-extend-native": 2,
17+
"no-loop-func": 2,
18+
"no-new": 2,
19+
"no-param-reassign": 2,
20+
"no-return-assign": 2,
21+
"no-unused-expressions": 2,
22+
"no-use-before-define": 2,
23+
"radix": [2, "always"],
24+
"indent": [2, 2],
25+
"quotes": [2, "double"],
26+
"semi": [2, "always"]
27+
}
28+
}

.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
/.*
2+
!/.gitignore
3+
!/.eslintrc.json
4+
!/.travis.yml
15
/bower_components/
26
/node_modules/
3-
/.pulp-cache/
47
/output/
5-
/.psci*
6-
/src/.webpack.js
7-
.psc-ide-port

.jscsrc

-17
This file was deleted.

.jshintrc

-20
This file was deleted.

.travis.yml

+1-1
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

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"url": "git://github.com/purescript/purescript-generics-rep.git"
1313
},
1414
"dependencies": {
15-
"purescript-prelude": "^2.0.0",
16-
"purescript-monoid": "^2.0.0",
17-
"purescript-symbols": "^2.0.0",
18-
"purescript-foldable-traversable": "^2.0.0"
15+
"purescript-prelude": "^3.0.0",
16+
"purescript-monoid": "^3.0.0",
17+
"purescript-symbols": "^3.0.0",
18+
"purescript-foldable-traversable": "^3.0.0"
1919
},
2020
"devDependencies": {
21-
"purescript-console": "^2.0.0"
21+
"purescript-console": "^3.0.0"
2222
}
2323
}

package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "jshint src && jscs src && psa \"src/**/*.purs\" \"bower_components/purescript-*/src/**/*.purs\" --censor-lib --strict",
6-
"test": "psc \"src/**/*.purs\" \"bower_components/purescript-*/src/**/*.purs\" \"test/**/*.purs\" && psc-bundle \"output/**/*.js\" --module Test.Main --main Test.Main | node"
5+
"build": "eslint src && pulp build -- --censor-lib --strict",
6+
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"jscs": "^2.8.0",
10-
"jshint": "^2.9.1",
11-
"pulp": "^8.2.0",
12-
"purescript-psa": "^0.3.8",
13-
"rimraf": "^2.5.0"
9+
"eslint": "^3.17.1",
10+
"pulp": "^10.0.4",
11+
"purescript-psa": "^0.5.0-rc.1",
12+
"rimraf": "^2.6.1"
1413
}
1514
}

src/Data/Generic/Rep/Bounded.purs

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ instance genericTopConstructor :: GenericTop a => GenericTop (Constructor name a
3434
genericTop' = Constructor genericTop'
3535

3636
-- | A `Generic` implementation of the `bottom` member from the `Bounded` type class.
37-
genericBottom :: forall a rep. (Generic a rep, GenericBottom rep) => a
37+
genericBottom :: forall a rep. Generic a rep => GenericBottom rep => a
3838
genericBottom = to genericBottom'
3939

4040
-- | A `Generic` implementation of the `top` member from the `Bounded` type class.
41-
genericTop :: forall a rep. (Generic a rep, GenericTop rep) => a
41+
genericTop :: forall a rep. Generic a rep => GenericTop rep => a
4242
genericTop = to genericTop'

src/Data/Generic/Rep/Eq.purs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ instance genericEqField :: Eq a => GenericEq (Field name a) where
3737
genericEq' (Field a1) (Field a2) = a1 == a2
3838

3939
-- | A `Generic` implementation of the `eq` member from the `Eq` type class.
40-
genericEq :: forall a rep. (Generic a rep, GenericEq rep) => a -> a -> Boolean
40+
genericEq :: forall a rep. Generic a rep => GenericEq rep => a -> a -> Boolean
4141
genericEq x y = genericEq' (from x) (from y)

src/Data/Generic/Rep/Monoid.purs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ instance genericMonoidField :: Monoid a => GenericMonoid (Field name a) where
2929
genericMempty' = Field mempty
3030

3131
-- | A `Generic` implementation of the `mempty` member from the `Monoid` type class.
32-
genericMempty :: forall a rep. (Generic a rep, GenericMonoid rep) => a
32+
genericMempty :: forall a rep. Generic a rep => GenericMonoid rep => a
3333
genericMempty = to genericMempty'

src/Data/Generic/Rep/Ord.purs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ instance genericOrdField :: Ord a => GenericOrd (Field name a) where
4141
genericCompare' (Field a1) (Field a2) = compare a1 a2
4242

4343
-- | A `Generic` implementation of the `compare` member from the `Ord` type class.
44-
genericCompare :: forall a rep. (Generic a rep, GenericOrd rep) => a -> a -> Ordering
44+
genericCompare :: forall a rep. Generic a rep => GenericOrd rep => a -> a -> Ordering
4545
genericCompare x y = genericCompare' (from x) (from y)

src/Data/Generic/Rep/Semigroup.purs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ instance genericSemigroupField :: Semigroup a => GenericSemigroup (Field name a)
3333
genericAppend' (Field a1) (Field a2) = Field (append a1 a2)
3434

3535
-- | A `Generic` implementation of the `append` member from the `Semigroup` type class.
36-
genericAppend :: forall a rep. (Generic a rep, GenericSemigroup rep) => a -> a -> a
36+
genericAppend :: forall a rep. Generic a rep => GenericSemigroup rep => a -> a -> a
3737
genericAppend x y = to (genericAppend' (from x) (from y))

src/Data/Generic/Rep/Show.purs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ instance genericShowFieldsField
6666
[reflectSymbol (SProxy :: SProxy name) <> ": " <> show a]
6767

6868
-- | A `Generic` implementation of the `show` member from the `Show` type class.
69-
genericShow :: forall a rep. (Generic a rep, GenericShow rep) => a -> String
69+
genericShow :: forall a rep. Generic a rep => GenericShow rep => a -> String
7070
genericShow x = genericShow' (from x)

0 commit comments

Comments
 (0)