Skip to content

Commit b90ac95

Browse files
committed
Rebase on latest 10.0 alpha compiler.
1 parent 02091f6 commit b90ac95

8 files changed

+1792
-2337
lines changed

example-async/src/AA.mjs

+100-99
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ function addTest(t) {
1515

1616
function addTest1(t, x) {
1717
tests.push(function () {
18-
return t(x);
19-
});
18+
return t(x);
19+
});
2020
}
2121

2222
async function foo(x, y) {
23-
return x + y | 0;
23+
return (x + y) | 0;
2424
}
2525

2626
async function bar(ff) {
2727
var a = await ff(3, 4);
2828
var b = await foo(5, 6);
29-
return a + b | 0;
29+
return (a + b) | 0;
3030
}
3131

3232
async function baz() {
@@ -40,14 +40,14 @@ async function testBaz() {
4040

4141
tests.push(testBaz);
4242

43-
var E = /* @__PURE__ */Caml_exceptions.create("AA.E");
43+
var E = /* @__PURE__ */ Caml_exceptions.create("AA.E");
4444

4545
async function e1() {
4646
throw {
47-
RE_EXN_ID: E,
48-
_1: 1000,
49-
Error: new Error()
50-
};
47+
RE_EXN_ID: E,
48+
_1: 1000,
49+
Error: new Error(),
50+
};
5151
}
5252

5353
async function e2() {
@@ -62,21 +62,22 @@ async function e4() {
6262
return await e2();
6363
}
6464

65-
var e5 = (function() { return Promise.reject(new Error('fail')) });
65+
var e5 = function () {
66+
return Promise.reject(new Error("fail"));
67+
};
6668

6769
async function testTryCatch(fn) {
6870
try {
6971
return await fn();
70-
}
71-
catch (raw_n){
72+
} catch (raw_n) {
7273
var n = Caml_js_exceptions.internalToOCamlException(raw_n);
7374
if (n.RE_EXN_ID === E) {
7475
console.log("testTryCatch: E", n._1);
75-
return ;
76+
return;
7677
}
7778
if (n.RE_EXN_ID === "JsError") {
7879
console.log("testTryCatch: JsError");
79-
return ;
80+
return;
8081
}
8182
throw n;
8283
}
@@ -93,11 +94,11 @@ addTest1(testTryCatch, e4);
9394
addTest1(testTryCatch, e5);
9495

9596
async function singlePromise(x) {
96-
return x + 1 | 0;
97+
return (x + 1) | 0;
9798
}
9899

99100
async function nestedPromise(x) {
100-
var x$1 = singlePromise(x + 1 | 0);
101+
var x$1 = singlePromise((x + 1) | 0);
101102
[Promise.resolve(x$1)];
102103
return 32;
103104
}
@@ -112,21 +113,20 @@ function status(response) {
112113

113114
var Fetch = {
114115
$$fetch: $$fetch$1,
115-
status: status
116+
status: status,
116117
};
117118

118-
var explainError = ((e)=>e.toString());
119+
var explainError = e => e.toString();
119120

120121
async function testFetch(url) {
121122
var response;
122123
try {
123124
response = await fetch(url);
124-
}
125-
catch (raw_e){
125+
} catch (raw_e) {
126126
var e = Caml_js_exceptions.internalToOCamlException(raw_e);
127127
if (e.RE_EXN_ID === "JsError") {
128128
console.log("Fetch returned an error:", explainError(e._1));
129-
return ;
129+
return;
130130
}
131131
throw e;
132132
}
@@ -140,7 +140,7 @@ addTest1(testFetch, "https://www.google.comsdkjdkghdsg");
140140

141141
async function withCallback() {
142142
return async function (x) {
143-
return await Promise.resolve(x) + 1 | 0;
143+
return ((await Promise.resolve(x)) + 1) | 0;
144144
};
145145
}
146146

@@ -154,55 +154,58 @@ async function map(l, f) {
154154
var loop = async function (l, acc) {
155155
if (l) {
156156
return await loop(l.tl, {
157-
hd: await l.hd,
158-
tl: acc
159-
});
157+
hd: await l.hd,
158+
tl: acc,
159+
});
160160
} else {
161161
return acc;
162162
}
163163
};
164-
return await loop(Belt_List.mapReverse(l, (function (x) {
165-
return f(x);
166-
})), /* [] */0);
164+
return await loop(
165+
Belt_List.mapReverse(l, function (x) {
166+
return f(x);
167+
}),
168+
/* [] */ 0
169+
);
167170
}
168171

169172
var AsyncList = {
170-
map: map
173+
map: map,
171174
};
172175

173176
var counter = {
174-
contents: 0
177+
contents: 0,
175178
};
176179

177180
async function ff(url) {
178181
var response = await fetch(url);
179-
counter.contents = counter.contents + 1 | 0;
180-
return [
181-
counter.contents,
182-
response.status
183-
];
182+
counter.contents = (counter.contents + 1) | 0;
183+
return [counter.contents, response.status];
184184
}
185185

186186
async function testFetchMany() {
187-
var fetchedItems = await map({
187+
var fetchedItems = await map(
188+
{
189+
hd: "https://www.google.com",
190+
tl: {
188191
hd: "https://www.google.com",
189192
tl: {
190193
hd: "https://www.google.com",
191194
tl: {
192195
hd: "https://www.google.com",
193196
tl: {
194197
hd: "https://www.google.com",
195-
tl: {
196-
hd: "https://www.google.com",
197-
tl: /* [] */0
198-
}
199-
}
200-
}
201-
}
202-
}, ff);
203-
return Belt_List.forEach(fetchedItems, (function (param) {
204-
console.log("Fetched", param[0], param[1]);
205-
}));
198+
tl: /* [] */ 0,
199+
},
200+
},
201+
},
202+
},
203+
},
204+
ff
205+
);
206+
return Belt_List.forEach(fetchedItems, function (param) {
207+
console.log("Fetched", param[0], param[1]);
208+
});
206209
}
207210

208211
tests.push(testFetchMany);
@@ -211,25 +214,24 @@ async function $$fetch$2(url) {
211214
var response;
212215
try {
213216
response = await fetch(url);
214-
}
215-
catch (raw_e){
217+
} catch (raw_e) {
216218
var e = Caml_js_exceptions.internalToOCamlException(raw_e);
217219
if (e.RE_EXN_ID === "JsError") {
218220
return {
219-
TAG: /* Error */1,
220-
_0: e._1
221-
};
221+
TAG: /* Error */ 1,
222+
_0: e._1,
223+
};
222224
}
223225
throw e;
224226
}
225227
return {
226-
TAG: /* Ok */0,
227-
_0: response
228-
};
228+
TAG: /* Ok */ 0,
229+
_0: response,
230+
};
229231
}
230232

231233
var FetchResult = {
232-
$$fetch: $$fetch$2
234+
$$fetch: $$fetch$2,
233235
};
234236

235237
function nextFetch(_response) {
@@ -238,18 +240,18 @@ function nextFetch(_response) {
238240

239241
async function testFetchWithResult() {
240242
var response1 = await $$fetch$2("https://www.google.com");
241-
if (response1.TAG !== /* Ok */0) {
242-
return ;
243+
if (response1.TAG !== /* Ok */ 0) {
244+
return;
243245
}
244246
var response1$1 = response1._0;
245247
console.log("FetchResult response1", response1$1.status);
246248
var url = nextFetch(response1$1);
247249
if (url === undefined) {
248-
return ;
250+
return;
249251
}
250252
var response2 = await $$fetch$2(url);
251-
if (response2.TAG !== /* Ok */0) {
252-
return ;
253+
if (response2.TAG !== /* Ok */ 0) {
254+
return;
253255
}
254256
console.log("FetchResult response2", response2._0.status);
255257
}
@@ -259,9 +261,8 @@ tests.push(testFetchWithResult);
259261
async function runAllTests(n) {
260262
if (n >= 0 && n < tests.length) {
261263
await Caml_array.get(tests, n)();
262-
return await runAllTests(n + 1 | 0);
264+
return await runAllTests((n + 1) | 0);
263265
}
264-
265266
}
266267

267268
runAllTests(0);
@@ -272,51 +273,51 @@ async function bb(x) {
272273

273274
async function cc(x, yOpt, z) {
274275
var y = yOpt !== undefined ? Caml_option.valFromOption(yOpt) : x;
275-
return (await x + await y | 0) + await z | 0;
276+
return ((((await x) + (await y)) | 0) + (await z)) | 0;
276277
}
277278

278279
async function dd(x, y) {
279-
return await x + await y | 0;
280+
return ((await x) + (await y)) | 0;
280281
}
281282

282283
async function ee(x, y) {
283-
return await x + await y | 0;
284+
return ((await x) + (await y)) | 0;
284285
}
285286

286287
var fetchAndCount = ff;
287288

288289
export {
289-
tests ,
290-
addTest ,
291-
addTest1 ,
292-
foo ,
293-
bar ,
294-
baz ,
295-
testBaz ,
296-
E ,
297-
e1 ,
298-
e2 ,
299-
e3 ,
300-
e4 ,
301-
e5 ,
302-
testTryCatch ,
303-
singlePromise ,
304-
nestedPromise ,
305-
Fetch ,
306-
explainError ,
307-
testFetch ,
308-
withCallback ,
309-
testWithCallback ,
310-
AsyncList ,
311-
fetchAndCount ,
312-
testFetchMany ,
313-
FetchResult ,
314-
nextFetch ,
315-
testFetchWithResult ,
316-
runAllTests ,
317-
bb ,
318-
cc ,
319-
dd ,
320-
ee ,
321-
}
290+
tests,
291+
addTest,
292+
addTest1,
293+
foo,
294+
bar,
295+
baz,
296+
testBaz,
297+
E,
298+
e1,
299+
e2,
300+
e3,
301+
e4,
302+
e5,
303+
testTryCatch,
304+
singlePromise,
305+
nestedPromise,
306+
Fetch,
307+
explainError,
308+
testFetch,
309+
withCallback,
310+
testWithCallback,
311+
AsyncList,
312+
fetchAndCount,
313+
testFetchMany,
314+
FetchResult,
315+
nextFetch,
316+
testFetchWithResult,
317+
runAllTests,
318+
bb,
319+
cc,
320+
dd,
321+
ee,
322+
};
322323
/* Not a pure module */

jscomp/main/builtin_cmi_datasets.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* dec5d460e2475d3c05dee9d57da6d5f9 *)
1+
(* ea8d7444220084bce9d9a044eb755297 *)
22
let module_names : string array = Obj.magic (
33
"Js" (* 5893 *),
44
"Arg" (* 3634 *),

lib/4.06.1/unstable/js_compiler.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ val module_data :
1313

1414
end = struct
1515
#1 "builtin_cmi_datasets.ml"
16-
(* dec5d460e2475d3c05dee9d57da6d5f9 *)
16+
(* ea8d7444220084bce9d9a044eb755297 *)
1717
let module_names : string array = Obj.magic (
1818
"Js" (* 5893 *),
1919
"Arg" (* 3634 *),

0 commit comments

Comments
 (0)