Merge pull request #10 from purescript-contrib/fix-shadow-warning

Fix shadow warning

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

@@ -2,15 +2,14 @@
   "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": "^3.0.7",
-    "jshint": "^2.9.3",
-    "pulp": "^9.0.1",
+    "eslint": "^3.10.2",
+    "pulp": "^10.0.0",
     "purescript-psa": "^0.3.9",
-    "purescript": "^0.10.1",
+    "purescript": "^0.10.2",
     "rimraf": "^2.5.4"
   }
 }

.jshintrc

@@ -117,13 +117,13 @@ cursorSet (JIndex i c) v = J.foldJsonArray defaultArr mergeArrs
   mergeArrs a =
     setArr a i =<< cursorSet c v (fromMaybe (inferEmpty c) (a A.!! i))
   setArr :: J.JArray -> Int -> J.Json -> Maybe J.Json
-  setArr xs i v =
+  setArr xs i' v' =
     let len = A.length xs
-    in if i < 0
+    in if i' < 0
        then Nothing
-       else if i >= len
-            then setArr (xs <> (replicate (i - len + 1) J.jsonNull)) i v
-            else J.fromArray <$> A.updateAt i v xs
+       else if i' >= len
+            then setArr (xs <> (replicate (i' - len + 1) J.jsonNull)) i' v'
+            else J.fromArray <$> A.updateAt i' v' xs
 
 toPrims :: J.Json -> List (Tuple JCursor JsonPrim)
 toPrims = J.foldJson nullFn boolFn numFn strFn arrFn objFn