Merge pull request #120 from purescript/ps-0.11

Update for PureScript 0.11

Author: garyb

.eslintrc.json

@@ -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, { "SwitchCase": 1 }],
+    "quotes": [2, "double"],
+    "semi": [2, "always"]
+  }
+}

.gitignore

@@ -1,7 +1,6 @@
 /.*
 !/.gitignore
-!/.jscsrc
-!/.jshintrc
+!/.eslintrc.json
 !/.travis.yml
 /bower_components/
 /node_modules/

.jscsrc

@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: stable
 env:
   - PATH=$HOME/purescript:$PATH
 install:

.jshintrc

@@ -2,13 +2,13 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && psa \"src/**/*.purs\" \"bower_components/purescript-*/**/*.purs\" --censor-lib --strict",
-    "test": "psc \"src/**/*.purs\" \"bower_components/purescript-*/**/*.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",
-    "purescript-psa": "^0.3.8",
-    "rimraf": "^2.5.0"
+    "eslint": "^3.17.1",
+    "purescript-psa": "^0.5.0-rc.1",
+    "pulp": "^10.0.4",
+    "rimraf": "^2.6.1"
   }
 }

.travis.yml

@@ -65,5 +65,5 @@ class Eq1 f where
 instance eq1Array :: Eq1 Array where
   eq1 = eq
 
-notEq1 :: forall f a. (Eq1 f, Eq a) => f a -> f a -> Boolean
+notEq1 :: forall f a. Eq1 f => Eq a => f a -> f a -> Boolean
 notEq1 x y = (x `eq1` y) == false

package.json

@@ -12,7 +12,6 @@ import Data.CommutativeRing (class CommutativeRing)
 import Data.Eq (class Eq, (==))
 import Data.Ring (class Ring, sub, (-))
 import Data.Semiring (class Semiring, add, mul, one, zero, (*), (+))
-import Data.Unit (Unit, unit)
 
 -- | The `EuclideanRing` class is for commutative rings that support division.
 -- | The mathematical structure this class is based on is sometimes also called
@@ -63,26 +62,21 @@ instance euclideanRingNumber :: EuclideanRing Number where
   div = numDiv
   mod _ _ = 0.0
 
-instance euclideanRingUnit :: EuclideanRing Unit where
-  degree _ = 1
-  div _ _ = unit
-  mod _ _ = unit
-
 foreign import intDegree :: Int -> Int
 foreign import intDiv :: Int -> Int -> Int
 foreign import intMod :: Int -> Int -> Int
 
 foreign import numDiv :: Number -> Number -> Number
 
 -- | The *greatest common divisor* of two values.
-gcd :: forall a. (Eq a, EuclideanRing a) => a -> a -> a
+gcd :: forall a. Eq a => EuclideanRing a => a -> a -> a
 gcd a b =
   if b == zero
     then a
     else gcd b (a `mod` b)
 
 -- | The *least common multiple* of two values.
-lcm :: forall a. (Eq a, EuclideanRing a) => a -> a -> a
+lcm :: forall a. Eq a => EuclideanRing a => a -> a -> a
 lcm a b =
   if a == zero || b == zero
     then zero

src/Data/Eq.purs

@@ -10,7 +10,6 @@ import Data.CommutativeRing (class CommutativeRing)
 import Data.EuclideanRing (class EuclideanRing, degree, div, mod, (/), gcd, lcm)
 import Data.Ring (class Ring, negate, sub)
 import Data.Semiring (class Semiring, add, mul, one, zero, (*), (+))
-import Data.Unit (Unit)
 
 -- | The `Field` class is for types that are commutative fields.
 -- |
@@ -25,4 +24,3 @@ import Data.Unit (Unit)
 class EuclideanRing a <= Field a
 
 instance fieldNumber :: Field Number
-instance fieldUnit :: Field Unit

src/Data/EuclideanRing.purs

@@ -155,12 +155,12 @@ between low hi x
 
 -- | The absolute value function. `abs x` is defined as `if x >= zero then x
 -- | else negate x`.
-abs :: forall a. (Ord a, Ring a) => a -> a
+abs :: forall a. Ord a => Ring a => a -> a
 abs x = if x >= zero then x else negate x
 
 -- | The sign function; always evaluates to either `one` or `negate one`. For
 -- | any `x`, we should have `signum x * abs x == x`.
-signum :: forall a. (Ord a, Ring a) => a -> a
+signum :: forall a. Ord a => Ring a => a -> a
 signum x = if x >= zero then one else negate one
 
 -- | The `Ord1` type class represents totally ordered type constructors.

src/Data/Field.purs

@@ -29,8 +29,8 @@ exports.showCharImpl = function (c) {
 exports.showStringImpl = function (s) {
   var l = s.length;
   return "\"" + s.replace(
-    /[\0-\x1F\x7F"\\]/g,
-    function (c, i) { // jshint ignore:line
+    /[\0-\x1F\x7F"\\]/g, // eslint-disable-line no-control-regex
+    function (c, i) {
       switch (c) {
         case "\"":
         case "\\":

src/Data/Ord.purs

@@ -8,7 +8,7 @@ import Data.Show (class Show)
 -- | `Unit` is often used, wrapped in a monadic type constructor, as the
 -- | return type of a computation where only
 -- | the _effects_ are important.
-foreign import data Unit :: *
+foreign import data Unit :: Type
 
 -- | `unit` is the sole inhabitant of the `Unit` type.
 foreign import unit :: Unit

src/Data/Show.js

@@ -17,7 +17,7 @@ foreign import throwErr :: String -> AlmostEff
 assert :: String -> Boolean -> AlmostEff
 assert msg condition = if condition then const unit else throwErr msg
 
-testOrd :: forall a. (Ord a, Show a) => a -> a -> Ordering -> AlmostEff
+testOrd :: forall a. Ord a => Show a => a -> a -> Ordering -> AlmostEff
 testOrd x y ord =
     assert
         ("(compare " <> show x <> " " <> show y <> " ) is not equal to " <> show ord)