Merge pull request #98 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],
+    "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

@@ -16,18 +16,18 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-foldable-traversable": "^2.0.0",
-    "purescript-nonempty": "^3.0.0",
-    "purescript-partial": "^1.1.0",
-    "purescript-st": "^2.0.0",
-    "purescript-tailrec": "^2.0.0",
-    "purescript-tuples": "^3.0.0",
-    "purescript-unfoldable": "^2.0.0",
-    "purescript-unsafe-coerce": "^2.0.0"
+    "purescript-foldable-traversable": "^3.0.0",
+    "purescript-nonempty": "^4.0.0",
+    "purescript-partial": "^1.2.0",
+    "purescript-st": "^3.0.0",
+    "purescript-tailrec": "^3.0.0",
+    "purescript-tuples": "^4.0.0",
+    "purescript-unfoldable": "^3.0.0",
+    "purescript-unsafe-coerce": "^3.0.0"
   },
   "devDependencies": {
-    "purescript-assert": "^2.0.0",
-    "purescript-console": "^2.0.0",
-    "purescript-const": "^2.0.0"
+    "purescript-assert": "^3.0.0",
+    "purescript-console": "^3.0.0",
+    "purescript-const": "^3.0.0"
   }
 }

.travis.yml

@@ -2,14 +2,13 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && pulp build --censor-lib --strict",
+    "build": "eslint src && pulp build -- --censor-lib --strict",
     "test": "pulp test"
   },
   "devDependencies": {
-    "jscs": "^2.8.0",
-    "jshint": "^2.9.1",
-    "pulp": "^9.0.1",
-    "purescript-psa": "^0.3.9",
-    "rimraf": "^2.5.0"
+    "eslint": "^3.17.1",
+    "pulp": "^10.0.4",
+    "purescript-psa": "^0.5.0-rc.1",
+    "rimraf": "^2.6.1"
   }
 }

bower.json

@@ -8,8 +8,10 @@ exports.range = function (start) {
   return function (end) {
     var step = start > end ? -1 : 1;
     var result = [];
-    for (var i = start, n = 0; i !== end; i += step) {
+    var i = start, n = 0;
+    while (i !== end) {
       result[n++] = i;
+      i += step;
     }
     result[n] = i;
     return result;
@@ -59,9 +61,10 @@ exports.fromFoldableImpl = (function () {
   function listToArray(list) {
     var result = [];
     var count = 0;
-    while (list !== emptyList) {
-      result[count++] = list.head;
-      list = list.tail;
+    var xs = list;
+    while (xs !== emptyList) {
+      result[count++] = xs.head;
+      xs = xs.tail;
     }
     return result;
   }

package.json

@@ -113,7 +113,7 @@ import Prelude
 import Control.Alt ((<|>))
 import Control.Alternative (class Alternative)
 import Control.Lazy (class Lazy, defer)
-import Control.Monad.Rec.Class (class MonadRec, Step(..), tailRecM2)
+import Control.Monad.Rec.Class (class MonadRec, Step(..), tailRecM2, tailRec)
 import Control.Monad.ST (pureST)
 import Data.Array.ST (unsafeFreeze, emptySTArray, pushSTArray)
 import Data.Array.ST.Iterator (iterator, iterate, pushWhile)
@@ -163,15 +163,15 @@ infix 8 range as ..
 -- |
 -- | The `Lazy` constraint is used to generate the result lazily, to ensure
 -- | termination.
-some :: forall f a. (Alternative f, Lazy (f (Array a))) => f a -> f (Array a)
+some :: forall f a. Alternative f => Lazy (f (Array a)) => f a -> f (Array a)
 some v = (:) <$> v <*> defer (\_ -> many v)
 
 -- | Attempt a computation multiple times, returning as many successful results
 -- | as possible (possibly zero).
 -- |
 -- | The `Lazy` constraint is used to generate the result lazily, to ensure
 -- | termination.
-many :: forall f a. (Alternative f, Lazy (f (Array a))) => f a -> f (Array a)
+many :: forall f a. Alternative f => Lazy (f (Array a)) => f a -> f (Array a)
 many v = some v <|> pure []
 
 --------------------------------------------------------------------------------
@@ -521,13 +521,13 @@ span p arr =
       { init: arr, rest: [] }
   where
   breakIndex = go 0
-  go i =
+  go = tailRec \i ->
     -- This looks like a good opportunity to use the Monad Maybe instance,
     -- but it's important to write out an explicit case expression here in
     -- order to ensure that TCO is triggered.
     case index arr i of
-      Just x -> if p x then go (i+1) else Just i
-      Nothing -> Nothing
+      Just x -> if p x then Loop (i + 1) else Done (Just i)
+      Nothing -> Done Nothing
 
 -- | Group equal, consecutive elements of an array into arrays.
 -- |

src/Data/Array.js

@@ -31,7 +31,7 @@ import Unsafe.Coerce (unsafeCoerce)
 -- |
 -- | The runtime representation of a value of type `STArray h a` is the same as that of `Array a`,
 -- | except that mutation is allowed.
-foreign import data STArray :: * -> * -> *
+foreign import data STArray :: Type -> Type -> Type
 
 -- | An element and its index.
 type Assoc a = { value :: a, index :: Int }