Skip to content

Commit 017ee42

Browse files
cristianoccristianoc
committed
Use then in a .res file.
1 parent 9cefe18 commit 017ee42

File tree

10 files changed

+53
-45
lines changed

10 files changed

+53
-45
lines changed

‎jscomp/main/builtin_cmi_datasets.ml‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎jscomp/main/builtin_cmj_datasets.ml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* af520558d40cfd07880d752cd665a60b *)
1+
(* fe9141272036e1415f92ab1b938172f9 *)
22
let module_names : string array = Obj.magic (
33
"Js" (* 23 *),
44
"Arg" (* 217 *),
@@ -89,7 +89,7 @@ let module_names : string array = Obj.magic (
8989
"BytesLabels" (* 878 *),
9090
"Dom_storage" (* 386 *),
9191
"Js_mapperRt" (* 87 *),
92-
"Js_promise2" (* 51 *),
92+
"Js_promise2" (* 61 *),
9393
"JsxDOMStyle" (* 23 *),
9494
"Node_buffer" (* 23 *),
9595
"Node_module" (* 23 *),
@@ -225,7 +225,7 @@ let module_data : string array = Obj.magic (
225225
(* BytesLabels *)"\132\149\166\190\000\000\003Z\000\000\000\231\000\000\003\012\000\000\002\216\160\b\000\000\152\000\176#cat\144\160\160B@@@\176#map\144\160\160B@@@\176#sub\144\160\160C@@@\176$blit\144\160\160E@@@\176$copy\144\160\160A@@@\176$fill\144\160\160D@@@\176$init\144\160\160B@@@\176$iter\144\160\160B@@@\176$make\144\160\160B@@@\176$mapi\144\160\160B@@@\176$trim\144\160\160A@@@\176%equal\144\160\160B@@\144\148\192B\160\176\001\005z!x@\160\176\001\005{!y@@\151\176\1470caml_bytes_equal\160\144\004\011\160\144\004\n@\176\1929stdlib-406/bytesLabels.ml\001\001\171\0011\127\0011\155\192\004\002\001\001\171\0011\127\0011\160@\208B@@@@\176%index\144\160\160B@@@\176%iteri\144\160\160B@@@\176&concat\144\160\160B@@@\176&extend\144\160\160C@@@\176&rindex\144\160\160B@@@\176'compare\144\160\160B@@\144\148\192B\160\176\001\005w!x@\160\176\001\005x!y@@\151\176\1472caml_bytes_compare\160\144\004\011\160\144\004\n@\176\192\0044\001\001\170\0011L\0011h\192\0045\001\001\170\0011L\0011~@\208B@@@@\176'escaped\144\160\160A@@@\176(contains\144\160\160B@@@\176)index_opt\144\160\160B@@@\176)of_string\144\160\160A@@@\176)to_string\144\160\160A@@@\176*index_from\144\160\160C@@@\176*rindex_opt\144\160\160B@@@\176*sub_string\144\160\160C@@@\176+blit_string\144\160\160E@@@\176+rindex_from\144\160\160C@@@\176-contains_from\144\160\160C@@@\176.index_from_opt\144\160\160C@@@\176.rcontains_from\144\160\160C@@@\176/lowercase_ascii\144\160\160A@@@\176/rindex_from_opt\144\160\160C@@@\176/uppercase_ascii\144\160\160A@@@\1760capitalize_ascii\144\160\160A@@@\1760unsafe_of_string\144\004F@\1760unsafe_to_string\144\004D@\1762uncapitalize_ascii\144\160\160A@@@A",
226226
(* Dom_storage *)"\132\149\166\190\000\000\001n\000\000\000k\000\000\001^\000\000\001T\160\192\176#key\144\160\160B@@\144\148\192B\160\176\001\004\004!i@\160\176\001\004\005#obj@@\151\176\000B\160\151\176\180#key\160\160AA\160\004\002@\181#key@@\160\144\004\016\160\144\004\021@\176\1925others/dom_storage.mlR\001\003\022\001\0036\192\004\002R\001\003\022\001\003B@@\004\004\208B@@@@\176'getItem\144\160\160B@@\144\148\192B\160\176\001\003\246!s@\160\176\001\003\247#obj@@\151\176\000B\160\151\176\180'getItem\160\004#\160\004$@\181'getItem@@\160\144\004\015\160\144\004\020@\176\192\004\"D\000x\001\000\140\192\004#D\000x\001\000\156@@\004\003\208B@@@@\176'setItem\144\160\160C@@@\176*removeItem\144\160\160B@@\144\148\192B\160\176\001\003\255!s@\160\176\001\004\000#obj@@\174\151\176\180*removeItem\160\004G\160\004H@\181*removeItem@@\160\144\004\r\160\144\004\018@\176\192\004FL\001\001\208\001\001\238\192\004GL\001\001\208\001\002\001@\146A\208B@@A@A",
227227
(* Js_mapperRt *)"\132\149\166\190\000\000\000C\000\000\000\017\000\000\0009\000\000\0004\160\176\176'fromInt\144\160\160C@@@\176-fromIntAssert\144\160\160C@@@\1761raiseWhenNotFound\144\160\160A@@@A",
228-
(* Js_promise2 *)"\132\149\166\190\000\000\000\031\000\000\000\012\000\000\000$\000\000\000\"\160\160\176%catch\144\160\160B@@@\176%then_\144\160\160B@@@A",
228+
(* Js_promise2 *)"\132\149\166\190\000\000\000)\000\000\000\015\000\000\000.\000\000\000+\160\176\176$then\144\160\160B@@@\176%catch\144\160\160B@@@\176%then_\144\004\n@A",
229229
(* JsxDOMStyle *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
230230
(* Node_buffer *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
231231
(* Node_module *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",

‎jscomp/others/js_promise2.ml‎

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

‎jscomp/others/js_promise2.res‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
include Js_promise
2+
3+
/** Type-safe t-first then */
4+
let then: (promise<'a>, 'a => promise<'b>) => promise<'b> = %raw(`
5+
function(p, cont) {
6+
Promise.resolve(p).then(cont)
7+
}
8+
`)
9+
10+
/** Type-safe t-first catch */
11+
let catch: (promise<'a>, error => promise<'a>) => promise<'a> = %raw(`
12+
function(p, cont) {
13+
Promise.resolve(p).catch(cont)
14+
}
15+
`)
16+
17+
/** Old syntax, can use then instead */
18+
let then_ = then

‎jscomp/others/release.ninja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ o others/js_obj.cmi others/js_obj.cmj : cc others/js_obj.ml | others/belt_intern
4747
o others/js_option.cmj : cc_cmi others/js_option.ml | others/belt_internals.cmi others/js.cmi others/js_exn.cmj others/js_option.cmi $bsc
4848
o others/js_option.cmi : cc others/js_option.mli | others/belt_internals.cmi others/js.cmi $bsc
4949
o others/js_promise.cmi others/js_promise.cmj : cc others/js_promise.ml | others/belt_internals.cmi others/js.cmi $bsc
50-
o others/js_promise2.cmi others/js_promise2.cmj : cc others/js_promise2.ml | others/belt_internals.cmi others/js.cmi others/js_promise.cmj $bsc
50+
o others/js_promise2.cmi others/js_promise2.cmj : cc others/js_promise2.res | others/belt_internals.cmi others/js.cmi $bsc
5151
o others/js_re.cmi others/js_re.cmj : cc others/js_re.ml | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
5252
o others/js_result.cmj : cc_cmi others/js_result.ml | others/belt_internals.cmi others/js.cmi others/js_result.cmi $bsc
5353
o others/js_result.cmi : cc others/js_result.mli | others/belt_internals.cmi others/js.cmi $bsc

‎lib/4.06.1/unstable/js_compiler.ml‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎lib/4.06.1/unstable/js_playground_compiler.ml‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎lib/4.06.1/whole_compiler.ml‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎lib/es6/js_promise2.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11

22

33

4-
var then_ = (function(p, cont) {
4+
var then = (function(p, cont) {
55
Promise.resolve(p).then(cont)
66
});
77

88
var $$catch = (function(p, cont) {
99
Promise.resolve(p).catch(cont)
1010
});
1111

12+
var then_ = then;
13+
1214
export {
13-
then_ ,
15+
then ,
1416
$$catch ,
17+
then_ ,
1518
}
1619
/* No side effect */

‎lib/js/js_promise2.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
'use strict';
22

33

4-
var then_ = (function(p, cont) {
4+
var then = (function(p, cont) {
55
Promise.resolve(p).then(cont)
66
});
77

88
var $$catch = (function(p, cont) {
99
Promise.resolve(p).catch(cont)
1010
});
1111

12-
exports.then_ = then_;
12+
var then_ = then;
13+
14+
exports.then = then;
1315
exports.$$catch = $$catch;
16+
exports.then_ = then_;
1417
/* No side effect */

0 commit comments

Comments
 (0)