Skip to content

sync up with the compiler, now with comments for nested modules!!! #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2016
Merged

sync up with the compiler, now with comments for nested modules!!! #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jscomp/stdlib/filename.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,15 @@ function chop_extension(name) {

var prng = {
0: function () {
return Caml_curry.app1(Random.State[1], /* () */0);
return Caml_curry.app1(Random.State[/* make_self_init */1], /* () */0);
},
length: 1,
tag: 246
};

function temp_file_name(temp_dir, prefix, suffix) {
var tag = prng.tag | 0;
var rnd = Caml_curry.app1(Random.State[3], tag === 250 ? prng[0] : (
var rnd = Caml_curry.app1(Random.State[/* bits */3], tag === 250 ? prng[0] : (
tag === 246 ? CamlinternalLazy.force_lazy_block(prng) : prng
)) & 16777215;
return concat(temp_dir, Caml_curry.app3(Printf.sprintf(/* Format */[
Expand Down
26 changes: 13 additions & 13 deletions jscomp/stdlib/hashtbl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function randomize() {

var prng = {
0: function () {
return Caml_curry.app1(Random.State[1], /* () */0);
return Caml_curry.app1(Random.State[/* make_self_init */1], /* () */0);
},
length: 1,
tag: 246
Expand Down Expand Up @@ -82,7 +82,7 @@ function create($staropt$star, initial_size) {
var seed;
if (random) {
var tag = prng.tag | 0;
seed = Caml_curry.app1(Random.State[3], tag === 250 ? prng[0] : (
seed = Caml_curry.app1(Random.State[/* bits */3], tag === 250 ? prng[0] : (
tag === 246 ? CamlinternalLazy.force_lazy_block(prng) : prng
));
}
Expand Down Expand Up @@ -450,7 +450,7 @@ function stats(h) {

function MakeSeeded(H) {
var key_index = function (h, key) {
return Caml_curry.app2(H[1], h[/* seed */2], key) & (h[/* data */1].length - 1 | 0);
return Caml_curry.app2(H[/* hash */1], h[/* seed */2], key) & (h[/* data */1].length - 1 | 0);
};
var add = function (h, key, info) {
var i = key_index(h, key);
Expand All @@ -474,7 +474,7 @@ function MakeSeeded(H) {
if (param) {
var next = param[2];
var k = param[0];
if (Caml_curry.app2(H[0], k, key)) {
if (Caml_curry.app2(H[/* equal */0], k, key)) {
h[/* size */0] = h[/* size */0] - 1 | 0;
return next;
}
Expand All @@ -498,16 +498,16 @@ function MakeSeeded(H) {
var match = h[/* data */1][key_index(h, key)];
if (match) {
var rest1 = match[2];
if (Caml_curry.app2(H[0], key, match[0])) {
if (Caml_curry.app2(H[/* equal */0], key, match[0])) {
return match[1];
}
else if (rest1) {
var rest2 = rest1[2];
if (Caml_curry.app2(H[0], key, rest1[0])) {
if (Caml_curry.app2(H[/* equal */0], key, rest1[0])) {
return rest1[1];
}
else if (rest2) {
if (Caml_curry.app2(H[0], key, rest2[0])) {
if (Caml_curry.app2(H[/* equal */0], key, rest2[0])) {
return rest2[1];
}
else {
Expand All @@ -516,7 +516,7 @@ function MakeSeeded(H) {
while(true) {
var param = _param;
if (param) {
if (Caml_curry.app2(H[0], key$1, param[0])) {
if (Caml_curry.app2(H[/* equal */0], key$1, param[0])) {
return param[1];
}
else {
Expand Down Expand Up @@ -549,7 +549,7 @@ function MakeSeeded(H) {
var param = _param;
if (param) {
var rest = param[2];
if (Caml_curry.app2(H[0], param[0], key)) {
if (Caml_curry.app2(H[/* equal */0], param[0], key)) {
return /* :: */[
param[1],
find_in_bucket(rest)
Expand All @@ -573,7 +573,7 @@ function MakeSeeded(H) {
if (param) {
var next = param[2];
var k = param[0];
if (Caml_curry.app2(H[0], k, key)) {
if (Caml_curry.app2(H[/* equal */0], k, key)) {
return /* Cons */[
key,
info,
Expand Down Expand Up @@ -623,7 +623,7 @@ function MakeSeeded(H) {
while(true) {
var param = _param;
if (param) {
if (Caml_curry.app2(H[0], param[0], key)) {
if (Caml_curry.app2(H[/* equal */0], param[0], key)) {
return /* true */1;
}
else {
Expand Down Expand Up @@ -656,9 +656,9 @@ function MakeSeeded(H) {
}

function Make(H) {
var equal = H[0];
var equal = H[/* equal */0];
var key_index = function (h, key) {
return Caml_curry.app1(H[1], key) & (h[/* data */1].length - 1 | 0);
return Caml_curry.app1(H[/* hash */1], key) & (h[/* data */1].length - 1 | 0);
};
var add = function (h, key, info) {
var i = key_index(h, key);
Expand Down
14 changes: 7 additions & 7 deletions jscomp/stdlib/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function Make(funarg) {
var d = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
if (c < 0) {
return bal(add(x, data, l), v, d, r);
Expand Down Expand Up @@ -145,7 +145,7 @@ function Make(funarg) {
while(true) {
var param = _param;
if (param) {
var c = Caml_curry.app2(funarg[0], x, param[1]);
var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
if (c) {
_param = c < 0 ? param[0] : param[3];
continue ;
Expand All @@ -164,7 +164,7 @@ function Make(funarg) {
while(true) {
var param = _param;
if (param) {
var c = Caml_curry.app2(funarg[0], x, param[1]);
var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
if (c) {
_param = c < 0 ? param[0] : param[3];
continue ;
Expand Down Expand Up @@ -246,7 +246,7 @@ function Make(funarg) {
var d = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
if (c < 0) {
return bal(remove(x, l), v, d, r);
Expand Down Expand Up @@ -452,7 +452,7 @@ function Make(funarg) {
var d = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
if (c < 0) {
var match = split(x, l);
Expand Down Expand Up @@ -601,7 +601,7 @@ function Make(funarg) {
var e1 = _e1;
if (e1) {
if (e2) {
var c = Caml_curry.app2(funarg[0], e1[0], e2[0]);
var c = Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0]);
if (c !== 0) {
return c;
}
Expand Down Expand Up @@ -638,7 +638,7 @@ function Make(funarg) {
var e1 = _e1;
if (e1) {
if (e2) {
if (Caml_curry.app2(funarg[0], e1[0], e2[0])) {
if (Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0])) {
return /* false */0;
}
else if (Caml_curry.app2(cmp, e1[1], e2[1])) {
Expand Down
16 changes: 8 additions & 8 deletions jscomp/stdlib/set.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function Make(funarg) {
var r = t[2];
var v = t[1];
var l = t[0];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
if (c < 0) {
return bal(add(x, l), v, r);
Expand Down Expand Up @@ -233,7 +233,7 @@ function Make(funarg) {
var r = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
if (c < 0) {
var match = split(x, l);
Expand Down Expand Up @@ -280,7 +280,7 @@ function Make(funarg) {
while(true) {
var param = _param;
if (param) {
var c = Caml_curry.app2(funarg[0], x, param[1]);
var c = Caml_curry.app2(funarg[/* compare */0], x, param[1]);
if (c) {
_param = c < 0 ? param[0] : param[2];
continue ;
Expand All @@ -300,7 +300,7 @@ function Make(funarg) {
var r = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
if (c < 0) {
return bal(remove(x, l), v, r);
Expand Down Expand Up @@ -434,7 +434,7 @@ function Make(funarg) {
var e1 = _e1;
if (e1) {
if (e2) {
var c = Caml_curry.app2(funarg[0], e1[0], e2[0]);
var c = Caml_curry.app2(funarg[/* compare */0], e1[0], e2[0]);
if (c !== 0) {
return c;
}
Expand Down Expand Up @@ -471,7 +471,7 @@ function Make(funarg) {
var r1 = s1[2];
var v1 = s1[1];
var l1 = s1[0];
var c = Caml_curry.app2(funarg[0], v1, s2[1]);
var c = Caml_curry.app2(funarg[/* compare */0], v1, s2[1]);
if (c) {
if (c < 0) {
if (subset(/* Node */[
Expand Down Expand Up @@ -676,7 +676,7 @@ function Make(funarg) {
var param = _param;
if (param) {
var v = param[1];
var c = Caml_curry.app2(funarg[0], x, v);
var c = Caml_curry.app2(funarg[/* compare */0], x, v);
if (c) {
_param = c < 0 ? param[0] : param[2];
continue ;
Expand Down Expand Up @@ -706,7 +706,7 @@ function Make(funarg) {
var x3 = match$2[0];
if (match$3) {
if (match$3[1]) {
var l$1 = List.sort_uniq(funarg[0], l);
var l$1 = List.sort_uniq(funarg[/* compare */0], l);
var sub = function (n, l) {
var exit = 0;
if (n > 3 || n < 0) {
Expand Down
14 changes: 7 additions & 7 deletions jscomp/stdlib/weak.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ function Make(H) {
};
};
var add = function (t, d) {
var h = Caml_curry.app1(H[1], d);
var h = Caml_curry.app1(H[/* hash */1], d);
return add_aux(t, Caml_weak.caml_weak_set, /* Some */[d], h, get_index(t, h));
};
var find_or = function (t, d, ifnotfound) {
var h = Caml_curry.app1(H[1], d);
var h = Caml_curry.app1(H[/* hash */1], d);
var index = get_index(t, h);
var bucket = t[/* table */0][index];
var hashes = t[/* hashes */1][index];
Expand All @@ -310,7 +310,7 @@ function Make(H) {
else if (h === hashes[i]) {
var match = Caml_weak.caml_weak_get_copy(bucket, i);
if (match) {
if (Caml_curry.app2(H[0], match[0], d)) {
if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
var match$1 = Caml_weak.caml_weak_get(bucket, i);
if (match$1) {
return match$1[0];
Expand Down Expand Up @@ -352,7 +352,7 @@ function Make(H) {
});
};
var find_shadow = function (t, d, iffound, ifnotfound) {
var h = Caml_curry.app1(H[1], d);
var h = Caml_curry.app1(H[/* hash */1], d);
var index = get_index(t, h);
var bucket = t[/* table */0][index];
var hashes = t[/* hashes */1][index];
Expand All @@ -366,7 +366,7 @@ function Make(H) {
else if (h === hashes[i]) {
var match = Caml_weak.caml_weak_get_copy(bucket, i);
if (match) {
if (Caml_curry.app2(H[0], match[0], d)) {
if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
return Caml_curry.app2(iffound, bucket, i);
}
else {
Expand Down Expand Up @@ -399,7 +399,7 @@ function Make(H) {
}, /* false */0);
};
var find_all = function (t, d) {
var h = Caml_curry.app1(H[1], d);
var h = Caml_curry.app1(H[/* hash */1], d);
var index = get_index(t, h);
var bucket = t[/* table */0][index];
var hashes = t[/* hashes */1][index];
Expand All @@ -415,7 +415,7 @@ function Make(H) {
else if (h === hashes[i]) {
var match = Caml_weak.caml_weak_get_copy(bucket, i);
if (match) {
if (Caml_curry.app2(H[0], match[0], d)) {
if (Caml_curry.app2(H[/* equal */0], match[0], d)) {
var match$1 = Caml_weak.caml_weak_get(bucket, i);
if (match$1) {
_accu = /* :: */[
Expand Down
4 changes: 2 additions & 2 deletions jscomp/test/bigarray_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var Bigarray = require("../stdlib/bigarray");
var Caml_primitive = require("../runtime/caml_primitive");
var Caml_curry = require("../runtime/caml_curry");

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

function sum(v) {
var result = 0;
Expand All @@ -16,7 +16,7 @@ function sum(v) {
return /* () */0;
}

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

function init(v) {
for(var i = 0 ,i_finish = Caml_bigarray.caml_ba_dim_1(v) - 1 | 0; i<= i_finish; ++i){
Expand Down
14 changes: 7 additions & 7 deletions jscomp/test/inline_map2_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function Make(Ord) {
var d = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(Ord[0], x, v);
var c = Caml_curry.app2(Ord[/* compare */0], x, v);
if (c) {
if (c < 0) {
return bal(add(x, data, l), v, d, r);
Expand Down Expand Up @@ -149,7 +149,7 @@ function Make(Ord) {
while(true) {
var param = _param;
if (param) {
var c = Caml_curry.app2(Ord[0], x, param[1]);
var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
if (c) {
_param = c < 0 ? param[0] : param[3];
continue ;
Expand All @@ -168,7 +168,7 @@ function Make(Ord) {
while(true) {
var param = _param;
if (param) {
var c = Caml_curry.app2(Ord[0], x, param[1]);
var c = Caml_curry.app2(Ord[/* compare */0], x, param[1]);
if (c) {
_param = c < 0 ? param[0] : param[3];
continue ;
Expand Down Expand Up @@ -250,7 +250,7 @@ function Make(Ord) {
var d = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(Ord[0], x, v);
var c = Caml_curry.app2(Ord[/* compare */0], x, v);
if (c) {
if (c < 0) {
return bal(remove(x, l), v, d, r);
Expand Down Expand Up @@ -456,7 +456,7 @@ function Make(Ord) {
var d = param[2];
var v = param[1];
var l = param[0];
var c = Caml_curry.app2(Ord[0], x, v);
var c = Caml_curry.app2(Ord[/* compare */0], x, v);
if (c) {
if (c < 0) {
var match = split(x, l);
Expand Down Expand Up @@ -605,7 +605,7 @@ function Make(Ord) {
var e1 = _e1;
if (e1) {
if (e2) {
var c = Caml_curry.app2(Ord[0], e1[0], e2[0]);
var c = Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0]);
if (c !== 0) {
return c;
}
Expand Down Expand Up @@ -642,7 +642,7 @@ function Make(Ord) {
var e1 = _e1;
if (e1) {
if (e2) {
if (Caml_curry.app2(Ord[0], e1[0], e2[0])) {
if (Caml_curry.app2(Ord[/* compare */0], e1[0], e2[0])) {
return /* false */0;
}
else if (Caml_curry.app2(cmp, e1[1], e2[1])) {
Expand Down
Loading