Skip to content

Commit 3b7ec4f

Browse files
bobzhangbobzhang
committedMay 22, 2021
tweak
1 parent 2254caf commit 3b7ec4f

13 files changed

+1786
-1775
lines changed
 

‎jscomp/frontend/ast_external.ml

+19-16
Original file line numberDiff line numberDiff line change
@@ -149,26 +149,29 @@ let handleExternalInStru
149149
~loc Nonrecursive [
150150
Vb.mk ~loc
151151
(Pat.var ~loc prim.pval_name)
152-
153-
(let body = (Exp.apply ~loc
154-
(Exp.ident ~loc {txt = Lident prim.pval_name.txt; loc })
155-
(Ext_list.mapi args (fun i x ->
156-
match x with
157-
| Asttypes.Nolabel ->
158-
Asttypes.Nolabel, Exp.ident {txt = Lident ("arg"^string_of_int i); loc}
159-
| Labelled s
160-
| Optional s
161-
->
162-
x, Exp.ident {txt = Lident s ; loc}
163-
))
164-
) in
152+
(let body =
153+
Exp.apply ~loc
154+
(Exp.ident ~loc {txt = Lident prim.pval_name.txt; loc })
155+
(
156+
(Asttypes.Nolabel, Exp.ident ~loc {txt = Lident "obj"; loc}) ::
157+
Ext_list.mapi params (fun i x ->
158+
(x,
159+
match x with
160+
| Asttypes.Nolabel ->
161+
Exp.ident {txt = Lident ("arg"^string_of_int (i + 1)); loc}
162+
| Labelled s
163+
| Optional s
164+
->
165+
Exp.ident {txt = Lident s ; loc})))
166+
in
165167
snd @@
166168
Ext_list.fold_right
167-
params (0, Exp.fun_ Nolabel None (Pat.var ~loc { txt = "arg0"; loc} ) body) (
169+
params (0, Exp.fun_ Nolabel None (Pat.var ~loc { txt = "obj"; loc} ) body) (
168170
fun arg (i, obj) ->
169171
i + 1, Exp.fun_ arg None
170-
(Pat.var ~loc {txt = (match arg with | Labelled s | Optional s -> s
171-
| Nolabel -> "arg" ^ string_of_int (arity - i - 1)); loc}) obj
172+
(Pat.var ~loc {txt = (match arg with
173+
| Labelled s | Optional s -> s
174+
| Nolabel -> "arg" ^ string_of_int (arity - i - 1)); loc}) obj
172175
)
173176
)
174177
]

‎jscomp/main/builtin_cmj_datasets.ml

+7-7
Large diffs are not rendered by default.

‎jscomp/test/js_promise_basic_test.js

+38-38
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ function andThenTest(param) {
6868
var arg1 = function (param) {
6969
return Promise.resolve(12);
7070
};
71-
var arg0 = p.then(arg1);
71+
var obj = p.then(arg1);
7272
var arg1$1 = function (y) {
7373
return Promise.resolve(assert_bool(y === 12));
7474
};
75-
return arg0.then(arg1$1);
75+
return obj.then(arg1$1);
7676
}
7777

7878
var h = Promise.resolve(undefined);
@@ -97,22 +97,22 @@ function catchTest(param) {
9797
var p = Promise.reject({
9898
RE_EXN_ID: "Not_found"
9999
});
100-
var arg0 = p.then(fail);
100+
var obj = p.then(fail);
101101
var arg1 = assertIsNotFound;
102-
return arg0.catch(arg1);
102+
return obj.catch(arg1);
103103
}
104104

105105
function orResolvedTest(param) {
106106
var p = Promise.resolve(42);
107107
var arg1 = function (param) {
108108
return Promise.resolve(22);
109109
};
110-
var arg0 = p.catch(arg1);
110+
var obj = p.catch(arg1);
111111
var arg1$1 = function (value) {
112112
return Promise.resolve(assert_bool(value === 42));
113113
};
114-
var arg0$1 = arg0.then(arg1$1);
115-
return arg0$1.catch(fail);
114+
var obj$1 = obj.then(arg1$1);
115+
return obj$1.catch(fail);
116116
}
117117

118118
function orRejectedTest(param) {
@@ -122,25 +122,25 @@ function orRejectedTest(param) {
122122
var arg1 = function (param) {
123123
return Promise.resolve(22);
124124
};
125-
var arg0 = p.catch(arg1);
125+
var obj = p.catch(arg1);
126126
var arg1$1 = function (value) {
127127
return Promise.resolve(assert_bool(value === 22));
128128
};
129-
var arg0$1 = arg0.then(arg1$1);
130-
return arg0$1.catch(fail);
129+
var obj$1 = obj.then(arg1$1);
130+
return obj$1.catch(fail);
131131
}
132132

133133
function orElseResolvedTest(param) {
134134
var p = Promise.resolve(42);
135135
var arg1 = function (param) {
136136
return Promise.resolve(22);
137137
};
138-
var arg0 = p.catch(arg1);
138+
var obj = p.catch(arg1);
139139
var arg1$1 = function (value) {
140140
return Promise.resolve(assert_bool(value === 42));
141141
};
142-
var arg0$1 = arg0.then(arg1$1);
143-
return arg0$1.catch(fail);
142+
var obj$1 = obj.then(arg1$1);
143+
return obj$1.catch(fail);
144144
}
145145

146146
function orElseRejectedResolveTest(param) {
@@ -150,12 +150,12 @@ function orElseRejectedResolveTest(param) {
150150
var arg1 = function (param) {
151151
return Promise.resolve(22);
152152
};
153-
var arg0 = p.catch(arg1);
153+
var obj = p.catch(arg1);
154154
var arg1$1 = function (value) {
155155
return Promise.resolve(assert_bool(value === 22));
156156
};
157-
var arg0$1 = arg0.then(arg1$1);
158-
return arg0$1.catch(fail);
157+
var obj$1 = obj.then(arg1$1);
158+
return obj$1.catch(fail);
159159
}
160160

161161
function orElseRejectedRejectTest(param) {
@@ -167,8 +167,8 @@ function orElseRejectedRejectTest(param) {
167167
RE_EXN_ID: "Stack_overflow"
168168
});
169169
};
170-
var arg0 = p.catch(arg1);
171-
var arg0$1 = arg0.then(fail);
170+
var obj = p.catch(arg1);
171+
var obj$1 = obj.then(fail);
172172
var arg1$1 = function (error) {
173173
var match = Caml_exceptions.is_extension(error) && error.RE_EXN_ID === "Stack_overflow" ? 0 : undefined;
174174
if (match !== undefined) {
@@ -184,7 +184,7 @@ function orElseRejectedRejectTest(param) {
184184
Error: new Error()
185185
};
186186
};
187-
return arg0$1.catch(arg1$1);
187+
return obj$1.catch(arg1$1);
188188
}
189189

190190
function resolveTest(param) {
@@ -208,17 +208,17 @@ function thenCatchChainResolvedTest(param) {
208208
var arg1 = function (value) {
209209
return Promise.resolve(assert_bool(value === 20));
210210
};
211-
var arg0 = p.then(arg1);
212-
return arg0.catch(fail);
211+
var obj = p.then(arg1);
212+
return obj.catch(fail);
213213
}
214214

215215
function thenCatchChainRejectedTest(param) {
216216
var p = Promise.reject({
217217
RE_EXN_ID: "Not_found"
218218
});
219-
var arg0 = p.then(fail);
219+
var obj = p.then(fail);
220220
var arg1 = assertIsNotFound;
221-
return arg0.catch(arg1);
221+
return obj.catch(arg1);
222222
}
223223

224224
function allResolvedTest(param) {
@@ -230,14 +230,14 @@ function allResolvedTest(param) {
230230
p2,
231231
p3
232232
];
233-
var arg0 = Promise.all(promises);
233+
var obj = Promise.all(promises);
234234
var arg1 = function (resolved) {
235235
assert_bool(Caml_array.get(resolved, 0) === 1);
236236
assert_bool(Caml_array.get(resolved, 1) === 2);
237237
assert_bool(Caml_array.get(resolved, 2) === 3);
238238
return h;
239239
};
240-
return arg0.then(arg1);
240+
return obj.then(arg1);
241241
}
242242

243243
function allRejectTest(param) {
@@ -251,15 +251,15 @@ function allRejectTest(param) {
251251
p2,
252252
p3
253253
];
254-
var arg0 = Promise.all(promises);
255-
var arg0$1 = arg0.then(fail);
254+
var obj = Promise.all(promises);
255+
var obj$1 = obj.then(fail);
256256
var arg1 = function (error) {
257257
assert_bool(error === ({
258258
RE_EXN_ID: "Not_found"
259259
}));
260260
return h;
261261
};
262-
return arg0$1.catch(arg1);
262+
return obj$1.catch(arg1);
263263
}
264264

265265
function raceTest(param) {
@@ -271,16 +271,16 @@ function raceTest(param) {
271271
p2,
272272
p3
273273
];
274-
var arg0 = Promise.race(promises);
274+
var obj = Promise.race(promises);
275275
var arg1 = function (resolved) {
276276
return h;
277277
};
278-
var arg0$1 = arg0.then(arg1);
279-
return arg0$1.catch(fail);
278+
var obj$1 = obj.then(arg1);
279+
return obj$1.catch(fail);
280280
}
281281

282282
function createPromiseRejectTest(param) {
283-
var arg0 = new Promise((function (resolve, reject) {
283+
var obj = new Promise((function (resolve, reject) {
284284
return reject({
285285
RE_EXN_ID: "Not_found"
286286
});
@@ -291,19 +291,19 @@ function createPromiseRejectTest(param) {
291291
}));
292292
return h;
293293
};
294-
return arg0.catch(arg1);
294+
return obj.catch(arg1);
295295
}
296296

297297
function createPromiseFulfillTest(param) {
298-
var arg0 = new Promise((function (resolve, param) {
298+
var obj = new Promise((function (resolve, param) {
299299
return resolve("success");
300300
}));
301301
var arg1 = function (resolved) {
302302
assert_bool(resolved === "success");
303303
return h;
304304
};
305-
var arg0$1 = arg0.then(arg1);
306-
return arg0$1.catch(fail);
305+
var obj$1 = obj.then(arg1);
306+
return obj$1.catch(fail);
307307
}
308308

309309
thenTest(undefined);
@@ -336,7 +336,7 @@ createPromiseRejectTest(undefined);
336336

337337
createPromiseFulfillTest(undefined);
338338

339-
var arg0 = Promise.all([
339+
var obj = Promise.all([
340340
Promise.resolve(2),
341341
Promise.resolve(3)
342342
]);
@@ -352,7 +352,7 @@ function arg1(param) {
352352
return Promise.resolve(undefined);
353353
}
354354

355-
arg0.then(arg1);
355+
obj.then(arg1);
356356

357357
console.log(List.length(suites.contents));
358358

‎lib/4.06.1/unstable/js_compiler.ml

+27-23
Large diffs are not rendered by default.

‎lib/4.06.1/whole_compiler.ml

+27-23
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)