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

Update for PureScript 0.11 #8

Merged
merged 1 commit into from
Mar 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parserOptions": {
"ecmaVersion": 5
},
"extends": "eslint:recommended",
"env": {
"commonjs": true
},
"rules": {
"strict": [2, "global"],
"block-scoped-var": 2,
"consistent-return": 2,
"eqeqeq": [2, "smart"],
"guard-for-in": 2,
"no-caller": 2,
"no-extend-native": 2,
"no-loop-func": 2,
"no-new": 2,
"no-param-reassign": 2,
"no-return-assign": 2,
"no-unused-expressions": 2,
"no-use-before-define": 2,
"radix": [2, "always"],
"indent": [2, 2],
"quotes": [2, "double"],
"semi": [2, "always"]
}
}
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/.*
!/.gitignore
!/.eslintrc.json
!/.travis.yml
/bower_components/
/node_modules/
/.pulp-cache/
/output/
/.psci*
/src/.webpack.js
.psc-ide-port
17 changes: 0 additions & 17 deletions .jscsrc

This file was deleted.

20 changes: 0 additions & 20 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
dist: trusty
sudo: required
node_js: 6
node_js: stable
env:
- PATH=$HOME/purescript:$PATH
install:
Expand Down
10 changes: 5 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"url": "git://github.com/purescript/purescript-generics-rep.git"
},
"dependencies": {
"purescript-prelude": "^2.0.0",
"purescript-monoid": "^2.0.0",
"purescript-symbols": "^2.0.0",
"purescript-foldable-traversable": "^2.0.0"
"purescript-prelude": "^3.0.0",
"purescript-monoid": "^3.0.0",
"purescript-symbols": "^3.0.0",
"purescript-foldable-traversable": "^3.0.0"
},
"devDependencies": {
"purescript-console": "^2.0.0"
"purescript-console": "^3.0.0"
}
}
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
"private": true,
"scripts": {
"clean": "rimraf output && rimraf .pulp-cache",
"build": "jshint src && jscs src && psa \"src/**/*.purs\" \"bower_components/purescript-*/src/**/*.purs\" --censor-lib --strict",
"test": "psc \"src/**/*.purs\" \"bower_components/purescript-*/src/**/*.purs\" \"test/**/*.purs\" && psc-bundle \"output/**/*.js\" --module Test.Main --main Test.Main | node"
"build": "eslint src && pulp build -- --censor-lib --strict",
"test": "pulp test"
},
"devDependencies": {
"jscs": "^2.8.0",
"jshint": "^2.9.1",
"pulp": "^8.2.0",
"purescript-psa": "^0.3.8",
"rimraf": "^2.5.0"
"eslint": "^3.17.1",
"pulp": "^10.0.4",
"purescript-psa": "^0.5.0-rc.1",
"rimraf": "^2.6.1"
}
}
4 changes: 2 additions & 2 deletions src/Data/Generic/Rep/Bounded.purs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ instance genericTopConstructor :: GenericTop a => GenericTop (Constructor name a
genericTop' = Constructor genericTop'

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

-- | A `Generic` implementation of the `top` member from the `Bounded` type class.
genericTop :: forall a rep. (Generic a rep, GenericTop rep) => a
genericTop :: forall a rep. Generic a rep => GenericTop rep => a
genericTop = to genericTop'
2 changes: 1 addition & 1 deletion src/Data/Generic/Rep/Eq.purs
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ instance genericEqField :: Eq a => GenericEq (Field name a) where
genericEq' (Field a1) (Field a2) = a1 == a2

-- | A `Generic` implementation of the `eq` member from the `Eq` type class.
genericEq :: forall a rep. (Generic a rep, GenericEq rep) => a -> a -> Boolean
genericEq :: forall a rep. Generic a rep => GenericEq rep => a -> a -> Boolean
genericEq x y = genericEq' (from x) (from y)
2 changes: 1 addition & 1 deletion src/Data/Generic/Rep/Monoid.purs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ instance genericMonoidField :: Monoid a => GenericMonoid (Field name a) where
genericMempty' = Field mempty

-- | A `Generic` implementation of the `mempty` member from the `Monoid` type class.
genericMempty :: forall a rep. (Generic a rep, GenericMonoid rep) => a
genericMempty :: forall a rep. Generic a rep => GenericMonoid rep => a
genericMempty = to genericMempty'
2 changes: 1 addition & 1 deletion src/Data/Generic/Rep/Ord.purs
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ instance genericOrdField :: Ord a => GenericOrd (Field name a) where
genericCompare' (Field a1) (Field a2) = compare a1 a2

-- | A `Generic` implementation of the `compare` member from the `Ord` type class.
genericCompare :: forall a rep. (Generic a rep, GenericOrd rep) => a -> a -> Ordering
genericCompare :: forall a rep. Generic a rep => GenericOrd rep => a -> a -> Ordering
genericCompare x y = genericCompare' (from x) (from y)
2 changes: 1 addition & 1 deletion src/Data/Generic/Rep/Semigroup.purs
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ instance genericSemigroupField :: Semigroup a => GenericSemigroup (Field name a)
genericAppend' (Field a1) (Field a2) = Field (append a1 a2)

-- | A `Generic` implementation of the `append` member from the `Semigroup` type class.
genericAppend :: forall a rep. (Generic a rep, GenericSemigroup rep) => a -> a -> a
genericAppend :: forall a rep. Generic a rep => GenericSemigroup rep => a -> a -> a
genericAppend x y = to (genericAppend' (from x) (from y))
2 changes: 1 addition & 1 deletion src/Data/Generic/Rep/Show.purs
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ instance genericShowFieldsField
[reflectSymbol (SProxy :: SProxy name) <> ": " <> show a]

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