Skip to content

Commit 1fa4c0e

Browse files
committed
Merge pull request #4 from SimonRichardson/meltdown
Updating to purescript 0.7.0
2 parents a591694 + 0b194fc commit 1fa4c0e

File tree

9 files changed

+72
-2007
lines changed

9 files changed

+72
-2007
lines changed

Gruntfile.js

Lines changed: 0 additions & 52 deletions
This file was deleted.

bower.json

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,11 @@
1919
"package.json"
2020
],
2121
"dependencies": {
22-
"purescript-tuples": "~0.3.0",
23-
"purescript-either": "~0.1.4",
24-
"purescript-monoid": "~0.2.0",
25-
"purescript-exceptions": "~0.2.2",
26-
"purescript-control": "~0.2.2",
27-
"purescript-maybe": "~0.2.1",
28-
"purescript-strings": "~0.4.5",
29-
"purescript-monad-eff": "~0.1.0",
30-
"purescript-lists": "~0.6.0",
31-
"purescript-profunctor": "~0.2.1",
32-
"purescript-control": "~0.2.6",
33-
"purescript-foldable-traversable": "~0.3.1",
34-
"purescript-transformers": "~0.5.1"
22+
"purescript-console": "^0.1.0",
23+
"purescript-exceptions": "^0.3.0",
24+
"purescript-lists": "^0.7.0",
25+
"purescript-profunctor": "^0.3.0",
26+
"purescript-strings": "^0.5.2",
27+
"purescript-transformers": "^0.6.1"
3528
}
3629
}

examples/src/Examples.purs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module Examples where
2-
import Debug.Trace(Trace(), trace)
2+
import Control.Monad.Eff.Console
33
import Control.Monad.Eff(Eff())
44
import Data.Maybe(Maybe(..))
55
import Data.Maybe.Unsafe(fromJust)
66
import Data.Path.Pathy
77

8-
test :: forall a. (Show a, Eq a) => String -> a -> a -> Eff (trace :: Trace) Unit
8+
test :: forall a. (Show a, Eq a) => String -> a -> a -> Eff (print :: CONSOLE) Unit
99
test name actual expected= do
10-
trace $ "Test: " ++ name
11-
if expected == actual then trace $ "Passed: " ++ (show expected) else trace $ "Failed: Expected " ++ (show expected) ++ " but found " ++ (show actual)
10+
print $ "Test: " ++ name
11+
if expected == actual then print $ "Passed: " ++ (show expected) else print $ "Failed: Expected " ++ (show expected) ++ " but found " ++ (show actual)
1212

13-
test' :: forall a b s. String -> Path a b s -> String -> Eff (trace :: Trace) Unit
13+
test' :: forall a b s. String -> Path a b s -> String -> Eff (print :: CONSOLE) Unit
1414
test' n p s = test n (unsafePrintPath p) s
1515

1616
main = do
17-
trace "NEW TEST"
17+
print "NEW TEST"
1818

1919
-- Should not compile:
2020
-- test "(</>) - file in dir" (printPath (file "image.png" </> dir "foo")) "./image.png/foo"

gulpfile.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/* jshint node: true */
2+
"use strict";
3+
4+
var gulp = require("gulp"),
5+
purescript = require("gulp-purescript"),
6+
run = require("gulp-run"),
7+
8+
sources = [
9+
"src/**/*.purs",
10+
"bower_components/purescript-*/src/**/*.purs",
11+
"test/**/*.purs"
12+
],
13+
14+
foreigns = [
15+
"src/**/*.js",
16+
"bower_components/purescript-*/src/**/*.js",
17+
"test/**/*.js"
18+
];
19+
20+
gulp.task("make", function() {
21+
return purescript.psc({ src: sources, ffi: foreigns });
22+
});
23+
24+
gulp.task("test", ["make"], function() {
25+
return purescript.pscBundle({ src: "output/**/*.js", main: "Test.Main" })
26+
.pipe(run("node"));
27+
});
28+
29+
gulp.task("dotpsci", function () {
30+
return purescript.psci({ src: sources, ffi: foreigns })
31+
.pipe(gulp.dest("."));
32+
});
33+
34+
gulp.task("default", ["test", "dotpsci"]);

output/examples.html

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)