Skip to content

Commit a0f1296

Browse files
bobzhangbobzhang
committed
sync up with the compiler, now with comments for nested modules!!! (#276)
1 parent a06f36f commit a0f1296

File tree

11 files changed

+85
-85
lines changed

11 files changed

+85
-85
lines changed

‎jscomp/stdlib/filename.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,15 @@ function chop_extension(name) {
235235

236236
var prng = {
237237
0: function () {
238-
return Caml_curry.app1(Random.State[1], /* () */0);
238+
return Caml_curry.app1(Random.State[/* make_self_init */1], /* () */0);
239239
},
240240
length: 1,
241241
tag: 246
242242
};
243243

244244
function temp_file_name(temp_dir, prefix, suffix) {
245245
var tag = prng.tag | 0;
246-
var rnd = Caml_curry.app1(Random.State[3], tag === 250 ? prng[0] : (
246+
var rnd = Caml_curry.app1(Random.State[/* bits */3], tag === 250 ? prng[0] : (
247247
tag === 246 ? CamlinternalLazy.force_lazy_block(prng) : prng
248248
)) & 16777215;
249249
return concat(temp_dir, Caml_curry.app3(Printf.sprintf(/* Format */[

‎jscomp/stdlib/hashtbl.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function randomize() {
5353

5454
var prng = {
5555
0: function () {
56-
return Caml_curry.app1(Random.State[1], /* () */0);
56+
return Caml_curry.app1(Random.State[/* make_self_init */1], /* () */0);
5757
},
5858
length: 1,
5959
tag: 246
@@ -82,7 +82,7 @@ function create($staropt$star, initial_size) {
8282
var seed;
8383
if (random) {
8484
var tag = prng.tag | 0;
85-
seed = Caml_curry.app1(Random.State[3], tag === 250 ? prng[0] : (
85+
seed = Caml_curry.app1(Random.State[/* bits */3], tag === 250 ? prng[0] : (
8686
tag === 246 ? CamlinternalLazy.force_lazy_block(prng) : prng
8787
));
8888
}
@@ -450,7 +450,7 @@ function stats(h) {
450450

451451
function MakeSeeded(H) {
452452
var key_index = function (h, key) {
453-
return Caml_curry.app2(H[1], h[/* seed */2], key) & (h[/* data */1].length - 1 | 0);
453+
return Caml_curry.app2(H[/* hash */1], h[/* seed */2], key) & (h[/* data */1].length - 1 | 0);
454454
};
455455
var add = function (h, key, info) {
456456
var i = key_index(h, key);
@@ -474,7 +474,7 @@ function MakeSeeded(H) {
474474
if (param) {
475475
var next = param[2];
476476
var k = param[0];
477-
if (Caml_curry.app2(H[0], k, key)) {
477+
if (Caml_curry.app2(H[/* equal */0], k, key)) {
478478
h[/* size */0] = h[/* size */0] - 1 | 0;
479479
return next;
480480
}
@@ -498,16 +498,16 @@ function MakeSeeded(H) {
498498
var match = h[/* data */1][key_index(h, key)];
499499
if (match) {
500500
var rest1 = match[2];
501-
if (Caml_curry.app2(H[0], key, match[0])) {
501+
if (Caml_curry.app2(H[/* equal */0], key, match[0])) {
502502
return match[1];
503503
}
504504
else if (rest1) {
505505
var rest2 = rest1[2];
506-
if (Caml_curry.app2(H[0], key, rest1[0])) {
506+
if (Caml_curry.app2(H[/* equal */0], key, rest1[0])) {
507507
return rest1[1];
508508
}
509509
else if (rest2) {
510-
if (Caml_curry.app2(H[0], key, rest2[0])) {
510+
if (Caml_curry.app2(H[/* equal */0], key, rest2[0])) {
511511
return rest2[1];
512512
}
513513
else {
@@ -516,7 +516,7 @@ function MakeSeeded(H) {
516516
while(true) {
517517
var param = _param;
518518
if (param) {
519-
if (Caml_curry.app2(H[0], key$1, param[0])) {
519+
if (Caml_curry.app2(H[/* equal */0], key$1, param[0])) {
520520
return param[1];
521521
}
522522
else {
@@ -549,7 +549,7 @@ function MakeSeeded(H) {
549549
var param = _param;
550550
if (param) {
551551
var rest = param[2];
552-
if (Caml_curry.app2(H[0], param[0], key)) {
552+
if (Caml_curry.app2(H[/* equal */0], param[0], key)) {
553553
return /* :: */[
554554
param[1],
555555
find_in_bucket(rest)
@@ -573,7 +573,7 @@ function MakeSeeded(H) {
573573
if (param) {
574574
var next = param[2];
575575
var k = param[0];
576-
if (Caml_curry.app2(H[0], k, key)) {
576+
if (Caml_curry.app2(H[/* equal */0], k, key)) {
577577
return /* Cons */[
578578
key,
579579
info,
@@ -623,7 +623,7 @@ function MakeSeeded(H) {
623623
while(true) {
624624
var param = _param;
625625
if (param) {
626-
if (Caml_curry.app2(H[0], param[0], key)) {
626+
if (Caml_curry.app2(H[/* equal */0], param[0], key)) {
627627
return /* true */1;
628628
}
629629
else {
@@ -656,9 +656,9 @@ function MakeSeeded(H) {
656656
}
657657

658658
function Make(H) {
659-
var equal = H[0];
659+
var equal = H[/* equal */0];
660660
var key_index = function (h, key) {
661-
return Caml_curry.app1(H[1], key) & (h[/* data */1].length - 1 | 0);
661+
return Caml_curry.app1(H[/* hash */1], key) & (h[/* data */1].length - 1 | 0);
662662
};
663663
var add = function (h, key, info) {
664664
var i = key_index(h, key);

‎jscomp/stdlib/map.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function Make(funarg) {
112112
var d = param[2];
113113
var v = param[1];
114114
var l = param[0];
115-
var c = Caml_curry.app2(funarg[0], x, v);
115+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
116116
if (c) {
117117
if (c < 0) {
118118
return bal(add(x, data, l), v, d, r);
@@ -145,7 +145,7 @@ function Make(funarg) {
145145
while(true) {
146146
var param = _param;
147147
if (param) {
148-
var c = Caml_curry.app2(funarg[0], x, param[1]);
148+
var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
149149
if (c) {
150150
_param = c < 0 ? param[0] : param[3];
151151
continue ;
@@ -164,7 +164,7 @@ function Make(funarg) {
164164
while(true) {
165165
var param = _param;
166166
if (param) {
167-
var c = Caml_curry.app2(funarg[0], x, param[1]);
167+
var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
168168
if (c) {
169169
_param = c < 0 ? param[0] : param[3];
170170
continue ;
@@ -246,7 +246,7 @@ function Make(funarg) {
246246
var d = param[2];
247247
var v = param[1];
248248
var l = param[0];
249-
var c = Caml_curry.app2(funarg[0], x, v);
249+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
250250
if (c) {
251251
if (c < 0) {
252252
return bal(remove(x, l), v, d, r);
@@ -452,7 +452,7 @@ function Make(funarg) {
452452
var d = param[2];
453453
var v = param[1];
454454
var l = param[0];
455-
var c = Caml_curry.app2(funarg[0], x, v);
455+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
456456
if (c) {
457457
if (c < 0) {
458458
var match = split(x, l);
@@ -601,7 +601,7 @@ function Make(funarg) {
601601
var e1 = _e1;
602602
if (e1) {
603603
if (e2) {
604-
var c = Caml_curry.app2(funarg[0], e1[0], e2[0]);
604+
var c = Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0]);
605605
if (c !== 0) {
606606
return c;
607607
}
@@ -638,7 +638,7 @@ function Make(funarg) {
638638
var e1 = _e1;
639639
if (e1) {
640640
if (e2) {
641-
if (Caml_curry.app2(funarg[0], e1[0], e2[0])) {
641+
if (Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0])) {
642642
return /* false */0;
643643
}
644644
else if (Caml_curry.app2(cmp, e1[1], e2[1])) {

‎jscomp/stdlib/set.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function Make(funarg) {
9191
var r = t[2];
9292
var v = t[1];
9393
var l = t[0];
94-
var c = Caml_curry.app2(funarg[0], x, v);
94+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
9595
if (c) {
9696
if (c < 0) {
9797
return bal(add(x, l), v, r);
@@ -233,7 +233,7 @@ function Make(funarg) {
233233
var r = param[2];
234234
var v = param[1];
235235
var l = param[0];
236-
var c = Caml_curry.app2(funarg[0], x, v);
236+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
237237
if (c) {
238238
if (c < 0) {
239239
var match = split(x, l);
@@ -280,7 +280,7 @@ function Make(funarg) {
280280
while(true) {
281281
var param = _param;
282282
if (param) {
283-
var c = Caml_curry.app2(funarg[0], x, param[1]);
283+
var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
284284
if (c) {
285285
_param = c < 0 ? param[0] : param[2];
286286
continue ;
@@ -300,7 +300,7 @@ function Make(funarg) {
300300
var r = param[2];
301301
var v = param[1];
302302
var l = param[0];
303-
var c = Caml_curry.app2(funarg[0], x, v);
303+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
304304
if (c) {
305305
if (c < 0) {
306306
return bal(remove(x, l), v, r);
@@ -434,7 +434,7 @@ function Make(funarg) {
434434
var e1 = _e1;
435435
if (e1) {
436436
if (e2) {
437-
var c = Caml_curry.app2(funarg[0], e1[0], e2[0]);
437+
var c = Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0]);
438438
if (c !== 0) {
439439
return c;
440440
}
@@ -471,7 +471,7 @@ function Make(funarg) {
471471
var r1 = s1[2];
472472
var v1 = s1[1];
473473
var l1 = s1[0];
474-
var c = Caml_curry.app2(funarg[0], v1, s2[1]);
474+
var c = Caml_curry.app2(funarg[/* compare */0], v1, s2[1]);
475475
if (c) {
476476
if (c < 0) {
477477
if (subset(/* Node */[
@@ -676,7 +676,7 @@ function Make(funarg) {
676676
var param = _param;
677677
if (param) {
678678
var v = param[1];
679-
var c = Caml_curry.app2(funarg[0], x, v);
679+
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
680680
if (c) {
681681
_param = c < 0 ? param[0] : param[2];
682682
continue ;
@@ -706,7 +706,7 @@ function Make(funarg) {
706706
var x3 = match$2[0];
707707
if (match$3) {
708708
if (match$3[1]) {
709-
var l$1 = List.sort_uniq(funarg[0], l);
709+
var l$1 = List.sort_uniq(funarg[/* compare */0], l);
710710
var sub = function (n, l) {
711711
var exit = 0;
712712
if (n > 3 || n < 0) {

‎jscomp/stdlib/weak.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,11 @@ function Make(H) {
292292
};
293293
};
294294
var add = function (t, d) {
295-
var h = Caml_curry.app1(H[1], d);
295+
var h = Caml_curry.app1(H[/* hash */1], d);
296296
return add_aux(t, Caml_weak.caml_weak_set, /* Some */[d], h, get_index(t, h));
297297
};
298298
var find_or = function (t, d, ifnotfound) {
299-
var h = Caml_curry.app1(H[1], d);
299+
var h = Caml_curry.app1(H[/* hash */1], d);
300300
var index = get_index(t, h);
301301
var bucket = t[/* table */0][index];
302302
var hashes = t[/* hashes */1][index];
@@ -310,7 +310,7 @@ function Make(H) {
310310
else if (h === hashes[i]) {
311311
var match = Caml_weak.caml_weak_get_copy(bucket, i);
312312
if (match) {
313-
if (Caml_curry.app2(H[0], match[0], d)) {
313+
if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
314314
var match$1 = Caml_weak.caml_weak_get(bucket, i);
315315
if (match$1) {
316316
return match$1[0];
@@ -352,7 +352,7 @@ function Make(H) {
352352
});
353353
};
354354
var find_shadow = function (t, d, iffound, ifnotfound) {
355-
var h = Caml_curry.app1(H[1], d);
355+
var h = Caml_curry.app1(H[/* hash */1], d);
356356
var index = get_index(t, h);
357357
var bucket = t[/* table */0][index];
358358
var hashes = t[/* hashes */1][index];
@@ -366,7 +366,7 @@ function Make(H) {
366366
else if (h === hashes[i]) {
367367
var match = Caml_weak.caml_weak_get_copy(bucket, i);
368368
if (match) {
369-
if (Caml_curry.app2(H[0], match[0], d)) {
369+
if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
370370
return Caml_curry.app2(iffound, bucket, i);
371371
}
372372
else {
@@ -399,7 +399,7 @@ function Make(H) {
399399
}, /* false */0);
400400
};
401401
var find_all = function (t, d) {
402-
var h = Caml_curry.app1(H[1], d);
402+
var h = Caml_curry.app1(H[/* hash */1], d);
403403
var index = get_index(t, h);
404404
var bucket = t[/* table */0][index];
405405
var hashes = t[/* hashes */1][index];
@@ -415,7 +415,7 @@ function Make(H) {
415415
else if (h === hashes[i]) {
416416
var match = Caml_weak.caml_weak_get_copy(bucket, i);
417417
if (match) {
418-
if (Caml_curry.app2(H[0], match[0], d)) {
418+
if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
419419
var match$1 = Caml_weak.caml_weak_get(bucket, i);
420420
if (match$1) {
421421
_accu = /* :: */[

‎jscomp/test/bigarray_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var Bigarray = require("../stdlib/bigarray");
66
var Caml_primitive = require("../runtime/caml_primitive");
77
var Caml_curry = require("../runtime/caml_curry");
88

9-
var v = Caml_curry.app3(Bigarray.Array1[0], /* Int32 */6, /* C_layout */0, 20);
9+
var v = Caml_curry.app3(Bigarray.Array1[/* create */0], /* Int32 */6, /* C_layout */0, 20);
1010

1111
function sum(v) {
1212
var result = 0;
@@ -16,7 +16,7 @@ function sum(v) {
1616
return /* () */0;
1717
}
1818

19-
var vv = Caml_curry.app3(Bigarray.Array1[0], /* Int32 */6, /* Fortran_layout */1, 30);
19+
var vv = Caml_curry.app3(Bigarray.Array1[/* create */0], /* Int32 */6, /* Fortran_layout */1, 30);
2020

2121
function init(v) {
2222
for(var i = 0 ,i_finish = Caml_bigarray.caml_ba_dim_1(v) - 1 | 0; i<= i_finish; ++i){

‎jscomp/test/inline_map2_test.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function Make(Ord) {
116116
var d = param[2];
117117
var v = param[1];
118118
var l = param[0];
119-
var c = Caml_curry.app2(Ord[0], x, v);
119+
var c = Caml_curry.app2(Ord[/* compare */0], x, v);
120120
if (c) {
121121
if (c < 0) {
122122
return bal(add(x, data, l), v, d, r);
@@ -149,7 +149,7 @@ function Make(Ord) {
149149
while(true) {
150150
var param = _param;
151151
if (param) {
152-
var c = Caml_curry.app2(Ord[0], x, param[1]);
152+
var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
153153
if (c) {
154154
_param = c < 0 ? param[0] : param[3];
155155
continue ;
@@ -168,7 +168,7 @@ function Make(Ord) {
168168
while(true) {
169169
var param = _param;
170170
if (param) {
171-
var c = Caml_curry.app2(Ord[0], x, param[1]);
171+
var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
172172
if (c) {
173173
_param = c < 0 ? param[0] : param[3];
174174
continue ;
@@ -250,7 +250,7 @@ function Make(Ord) {
250250
var d = param[2];
251251
var v = param[1];
252252
var l = param[0];
253-
var c = Caml_curry.app2(Ord[0], x, v);
253+
var c = Caml_curry.app2(Ord[/* compare */0], x, v);
254254
if (c) {
255255
if (c < 0) {
256256
return bal(remove(x, l), v, d, r);
@@ -456,7 +456,7 @@ function Make(Ord) {
456456
var d = param[2];
457457
var v = param[1];
458458
var l = param[0];
459-
var c = Caml_curry.app2(Ord[0], x, v);
459+
var c = Caml_curry.app2(Ord[/* compare */0], x, v);
460460
if (c) {
461461
if (c < 0) {
462462
var match = split(x, l);
@@ -605,7 +605,7 @@ function Make(Ord) {
605605
var e1 = _e1;
606606
if (e1) {
607607
if (e2) {
608-
var c = Caml_curry.app2(Ord[0], e1[0], e2[0]);
608+
var c = Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0]);
609609
if (c !== 0) {
610610
return c;
611611
}
@@ -642,7 +642,7 @@ function Make(Ord) {
642642
var e1 = _e1;
643643
if (e1) {
644644
if (e2) {
645-
if (Caml_curry.app2(Ord[0], e1[0], e2[0])) {
645+
if (Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0])) {
646646
return /* false */0;
647647
}
648648
else if (Caml_curry.app2(cmp, e1[1], e2[1])) {

0 commit comments

Comments
 (0)