Skip to content
This repository was archived by the owner on Jun 5, 2022. It is now read-only.

Commit 69e64af

Browse files
committed
Updates for RC
1 parent c0ec29e commit 69e64af

File tree

10 files changed

+88
-43
lines changed

10 files changed

+88
-43
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/.*
22
!/.gitignore
3+
!/.jscsrc
4+
!/.jshintrc
35
!/.travis.yml
46
/bower_components/
57
/node_modules/
68
/output/
7-
/tmp/

.jscsrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"preset": "grunt",
3+
"disallowSpacesInAnonymousFunctionExpression": null,
4+
"requireSpacesInAnonymousFunctionExpression": {
5+
"beforeOpeningRoundBrace": true,
6+
"beforeOpeningCurlyBrace": true
7+
},
8+
"disallowSpacesInsideObjectBrackets": null,
9+
"requireSpacesInsideObjectBrackets": "all",
10+
"validateQuoteMarks": "\"",
11+
"requireCurlyBraces": null
12+
}

.jshintrc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"bitwise": true,
3+
"eqeqeq": true,
4+
"forin": true,
5+
"freeze": true,
6+
"funcscope": true,
7+
"futurehostile": true,
8+
"globalstrict": true,
9+
"latedef": true,
10+
"maxparams": 1,
11+
"noarg": true,
12+
"nocomma": true,
13+
"nonew": true,
14+
"notypeof": true,
15+
"singleGroups": true,
16+
"undef": true,
17+
"unused": true,
18+
"eqnull": true
19+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/purescript/purescript-math.svg?branch=master)](https://travis-ci.org/purescript/purescript-math)
44

5-
Math functions.
5+
Standard math functions from JavaScript.
66

77
## Installation
88

bower.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
"purescript"
77
],
88
"license": "MIT",
9+
"repository": {
10+
"type": "git",
11+
"url": "git://github.com/purescript/purescript-math.git"
12+
},
913
"ignore": [
1014
"**/.*",
1115
"bower_components",
1216
"node_modules",
1317
"output",
18+
"test",
1419
"bower.json",
1520
"gulpfile.js",
1621
"package.json"

docs/Math.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Module Documentation
2-
31
## Module Math
42

5-
63
Wraps the math functions and constants from Javascript's built-in `Math` object.
74
See [Math Reference at MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math).
85

@@ -219,4 +216,3 @@ sqrt2 :: Number
219216
The square root of two, around 1.41421.
220217

221218

222-

gulpfile.js

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,60 @@
1+
/* jshint node: true */
12
"use strict";
23

34
var gulp = require("gulp");
5+
var jshint = require("gulp-jshint");
6+
var jscs = require("gulp-jscs");
47
var plumber = require("gulp-plumber");
58
var purescript = require("gulp-purescript");
6-
var jsvalidate = require("gulp-jsvalidate");
9+
var rimraf = require("rimraf");
710

8-
var paths = [
11+
var sources = [
912
"src/**/*.purs",
1013
"bower_components/purescript-*/src/**/*.purs"
1114
];
1215

13-
gulp.task("make", function() {
14-
return gulp.src(paths)
15-
.pipe(plumber())
16-
.pipe(purescript.pscMake({ noPrelude: true }));
16+
var foreigns = [
17+
"src/**/*.js",
18+
"bower_components/purescript-*/src/**/*.js"
19+
];
20+
21+
gulp.task("clean-docs", function (cb) {
22+
rimraf("docs", cb);
1723
});
1824

19-
gulp.task("jsvalidate", ["make"], function () {
20-
return gulp.src("output/**/*.js")
21-
.pipe(plumber())
22-
.pipe(jsvalidate());
25+
gulp.task("clean-output", function (cb) {
26+
rimraf("output", cb);
2327
});
2428

25-
var docTasks = [];
29+
gulp.task("clean", ["clean-docs", "clean-output"]);
2630

27-
var docTask = function(name) {
28-
var taskName = "docs-" + name.toLowerCase();
29-
gulp.task(taskName, function () {
30-
return gulp.src("src/" + name.replace(/\./g, "/") + ".purs")
31-
.pipe(plumber())
32-
.pipe(purescript.pscDocs())
33-
.pipe(gulp.dest("docs/" + name + ".md"));
34-
});
35-
docTasks.push(taskName);
36-
};
31+
gulp.task("lint", function() {
32+
return gulp.src("src/**/*.js")
33+
.pipe(jshint())
34+
.pipe(jshint.reporter())
35+
.pipe(jscs());
36+
});
3737

38-
["Math"].forEach(docTask);
38+
gulp.task("make", ["lint"], function() {
39+
return gulp.src(sources)
40+
.pipe(plumber())
41+
.pipe(purescript.pscMake({ ffi: foreigns }));
42+
});
3943

40-
gulp.task("docs", docTasks);
44+
gulp.task("docs", ["clean-docs"], function () {
45+
return gulp.src(sources)
46+
.pipe(plumber())
47+
.pipe(purescript.pscDocs({
48+
docgen: {
49+
"Math": "docs/Math.md"
50+
}
51+
}));
52+
});
4153

4254
gulp.task("dotpsci", function () {
43-
return gulp.src(paths)
55+
return gulp.src(sources)
4456
.pipe(plumber())
4557
.pipe(purescript.dotPsci());
4658
});
4759

48-
gulp.task("default", ["jsvalidate", "docs", "dotpsci"]);
60+
gulp.task("default", ["make", "docs", "dotpsci"]);

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
"private": true,
33
"devDependencies": {
44
"gulp": "^3.8.11",
5-
"gulp-jsvalidate": "^1.0.1",
5+
"gulp-jscs": "^1.6.0",
6+
"gulp-jshint": "^1.10.0",
67
"gulp-plumber": "^1.0.0",
7-
"gulp-purescript": "^0.3.1"
8+
"gulp-purescript": "^0.5.0-rc.1",
9+
"rimraf": "^2.3.3"
810
}
911
}

src/Math.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ exports.asin = Math.asin;
1111

1212
exports.atan = Math.atan;
1313

14-
exports.atan2 = function(y){
14+
exports.atan2 = function (y) {
1515
return function (x) {
1616
return Math.atan2(y, x);
1717
};
1818
};
19-
19+
2020
exports.ceil = Math.ceil;
2121

2222
exports.cos = Math.cos;
@@ -27,20 +27,20 @@ exports.floor = Math.floor;
2727

2828
exports.log = Math.log;
2929

30-
exports.max = function(n1){
31-
return function(n2) {
30+
exports.max = function (n1) {
31+
return function (n2) {
3232
return Math.max(n1, n2);
3333
};
3434
};
3535

36-
exports.min = function(n1){
37-
return function(n2) {
36+
exports.min = function (n1) {
37+
return function (n2) {
3838
return Math.min(n1, n2);
3939
};
4040
};
4141

42-
exports.pow = function(n){
43-
return function(p) {
42+
exports.pow = function (n) {
43+
return function (p) {
4444
return Math.pow(n, p);
4545
};
4646
};

src/Math.purs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
-- | See [Math Reference at MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math).
33
module Math where
44

5-
import Prelude
6-
75
-- | An alias to make types in this module more explicit.
86
type Radians = Number
97

0 commit comments

Comments
 (0)