Merge pull request #19 from purescript/foreign-updates

Updates for external foreign definitions

Author: garyb

.gitignore

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

.jscsrc

@@ -0,0 +1,10 @@
+{
+  "preset": "grunt",
+  "disallowSpacesInAnonymousFunctionExpression": null,
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningRoundBrace": true,
+    "beforeOpeningCurlyBrace": true
+  },
+  "validateQuoteMarks": "\"",
+  "requireCurlyBraces": null
+}

.jshintrc

@@ -0,0 +1,19 @@
+{
+  "bitwise": true,
+  "eqeqeq": true,
+  "forin": true,
+  "freeze": true,
+  "funcscope": true,
+  "futurehostile": true,
+  "globalstrict": true,
+  "latedef": true,
+  "maxparams": 1,
+  "noarg": true,
+  "nocomma": true,
+  "nonew": true,
+  "notypeof": true,
+  "singleGroups": true,
+  "undef": true,
+  "unused": true,
+  "eqnull": true
+}

README.md

@@ -13,4 +13,3 @@ bower install purescript-prelude
 ## Module documentation
 
 - [Prelude](docs/Prelude.md)
-- [Prelude.Unsafe](docs/Prelude.Unsafe.md)

docs/Prelude.Unsafe.md

@@ -613,13 +613,15 @@ instance semiringUnit :: Semiring Unit
 (+) :: forall a. (Semiring a) => a -> a -> a
 ```
 
+`(+)` is an alias for `add`.
 
 #### `(*)`
 
 ``` purescript
 (*) :: forall a. (Semiring a) => a -> a -> a
 ```
 
+`(*)` is an alias for `mul`.
 
 #### `Ring`
 
@@ -663,6 +665,7 @@ instance ringUnit :: Ring Unit
 (-) :: forall a. (Ring a) => a -> a -> a
 ```
 
+`(-)` is an alias for `sub`.
 
 #### `negate`
 
@@ -714,6 +717,7 @@ instance moduloSemiringUnit :: ModuloSemiring Unit
 (/) :: forall a. (ModuloSemiring a) => a -> a -> a
 ```
 
+`(/)` is an alias for `div`.
 
 #### `DivisionRing`
 
@@ -786,14 +790,14 @@ The `Eq` type class represents types which support decidable equality.
 - Reflexivity: `x == x = true`
 - Symmetry: `x == y = y == x`
 - Transitivity: if `x == y` and `y == z` then `x == z`
-- Negation: `x /= y = not (x == y)`
 
 #### `(==)`
 
 ``` purescript
 (==) :: forall a. (Eq a) => a -> a -> Boolean
 ```
 
+`(==)` is an alias for `eq`.
 
 #### `(/=)`
 

docs/Prelude.md

@@ -1,26 +1,29 @@
+/* jshint node: true */
 "use strict";
 
 var gulp = require("gulp");
+var jshint = require("gulp-jshint");
+var jscs = require("gulp-jscs");
 var plumber = require("gulp-plumber");
 var purescript = require("gulp-purescript");
-var jsvalidate = require("gulp-jsvalidate");
-var run = require('gulp-run');
+var run = require("gulp-run");
 
 var paths = [
   "src/**/*.purs",
   "bower_components/purescript-*/src/**/*.purs"
 ];
 
-gulp.task("make", function() {
-  return gulp.src(paths)
-    .pipe(plumber())
-    .pipe(purescript.pscMake());
+gulp.task("lint", function() {
+  return gulp.src("src/**/*.js")
+    .pipe(jshint())
+    .pipe(jshint.reporter())
+    .pipe(jscs());
 });
 
-gulp.task("jsvalidate", ["make"], function () {
-  return gulp.src("output/**/*.js")
+gulp.task("make", ["lint"], function() {
+  return gulp.src(paths)
     .pipe(plumber())
-    .pipe(jsvalidate());
+    .pipe(purescript.pscMake());
 });
 
 var docTasks = [];
@@ -36,7 +39,7 @@ var docTask = function(name) {
   docTasks.push(taskName);
 };
 
-["Prelude", "Prelude.Unsafe"].forEach(docTask);
+["Prelude"].forEach(docTask);
 
 gulp.task("docs", docTasks);
 
@@ -47,10 +50,10 @@ gulp.task("dotpsci", function () {
 });
 
 gulp.task("test", function() {
-  return gulp.src(paths.concat(['test/Main.purs']))
+  return gulp.src(paths.concat(["test/Main.purs"]))
     .pipe(plumber())
     .pipe(purescript.psc({ main: "Test.Main" }))
     .pipe(run("node"));
-})
+});
 
-gulp.task("default", ["jsvalidate", "docs", "dotpsci"]);
+gulp.task("default", ["make", "docs", "dotpsci"]);

gulpfile.js

@@ -2,7 +2,8 @@
   "private": true,
   "devDependencies": {
     "gulp": "^3.8.11",
-    "gulp-jsvalidate": "^1.0.1",
+    "gulp-jscs": "^1.6.0",
+    "gulp-jshint": "^1.10.0",
     "gulp-plumber": "^1.0.0",
     "gulp-purescript": "^0.3.1",
     "gulp-run": "~1.6.7"

package.json

@@ -0,0 +1,222 @@
+/* global exports */
+"use strict";
+
+// module Prelude
+
+//- Functor --------------------------------------------------------------------
+
+exports.arrayMap = function (f) {
+  return function (arr) {
+    var l = arr.length;
+    var result = new Array(l);
+    for (var i = 0; i < l; i++) {
+      result[i] = f(arr[i]);
+    }
+    return result;
+  };
+};
+
+//- Bind -----------------------------------------------------------------------
+
+exports.arrayBind = function (arr) {
+  return function (f) {
+    var result = [];
+    for (var i = 0, l = arr.length; i < l; i++) {
+      Array.prototype.push.apply(result, f(arr[i]));
+    }
+    return result;
+  };
+};
+
+//- Monoid ---------------------------------------------------------------------
+
+exports.concatString = function (s1) {
+  return function (s2) {
+    return s1 + s2;
+  };
+};
+
+exports.concatArray = function (xs) {
+  return function (ys) {
+    return xs.concat(ys);
+  };
+};
+
+//- Semiring -------------------------------------------------------------------
+
+exports.intAdd = function (x) {
+  return function (y) {
+    /* jshint bitwise: false */
+    return x + y | 0;
+  };
+};
+
+exports.intMul = function (x) {
+  return function (y) {
+    /* jshint bitwise: false */
+    return x * y | 0;
+  };
+};
+
+exports.numAdd = function (n1) {
+  return function (n2) {
+    return n1 + n2;
+  };
+};
+
+exports.numMul = function (n1) {
+  return function (n2) {
+    return n1 * n2;
+  };
+};
+
+//- ModuloSemiring -------------------------------------------------------------
+
+exports.intDiv = function (x) {
+  return function (y) {
+    /* jshint bitwise: false */
+    return x / y | 0;
+  };
+};
+
+exports.intMod = function (x) {
+  return function (y) {
+    return x % y;
+  };
+};
+
+exports.numDiv = function (n1) {
+  return function (n2) {
+    return n1 / n2;
+  };
+};
+
+//- Ring -----------------------------------------------------------------------
+
+exports.intSub = function (x) {
+  return function (y) {
+    /* jshint bitwise: false */
+    return x - y | 0;
+  };
+};
+
+exports.numSub = function (n1) {
+  return function (n2) {
+    return n1 - n2;
+  };
+};
+
+//- Eq -------------------------------------------------------------------------
+
+exports.refEq = function (r1) {
+  return function (r2) {
+    return r1 === r2;
+  };
+};
+
+exports.refIneq = function (r1) {
+  return function (r2) {
+    return r1 !== r2;
+  };
+};
+
+exports.eqArrayImpl = function (f) {
+  return function (xs) {
+    return function (ys) {
+      if (xs.length !== ys.length) return false;
+      for (var i = 0; i < xs.length; i++) {
+        if (!f(xs[i])(ys[i])) return false;
+      }
+      return true;
+    };
+  };
+};
+
+exports.ordArrayImpl = function (f) {
+  return function (xs) {
+    return function (ys) {
+      var i = 0;
+      var xlen = xs.length;
+      var ylen = ys.length;
+      while (i < xlen && i < ylen) {
+        var x = xs[i];
+        var y = ys[i];
+        var o = f(x)(y);
+        if (o !== 0) {
+          return o;
+        }
+        i++;
+      }
+      if (xlen === ylen) {
+        return 0;
+      } else if (xlen > ylen) {
+        return -1;
+      } else {
+        return 1;
+      }
+    };
+  };
+};
+
+//- Ord ------------------------------------------------------------------------
+
+exports.unsafeCompareImpl = function (lt) {
+  return function (eq) {
+    return function (gt) {
+      return function (x) {
+        return function (y) {
+          return x < y ? lt : x > y ? gt : eq;
+        };
+      };
+    };
+  };
+};
+
+//- Lattice --------------------------------------------------------------------
+
+exports.boolOr = function (b1) {
+  return function (b2) {
+    return b1 || b2;
+  };
+};
+
+exports.boolAnd = function (b1) {
+  return function (b2) {
+    return b1 && b2;
+  };
+};
+
+//- ComplementedLattice --------------------------------------------------------
+
+exports.boolNot = function (b) {
+  return !b;
+};
+
+//- Show -----------------------------------------------------------------------
+
+exports.showIntImpl = function (n) {
+  return n.toString();
+};
+
+exports.showNumberImpl = function (n) {
+  /* jshint bitwise: false */
+  return n === (n | 0) ? n + ".0" : n.toString();
+};
+
+exports.showCharImpl = function (c) {
+  return c === "'" ? "'\\''" : "'" + c + "'";
+};
+
+exports.showStringImpl = function (s) {
+  return JSON.stringify(s);
+};
+
+exports.showArrayImpl = function (f) {
+  return function (xs) {
+    var ss = [];
+    for (var i = 0, l = xs.length; i < l; i++) {
+      ss[i] = f(xs[i]);
+    }
+    return "[" + ss.join(",") + "]";
+  };
+};