Skip to content

Commit afd150f

Browse files
committed
FFI cleanup
1 parent ffc0b6f commit afd150f

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

src/Control/Monad/Aff.js

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ var Aff = function () {
6262
}
6363

6464
function AffCtr(tag) {
65-
return function (_1, _2, _3) {
65+
var fn = function (_1, _2, _3) {
6666
return new Aff(tag, _1, _2, _3);
6767
};
68+
fn.tag = tag;
69+
return fn;
6870
}
6971

7072
function nonCanceler(error) {
@@ -898,93 +900,93 @@ var Aff = function () {
898900
}
899901

900902
Aff.EMPTY = EMPTY;
901-
Aff.pure = AffCtr(PURE);
902-
Aff.throw = AffCtr(THROW);
903-
Aff.catch = AffCtr(CATCH);
904-
Aff.sync = AffCtr(SYNC);
905-
Aff.async = AffCtr(ASYNC);
906-
Aff.bind = AffCtr(BIND);
907-
Aff.bracket = AffCtr(BRACKET);
908-
Aff.fork = AffCtr(FORK);
909-
Aff.parMap = AffCtr(MAP);
910-
Aff.parApply = AffCtr(APPLY);
911-
Aff.parAlt = AffCtr(ALT);
903+
Aff.Pure = AffCtr(PURE);
904+
Aff.Throw = AffCtr(THROW);
905+
Aff.Catch = AffCtr(CATCH);
906+
Aff.Sync = AffCtr(SYNC);
907+
Aff.Async = AffCtr(ASYNC);
908+
Aff.Bind = AffCtr(BIND);
909+
Aff.Bracket = AffCtr(BRACKET);
910+
Aff.Fork = AffCtr(FORK);
911+
Aff.ParMap = AffCtr(MAP);
912+
Aff.ParApply = AffCtr(APPLY);
913+
Aff.ParAlt = AffCtr(ALT);
912914
Aff.runFiber = runFiber;
913915
Aff.runPar = runPar;
914916

915917
return Aff;
916918
}();
917919

918-
exports._pure = Aff.pure;
920+
exports._pure = Aff.Pure;
919921

920-
exports._throwError = Aff.throw;
922+
exports._throwError = Aff.Throw;
921923

922924
exports._catchError = function (aff) {
923925
return function (k) {
924-
return Aff.catch(aff, k);
926+
return Aff.Catch(aff, k);
925927
};
926928
};
927929

928930
exports._map = function (f) {
929931
return function (aff) {
930-
if (aff.tag === "Pure") {
931-
return Aff.pure(f(aff._1));
932+
if (aff.tag === Aff.Pure.tag) {
933+
return Aff.Pure(f(aff._1));
932934
} else {
933-
return Aff.bind(aff, function (value) {
934-
return Aff.pure(f(value));
935+
return Aff.Bind(aff, function (value) {
936+
return Aff.Pure(f(value));
935937
});
936938
}
937939
};
938940
};
939941

940942
exports._bind = function (aff) {
941943
return function (k) {
942-
return Aff.bind(aff, k);
944+
return Aff.Bind(aff, k);
943945
};
944946
};
945947

946948
exports._fork = function (suspended) {
947949
return function (aff) {
948-
return Aff.fork(suspended, aff);
950+
return Aff.Fork(suspended, aff);
949951
};
950952
};
951953

952-
exports._liftEff = Aff.sync;
954+
exports._liftEff = Aff.Sync;
953955

954956
exports._parAffMap = function (f) {
955957
return function (aff) {
956-
return Aff.parMap(f, aff);
958+
return Aff.ParMap(f, aff);
957959
};
958960
};
959961

960962
exports._parAffApply = function (aff1) {
961963
return function (aff2) {
962-
return Aff.parApply(aff1, aff2);
964+
return Aff.ParApply(aff1, aff2);
963965
};
964966
};
965967

966968
exports._parAffAlt = function (aff1) {
967969
return function (aff2) {
968-
return Aff.parAlt(aff1, aff2);
970+
return Aff.ParAlt(aff1, aff2);
969971
};
970972
};
971973

972-
exports.makeAff = Aff.async;
974+
exports.makeAff = Aff.Async;
973975

974976
exports.generalBracket = function (acquire) {
975977
return function (options) {
976978
return function (k) {
977-
return Aff.bracket(acquire, options, k);
979+
return Aff.Bracket(acquire, options, k);
978980
};
979981
};
980982
};
981983

982984
exports.memoAff = function (aff) {
983985
var value = Aff.EMPTY;
984-
return Aff.bind(Aff.pure(void 0), function () {
986+
return Aff.Bind(Aff.Pure(void 0), function () {
985987
if (value === Aff.EMPTY) {
986-
return Aff.bind(aff, function (result) {
987-
value = Aff.pure(result);
988+
return Aff.Bind(aff, function (result) {
989+
value = Aff.Pure(result);
988990
return value;
989991
});
990992
} else {
@@ -1011,11 +1013,11 @@ exports._delay = function () {
10111013
}
10121014

10131015
return function (right, ms) {
1014-
return Aff.async(function (cb) {
1016+
return Aff.Async(function (cb) {
10151017
return function () {
10161018
var timer = setDelay(ms, cb(right()));
10171019
return function () {
1018-
return Aff.sync(function () {
1020+
return Aff.Sync(function () {
10191021
return right(clearDelay(ms, timer));
10201022
});
10211023
};
@@ -1031,7 +1033,7 @@ exports._launchAff = function (util, suspended, aff) {
10311033
};
10321034

10331035
exports._sequential = function(util, par) {
1034-
return Aff.async(function (cb) {
1036+
return Aff.Async(function (cb) {
10351037
return function () {
10361038
return Aff.runPar(util, par, cb);
10371039
};

0 commit comments

Comments
 (0)