diff --git a/belt/src/belt.js b/belt/src/belt.js index 84802e8..46fc28b 100644 --- a/belt/src/belt.js +++ b/belt/src/belt.js @@ -1,57 +1,57 @@ -var Id; +let Id; -var $$Array; +let $$Array; -var SortArray; +let SortArray; -var MutableQueue; +let MutableQueue; -var MutableStack; +let MutableStack; -var List; +let List; -var $$Range; +let Range; -var $$Set; +let $$Set; -var $$Map; +let $$Map; -var MutableSet; +let MutableSet; -var MutableMap; +let MutableMap; -var HashSet; +let HashSet; -var HashMap; +let HashMap; -var $$Option; +let Option; -var Result; +let Result; -var Int; +let Int; -var Float; +let Float; export { - Id , - $$Array , - SortArray , - MutableQueue , - MutableStack , - List , - $$Range , - $$Set , - $$Map , - MutableSet , - MutableMap , - HashSet , - HashMap , - $$Option , - Result , - Int , - Float , + Id, + $$Array, + SortArray, + MutableQueue, + MutableStack, + List, + Range, + $$Set, + $$Map, + MutableSet, + MutableMap, + HashSet, + HashMap, + Option, + Result, + Int, + Float, } /* No side effect */ diff --git a/belt/src/belt_Array.js b/belt/src/belt_Array.js index 932761c..3204ded 100644 --- a/belt/src/belt_Array.js +++ b/belt/src/belt_Array.js @@ -13,15 +13,16 @@ function get(arr, i) { function getExn(arr, i) { if (!(i >= 0 && i < arr.length)) { - throw { - RE_EXN_ID: "Assert_failure", - _1: [ - "belt_Array.res", - 36, - 2 - ], - Error: new Error() - }; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_Array.res", + 36, + 2 + ] + } + }); } return arr[i]; } @@ -37,21 +38,22 @@ function set(arr, i, v) { function setExn(arr, i, v) { if (!(i >= 0 && i < arr.length)) { - throw { - RE_EXN_ID: "Assert_failure", - _1: [ - "belt_Array.res", - 49, - 2 - ], - Error: new Error() - }; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_Array.res", + 49, + 2 + ] + } + }); } arr[i] = v; } function swapUnsafe(xs, i, j) { - var tmp = xs[i]; + let tmp = xs[i]; xs[i] = xs[j]; xs[j] = tmp; } @@ -71,30 +73,30 @@ function random_int(min, max) { } function shuffleInPlace(xs) { - var len = xs.length; - for(var i = 0; i < len; ++i){ + let len = xs.length; + for(let i = 0; i < len; ++i){ swapUnsafe(xs, i, random_int(i, len)); } } function shuffle(xs) { - var result = xs.slice(0); + let result = xs.slice(0); shuffleInPlace(result); return result; } function reverseInPlace(xs) { - var len = xs.length; - var ofs = 0; - for(var i = 0 ,i_finish = len / 2 | 0; i < i_finish; ++i){ + let len = xs.length; + let ofs = 0; + for(let i = 0 ,i_finish = len / 2 | 0; i < i_finish; ++i){ swapUnsafe(xs, ofs + i | 0, ((ofs + len | 0) - i | 0) - 1 | 0); } } function reverse(xs) { - var len = xs.length; - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let len = xs.length; + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = xs[(len - 1 | 0) - i | 0]; } return result; @@ -104,8 +106,8 @@ function make(l, f) { if (l <= 0) { return []; } - var res = new Array(l); - for(var i = 0; i < l; ++i){ + let res = new Array(l); + for(let i = 0; i < l; ++i){ res[i] = f; } return res; @@ -115,8 +117,8 @@ function makeByU(l, f) { if (l <= 0) { return []; } - var res = new Array(l); - for(var i = 0; i < l; ++i){ + let res = new Array(l); + for(let i = 0; i < l; ++i){ res[i] = f(i); } return res; @@ -124,43 +126,43 @@ function makeByU(l, f) { function makeBy(l, f) { return makeByU(l, (function (a) { - return f(a); - })); + return f(a); + })); } function makeByAndShuffleU(l, f) { - var u = makeByU(l, f); + let u = makeByU(l, f); shuffleInPlace(u); return u; } function makeByAndShuffle(l, f) { return makeByAndShuffleU(l, (function (a) { - return f(a); - })); + return f(a); + })); } function range(start, finish) { - var cut = finish - start | 0; + let cut = finish - start | 0; if (cut < 0) { return []; } - var arr = new Array(cut + 1 | 0); - for(var i = 0; i <= cut; ++i){ + let arr = new Array(cut + 1 | 0); + for(let i = 0; i <= cut; ++i){ arr[i] = start + i | 0; } return arr; } function rangeBy(start, finish, step) { - var cut = finish - start | 0; + let cut = finish - start | 0; if (cut < 0 || step <= 0) { return []; } - var nb = Caml_int32.div(cut, step) + 1 | 0; - var arr = new Array(nb); - var cur = start; - for(var i = 0; i < nb; ++i){ + let nb = Caml_int32.div(cut, step) + 1 | 0; + let arr = new Array(nb); + let cur = start; + for(let i = 0; i < nb; ++i){ arr[i] = cur; cur = cur + step | 0; } @@ -168,11 +170,11 @@ function rangeBy(start, finish, step) { } function zip(xs, ys) { - var lenx = xs.length; - var leny = ys.length; - var len = lenx < leny ? lenx : leny; - var s = new Array(len); - for(var i = 0; i < len; ++i){ + let lenx = xs.length; + let leny = ys.length; + let len = lenx < leny ? lenx : leny; + let s = new Array(len); + for(let i = 0; i < len; ++i){ s[i] = [ xs[i], ys[i] @@ -182,11 +184,11 @@ function zip(xs, ys) { } function zipByU(xs, ys, f) { - var lenx = xs.length; - var leny = ys.length; - var len = lenx < leny ? lenx : leny; - var s = new Array(len); - for(var i = 0; i < len; ++i){ + let lenx = xs.length; + let leny = ys.length; + let len = lenx < leny ? lenx : leny; + let s = new Array(len); + for(let i = 0; i < len; ++i){ s[i] = f(xs[i], ys[i]); } return s; @@ -194,34 +196,34 @@ function zipByU(xs, ys, f) { function zipBy(xs, ys, f) { return zipByU(xs, ys, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function concat(a1, a2) { - var l1 = a1.length; - var l2 = a2.length; - var a1a2 = new Array(l1 + l2 | 0); - for(var i = 0; i < l1; ++i){ + let l1 = a1.length; + let l2 = a2.length; + let a1a2 = new Array(l1 + l2 | 0); + for(let i = 0; i < l1; ++i){ a1a2[i] = a1[i]; } - for(var i$1 = 0; i$1 < l2; ++i$1){ + for(let i$1 = 0; i$1 < l2; ++i$1){ a1a2[l1 + i$1 | 0] = a2[i$1]; } return a1a2; } function concatMany(arrs) { - var lenArrs = arrs.length; - var totalLen = 0; - for(var i = 0; i < lenArrs; ++i){ + let lenArrs = arrs.length; + let totalLen = 0; + for(let i = 0; i < lenArrs; ++i){ totalLen = totalLen + arrs[i].length | 0; } - var result = new Array(totalLen); + let result = new Array(totalLen); totalLen = 0; - for(var j = 0; j < lenArrs; ++j){ - var cur = arrs[j]; - for(var k = 0 ,k_finish = cur.length; k < k_finish; ++k){ + for(let j = 0; j < lenArrs; ++j){ + let cur = arrs[j]; + for(let k = 0 ,k_finish = cur.length; k < k_finish; ++k){ result[totalLen] = cur[k]; totalLen = totalLen + 1 | 0; } @@ -233,26 +235,26 @@ function slice(a, offset, len) { if (len <= 0) { return []; } - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var hasLen = lena - ofs | 0; - var copyLength = hasLen < len ? hasLen : len; + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let hasLen = lena - ofs | 0; + let copyLength = hasLen < len ? hasLen : len; if (copyLength <= 0) { return []; } - var result = new Array(copyLength); - for(var i = 0; i < copyLength; ++i){ + let result = new Array(copyLength); + for(let i = 0; i < copyLength; ++i){ result[i] = a[ofs + i | 0]; } return result; } function sliceToEnd(a, offset) { - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var len = lena > ofs ? lena - ofs | 0 : 0; - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let len = lena > ofs ? lena - ofs | 0 : 0; + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = a[ofs + i | 0]; } return result; @@ -260,65 +262,65 @@ function sliceToEnd(a, offset) { function fill(a, offset, len, v) { if (len <= 0) { - return ; + return; } - var lena = a.length; - var ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; - var hasLen = lena - ofs | 0; - var fillLength = hasLen < len ? hasLen : len; + let lena = a.length; + let ofs = offset < 0 ? Caml.int_max(lena + offset | 0, 0) : offset; + let hasLen = lena - ofs | 0; + let fillLength = hasLen < len ? hasLen : len; if (fillLength <= 0) { - return ; + return; } - for(var i = ofs ,i_finish = ofs + fillLength | 0; i < i_finish; ++i){ + for(let i = ofs ,i_finish = ofs + fillLength | 0; i < i_finish; ++i){ a[i] = v; } } function blitUnsafe(a1, srcofs1, a2, srcofs2, blitLength) { if (srcofs2 <= srcofs1) { - for(var j = 0; j < blitLength; ++j){ + for(let j = 0; j < blitLength; ++j){ a2[j + srcofs2 | 0] = a1[j + srcofs1 | 0]; } - return ; + return; } - for(var j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + srcofs2 | 0] = a1[j$1 + srcofs1 | 0]; } } function blit(a1, ofs1, a2, ofs2, len) { - var lena1 = a1.length; - var lena2 = a2.length; - var srcofs1 = ofs1 < 0 ? Caml.int_max(lena1 + ofs1 | 0, 0) : ofs1; - var srcofs2 = ofs2 < 0 ? Caml.int_max(lena2 + ofs2 | 0, 0) : ofs2; - var blitLength = Caml.int_min(len, Caml.int_min(lena1 - srcofs1 | 0, lena2 - srcofs2 | 0)); + let lena1 = a1.length; + let lena2 = a2.length; + let srcofs1 = ofs1 < 0 ? Caml.int_max(lena1 + ofs1 | 0, 0) : ofs1; + let srcofs2 = ofs2 < 0 ? Caml.int_max(lena2 + ofs2 | 0, 0) : ofs2; + let blitLength = Caml.int_min(len, Caml.int_min(lena1 - srcofs1 | 0, lena2 - srcofs2 | 0)); if (srcofs2 <= srcofs1) { - for(var j = 0; j < blitLength; ++j){ + for(let j = 0; j < blitLength; ++j){ a2[j + srcofs2 | 0] = a1[j + srcofs1 | 0]; } - return ; + return; } - for(var j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = blitLength - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + srcofs2 | 0] = a1[j$1 + srcofs1 | 0]; } } function forEachU(a, f) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(a[i]); } } function forEach(a, f) { forEachU(a, (function (a) { - f(a); - })); + f(a); + })); } function mapU(a, f) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(a[i]); } return r; @@ -326,8 +328,8 @@ function mapU(a, f) { function map(a, f) { return mapU(a, (function (a) { - return f(a); - })); + return f(a); + })); } function flatMapU(a, f) { @@ -335,17 +337,17 @@ function flatMapU(a, f) { } function flatMap(a, f) { - return flatMapU(a, (function (a) { - return f(a); - })); + return concatMany(mapU(a, (function (a) { + return f(a); + }))); } function getByU(a, p) { - var l = a.length; - var i = 0; - var r; + let l = a.length; + let i = 0; + let r; while(r === undefined && i < l) { - var v = a[i]; + let v = a[i]; if (p(v)) { r = Caml_option.some(v); } @@ -356,16 +358,16 @@ function getByU(a, p) { function getBy(a, p) { return getByU(a, (function (a) { - return p(a); - })); + return p(a); + })); } function getIndexByU(a, p) { - var l = a.length; - var i = 0; - var r; + let l = a.length; + let i = 0; + let r; while(r === undefined && i < l) { - var v = a[i]; + let v = a[i]; if (p(v)) { r = i; } @@ -376,16 +378,16 @@ function getIndexByU(a, p) { function getIndexBy(a, p) { return getIndexByU(a, (function (a) { - return p(a); - })); + return p(a); + })); } function keepU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; if (f(v)) { r[j] = v; j = j + 1 | 0; @@ -398,16 +400,16 @@ function keepU(a, f) { function keep(a, f) { return keepU(a, (function (a) { - return f(a); - })); + return f(a); + })); } function keepWithIndexU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; if (f(v, i)) { r[j] = v; j = j + 1 | 0; @@ -420,17 +422,17 @@ function keepWithIndexU(a, f) { function keepWithIndex(a, f) { return keepWithIndexU(a, (function (a, i) { - return f(a, i); - })); + return f(a, i); + })); } function keepMapU(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; - var v$1 = f(v); + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; + let v$1 = f(v); if (v$1 !== undefined) { r[j] = Caml_option.valFromOption(v$1); j = j + 1 | 0; @@ -443,26 +445,26 @@ function keepMapU(a, f) { function keepMap(a, f) { return keepMapU(a, (function (a) { - return f(a); - })); + return f(a); + })); } function forEachWithIndexU(a, f) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(i, a[i]); } } function forEachWithIndex(a, f) { forEachWithIndexU(a, (function (a, b) { - f(a, b); - })); + f(a, b); + })); } function mapWithIndexU(a, f) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(i, a[i]); } return r; @@ -470,13 +472,13 @@ function mapWithIndexU(a, f) { function mapWithIndex(a, f) { return mapWithIndexU(a, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceU(a, x, f) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i]); } return r; @@ -484,13 +486,13 @@ function reduceU(a, x, f) { function reduce(a, x, f) { return reduceU(a, x, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceReverseU(a, x, f) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(r, a[i]); } return r; @@ -498,14 +500,14 @@ function reduceReverseU(a, x, f) { function reduceReverse(a, x, f) { return reduceReverseU(a, x, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceReverse2U(a, b, x, f) { - var r = x; - var len = Caml.int_min(a.length, b.length); - for(var i = len - 1 | 0; i >= 0; --i){ + let r = x; + let len = Caml.int_min(a.length, b.length); + for(let i = len - 1 | 0; i >= 0; --i){ r = f(r, a[i], b[i]); } return r; @@ -513,13 +515,13 @@ function reduceReverse2U(a, b, x, f) { function reduceReverse2(a, b, x, f) { return reduceReverse2U(a, b, x, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function reduceWithIndexU(a, x, f) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i], i); } return r; @@ -527,15 +529,15 @@ function reduceWithIndexU(a, x, f) { function reduceWithIndex(a, x, f) { return reduceWithIndexU(a, x, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function everyU(arr, b) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -543,21 +545,21 @@ function everyU(arr, b) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } function every(arr, f) { return everyU(arr, (function (b) { - return f(b); - })); + return f(b); + })); } function someU(arr, b) { - var len = arr.length; - var _i = 0; + let len = arr.length; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return false; } @@ -565,19 +567,19 @@ function someU(arr, b) { return true; } _i = i + 1 | 0; - continue ; + continue; }; } function some(arr, f) { return someU(arr, (function (b) { - return f(b); - })); + return f(b); + })); } function everyAux2(arr1, arr2, _i, b, len) { while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -585,7 +587,7 @@ function everyAux2(arr1, arr2, _i, b, len) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } @@ -595,15 +597,15 @@ function every2U(a, b, p) { function every2(a, b, p) { return every2U(a, b, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function some2U(a, b, p) { - var _i = 0; - var len = Caml.int_min(a.length, b.length); + let _i = 0; + let len = Caml.int_min(a.length, b.length); while(true) { - var i = _i; + let i = _i; if (i === len) { return false; } @@ -611,19 +613,19 @@ function some2U(a, b, p) { return true; } _i = i + 1 | 0; - continue ; + continue; }; } function some2(a, b, p) { return some2U(a, b, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function eqU(a, b, p) { - var lena = a.length; - var lenb = b.length; + let lena = a.length; + let lenb = b.length; if (lena === lenb) { return everyAux2(a, b, 0, p, lena); } else { @@ -633,48 +635,48 @@ function eqU(a, b, p) { function eq(a, b, p) { return eqU(a, b, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function cmpU(a, b, p) { - var lena = a.length; - var lenb = b.length; + let lena = a.length; + let lenb = b.length; if (lena > lenb) { return 1; } else if (lena < lenb) { return -1; } else { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === lena) { return 0; } - var c = p(a[i], b[i]); + let c = p(a[i], b[i]); if (c !== 0) { return c; } _i = i + 1 | 0; - continue ; + continue; }; } } function cmp(a, b, p) { return cmpU(a, b, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function partitionU(a, f) { - var l = a.length; - var i = 0; - var j = 0; - var a1 = new Array(l); - var a2 = new Array(l); - for(var ii = 0; ii < l; ++ii){ - var v = a[ii]; + let l = a.length; + let i = 0; + let j = 0; + let a1 = new Array(l); + let a2 = new Array(l); + for(let ii = 0; ii < l; ++ii){ + let v = a[ii]; if (f(v)) { a1[i] = v; i = i + 1 | 0; @@ -686,61 +688,61 @@ function partitionU(a, f) { a1.length = i; a2.length = j; return [ - a1, - a2 - ]; + a1, + a2 + ]; } function partition(a, f) { return partitionU(a, (function (x) { - return f(x); - })); + return f(x); + })); } function unzip(a) { - var l = a.length; - var a1 = new Array(l); - var a2 = new Array(l); - for(var i = 0; i < l; ++i){ - var match = a[i]; + let l = a.length; + let a1 = new Array(l); + let a2 = new Array(l); + for(let i = 0; i < l; ++i){ + let match = a[i]; a1[i] = match[0]; a2[i] = match[1]; } return [ - a1, - a2 - ]; + a1, + a2 + ]; } function joinWithU(a, sep, toString) { - var l = a.length; + let l = a.length; if (l === 0) { return ""; } - var lastIndex = l - 1 | 0; - var _i = 0; - var _res = ""; + let lastIndex = l - 1 | 0; + let _i = 0; + let _res = ""; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i === lastIndex) { return res + toString(a[i]); } _res = res + (toString(a[i]) + sep); _i = i + 1 | 0; - continue ; + continue; }; } function joinWith(a, sep, toString) { return joinWithU(a, sep, (function (x) { - return toString(x); - })); + return toString(x); + })); } function initU(n, f) { - var v = new Array(n); - for(var i = 0; i < n; ++i){ + let v = new Array(n); + for(let i = 0; i < n; ++i){ v[i] = f(i); } return v; @@ -748,82 +750,82 @@ function initU(n, f) { function init(n, f) { return initU(n, (function (i) { - return f(i); - })); + return f(i); + })); } export { - get , - getExn , - set , - setExn , - shuffleInPlace , - shuffle , - reverseInPlace , - reverse , - make , - range , - rangeBy , - makeByU , - makeBy , - makeByAndShuffleU , - makeByAndShuffle , - zip , - zipByU , - zipBy , - unzip , - concat , - concatMany , - slice , - sliceToEnd , - fill , - blit , - blitUnsafe , - forEachU , - forEach , - mapU , - map , - flatMapU , - flatMap , - getByU , - getBy , - getIndexByU , - getIndexBy , - keepU , - keep , - keepWithIndexU , - keepWithIndex , - keepMapU , - keepMap , - forEachWithIndexU , - forEachWithIndex , - mapWithIndexU , - mapWithIndex , - partitionU , - partition , - reduceU , - reduce , - reduceReverseU , - reduceReverse , - reduceReverse2U , - reduceReverse2 , - reduceWithIndexU , - reduceWithIndex , - joinWithU , - joinWith , - someU , - some , - everyU , - every , - every2U , - every2 , - some2U , - some2 , - cmpU , - cmp , - eqU , - eq , - initU , - init , + get, + getExn, + set, + setExn, + shuffleInPlace, + shuffle, + reverseInPlace, + reverse, + make, + range, + rangeBy, + makeByU, + makeBy, + makeByAndShuffleU, + makeByAndShuffle, + zip, + zipByU, + zipBy, + unzip, + concat, + concatMany, + slice, + sliceToEnd, + fill, + blit, + blitUnsafe, + forEachU, + forEach, + mapU, + map, + flatMapU, + flatMap, + getByU, + getBy, + getIndexByU, + getIndexBy, + keepU, + keep, + keepWithIndexU, + keepWithIndex, + keepMapU, + keepMap, + forEachWithIndexU, + forEachWithIndex, + mapWithIndexU, + mapWithIndex, + partitionU, + partition, + reduceU, + reduce, + reduceReverseU, + reduceReverse, + reduceReverse2U, + reduceReverse2, + reduceWithIndexU, + reduceWithIndex, + joinWithU, + joinWith, + someU, + some, + everyU, + every, + every2U, + every2, + some2U, + some2, + cmpU, + cmp, + eqU, + eq, + initU, + init, } /* No side effect */ diff --git a/belt/src/belt_Float.js b/belt/src/belt_Float.js index 97b395d..80c12e9 100644 --- a/belt/src/belt_Float.js +++ b/belt/src/belt_Float.js @@ -2,15 +2,15 @@ function fromString(i) { - var i$1 = parseFloat(i); + let i$1 = parseFloat(i); if (isNaN(i$1)) { - return ; + return; } else { return i$1; } } export { - fromString , + fromString, } /* No side effect */ diff --git a/belt/src/belt_HashMap.js b/belt/src/belt_HashMap.js index c257151..ab08d1f 100644 --- a/belt/src/belt_HashMap.js +++ b/belt/src/belt_HashMap.js @@ -10,12 +10,12 @@ function size(h) { function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { - return ; + return; } - var nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -23,31 +23,31 @@ function copyBucketReHash(hash, h_buckets, ndata_tail, _old_bucket) { } ndata_tail[nidx] = old_bucket; _old_bucket = old_bucket.next; - continue ; + continue; }; } function replaceInBucket(eq, key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } _cell = cell$1; - continue ; + continue; }; } function set0(h, key, value, eq, hash) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = hash(key) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = hash(key) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(eq, key, value, l)) { h_buckets[i] = { @@ -67,26 +67,26 @@ function set0(h, key, value, eq, hash) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { - return ; + return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(hash, h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } } - return ; + return; } } @@ -96,73 +96,73 @@ function set(h, key, value) { } function remove(h, key) { - var h_buckets = h.buckets; - var i = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket === undefined) { - return ; + return; } - var eq = h.eq; + let eq = h.eq; if (eq(bucket.key, key)) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; - return ; + return; } else { - var _prec = bucket; - var _bucket = bucket.next; + let _prec = bucket; + let _bucket = bucket.next; while(true) { - var bucket$1 = _bucket; - var prec = _prec; + let bucket$1 = _bucket; + let prec = _prec; if (bucket$1 === undefined) { - return ; + return; } - var cell_next = bucket$1.next; + let cell_next = bucket$1.next; if (eq(bucket$1.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; - return ; + return; } _bucket = cell_next; _prec = bucket$1; - continue ; + continue; }; } } function get(h, key) { - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { - return ; + return; } - var eq = h.eq; + let eq = h.eq; if (eq(key, cell1.key)) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { - return ; + return; } if (eq(key, cell2.key)) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (eq(key, cell3.key)) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { - return ; + return; } if (eq(key, buckets.key)) { return Caml_option.some(buckets.value); } _buckets = buckets.next; - continue ; + continue; }; } } @@ -170,23 +170,23 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; - var eq = h.eq; + let _cell = bucket; + let eq = h.eq; while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } _cell = nextCell; - continue ; + continue; }; } else { return false; @@ -198,83 +198,83 @@ function make(hintSize, id) { } function fromArray(arr, id) { - var hash = id.hash; - var eq = id.eq; - var len = arr.length; - var v = Belt_internalBucketsType.make(hash, eq, len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let hash = id.hash; + let eq = id.eq; + let len = arr.length; + let v = Belt_internalBucketsType.make(hash, eq, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set0(v, match[0], match[1], eq, hash); } return v; } function mergeMany(h, arr) { - var hash = h.hash; - var eq = h.eq; - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let hash = h.hash; + let eq = h.eq; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set0(h, match[0], match[1], eq, hash); } } -var Int; +let Int; -var $$String; +let $$String; -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; export { - Int , - $$String , - make , - clear , - isEmpty , - set , - copy , - get , - has , - remove , - forEachU , - forEach , - reduceU , - reduce , - keepMapInPlaceU , - keepMapInPlace , - size , - toArray , - keysToArray , - valuesToArray , - fromArray , - mergeMany , - getBucketHistogram , - logStats , + Int, + $$String, + make, + clear, + isEmpty, + set, + copy, + get, + has, + remove, + forEachU, + forEach, + reduceU, + reduce, + keepMapInPlaceU, + keepMapInPlace, + size, + toArray, + keysToArray, + valuesToArray, + fromArray, + mergeMany, + getBucketHistogram, + logStats, } /* No side effect */ diff --git a/belt/src/belt_HashMapInt.js b/belt/src/belt_HashMapInt.js index 53905c1..866e4ca 100644 --- a/belt/src/belt_HashMapInt.js +++ b/belt/src/belt_HashMapInt.js @@ -7,12 +7,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { - return ; + return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -20,31 +20,31 @@ function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { } ndata_tail[nidx] = old_bucket; _old_bucket = old_bucket.next; - continue ; + continue; }; } function replaceInBucket(key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } _cell = cell$1; - continue ; + continue; }; } function set(h, key, value) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(key, value, l)) { h_buckets[i] = { @@ -64,57 +64,57 @@ function set(h, key, value) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { - return ; + return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } } - return ; + return; } } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket !== undefined) { if (bucket.key === key) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; - return ; + return; } else { - var _prec = bucket; - var _buckets = bucket.next; + let _prec = bucket; + let _buckets = bucket.next; while(true) { - var buckets = _buckets; - var prec = _prec; + let buckets = _buckets; + let prec = _prec; if (buckets === undefined) { - return ; + return; } - var cell_next = buckets.next; + let cell_next = buckets.next; if (buckets.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; - return ; + return; } _buckets = cell_next; _prec = buckets; - continue ; + continue; }; } } @@ -122,38 +122,38 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { - return ; + return; } if (key === cell1.key) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { - return ; + return; } if (key === cell2.key) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (key === cell3.key) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { - return ; + return; } if (key === buckets.key) { return Caml_option.some(buckets.value); } _buckets = buckets.next; - continue ; + continue; }; } } @@ -161,22 +161,22 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } _cell = nextCell; - continue ; + continue; }; } else { return false; @@ -192,73 +192,73 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = make(len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(v, match[0], match[1]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(h, match[0], match[1]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; export { - make , - clear , - isEmpty , - set , - copy , - get , - has , - remove , - forEachU , - forEach , - reduceU , - reduce , - keepMapInPlaceU , - keepMapInPlace , - size , - toArray , - keysToArray , - valuesToArray , - fromArray , - mergeMany , - getBucketHistogram , - logStats , + make, + clear, + isEmpty, + set, + copy, + get, + has, + remove, + forEachU, + forEach, + reduceU, + reduce, + keepMapInPlaceU, + keepMapInPlace, + size, + toArray, + keysToArray, + valuesToArray, + fromArray, + mergeMany, + getBucketHistogram, + logStats, } /* No side effect */ diff --git a/belt/src/belt_HashMapString.js b/belt/src/belt_HashMapString.js index c34d456..bea77bc 100644 --- a/belt/src/belt_HashMapString.js +++ b/belt/src/belt_HashMapString.js @@ -7,12 +7,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { - return ; + return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -20,31 +20,31 @@ function copyBucketReHash(h_buckets, ndata_tail, _old_bucket) { } ndata_tail[nidx] = old_bucket; _old_bucket = old_bucket.next; - continue ; + continue; }; } function replaceInBucket(key, info, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { cell.value = info; return false; } - var cell$1 = cell.next; + let cell$1 = cell.next; if (cell$1 === undefined) { return true; } _cell = cell$1; - continue ; + continue; }; } function set(h, key, value) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { if (replaceInBucket(key, value, l)) { h_buckets[i] = { @@ -64,57 +64,57 @@ function set(h, key, value) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { - return ; + return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucketReHash(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } } - return ; + return; } } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[i]; if (bucket !== undefined) { if (bucket.key === key) { h_buckets[i] = bucket.next; h.size = h.size - 1 | 0; - return ; + return; } else { - var _prec = bucket; - var _buckets = bucket.next; + let _prec = bucket; + let _buckets = bucket.next; while(true) { - var buckets = _buckets; - var prec = _prec; + let buckets = _buckets; + let prec = _prec; if (buckets === undefined) { - return ; + return; } - var cell_next = buckets.next; + let cell_next = buckets.next; if (buckets.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; - return ; + return; } _buckets = cell_next; _prec = buckets; - continue ; + continue; }; } } @@ -122,38 +122,38 @@ function remove(h, key) { } function get(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var cell1 = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let cell1 = h_buckets[nid]; if (cell1 === undefined) { - return ; + return; } if (key === cell1.key) { return Caml_option.some(cell1.value); } - var cell2 = cell1.next; + let cell2 = cell1.next; if (cell2 === undefined) { - return ; + return; } if (key === cell2.key) { return Caml_option.some(cell2.value); } - var cell3 = cell2.next; + let cell3 = cell2.next; if (cell3 !== undefined) { if (key === cell3.key) { return Caml_option.some(cell3.value); } else { - var _buckets = cell3.next; + let _buckets = cell3.next; while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { - return ; + return; } if (key === buckets.key) { return Caml_option.some(buckets.value); } _buckets = buckets.next; - continue ; + continue; }; } } @@ -161,22 +161,22 @@ function get(h, key) { } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } _cell = nextCell; - continue ; + continue; }; } else { return false; @@ -192,73 +192,73 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = make(len); - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(v, match[0], match[1]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + for(let i = 0; i < len; ++i){ + let match = arr[i]; set(h, match[0], match[1]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalBuckets.copy; +let copy = Belt_internalBuckets.copy; -var forEachU = Belt_internalBuckets.forEachU; +let forEachU = Belt_internalBuckets.forEachU; -var forEach = Belt_internalBuckets.forEach; +let forEach = Belt_internalBuckets.forEach; -var reduceU = Belt_internalBuckets.reduceU; +let reduceU = Belt_internalBuckets.reduceU; -var reduce = Belt_internalBuckets.reduce; +let reduce = Belt_internalBuckets.reduce; -var keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; +let keepMapInPlaceU = Belt_internalBuckets.keepMapInPlaceU; -var keepMapInPlace = Belt_internalBuckets.keepMapInPlace; +let keepMapInPlace = Belt_internalBuckets.keepMapInPlace; -var toArray = Belt_internalBuckets.toArray; +let toArray = Belt_internalBuckets.toArray; -var keysToArray = Belt_internalBuckets.keysToArray; +let keysToArray = Belt_internalBuckets.keysToArray; -var valuesToArray = Belt_internalBuckets.valuesToArray; +let valuesToArray = Belt_internalBuckets.valuesToArray; -var getBucketHistogram = Belt_internalBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalBuckets.getBucketHistogram; -var logStats = Belt_internalBuckets.logStats; +let logStats = Belt_internalBuckets.logStats; export { - make , - clear , - isEmpty , - set , - copy , - get , - has , - remove , - forEachU , - forEach , - reduceU , - reduce , - keepMapInPlaceU , - keepMapInPlace , - size , - toArray , - keysToArray , - valuesToArray , - fromArray , - mergeMany , - getBucketHistogram , - logStats , + make, + clear, + isEmpty, + set, + copy, + get, + has, + remove, + forEachU, + forEach, + reduceU, + reduce, + keepMapInPlaceU, + keepMapInPlace, + size, + toArray, + keysToArray, + valuesToArray, + fromArray, + mergeMany, + getBucketHistogram, + logStats, } /* No side effect */ diff --git a/belt/src/belt_HashSet.js b/belt/src/belt_HashSet.js index 035ed4d..78a9a88 100644 --- a/belt/src/belt_HashSet.js +++ b/belt/src/belt_HashSet.js @@ -5,12 +5,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { - return ; + return; } - var nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = hash(old_bucket.key) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -18,72 +18,72 @@ function copyBucket(hash, h_buckets, ndata_tail, _old_bucket) { } ndata_tail[nidx] = old_bucket; _old_bucket = old_bucket.next; - continue ; + continue; }; } function remove(h, key) { - var eq = h.eq; - var h_buckets = h.buckets; - var i = h.hash(key) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let eq = h.eq; + let h_buckets = h.buckets; + let i = h.hash(key) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { - return ; + return; } - var next_cell = l.next; + let next_cell = l.next; if (eq(l.key, key)) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; - return ; + return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (eq(cell.key, key)) { prec.next = cell_next; h.size = h.size - 1 | 0; - return ; + return; } if (cell_next === undefined) { - return ; + return; } _cell = cell_next; _prec = cell; - continue ; + continue; }; } else { - return ; + return; } } function addBucket(h, key, _cell, eq) { while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { - return ; + return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; - continue ; + continue; } h.size = h.size + 1 | 0; cell.next = { key: key, next: undefined }; - return ; + return; }; } function add0(h, key, hash, eq) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = hash(key) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = hash(key) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l, eq); } else { @@ -94,26 +94,26 @@ function add0(h, key, hash, eq) { }; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { - return ; + return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(hash, h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } } - return ; + return; } } @@ -123,23 +123,23 @@ function add(h, key) { } function has(h, key) { - var eq = h.eq; - var h_buckets = h.buckets; - var nid = h.hash(key) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let eq = h.eq; + let h_buckets = h.buckets; + let nid = h.hash(key) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (eq(cell.key, key)) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } _cell = nextCell; - continue ; + continue; }; } else { return false; @@ -155,68 +155,68 @@ function size(h) { } function fromArray(arr, id) { - var eq = id.eq; - var hash = id.hash; - var len = arr.length; - var v = Belt_internalBucketsType.make(hash, eq, len); - for(var i = 0; i < len; ++i){ + let eq = id.eq; + let hash = id.hash; + let len = arr.length; + let v = Belt_internalBucketsType.make(hash, eq, len); + for(let i = 0; i < len; ++i){ add0(v, arr[i], hash, eq); } return v; } function mergeMany(h, arr) { - var eq = h.eq; - var hash = h.hash; - var len = arr.length; - for(var i = 0; i < len; ++i){ + let eq = h.eq; + let hash = h.hash; + let len = arr.length; + for(let i = 0; i < len; ++i){ add0(h, arr[i], hash, eq); } } -var Int; +let Int; -var $$String; +let $$String; -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; export { - Int , - $$String , - make , - clear , - isEmpty , - add , - copy , - has , - remove , - forEachU , - forEach , - reduceU , - reduce , - size , - logStats , - toArray , - fromArray , - mergeMany , - getBucketHistogram , + Int, + $$String, + make, + clear, + isEmpty, + add, + copy, + has, + remove, + forEachU, + forEach, + reduceU, + reduce, + size, + logStats, + toArray, + fromArray, + mergeMany, + getBucketHistogram, } /* No side effect */ diff --git a/belt/src/belt_HashSetInt.js b/belt/src/belt_HashSetInt.js index 0373ae0..9cdfe1e 100644 --- a/belt/src/belt_HashSetInt.js +++ b/belt/src/belt_HashSetInt.js @@ -6,12 +6,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucket(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { - return ; + return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -19,71 +19,71 @@ function copyBucket(h_buckets, ndata_tail, _old_bucket) { } ndata_tail[nidx] = old_bucket; _old_bucket = old_bucket.next; - continue ; + continue; }; } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { - return ; + return; } - var next_cell = l.next; + let next_cell = l.next; if (l.key === key) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; - return ; + return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (cell.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; - return ; + return; } if (cell_next === undefined) { - return ; + return; } _cell = cell_next; _prec = cell; - continue ; + continue; }; } else { - return ; + return; } } function addBucket(h, key, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { - return ; + return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; - continue ; + continue; } h.size = h.size + 1 | 0; cell.next = { key: key, next: undefined }; - return ; + return; }; } function add(h, key) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l); } else { @@ -94,47 +94,47 @@ function add(h, key) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { - return ; + return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } } - return ; + return; } } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_int(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } _cell = nextCell; - continue ; + continue; }; } else { return false; @@ -150,58 +150,58 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ add(v, arr[i]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ + let len = arr.length; + for(let i = 0; i < len; ++i){ add(h, arr[i]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; export { - make , - clear , - isEmpty , - add , - copy , - has , - remove , - forEachU , - forEach , - reduceU , - reduce , - size , - logStats , - toArray , - fromArray , - mergeMany , - getBucketHistogram , + make, + clear, + isEmpty, + add, + copy, + has, + remove, + forEachU, + forEach, + reduceU, + reduce, + size, + logStats, + toArray, + fromArray, + mergeMany, + getBucketHistogram, } /* No side effect */ diff --git a/belt/src/belt_HashSetString.js b/belt/src/belt_HashSetString.js index 4d15b45..a214048 100644 --- a/belt/src/belt_HashSetString.js +++ b/belt/src/belt_HashSetString.js @@ -6,12 +6,12 @@ import * as Belt_internalBucketsType from "./belt_internalBucketsType.js"; function copyBucket(h_buckets, ndata_tail, _old_bucket) { while(true) { - var old_bucket = _old_bucket; + let old_bucket = _old_bucket; if (old_bucket === undefined) { - return ; + return; } - var nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); - var tail = ndata_tail[nidx]; + let nidx = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, old_bucket.key)) & (h_buckets.length - 1 | 0); + let tail = ndata_tail[nidx]; if (tail !== undefined) { tail.next = old_bucket; } else { @@ -19,71 +19,71 @@ function copyBucket(h_buckets, ndata_tail, _old_bucket) { } ndata_tail[nidx] = old_bucket; _old_bucket = old_bucket.next; - continue ; + continue; }; } function remove(h, key) { - var h_buckets = h.buckets; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let l = h_buckets[i]; if (l === undefined) { - return ; + return; } - var next_cell = l.next; + let next_cell = l.next; if (l.key === key) { h.size = h.size - 1 | 0; h_buckets[i] = next_cell; - return ; + return; } else if (next_cell !== undefined) { - var _prec = l; - var _cell = next_cell; + let _prec = l; + let _cell = next_cell; while(true) { - var cell = _cell; - var prec = _prec; - var cell_next = cell.next; + let cell = _cell; + let prec = _prec; + let cell_next = cell.next; if (cell.key === key) { prec.next = cell_next; h.size = h.size - 1 | 0; - return ; + return; } if (cell_next === undefined) { - return ; + return; } _cell = cell_next; _prec = cell; - continue ; + continue; }; } else { - return ; + return; } } function addBucket(h, key, _cell) { while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { - return ; + return; } - var n = cell.next; + let n = cell.next; if (n !== undefined) { _cell = n; - continue ; + continue; } h.size = h.size + 1 | 0; cell.next = { key: key, next: undefined }; - return ; + return; }; } function add(h, key) { - var h_buckets = h.buckets; - var buckets_len = h_buckets.length; - var i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); - var l = h_buckets[i]; + let h_buckets = h.buckets; + let buckets_len = h_buckets.length; + let i = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (buckets_len - 1 | 0); + let l = h_buckets[i]; if (l !== undefined) { addBucket(h, key, l); } else { @@ -94,47 +94,47 @@ function add(h, key) { h.size = h.size + 1 | 0; } if (h.size > (buckets_len << 1)) { - var odata = h.buckets; - var osize = odata.length; - var nsize = (osize << 1); + let odata = h.buckets; + let osize = odata.length; + let nsize = (osize << 1); if (nsize < osize) { - return ; + return; } - var h_buckets$1 = new Array(nsize); - var ndata_tail = new Array(nsize); + let h_buckets$1 = new Array(nsize); + let ndata_tail = new Array(nsize); h.buckets = h_buckets$1; - for(var i$1 = 0; i$1 < osize; ++i$1){ + for(let i$1 = 0; i$1 < osize; ++i$1){ copyBucket(h_buckets$1, ndata_tail, odata[i$1]); } - for(var i$2 = 0; i$2 < nsize; ++i$2){ - var tail = ndata_tail[i$2]; + for(let i$2 = 0; i$2 < nsize; ++i$2){ + let tail = ndata_tail[i$2]; if (tail !== undefined) { tail.next = undefined; } } - return ; + return; } } function has(h, key) { - var h_buckets = h.buckets; - var nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); - var bucket = h_buckets[nid]; + let h_buckets = h.buckets; + let nid = Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, key)) & (h_buckets.length - 1 | 0); + let bucket = h_buckets[nid]; if (bucket !== undefined) { - var _cell = bucket; + let _cell = bucket; while(true) { - var cell = _cell; + let cell = _cell; if (cell.key === key) { return true; } - var nextCell = cell.next; + let nextCell = cell.next; if (nextCell === undefined) { return false; } _cell = nextCell; - continue ; + continue; }; } else { return false; @@ -150,58 +150,58 @@ function size(h) { } function fromArray(arr) { - var len = arr.length; - var v = Belt_internalBucketsType.make(undefined, undefined, len); - for(var i = 0; i < len; ++i){ + let len = arr.length; + let v = Belt_internalBucketsType.make(undefined, undefined, len); + for(let i = 0; i < len; ++i){ add(v, arr[i]); } return v; } function mergeMany(h, arr) { - var len = arr.length; - for(var i = 0; i < len; ++i){ + let len = arr.length; + for(let i = 0; i < len; ++i){ add(h, arr[i]); } } -var clear = Belt_internalBucketsType.clear; +let clear = Belt_internalBucketsType.clear; -var isEmpty = Belt_internalBucketsType.isEmpty; +let isEmpty = Belt_internalBucketsType.isEmpty; -var copy = Belt_internalSetBuckets.copy; +let copy = Belt_internalSetBuckets.copy; -var forEachU = Belt_internalSetBuckets.forEachU; +let forEachU = Belt_internalSetBuckets.forEachU; -var forEach = Belt_internalSetBuckets.forEach; +let forEach = Belt_internalSetBuckets.forEach; -var reduceU = Belt_internalSetBuckets.reduceU; +let reduceU = Belt_internalSetBuckets.reduceU; -var reduce = Belt_internalSetBuckets.reduce; +let reduce = Belt_internalSetBuckets.reduce; -var logStats = Belt_internalSetBuckets.logStats; +let logStats = Belt_internalSetBuckets.logStats; -var toArray = Belt_internalSetBuckets.toArray; +let toArray = Belt_internalSetBuckets.toArray; -var getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; +let getBucketHistogram = Belt_internalSetBuckets.getBucketHistogram; export { - make , - clear , - isEmpty , - add , - copy , - has , - remove , - forEachU , - forEach , - reduceU , - reduce , - size , - logStats , - toArray , - fromArray , - mergeMany , - getBucketHistogram , + make, + clear, + isEmpty, + add, + copy, + has, + remove, + forEachU, + forEach, + reduceU, + reduce, + size, + logStats, + toArray, + fromArray, + mergeMany, + getBucketHistogram, } /* No side effect */ diff --git a/belt/src/belt_Id.js b/belt/src/belt_Id.js index 9df13be..562e578 100644 --- a/belt/src/belt_Id.js +++ b/belt/src/belt_Id.js @@ -6,28 +6,28 @@ function MakeComparableU(M) { } function MakeComparable(M) { - var cmp = M.cmp; - var cmp$1 = function (a, b) { + let cmp = M.cmp; + let cmp$1 = function (a, b) { return cmp(a, b); }; return { - cmp: cmp$1 - }; + cmp: cmp$1 + }; } function comparableU(cmp) { return { - cmp: cmp - }; + cmp: cmp + }; } function comparable(cmp) { - var cmp$1 = function (a, b) { + let cmp$1 = function (a, b) { return cmp(a, b); }; return { - cmp: cmp$1 - }; + cmp: cmp$1 + }; } function MakeHashableU(M) { @@ -35,48 +35,48 @@ function MakeHashableU(M) { } function MakeHashable(M) { - var hash = M.hash; - var hash$1 = function (a) { + let hash = M.hash; + let hash$1 = function (a) { return hash(a); }; - var eq = M.eq; - var eq$1 = function (a, b) { + let eq = M.eq; + let eq$1 = function (a, b) { return eq(a, b); }; return { - hash: hash$1, - eq: eq$1 - }; + hash: hash$1, + eq: eq$1 + }; } function hashableU(hash, eq) { return { - hash: hash, - eq: eq - }; + hash: hash, + eq: eq + }; } function hashable(hash, eq) { - var hash$1 = function (a) { + let hash$1 = function (a) { return hash(a); }; - var eq$1 = function (a, b) { + let eq$1 = function (a, b) { return eq(a, b); }; return { - hash: hash$1, - eq: eq$1 - }; + hash: hash$1, + eq: eq$1 + }; } export { - MakeComparableU , - MakeComparable , - comparableU , - comparable , - MakeHashableU , - MakeHashable , - hashableU , - hashable , + MakeComparableU, + MakeComparable, + comparableU, + comparable, + MakeHashableU, + MakeHashable, + hashableU, + hashable, } /* No side effect */ diff --git a/belt/src/belt_Int.js b/belt/src/belt_Int.js index 18782ec..500142b 100644 --- a/belt/src/belt_Int.js +++ b/belt/src/belt_Int.js @@ -2,15 +2,15 @@ function fromString(i) { - var i$1 = parseInt(i, 10); + let i$1 = parseInt(i, 10); if (isNaN(i$1)) { - return ; + return; } else { return i$1; } } export { - fromString , + fromString, } /* No side effect */ diff --git a/belt/src/belt_List.js b/belt/src/belt_List.js index 89e1599..aaafd4a 100644 --- a/belt/src/belt_List.js +++ b/belt/src/belt_List.js @@ -15,10 +15,11 @@ function headExn(x) { if (x) { return x.hd; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function tail(x) { @@ -32,79 +33,82 @@ function tailExn(x) { if (x) { return x.tl; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function add(xs, x) { return { - hd: x, - tl: xs - }; + hd: x, + tl: xs + }; } function get(x, n) { if (n < 0) { - return ; + return; } else { - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (!x$1) { - return ; + return; } if (n$1 === 0) { return Caml_option.some(x$1.hd); } _n = n$1 - 1 | 0; _x = x$1.tl; - continue ; + continue; }; } } function getExn(x, n) { if (n < 0) { - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (x$1) { if (n$1 === 0) { return x$1.hd; } _n = n$1 - 1 | 0; _x = x$1.tl; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } function partitionAux(p, _cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { - return ; + return; } - var t = cell.tl; - var h = cell.hd; - var next = { + let t = cell.tl; + let h = cell.hd; + let next = { hd: h, tl: /* [] */0 }; @@ -112,29 +116,29 @@ function partitionAux(p, _cell, _precX, _precY) { precX.tl = next; _precX = next; _cell = t; - continue ; + continue; } precY.tl = next; _precY = next; _cell = t; - continue ; + continue; }; } function splitAux(_cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { - return ; + return; } - var match = cell.hd; - var nextA = { + let match = cell.hd; + let nextA = { hd: match[0], tl: /* [] */0 }; - var nextB = { + let nextB = { hd: match[1], tl: /* [] */0 }; @@ -143,64 +147,64 @@ function splitAux(_cell, _precX, _precY) { _precY = nextB; _precX = nextA; _cell = cell.tl; - continue ; + continue; }; } function copyAuxCont(_cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return prec; } - var next = { + let next = { hd: cellX.hd, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = cellX.tl; - continue ; + continue; }; } function copyAuxWitFilter(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; } _cellX = t; - continue ; + continue; }; } function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { while(true) { - var i = _i; - var prec = _prec; - var cellX = _cellX; + let i = _i; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h, i)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -208,71 +212,71 @@ function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { _i = i + 1 | 0; _prec = next; _cellX = t; - continue ; + continue; } _i = i + 1 | 0; _cellX = t; - continue ; + continue; }; } function copyAuxWitFilterMap(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var t = cellX.tl; - var h = f(cellX.hd); + let t = cellX.tl; + let h = f(cellX.hd); if (h !== undefined) { - var next = { + let next = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; } _cellX = t; - continue ; + continue; }; } function removeAssocAuxWithMap(_cellX, x, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h[0], x)) { prec.tl = t; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; }; } function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (eq(h[0], x)) { prec.tl = { hd: [ @@ -283,47 +287,47 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { }; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; }; } function copyAuxWithMap(_cellX, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var next = { + let next = { hd: f(cellX.hd), tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = cellX.tl; - continue ; + continue; }; } function zipAux(_cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { - return ; + return; } if (!cellY) { - return ; + return; } - var next = { + let next = { hd: [ cellX.hd, cellY.hd @@ -334,22 +338,22 @@ function zipAux(_cellX, _cellY, _prec) { _prec = next; _cellY = cellY.tl; _cellX = cellX.tl; - continue ; + continue; }; } function copyAuxWithMap2(f, _cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { - return ; + return; } if (!cellY) { - return ; + return; } - var next = { + let next = { hd: f(cellX.hd, cellY.hd), tl: /* [] */0 }; @@ -357,19 +361,19 @@ function copyAuxWithMap2(f, _cellX, _cellY, _prec) { _prec = next; _cellY = cellY.tl; _cellX = cellX.tl; - continue ; + continue; }; } function copyAuxWithMapI(f, _i, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; - var i = _i; + let prec = _prec; + let cellX = _cellX; + let i = _i; if (!cellX) { - return ; + return; } - var next = { + let next = { hd: f(i, cellX.hd), tl: /* [] */0 }; @@ -377,22 +381,22 @@ function copyAuxWithMapI(f, _i, _cellX, _prec) { _prec = next; _cellX = cellX.tl; _i = i + 1 | 0; - continue ; + continue; }; } function takeAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return true; } if (!cell) { return false; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -400,22 +404,22 @@ function takeAux(_n, _cell, _prec) { _prec = cell$1; _cell = cell.tl; _n = n - 1 | 0; - continue ; + continue; }; } function splitAtAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return cell; } if (!cell) { - return ; + return; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -423,25 +427,25 @@ function splitAtAux(_n, _cell, _prec) { _prec = cell$1; _cell = cell.tl; _n = n - 1 | 0; - continue ; + continue; }; } function take(lst, n) { if (n < 0) { - return ; + return; } if (n === 0) { return /* [] */0; } if (!lst) { - return ; + return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var has = takeAux(n - 1 | 0, lst.tl, cell); + let has = takeAux(n - 1 | 0, lst.tl, cell); if (has) { return cell; } @@ -450,49 +454,49 @@ function take(lst, n) { function drop(lst, n) { if (n < 0) { - return ; + return; } else { - var _l = lst; - var _n = n; + let _l = lst; + let _n = n; while(true) { - var n$1 = _n; - var l = _l; + let n$1 = _n; + let l = _l; if (n$1 === 0) { return l; } if (!l) { - return ; + return; } _n = n$1 - 1 | 0; _l = l.tl; - continue ; + continue; }; } } function splitAt(lst, n) { if (n < 0) { - return ; + return; } if (n === 0) { return [ - /* [] */0, - lst - ]; + /* [] */0, + lst + ]; } if (!lst) { - return ; + return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var rest = splitAtAux(n - 1 | 0, lst.tl, cell); + let rest = splitAtAux(n - 1 | 0, lst.tl, cell); if (rest !== undefined) { return [ - cell, - rest - ]; + cell, + rest + ]; } } @@ -501,7 +505,7 @@ function concat(xs, ys) { if (!xs) { return ys; } - var cell = { + let cell = { hd: xs.hd, tl: /* [] */0 }; @@ -513,7 +517,7 @@ function mapU(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(xs.hd), tl: /* [] */0 }; @@ -523,8 +527,8 @@ function mapU(xs, f) { function map(xs, f) { return mapU(xs, (function (x) { - return f(x); - })); + return f(x); + })); } function zipByU(l1, l2, f) { @@ -534,7 +538,7 @@ function zipByU(l1, l2, f) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: f(l1.hd, l2.hd), tl: /* [] */0 }; @@ -544,15 +548,15 @@ function zipByU(l1, l2, f) { function zipBy(l1, l2, f) { return zipByU(l1, l2, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } function mapWithIndexU(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(0, xs.hd), tl: /* [] */0 }; @@ -562,22 +566,22 @@ function mapWithIndexU(xs, f) { function mapWithIndex(xs, f) { return mapWithIndexU(xs, (function (i, x) { - return f(i, x); - })); + return f(i, x); + })); } function makeByU(n, f) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: f(0), tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v = { + let v = { hd: f(i), tl: /* [] */0 }; @@ -590,22 +594,22 @@ function makeByU(n, f) { function makeBy(n, f) { return makeByU(n, (function (x) { - return f(x); - })); + return f(x); + })); } function make(n, v) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: v, tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v$1 = { + let v$1 = { hd: v, tl: /* [] */0 }; @@ -617,40 +621,40 @@ function make(n, v) { } function length(xs) { - var _x = xs; - var _acc = 0; + let _x = xs; + let _acc = 0; while(true) { - var acc = _acc; - var x = _x; + let acc = _acc; + let x = _x; if (!x) { return acc; } _acc = acc + 1 | 0; _x = x.tl; - continue ; + continue; }; } function fillAux(arr, _i, _x) { while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { - return ; + return; } arr[i] = x.hd; _x = x.tl; _i = i + 1 | 0; - continue ; + continue; }; } function fromArray(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -659,27 +663,27 @@ function fromArray(a) { tl: res }; _i = i - 1 | 0; - continue ; + continue; }; } function toArray(x) { - var len = length(x); - var arr = new Array(len); + let len = length(x); + let arr = new Array(len); fillAux(arr, 0, x); return arr; } function shuffle(xs) { - var v = toArray(xs); + let v = toArray(xs); Belt_Array.shuffleInPlace(v); return fromArray(v); } function reverseConcat(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -688,7 +692,7 @@ function reverseConcat(_l1, _l2) { tl: l2 }; _l1 = l1.tl; - continue ; + continue; }; } @@ -698,27 +702,27 @@ function reverse(l) { function flattenAux(_prec, _xs) { while(true) { - var xs = _xs; - var prec = _prec; + let xs = _xs; + let prec = _prec; if (xs) { _xs = xs.tl; _prec = copyAuxCont(xs.hd, prec); - continue ; + continue; } prec.tl = /* [] */0; - return ; + return; }; } function flatten(_xs) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var match = xs.hd; + let match = xs.hd; if (match) { - var cell = { + let cell = { hd: match.hd, tl: /* [] */0 }; @@ -726,32 +730,32 @@ function flatten(_xs) { return cell; } _xs = xs.tl; - continue ; + continue; }; } function concatMany(xs) { - var len = xs.length; + let len = xs.length; if (len === 1) { return xs[0]; } if (len === 0) { return /* [] */0; } - var len$1 = xs.length; - var v = xs[len$1 - 1 | 0]; - for(var i = len$1 - 2 | 0; i >= 0; --i){ + let len$1 = xs.length; + let v = xs[len$1 - 1 | 0]; + for(let i = len$1 - 2 | 0; i >= 0; --i){ v = concat(xs[i], v); } return v; } function mapReverseU(l, f) { - var _accu = /* [] */0; - var _xs = l; + let _accu = /* [] */0; + let _xs = l; while(true) { - var xs = _xs; - var accu = _accu; + let xs = _xs; + let accu = _accu; if (!xs) { return accu; } @@ -760,73 +764,73 @@ function mapReverseU(l, f) { hd: f(xs.hd), tl: accu }; - continue ; + continue; }; } function mapReverse(l, f) { return mapReverseU(l, (function (x) { - return f(x); - })); + return f(x); + })); } function forEachU(_xs, f) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { - return ; + return; } f(xs.hd); _xs = xs.tl; - continue ; + continue; }; } function forEach(xs, f) { forEachU(xs, (function (x) { - return f(x); - })); + return f(x); + })); } function forEachWithIndexU(l, f) { - var _xs = l; - var _i = 0; + let _xs = l; + let _i = 0; while(true) { - var i = _i; - var xs = _xs; + let i = _i; + let xs = _xs; if (!xs) { - return ; + return; } f(i, xs.hd); _i = i + 1 | 0; _xs = xs.tl; - continue ; + continue; }; } function forEachWithIndex(l, f) { forEachWithIndexU(l, (function (i, x) { - return f(i, x); - })); + return f(i, x); + })); } function reduceU(_l, _accu, f) { while(true) { - var accu = _accu; - var l = _l; + let accu = _accu; + let l = _l; if (!l) { return accu; } _accu = f(accu, l.hd); _l = l.tl; - continue ; + continue; }; } function reduce(l, accu, f) { return reduceU(l, accu, (function (acc, x) { - return f(acc, x); - })); + return f(acc, x); + })); } function reduceReverseUnsafeU(l, accu, f) { @@ -838,7 +842,7 @@ function reduceReverseUnsafeU(l, accu, f) { } function reduceReverseU(l, acc, f) { - var len = length(l); + let len = length(l); if (len < 1000) { return reduceReverseUnsafeU(l, acc, f); } else { @@ -848,42 +852,42 @@ function reduceReverseU(l, acc, f) { function reduceReverse(l, accu, f) { return reduceReverseU(l, accu, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceWithIndexU(l, acc, f) { - var _l = l; - var _acc = acc; - var _i = 0; + let _l = l; + let _acc = acc; + let _i = 0; while(true) { - var i = _i; - var acc$1 = _acc; - var l$1 = _l; + let i = _i; + let acc$1 = _acc; + let l$1 = _l; if (!l$1) { return acc$1; } _i = i + 1 | 0; _acc = f(acc$1, l$1.hd, i); _l = l$1.tl; - continue ; + continue; }; } function reduceWithIndex(l, acc, f) { return reduceWithIndexU(l, acc, (function (acc, x, i) { - return f(acc, x, i); - })); + return f(acc, x, i); + })); } function mapReverse2U(l1, l2, f) { - var _l1 = l1; - var _l2 = l2; - var _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1$1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; if (!l1$1) { return accu; } @@ -896,44 +900,44 @@ function mapReverse2U(l1, l2, f) { }; _l2 = l2$1.tl; _l1 = l1$1.tl; - continue ; + continue; }; } function mapReverse2(l1, l2, f) { return mapReverse2U(l1, l2, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function forEach2U(_l1, _l2, f) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { - return ; + return; } if (!l2) { - return ; + return; } f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function forEach2(l1, l2, f) { forEach2U(l1, l2, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduce2U(_l1, _l2, _accu, f) { while(true) { - var accu = _accu; - var l2 = _l2; - var l1 = _l1; + let accu = _accu; + let l2 = _l2; + let l1 = _l1; if (!l1) { return accu; } @@ -943,14 +947,14 @@ function reduce2U(_l1, _l2, _accu, f) { _accu = f(accu, l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function reduce2(l1, l2, acc, f) { return reduce2U(l1, l2, acc, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function reduceReverse2UnsafeU(l1, l2, accu, f) { @@ -962,7 +966,7 @@ function reduceReverse2UnsafeU(l1, l2, accu, f) { } function reduceReverse2U(l1, l2, acc, f) { - var len = length(l1); + let len = length(l1); if (len < 1000) { return reduceReverse2UnsafeU(l1, l2, acc, f); } else { @@ -972,13 +976,13 @@ function reduceReverse2U(l1, l2, acc, f) { function reduceReverse2(l1, l2, acc, f) { return reduceReverse2U(l1, l2, acc, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function everyU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return true; } @@ -986,19 +990,19 @@ function everyU(_xs, p) { return false; } _xs = xs.tl; - continue ; + continue; }; } function every(xs, p) { return everyU(xs, (function (x) { - return p(x); - })); + return p(x); + })); } function someU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1006,20 +1010,20 @@ function someU(_xs, p) { return true; } _xs = xs.tl; - continue ; + continue; }; } function some(xs, p) { return someU(xs, (function (x) { - return p(x); - })); + return p(x); + })); } function every2U(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return true; } @@ -1031,20 +1035,20 @@ function every2U(_l1, _l2, p) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function every2(l1, l2, p) { return every2U(l1, l2, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function cmpByLength(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1057,14 +1061,14 @@ function cmpByLength(_l1, _l2) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function cmpU(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -1075,26 +1079,26 @@ function cmpU(_l1, _l2, p) { if (!l2) { return 1; } - var c = p(l1.hd, l2.hd); + let c = p(l1.hd, l2.hd); if (c !== 0) { return c; } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function cmp(l1, l2, f) { return cmpU(l1, l2, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } function eqU(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -1110,20 +1114,20 @@ function eqU(_l1, _l2, p) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function eq(l1, l2, f) { return eqU(l1, l2, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } function some2U(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return false; } @@ -1135,19 +1139,19 @@ function some2U(_l1, _l2, p) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function some2(l1, l2, p) { return some2U(l1, l2, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function hasU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1155,40 +1159,40 @@ function hasU(_xs, x, eq) { return true; } _xs = xs.tl; - continue ; + continue; }; } function has(xs, x, eq) { return hasU(xs, x, (function (a, b) { - return eq(a, b); - })); + return eq(a, b); + })); } function getAssocU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { - return ; + return; } - var match = xs.hd; + let match = xs.hd; if (eq(match[0], x)) { return Caml_option.some(match[1]); } _xs = xs.tl; - continue ; + continue; }; } function getAssoc(xs, x, eq) { return getAssocU(xs, x, (function (a, b) { - return eq(a, b); - })); + return eq(a, b); + })); } function hasAssocU(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1196,30 +1200,30 @@ function hasAssocU(_xs, x, eq) { return true; } _xs = xs.tl; - continue ; + continue; }; } function hasAssoc(xs, x, eq) { return hasAssocU(xs, x, (function (a, b) { - return eq(a, b); - })); + return eq(a, b); + })); } function removeAssocU(xs, x, eq) { if (!xs) { return /* [] */0; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return l; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var removed = removeAssocAuxWithMap(l, x, cell, eq); + let removed = removeAssocAuxWithMap(l, x, cell, eq); if (removed) { return cell; } else { @@ -1229,98 +1233,98 @@ function removeAssocU(xs, x, eq) { function removeAssoc(xs, x, eq) { return removeAssocU(xs, x, (function (a, b) { - return eq(a, b); - })); + return eq(a, b); + })); } function setAssocU(xs, x, k, eq) { if (!xs) { return { - hd: [ - x, - k - ], - tl: /* [] */0 - }; + hd: [ + x, + k + ], + tl: /* [] */0 + }; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return { - hd: [ - x, - k - ], - tl: l - }; + hd: [ + x, + k + ], + tl: l + }; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var replaced = setAssocAuxWithMap(l, x, k, cell, eq); + let replaced = setAssocAuxWithMap(l, x, k, cell, eq); if (replaced) { return cell; } else { return { - hd: [ - x, - k - ], - tl: xs - }; + hd: [ + x, + k + ], + tl: xs + }; } } function setAssoc(xs, x, k, eq) { return setAssocU(xs, x, k, (function (a, b) { - return eq(a, b); - })); + return eq(a, b); + })); } function sortU(xs, cmp) { - var arr = toArray(xs); + let arr = toArray(xs); Belt_SortArray.stableSortInPlaceByU(arr, cmp); return fromArray(arr); } function sort(xs, cmp) { return sortU(xs, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function getByU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { - return ; + return; } - var x = xs.hd; + let x = xs.hd; if (p(x)) { return Caml_option.some(x); } _xs = xs.tl; - continue ; + continue; }; } function getBy(xs, p) { return getByU(xs, (function (a) { - return p(a); - })); + return p(a); + })); } function keepU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = xs.hd; + let t = xs.tl; + let h = xs.hd; if (p(h)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1328,29 +1332,29 @@ function keepU(_xs, p) { return cell; } _xs = t; - continue ; + continue; }; } function keep(xs, p) { return keepU(xs, (function (x) { - return p(x); - })); + return p(x); + })); } function keepWithIndexU(xs, p) { - var _xs = xs; - var _i = 0; + let _xs = xs; + let _i = 0; while(true) { - var i = _i; - var xs$1 = _xs; + let i = _i; + let xs$1 = _xs; if (!xs$1) { return /* [] */0; } - var t = xs$1.tl; - var h = xs$1.hd; + let t = xs$1.tl; + let h = xs$1.hd; if (p(h, i)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1359,26 +1363,26 @@ function keepWithIndexU(xs, p) { } _i = i + 1 | 0; _xs = t; - continue ; + continue; }; } function keepWithIndex(xs, p) { return keepWithIndexU(xs, (function (x, i) { - return p(x, i); - })); + return p(x, i); + })); } function keepMapU(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = p(xs.hd); + let t = xs.tl; + let h = p(xs.hd); if (h !== undefined) { - var cell = { + let cell = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; @@ -1386,74 +1390,103 @@ function keepMapU(_xs, p) { return cell; } _xs = t; - continue ; + continue; }; } function keepMap(xs, p) { return keepMapU(xs, (function (x) { - return p(x); - })); + return p(x); + })); } function partitionU(l, p) { if (!l) { return [ - /* [] */0, - /* [] */0 - ]; + /* [] */0, + /* [] */0 + ]; } - var h = l.hd; - var nextX = { + let h = l.hd; + let nextX = { hd: h, tl: /* [] */0 }; - var nextY = { + let nextY = { hd: h, tl: /* [] */0 }; - var b = p(h); + let b = p(h); partitionAux(p, l.tl, nextX, nextY); if (b) { + let tmp; + if (nextY) { + tmp = nextY.tl; + } else { + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_List.res", + 876, + 20 + ] + } + }); + } return [ - nextX, - nextY.tl - ]; + nextX, + tmp + ]; + } + let tmp$1; + if (nextX) { + tmp$1 = nextX.tl; } else { - return [ - nextX.tl, - nextY - ]; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_List.res", + 883, + 20 + ] + } + }); } + return [ + tmp$1, + nextY + ]; } function partition(l, p) { return partitionU(l, (function (x) { - return p(x); - })); + return p(x); + })); } function unzip(xs) { if (!xs) { return [ - /* [] */0, - /* [] */0 - ]; + /* [] */0, + /* [] */0 + ]; } - var match = xs.hd; - var cellX = { + let match = xs.hd; + let cellX = { hd: match[0], tl: /* [] */0 }; - var cellY = { + let cellY = { hd: match[1], tl: /* [] */0 }; splitAux(xs.tl, cellX, cellY); return [ - cellX, - cellY - ]; + cellX, + cellY + ]; } function zip(l1, l2) { @@ -1463,7 +1496,7 @@ function zip(l1, l2) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: [ l1.hd, l2.hd @@ -1474,100 +1507,100 @@ function zip(l1, l2) { return cell; } -var size = length; +let size = length; -var filter = keep; +let filter = keep; -var filterWithIndex = keepWithIndex; +let filterWithIndex = keepWithIndex; export { - length , - size , - head , - headExn , - tail , - tailExn , - add , - get , - getExn , - make , - makeByU , - makeBy , - shuffle , - drop , - take , - splitAt , - concat , - concatMany , - reverseConcat , - flatten , - mapU , - map , - zip , - zipByU , - zipBy , - mapWithIndexU , - mapWithIndex , - fromArray , - toArray , - reverse , - mapReverseU , - mapReverse , - forEachU , - forEach , - forEachWithIndexU , - forEachWithIndex , - reduceU , - reduce , - reduceWithIndexU , - reduceWithIndex , - reduceReverseU , - reduceReverse , - mapReverse2U , - mapReverse2 , - forEach2U , - forEach2 , - reduce2U , - reduce2 , - reduceReverse2U , - reduceReverse2 , - everyU , - every , - someU , - some , - every2U , - every2 , - some2U , - some2 , - cmpByLength , - cmpU , - cmp , - eqU , - eq , - hasU , - has , - getByU , - getBy , - keepU , - keep , - filter , - keepWithIndexU , - keepWithIndex , - filterWithIndex , - keepMapU , - keepMap , - partitionU , - partition , - unzip , - getAssocU , - getAssoc , - hasAssocU , - hasAssoc , - removeAssocU , - removeAssoc , - setAssocU , - setAssoc , - sortU , - sort , + length, + size, + head, + headExn, + tail, + tailExn, + add, + get, + getExn, + make, + makeByU, + makeBy, + shuffle, + drop, + take, + splitAt, + concat, + concatMany, + reverseConcat, + flatten, + mapU, + map, + zip, + zipByU, + zipBy, + mapWithIndexU, + mapWithIndex, + fromArray, + toArray, + reverse, + mapReverseU, + mapReverse, + forEachU, + forEach, + forEachWithIndexU, + forEachWithIndex, + reduceU, + reduce, + reduceWithIndexU, + reduceWithIndex, + reduceReverseU, + reduceReverse, + mapReverse2U, + mapReverse2, + forEach2U, + forEach2, + reduce2U, + reduce2, + reduceReverse2U, + reduceReverse2, + everyU, + every, + someU, + some, + every2U, + every2, + some2U, + some2, + cmpByLength, + cmpU, + cmp, + eqU, + eq, + hasU, + has, + getByU, + getBy, + keepU, + keep, + filter, + keepWithIndexU, + keepWithIndex, + filterWithIndex, + keepMapU, + keepMap, + partitionU, + partition, + unzip, + getAssocU, + getAssoc, + hasAssocU, + hasAssoc, + removeAssocU, + removeAssoc, + setAssocU, + setAssoc, + sortU, + sort, } /* No side effect */ diff --git a/belt/src/belt_Map.js b/belt/src/belt_Map.js index 17dd09b..095b87f 100644 --- a/belt/src/belt_Map.js +++ b/belt/src/belt_Map.js @@ -3,104 +3,104 @@ import * as Belt_MapDict from "./belt_MapDict.js"; function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { - cmp: cmp, - data: Belt_MapDict.fromArray(data, cmp) - }; + cmp: cmp, + data: Belt_MapDict.fromArray(data, cmp) + }; } function remove(m, x) { - var odata = m.data; - var cmp = m.cmp; - var newData = Belt_MapDict.remove(odata, x, cmp); + let odata = m.data; + let cmp = m.cmp; + let newData = Belt_MapDict.remove(odata, x, cmp); if (newData === odata) { return m; } else { return { - cmp: cmp, - data: newData - }; + cmp: cmp, + data: newData + }; } } function removeMany(m, x) { - var cmp = m.cmp; - var newData = Belt_MapDict.removeMany(m.data, x, cmp); + let cmp = m.cmp; + let newData = Belt_MapDict.removeMany(m.data, x, cmp); return { - cmp: cmp, - data: newData - }; + cmp: cmp, + data: newData + }; } function set(m, key, d) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_MapDict.set(m.data, key, d, cmp) - }; + cmp: cmp, + data: Belt_MapDict.set(m.data, key, d, cmp) + }; } function mergeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_MapDict.mergeMany(m.data, e, cmp) - }; + cmp: cmp, + data: Belt_MapDict.mergeMany(m.data, e, cmp) + }; } function updateU(m, key, f) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_MapDict.updateU(m.data, key, f, cmp) - }; + cmp: cmp, + data: Belt_MapDict.updateU(m.data, key, f, cmp) + }; } function update(m, key, f) { return updateU(m, key, (function (a) { - return f(a); - })); + return f(a); + })); } function split(m, x) { - var cmp = m.cmp; - var match = Belt_MapDict.split(m.data, x, cmp); - var match$1 = match[0]; + let cmp = m.cmp; + let match = Belt_MapDict.split(m.data, x, cmp); + let match$1 = match[0]; return [ - [ - { - cmp: cmp, - data: match$1[0] - }, - { - cmp: cmp, - data: match$1[1] - } - ], - match[1] - ]; + [ + { + cmp: cmp, + data: match$1[0] + }, + { + cmp: cmp, + data: match$1[1] + } + ], + match[1] + ]; } function mergeU(s1, s2, f) { - var cmp = s1.cmp; + let cmp = s1.cmp; return { - cmp: cmp, - data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp) - }; + cmp: cmp, + data: Belt_MapDict.mergeU(s1.data, s2.data, f, cmp) + }; } function merge(s1, s2, f) { return mergeU(s1, s2, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function make(id) { return { - cmp: id.cmp, - data: undefined - }; + cmp: id.cmp, + data: undefined + }; } function isEmpty(map) { @@ -112,9 +112,9 @@ function findFirstByU(m, f) { } function findFirstBy(m, f) { - return findFirstByU(m, (function (a, b) { - return f(a, b); - })); + return Belt_MapDict.findFirstByU(m.data, (function (a, b) { + return f(a, b); + })); } function forEachU(m, f) { @@ -122,9 +122,9 @@ function forEachU(m, f) { } function forEach(m, f) { - forEachU(m, (function (a, b) { - f(a, b); - })); + Belt_MapDict.forEachU(m.data, (function (a, b) { + f(a, b); + })); } function reduceU(m, acc, f) { @@ -133,8 +133,8 @@ function reduceU(m, acc, f) { function reduce(m, acc, f) { return reduceU(m, acc, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function everyU(m, f) { @@ -142,9 +142,9 @@ function everyU(m, f) { } function every(m, f) { - return everyU(m, (function (a, b) { - return f(a, b); - })); + return Belt_MapDict.everyU(m.data, (function (a, b) { + return f(a, b); + })); } function someU(m, f) { @@ -152,69 +152,69 @@ function someU(m, f) { } function some(m, f) { - return someU(m, (function (a, b) { - return f(a, b); - })); + return Belt_MapDict.someU(m.data, (function (a, b) { + return f(a, b); + })); } function keepU(m, f) { return { - cmp: m.cmp, - data: Belt_MapDict.keepU(m.data, f) - }; + cmp: m.cmp, + data: Belt_MapDict.keepU(m.data, f) + }; } function keep(m, f) { return keepU(m, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function partitionU(m, p) { - var cmp = m.cmp; - var match = Belt_MapDict.partitionU(m.data, p); + let cmp = m.cmp; + let match = Belt_MapDict.partitionU(m.data, p); return [ - { - cmp: cmp, - data: match[0] - }, - { - cmp: cmp, - data: match[1] - } - ]; + { + cmp: cmp, + data: match[0] + }, + { + cmp: cmp, + data: match[1] + } + ]; } function partition(m, p) { return partitionU(m, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function mapU(m, f) { return { - cmp: m.cmp, - data: Belt_MapDict.mapU(m.data, f) - }; + cmp: m.cmp, + data: Belt_MapDict.mapU(m.data, f) + }; } function map(m, f) { return mapU(m, (function (a) { - return f(a); - })); + return f(a); + })); } function mapWithKeyU(m, f) { return { - cmp: m.cmp, - data: Belt_MapDict.mapWithKeyU(m.data, f) - }; + cmp: m.cmp, + data: Belt_MapDict.mapWithKeyU(m.data, f) + }; } function mapWithKey(m, f) { return mapWithKeyU(m, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function size(map) { @@ -299,8 +299,8 @@ function eqU(m1, m2, veq) { function eq(m1, m2, veq) { return eqU(m1, m2, (function (a, b) { - return veq(a, b); - })); + return veq(a, b); + })); } function cmpU(m1, m2, vcmp) { @@ -309,8 +309,8 @@ function cmpU(m1, m2, vcmp) { function cmp(m1, m2, vcmp) { return cmpU(m1, m2, (function (a, b) { - return vcmp(a, b); - })); + return vcmp(a, b); + })); } function getData(m) { @@ -318,84 +318,84 @@ function getData(m) { } function getId(m) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp - }; + cmp: cmp + }; } function packIdData(id, data) { return { - cmp: id.cmp, - data: data - }; + cmp: id.cmp, + data: data + }; } -var Int; +let Int; -var $$String; +let $$String; -var Dict; +let Dict; export { - Int , - $$String , - Dict , - make , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - findFirstByU , - findFirstBy , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toArray , - toList , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - remove , - removeMany , - set , - updateU , - update , - mergeMany , - mergeU , - merge , - keepU , - keep , - partitionU , - partition , - split , - mapU , - map , - mapWithKeyU , - mapWithKey , - getData , - getId , - packIdData , - checkInvariantInternal , + Int, + $$String, + Dict, + make, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + findFirstByU, + findFirstBy, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toArray, + toList, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + remove, + removeMany, + set, + updateU, + update, + mergeMany, + mergeU, + merge, + keepU, + keep, + partitionU, + partition, + split, + mapU, + map, + mapWithKeyU, + mapWithKey, + getData, + getId, + packIdData, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_MapDict.js b/belt/src/belt_MapDict.js index c4e599f..f4b5b4e 100644 --- a/belt/src/belt_MapDict.js +++ b/belt/src/belt_MapDict.js @@ -7,14 +7,14 @@ function set(t, newK, newD, cmp) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; - var c = cmp(newK, k); + let k = t.k; + let c = cmp(newK, k); if (c === 0) { return Belt_internalAVLtree.updateValue(t, newD); } - var l = t.l; - var r = t.r; - var v = t.v; + let l = t.l; + let r = t.r; + let v = t.v; if (c < 0) { return Belt_internalAVLtree.bal(set(l, newK, newD, cmp), k, v, r); } else { @@ -24,49 +24,49 @@ function set(t, newK, newD, cmp) { function updateU(t, newK, f, cmp) { if (t !== undefined) { - var k = t.k; - var c = cmp(newK, k); + let k = t.k; + let c = cmp(newK, k); if (c === 0) { - var newD = f(Caml_option.some(t.v)); + let newD = f(Caml_option.some(t.v)); if (newD !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(newD)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var l$1 = t.l; - var r$2 = t.r; - var v = t.v; + let l$1 = t.l; + let r$2 = t.r; + let v = t.v; if (c < 0) { - var ll = updateU(l$1, newK, f, cmp); + let ll = updateU(l$1, newK, f, cmp); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, newK, f, cmp); + let rr = updateU(r$2, newK, f, cmp); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var newD$1 = f(undefined); + let newD$1 = f(undefined); if (newD$1 !== undefined) { return Belt_internalAVLtree.singleton(newK, Caml_option.valFromOption(newD$1)); } else { @@ -76,15 +76,15 @@ function updateU(t, newK, f, cmp) { function update(t, newK, f, cmp) { return updateU(t, newK, (function (a) { - return f(a); - }), cmp); + return f(a); + }), cmp); } function removeAux0(n, x, cmp) { - var v = n.k; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.k; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -92,20 +92,20 @@ function removeAux0(n, x, cmp) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (c < 0) { if (l === undefined) { return n; } - var ll = removeAux0(l, x, cmp); + let ll = removeAux0(l, x, cmp); if (ll === l) { return n; } else { @@ -115,7 +115,7 @@ function removeAux0(n, x, cmp) { if (r === undefined) { return n; } - var rr = removeAux0(r, x, cmp); + let rr = removeAux0(r, x, cmp); if (rr === r) { return n; } else { @@ -131,290 +131,290 @@ function remove(n, x, cmp) { } function mergeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1], cmp); } return v; } function splitAuxPivot(n, x, pres, cmp) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { pres.contents = Caml_option.some(d); return [ - l, - r - ]; + l, + r + ]; } if (c < 0) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxPivot(l, x, pres, cmp); + let match = splitAuxPivot(l, x, pres, cmp); return [ - match[0], - Belt_internalAVLtree.join(match[1], v, d, r) - ]; + match[0], + Belt_internalAVLtree.join(match[1], v, d, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxPivot(r, x, pres, cmp); + let match$1 = splitAuxPivot(r, x, pres, cmp); return [ - Belt_internalAVLtree.join(l, v, d, match$1[0]), - match$1[1] - ]; + Belt_internalAVLtree.join(l, v, d, match$1[0]), + match$1[1] + ]; } function split(n, x, cmp) { if (n === undefined) { return [ - [ - undefined, - undefined - ], - undefined - ]; + [ + undefined, + undefined + ], + undefined + ]; } - var pres = { + let pres = { contents: undefined }; - var v = splitAuxPivot(n, x, pres, cmp); + let v = splitAuxPivot(n, x, pres, cmp); return [ - v, - pres.contents - ]; + v, + pres.contents + ]; } function mergeU(s1, s2, f, cmp) { if (s1 === undefined) { if (s2 !== undefined) { return Belt_internalAVLtree.keepMapU(s2, (function (k, v) { - return f(k, undefined, Caml_option.some(v)); - })); + return f(k, undefined, Caml_option.some(v)); + })); } else { - return ; + return; } } if (s2 === undefined) { return Belt_internalAVLtree.keepMapU(s1, (function (k, v) { - return f(k, Caml_option.some(v), undefined); - })); + return f(k, Caml_option.some(v), undefined); + })); } if (s1.h >= s2.h) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var d2 = { + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let d2 = { contents: undefined }; - var match = splitAuxPivot(s2, v1, d2, cmp); - var d2$1 = d2.contents; - var newLeft = mergeU(l1, match[0], f, cmp); - var newD = f(v1, Caml_option.some(d1), d2$1); - var newRight = mergeU(r1, match[1], f, cmp); + let match = splitAuxPivot(s2, v1, d2, cmp); + let d2$1 = d2.contents; + let newLeft = mergeU(l1, match[0], f, cmp); + let newD = f(v1, Caml_option.some(d1), d2$1); + let newRight = mergeU(r1, match[1], f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft, v1, newD, newRight); } - var v2 = s2.k; - var d2$2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var d1$1 = { + let v2 = s2.k; + let d2$2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let d1$1 = { contents: undefined }; - var match$1 = splitAuxPivot(s1, v2, d1$1, cmp); - var d1$2 = d1$1.contents; - var newLeft$1 = mergeU(match$1[0], l2, f, cmp); - var newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); - var newRight$1 = mergeU(match$1[1], r2, f, cmp); + let match$1 = splitAuxPivot(s1, v2, d1$1, cmp); + let d1$2 = d1$1.contents; + let newLeft$1 = mergeU(match$1[0], l2, f, cmp); + let newD$1 = f(v2, d1$2, Caml_option.some(d2$2)); + let newRight$1 = mergeU(match$1[1], r2, f, cmp); return Belt_internalAVLtree.concatOrJoin(newLeft$1, v2, newD$1, newRight$1); } function merge(s1, s2, f, cmp) { return mergeU(s1, s2, (function (a, b, c) { - return f(a, b, c); - }), cmp); + return f(a, b, c); + }), cmp); } function removeMany(t, keys, cmp) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux0(t$1, ele, cmp); + let ele = keys[i]; + let u = removeAux0(t$1, ele, cmp); if (u === undefined) { return u; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalAVLtree.has; +let has = Belt_internalAVLtree.has; -var cmpU = Belt_internalAVLtree.cmpU; +let cmpU = Belt_internalAVLtree.cmpU; -var cmp = Belt_internalAVLtree.cmp; +let cmp = Belt_internalAVLtree.cmp; -var eqU = Belt_internalAVLtree.eqU; +let eqU = Belt_internalAVLtree.eqU; -var eq = Belt_internalAVLtree.eq; +let eq = Belt_internalAVLtree.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalAVLtree.fromArray; +let fromArray = Belt_internalAVLtree.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalAVLtree.get; +let get = Belt_internalAVLtree.get; -var getUndefined = Belt_internalAVLtree.getUndefined; +let getUndefined = Belt_internalAVLtree.getUndefined; -var getWithDefault = Belt_internalAVLtree.getWithDefault; +let getWithDefault = Belt_internalAVLtree.getWithDefault; -var getExn = Belt_internalAVLtree.getExn; +let getExn = Belt_internalAVLtree.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; export { - empty , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - findFirstByU , - findFirstBy , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toList , - toArray , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - checkInvariantInternal , - remove , - removeMany , - set , - updateU , - update , - mergeU , - merge , - mergeMany , - keepU , - keep , - partitionU , - partition , - split , - mapU , - map , - mapWithKeyU , - mapWithKey , + empty, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + findFirstByU, + findFirstBy, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toList, + toArray, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + checkInvariantInternal, + remove, + removeMany, + set, + updateU, + update, + mergeU, + merge, + mergeMany, + keepU, + keep, + partitionU, + partition, + split, + mapU, + map, + mapWithKeyU, + mapWithKey, } /* No side effect */ diff --git a/belt/src/belt_MapInt.js b/belt/src/belt_MapInt.js index 0b821e7..a5107f8 100644 --- a/belt/src/belt_MapInt.js +++ b/belt/src/belt_MapInt.js @@ -8,11 +8,11 @@ function set(t, newK, newD) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; + let k = t.k; if (newK === k) { return Belt_internalAVLtree.updateValue(t, newD); } - var v = t.v; + let v = t.v; if (newK < k) { return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r); } else { @@ -22,48 +22,48 @@ function set(t, newK, newD) { function updateU(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (x === k) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var v = t.v; - var l$1 = t.l; - var r$2 = t.r; + let v = t.v; + let l$1 = t.l; + let r$2 = t.r; if (x < k) { - var ll = updateU(l$1, x, f); + let ll = updateU(l$1, x, f); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, x, f); + let rr = updateU(r$2, x, f); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -73,14 +73,14 @@ function updateU(t, x, f) { function update(t, x, f) { return updateU(t, x, (function (a) { - return f(a); - })); + return f(a); + })); } function removeAux(n, x) { - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x === v) { if (l === undefined) { return r; @@ -88,20 +88,20 @@ function removeAux(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (x < v) { if (l === undefined) { return n; } - var ll = removeAux(l, x); + let ll = removeAux(l, x); if (ll === l) { return n; } else { @@ -111,7 +111,7 @@ function removeAux(n, x) { if (r === undefined) { return n; } - var rr = removeAux(r, x); + let rr = removeAux(r, x); return Belt_internalAVLtree.bal(l, v, n.v, rr); } @@ -123,186 +123,186 @@ function remove(n, x) { } function removeMany(t, keys) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux(t$1, ele); + let ele = keys[i]; + let u = removeAux(t$1, ele); if (u === undefined) { return u; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1]); } return v; } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalMapInt.has; +let has = Belt_internalMapInt.has; -var cmpU = Belt_internalMapInt.cmpU; +let cmpU = Belt_internalMapInt.cmpU; -var cmp = Belt_internalMapInt.cmp; +let cmp = Belt_internalMapInt.cmp; -var eqU = Belt_internalMapInt.eqU; +let eqU = Belt_internalMapInt.eqU; -var eq = Belt_internalMapInt.eq; +let eq = Belt_internalMapInt.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalMapInt.fromArray; +let fromArray = Belt_internalMapInt.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalMapInt.get; +let get = Belt_internalMapInt.get; -var getUndefined = Belt_internalMapInt.getUndefined; +let getUndefined = Belt_internalMapInt.getUndefined; -var getWithDefault = Belt_internalMapInt.getWithDefault; +let getWithDefault = Belt_internalMapInt.getWithDefault; -var getExn = Belt_internalMapInt.getExn; +let getExn = Belt_internalMapInt.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var mergeU = Belt_internalMapInt.mergeU; +let mergeU = Belt_internalMapInt.mergeU; -var merge = Belt_internalMapInt.merge; +let merge = Belt_internalMapInt.merge; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var split = Belt_internalMapInt.split; +let split = Belt_internalMapInt.split; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; export { - empty , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - findFirstByU , - findFirstBy , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toList , - toArray , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - checkInvariantInternal , - remove , - removeMany , - set , - updateU , - update , - mergeU , - merge , - mergeMany , - keepU , - keep , - partitionU , - partition , - split , - mapU , - map , - mapWithKeyU , - mapWithKey , + empty, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + findFirstByU, + findFirstBy, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toList, + toArray, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + checkInvariantInternal, + remove, + removeMany, + set, + updateU, + update, + mergeU, + merge, + mergeMany, + keepU, + keep, + partitionU, + partition, + split, + mapU, + map, + mapWithKeyU, + mapWithKey, } /* No side effect */ diff --git a/belt/src/belt_MapString.js b/belt/src/belt_MapString.js index fe04f69..bda4b5b 100644 --- a/belt/src/belt_MapString.js +++ b/belt/src/belt_MapString.js @@ -8,11 +8,11 @@ function set(t, newK, newD) { if (t === undefined) { return Belt_internalAVLtree.singleton(newK, newD); } - var k = t.k; + let k = t.k; if (newK === k) { return Belt_internalAVLtree.updateValue(t, newD); } - var v = t.v; + let v = t.v; if (newK < k) { return Belt_internalAVLtree.bal(set(t.l, newK, newD), k, v, t.r); } else { @@ -22,48 +22,48 @@ function set(t, newK, newD) { function updateU(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (x === k) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { return Belt_internalAVLtree.updateValue(t, Caml_option.valFromOption(data)); } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l === undefined) { return r; } if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } - var v = t.v; - var l$1 = t.l; - var r$2 = t.r; + let v = t.v; + let l$1 = t.l; + let r$2 = t.r; if (x < k) { - var ll = updateU(l$1, x, f); + let ll = updateU(l$1, x, f); if (l$1 === ll) { return t; } else { return Belt_internalAVLtree.bal(ll, k, v, r$2); } } - var rr = updateU(r$2, x, f); + let rr = updateU(r$2, x, f); if (r$2 === rr) { return t; } else { return Belt_internalAVLtree.bal(l$1, k, v, rr); } } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -73,14 +73,14 @@ function updateU(t, x, f) { function update(t, x, f) { return updateU(t, x, (function (a) { - return f(a); - })); + return f(a); + })); } function removeAux(n, x) { - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x === v) { if (l === undefined) { return r; @@ -88,20 +88,20 @@ function removeAux(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } if (x < v) { if (l === undefined) { return n; } - var ll = removeAux(l, x); + let ll = removeAux(l, x); if (ll === l) { return n; } else { @@ -111,7 +111,7 @@ function removeAux(n, x) { if (r === undefined) { return n; } - var rr = removeAux(r, x); + let rr = removeAux(r, x); return Belt_internalAVLtree.bal(l, v, n.v, rr); } @@ -123,186 +123,186 @@ function remove(n, x) { } function removeMany(t, keys) { - var len = keys.length; + let len = keys.length; if (t !== undefined) { - var _t = t; - var _i = 0; + let _t = t; + let _i = 0; while(true) { - var i = _i; - var t$1 = _t; + let i = _i; + let t$1 = _t; if (i >= len) { return t$1; } - var ele = keys[i]; - var u = removeAux(t$1, ele); + let ele = keys[i]; + let u = removeAux(t$1, ele); if (u === undefined) { return u; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var match = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let match = arr[i]; v = set(v, match[0], match[1]); } return v; } -var empty; +let empty; -var isEmpty = Belt_internalAVLtree.isEmpty; +let isEmpty = Belt_internalAVLtree.isEmpty; -var has = Belt_internalMapString.has; +let has = Belt_internalMapString.has; -var cmpU = Belt_internalMapString.cmpU; +let cmpU = Belt_internalMapString.cmpU; -var cmp = Belt_internalMapString.cmp; +let cmp = Belt_internalMapString.cmp; -var eqU = Belt_internalMapString.eqU; +let eqU = Belt_internalMapString.eqU; -var eq = Belt_internalMapString.eq; +let eq = Belt_internalMapString.eq; -var findFirstByU = Belt_internalAVLtree.findFirstByU; +let findFirstByU = Belt_internalAVLtree.findFirstByU; -var findFirstBy = Belt_internalAVLtree.findFirstBy; +let findFirstBy = Belt_internalAVLtree.findFirstBy; -var forEachU = Belt_internalAVLtree.forEachU; +let forEachU = Belt_internalAVLtree.forEachU; -var forEach = Belt_internalAVLtree.forEach; +let forEach = Belt_internalAVLtree.forEach; -var reduceU = Belt_internalAVLtree.reduceU; +let reduceU = Belt_internalAVLtree.reduceU; -var reduce = Belt_internalAVLtree.reduce; +let reduce = Belt_internalAVLtree.reduce; -var everyU = Belt_internalAVLtree.everyU; +let everyU = Belt_internalAVLtree.everyU; -var every = Belt_internalAVLtree.every; +let every = Belt_internalAVLtree.every; -var someU = Belt_internalAVLtree.someU; +let someU = Belt_internalAVLtree.someU; -var some = Belt_internalAVLtree.some; +let some = Belt_internalAVLtree.some; -var size = Belt_internalAVLtree.size; +let size = Belt_internalAVLtree.size; -var toList = Belt_internalAVLtree.toList; +let toList = Belt_internalAVLtree.toList; -var toArray = Belt_internalAVLtree.toArray; +let toArray = Belt_internalAVLtree.toArray; -var fromArray = Belt_internalMapString.fromArray; +let fromArray = Belt_internalMapString.fromArray; -var keysToArray = Belt_internalAVLtree.keysToArray; +let keysToArray = Belt_internalAVLtree.keysToArray; -var valuesToArray = Belt_internalAVLtree.valuesToArray; +let valuesToArray = Belt_internalAVLtree.valuesToArray; -var minKey = Belt_internalAVLtree.minKey; +let minKey = Belt_internalAVLtree.minKey; -var minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; +let minKeyUndefined = Belt_internalAVLtree.minKeyUndefined; -var maxKey = Belt_internalAVLtree.maxKey; +let maxKey = Belt_internalAVLtree.maxKey; -var maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; +let maxKeyUndefined = Belt_internalAVLtree.maxKeyUndefined; -var minimum = Belt_internalAVLtree.minimum; +let minimum = Belt_internalAVLtree.minimum; -var minUndefined = Belt_internalAVLtree.minUndefined; +let minUndefined = Belt_internalAVLtree.minUndefined; -var maximum = Belt_internalAVLtree.maximum; +let maximum = Belt_internalAVLtree.maximum; -var maxUndefined = Belt_internalAVLtree.maxUndefined; +let maxUndefined = Belt_internalAVLtree.maxUndefined; -var get = Belt_internalMapString.get; +let get = Belt_internalMapString.get; -var getUndefined = Belt_internalMapString.getUndefined; +let getUndefined = Belt_internalMapString.getUndefined; -var getWithDefault = Belt_internalMapString.getWithDefault; +let getWithDefault = Belt_internalMapString.getWithDefault; -var getExn = Belt_internalMapString.getExn; +let getExn = Belt_internalMapString.getExn; -var checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLtree.checkInvariantInternal; -var mergeU = Belt_internalMapString.mergeU; +let mergeU = Belt_internalMapString.mergeU; -var merge = Belt_internalMapString.merge; +let merge = Belt_internalMapString.merge; -var keepU = Belt_internalAVLtree.keepSharedU; +let keepU = Belt_internalAVLtree.keepSharedU; -var keep = Belt_internalAVLtree.keepShared; +let keep = Belt_internalAVLtree.keepShared; -var partitionU = Belt_internalAVLtree.partitionSharedU; +let partitionU = Belt_internalAVLtree.partitionSharedU; -var partition = Belt_internalAVLtree.partitionShared; +let partition = Belt_internalAVLtree.partitionShared; -var split = Belt_internalMapString.split; +let split = Belt_internalMapString.split; -var mapU = Belt_internalAVLtree.mapU; +let mapU = Belt_internalAVLtree.mapU; -var map = Belt_internalAVLtree.map; +let map = Belt_internalAVLtree.map; -var mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; +let mapWithKeyU = Belt_internalAVLtree.mapWithKeyU; -var mapWithKey = Belt_internalAVLtree.mapWithKey; +let mapWithKey = Belt_internalAVLtree.mapWithKey; export { - empty , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - findFirstByU , - findFirstBy , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toList , - toArray , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - checkInvariantInternal , - remove , - removeMany , - set , - updateU , - update , - mergeU , - merge , - mergeMany , - keepU , - keep , - partitionU , - partition , - split , - mapU , - map , - mapWithKeyU , - mapWithKey , + empty, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + findFirstByU, + findFirstBy, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toList, + toArray, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + checkInvariantInternal, + remove, + removeMany, + set, + updateU, + update, + mergeU, + merge, + mergeMany, + keepU, + keep, + partitionU, + partition, + split, + mapU, + map, + mapWithKeyU, + mapWithKey, } /* No side effect */ diff --git a/belt/src/belt_MutableMap.js b/belt/src/belt_MutableMap.js index 32c357e..cf254be 100644 --- a/belt/src/belt_MutableMap.js +++ b/belt/src/belt_MutableMap.js @@ -4,11 +4,11 @@ import * as Caml_option from "rescript/lib/es6/caml_option.js"; import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; function removeMutateAux(nt, x, cmp) { - var k = nt.k; - var c = cmp(x, k); + let k = nt.k; + let c = cmp(x, k); if (c === 0) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -23,7 +23,7 @@ function removeMutateAux(nt, x, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x, cmp); return Belt_internalAVLtree.balMutate(nt); @@ -31,7 +31,7 @@ function removeMutateAux(nt, x, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x, cmp); return Belt_internalAVLtree.balMutate(nt); @@ -41,62 +41,62 @@ function removeMutateAux(nt, x, cmp) { } function remove(d, k) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var newRoot = removeMutateAux(oldRoot, k, d.cmp); + let newRoot = removeMutateAux(oldRoot, k, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function removeArrayMutateAux(_t, xs, _i, len, cmp) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele, cmp); + let ele = xs[i]; + let u = removeMutateAux(t, ele, cmp); if (u === undefined) { - return ; + return; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len, d.cmp); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function updateDone(t, x, f, cmp) { if (t !== undefined) { - var k = t.k; - var c = cmp(x, k); + let k = t.k; + let c = cmp(x, k); if (c === 0) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -117,7 +117,7 @@ function updateDone(t, x, f, cmp) { } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -126,26 +126,26 @@ function updateDone(t, x, f, cmp) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f, t.cmp); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f, t.cmp); if (newRoot !== oldRoot) { t.data = newRoot; - return ; + return; } } function update(t, x, f) { updateU(t, x, (function (a) { - return f(a); - })); + return f(a); + })); } function make(id) { return { - cmp: id.cmp, - data: undefined - }; + cmp: id.cmp, + data: undefined + }; } function clear(m) { @@ -193,9 +193,9 @@ function forEachU(d, f) { } function forEach(d, f) { - forEachU(d, (function (a, b) { - f(a, b); - })); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function reduceU(d, acc, cb) { @@ -204,8 +204,8 @@ function reduceU(d, acc, cb) { function reduce(d, acc, cb) { return reduceU(d, acc, (function (a, b, c) { - return cb(a, b, c); - })); + return cb(a, b, c); + })); } function everyU(d, p) { @@ -213,9 +213,9 @@ function everyU(d, p) { } function every(d, p) { - return everyU(d, (function (a, b) { - return p(a, b); - })); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return p(a, b); + })); } function someU(d, p) { @@ -223,9 +223,9 @@ function someU(d, p) { } function some(d, p) { - return someU(d, (function (a, b) { - return p(a, b); - })); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return p(a, b); + })); } function size(d) { @@ -258,8 +258,8 @@ function cmpU(m1, m2, cmp) { function cmp(m1, m2, cmp$1) { return cmpU(m1, m2, (function (a, b) { - return cmp$1(a, b); - })); + return cmp$1(a, b); + })); } function eqU(m1, m2, cmp) { @@ -268,34 +268,34 @@ function eqU(m1, m2, cmp) { function eq(m1, m2, cmp) { return eqU(m1, m2, (function (a, b) { - return cmp(a, b); - })); + return cmp(a, b); + })); } function mapU(m, f) { return { - cmp: m.cmp, - data: Belt_internalAVLtree.mapU(m.data, f) - }; + cmp: m.cmp, + data: Belt_internalAVLtree.mapU(m.data, f) + }; } function map(m, f) { return mapU(m, (function (a) { - return f(a); - })); + return f(a); + })); } function mapWithKeyU(m, f) { return { - cmp: m.cmp, - data: Belt_internalAVLtree.mapWithKeyU(m.data, f) - }; + cmp: m.cmp, + data: Belt_internalAVLtree.mapWithKeyU(m.data, f) + }; } function mapWithKey(m, f) { return mapWithKeyU(m, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function get(m, x) { @@ -319,93 +319,93 @@ function has(m, x) { } function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { - cmp: cmp, - data: Belt_internalAVLtree.fromArray(data, cmp) - }; + cmp: cmp, + data: Belt_internalAVLtree.fromArray(data, cmp) + }; } function set(m, e, v) { - var oldRoot = m.data; - var newRoot = Belt_internalAVLtree.updateMutate(oldRoot, e, v, m.cmp); + let oldRoot = m.data; + let newRoot = Belt_internalAVLtree.updateMutate(oldRoot, e, v, m.cmp); if (newRoot !== oldRoot) { m.data = newRoot; - return ; + return; } } function mergeManyAux(t, xs, cmp) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ - var match = xs[i]; + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let match = xs[i]; v = Belt_internalAVLtree.updateMutate(v, match[0], match[1], cmp); } return v; } function mergeMany(d, xs) { - var oldRoot = d.data; - var newRoot = mergeManyAux(oldRoot, xs, d.cmp); + let oldRoot = d.data; + let newRoot = mergeManyAux(oldRoot, xs, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } -var Int; +let Int; -var $$String; +let $$String; export { - Int , - $$String , - make , - clear , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toList , - toArray , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - checkInvariantInternal , - remove , - removeMany , - set , - updateU , - update , - mergeMany , - mapU , - map , - mapWithKeyU , - mapWithKey , + Int, + $$String, + make, + clear, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toList, + toArray, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + checkInvariantInternal, + remove, + removeMany, + set, + updateU, + update, + mergeMany, + mapU, + map, + mapWithKeyU, + mapWithKey, } /* No side effect */ diff --git a/belt/src/belt_MutableMapInt.js b/belt/src/belt_MutableMapInt.js index bda01c2..dc7fba8 100644 --- a/belt/src/belt_MutableMapInt.js +++ b/belt/src/belt_MutableMapInt.js @@ -6,8 +6,8 @@ import * as Belt_internalAVLtree from "./belt_internalAVLtree.js"; function make() { return { - data: undefined - }; + data: undefined + }; } function isEmpty(m) { @@ -51,11 +51,11 @@ function maxUndefined(m) { } function set(m, k, v) { - var old_data = m.data; - var v$1 = Belt_internalMapInt.addMutate(old_data, k, v); + let old_data = m.data; + let v$1 = Belt_internalMapInt.addMutate(old_data, k, v); if (v$1 !== old_data) { m.data = v$1; - return ; + return; } } @@ -65,33 +65,33 @@ function forEachU(d, f) { } function forEach(d, f) { - forEachU(d, (function (a, b) { - f(a, b); - })); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function mapU(d, f) { return { - data: Belt_internalAVLtree.mapU(d.data, f) - }; + data: Belt_internalAVLtree.mapU(d.data, f) + }; } function map(d, f) { return mapU(d, (function (a) { - return f(a); - })); + return f(a); + })); } function mapWithKeyU(d, f) { return { - data: Belt_internalAVLtree.mapWithKeyU(d.data, f) - }; + data: Belt_internalAVLtree.mapWithKeyU(d.data, f) + }; } function mapWithKey(d, f) { return mapWithKeyU(d, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceU(d, acc, f) { @@ -100,8 +100,8 @@ function reduceU(d, acc, f) { function reduce(d, acc, f) { return reduceU(d, acc, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function everyU(d, f) { @@ -109,9 +109,9 @@ function everyU(d, f) { } function every(d, f) { - return everyU(d, (function (a, b) { - return f(a, b); - })); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return f(a, b); + })); } function someU(d, f) { @@ -119,9 +119,9 @@ function someU(d, f) { } function some(d, f) { - return someU(d, (function (a, b) { - return f(a, b); - })); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return f(a, b); + })); } function size(d) { @@ -153,10 +153,10 @@ function has(d, v) { } function removeMutateAux(nt, x) { - var k = nt.k; + let k = nt.k; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -169,7 +169,7 @@ function removeMutateAux(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -177,7 +177,7 @@ function removeMutateAux(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -187,29 +187,29 @@ function removeMutateAux(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var newRoot = removeMutateAux(oldRoot, v); + let newRoot = removeMutateAux(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function updateDone(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (k === x) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -221,17 +221,17 @@ function updateDone(t, x, f) { return r; } } - var l$1 = t.l; - var r$1 = t.r; + let l$1 = t.l; + let r$1 = t.r; if (x < k) { - var ll = updateDone(l$1, x, f); + let ll = updateDone(l$1, x, f); t.l = ll; } else { t.r = updateDone(r$1, x, f); } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -240,57 +240,57 @@ function updateDone(t, x, f) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f); if (newRoot !== oldRoot) { t.data = newRoot; - return ; + return; } } function update(t, x, f) { updateU(t, x, (function (a) { - return f(a); - })); + return f(a); + })); } function removeArrayMutateAux(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele); + let ele = xs[i]; + let u = removeMutateAux(t, ele); if (u === undefined) { - return ; + return; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function fromArray(xs) { return { - data: Belt_internalMapInt.fromArray(xs) - }; + data: Belt_internalMapInt.fromArray(xs) + }; } function cmpU(d0, d1, f) { @@ -299,8 +299,8 @@ function cmpU(d0, d1, f) { function cmp(d0, d1, f) { return cmpU(d0, d1, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function eqU(d0, d1, f) { @@ -309,8 +309,8 @@ function eqU(d0, d1, f) { function eq(d0, d1, f) { return eqU(d0, d1, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function get(d, x) { @@ -330,49 +330,49 @@ function getExn(d, x) { } export { - make , - clear , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toList , - toArray , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - checkInvariantInternal , - remove , - removeMany , - set , - updateU , - update , - mapU , - map , - mapWithKeyU , - mapWithKey , + make, + clear, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toList, + toArray, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + checkInvariantInternal, + remove, + removeMany, + set, + updateU, + update, + mapU, + map, + mapWithKeyU, + mapWithKey, } /* No side effect */ diff --git a/belt/src/belt_MutableMapString.js b/belt/src/belt_MutableMapString.js index a1d8e91..4d330f9 100644 --- a/belt/src/belt_MutableMapString.js +++ b/belt/src/belt_MutableMapString.js @@ -6,8 +6,8 @@ import * as Belt_internalMapString from "./belt_internalMapString.js"; function make() { return { - data: undefined - }; + data: undefined + }; } function isEmpty(m) { @@ -51,11 +51,11 @@ function maxUndefined(m) { } function set(m, k, v) { - var old_data = m.data; - var v$1 = Belt_internalMapString.addMutate(old_data, k, v); + let old_data = m.data; + let v$1 = Belt_internalMapString.addMutate(old_data, k, v); if (v$1 !== old_data) { m.data = v$1; - return ; + return; } } @@ -65,33 +65,33 @@ function forEachU(d, f) { } function forEach(d, f) { - forEachU(d, (function (a, b) { - f(a, b); - })); + Belt_internalAVLtree.forEachU(d.data, (function (a, b) { + f(a, b); + })); } function mapU(d, f) { return { - data: Belt_internalAVLtree.mapU(d.data, f) - }; + data: Belt_internalAVLtree.mapU(d.data, f) + }; } function map(d, f) { return mapU(d, (function (a) { - return f(a); - })); + return f(a); + })); } function mapWithKeyU(d, f) { return { - data: Belt_internalAVLtree.mapWithKeyU(d.data, f) - }; + data: Belt_internalAVLtree.mapWithKeyU(d.data, f) + }; } function mapWithKey(d, f) { return mapWithKeyU(d, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceU(d, acc, f) { @@ -100,8 +100,8 @@ function reduceU(d, acc, f) { function reduce(d, acc, f) { return reduceU(d, acc, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function everyU(d, f) { @@ -109,9 +109,9 @@ function everyU(d, f) { } function every(d, f) { - return everyU(d, (function (a, b) { - return f(a, b); - })); + return Belt_internalAVLtree.everyU(d.data, (function (a, b) { + return f(a, b); + })); } function someU(d, f) { @@ -119,9 +119,9 @@ function someU(d, f) { } function some(d, f) { - return someU(d, (function (a, b) { - return f(a, b); - })); + return Belt_internalAVLtree.someU(d.data, (function (a, b) { + return f(a, b); + })); } function size(d) { @@ -153,10 +153,10 @@ function has(d, v) { } function removeMutateAux(nt, x) { - var k = nt.k; + let k = nt.k; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(nt, r); @@ -169,7 +169,7 @@ function removeMutateAux(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeMutateAux(l$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -177,7 +177,7 @@ function removeMutateAux(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeMutateAux(r$1, x); return Belt_internalAVLtree.balMutate(nt); @@ -187,29 +187,29 @@ function removeMutateAux(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var newRoot = removeMutateAux(oldRoot, v); + let newRoot = removeMutateAux(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function updateDone(t, x, f) { if (t !== undefined) { - var k = t.k; + let k = t.k; if (k === x) { - var data = f(Caml_option.some(t.v)); + let data = f(Caml_option.some(t.v)); if (data !== undefined) { t.v = Caml_option.valFromOption(data); return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (l !== undefined) { if (r !== undefined) { t.r = Belt_internalAVLtree.removeMinAuxWithRootMutate(t, r); @@ -221,17 +221,17 @@ function updateDone(t, x, f) { return r; } } - var l$1 = t.l; - var r$1 = t.r; + let l$1 = t.l; + let r$1 = t.r; if (x < k) { - var ll = updateDone(l$1, x, f); + let ll = updateDone(l$1, x, f); t.l = ll; } else { t.r = updateDone(r$1, x, f); } return Belt_internalAVLtree.balMutate(t); } - var data$1 = f(undefined); + let data$1 = f(undefined); if (data$1 !== undefined) { return Belt_internalAVLtree.singleton(x, Caml_option.valFromOption(data$1)); } else { @@ -240,57 +240,57 @@ function updateDone(t, x, f) { } function updateU(t, x, f) { - var oldRoot = t.data; - var newRoot = updateDone(oldRoot, x, f); + let oldRoot = t.data; + let newRoot = updateDone(oldRoot, x, f); if (newRoot !== oldRoot) { t.data = newRoot; - return ; + return; } } function update(t, x, f) { updateU(t, x, (function (a) { - return f(a); - })); + return f(a); + })); } function removeArrayMutateAux(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = removeMutateAux(t, ele); + let ele = xs[i]; + let u = removeMutateAux(t, ele); if (u === undefined) { - return ; + return; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var len = xs.length; - var newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); + let len = xs.length; + let newRoot = removeArrayMutateAux(oldRoot, xs, 0, len); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function fromArray(xs) { return { - data: Belt_internalMapString.fromArray(xs) - }; + data: Belt_internalMapString.fromArray(xs) + }; } function cmpU(d0, d1, f) { @@ -299,8 +299,8 @@ function cmpU(d0, d1, f) { function cmp(d0, d1, f) { return cmpU(d0, d1, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function eqU(d0, d1, f) { @@ -309,8 +309,8 @@ function eqU(d0, d1, f) { function eq(d0, d1, f) { return eqU(d0, d1, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function get(d, x) { @@ -330,49 +330,49 @@ function getExn(d, x) { } export { - make , - clear , - isEmpty , - has , - cmpU , - cmp , - eqU , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - size , - toList , - toArray , - fromArray , - keysToArray , - valuesToArray , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getWithDefault , - getExn , - checkInvariantInternal , - remove , - removeMany , - set , - updateU , - update , - mapU , - map , - mapWithKeyU , - mapWithKey , + make, + clear, + isEmpty, + has, + cmpU, + cmp, + eqU, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + size, + toList, + toArray, + fromArray, + keysToArray, + valuesToArray, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getWithDefault, + getExn, + checkInvariantInternal, + remove, + removeMany, + set, + updateU, + update, + mapU, + map, + mapWithKeyU, + mapWithKey, } /* No side effect */ diff --git a/belt/src/belt_MutableQueue.js b/belt/src/belt_MutableQueue.js index ed95a16..b6002e8 100644 --- a/belt/src/belt_MutableQueue.js +++ b/belt/src/belt_MutableQueue.js @@ -4,10 +4,10 @@ import * as Caml_option from "rescript/lib/es6/caml_option.js"; function make() { return { - length: 0, - first: undefined, - last: undefined - }; + length: 0, + first: undefined, + last: undefined + }; } function clear(q) { @@ -17,11 +17,11 @@ function clear(q) { } function add(q, x) { - var cell = { + let cell = { content: x, next: undefined }; - var last = q.last; + let last = q.last; if (last !== undefined) { q.length = q.length + 1 | 0; last.next = cell; @@ -34,7 +34,7 @@ function add(q, x) { } function peek(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return Caml_option.some(v.content); } @@ -42,7 +42,7 @@ function peek(q) { } function peekUndefined(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return v.content; } @@ -50,22 +50,23 @@ function peekUndefined(q) { } function peekExn(q) { - var v = q.first; + let v = q.first; if (v !== undefined) { return v.content; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function pop(q) { - var x = q.first; + let x = q.first; if (x === undefined) { - return ; + return; } - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return Caml_option.some(x.content); @@ -77,9 +78,9 @@ function pop(q) { } function popExn(q) { - var x = q.first; + let x = q.first; if (x !== undefined) { - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return x.content; @@ -89,18 +90,19 @@ function popExn(q) { return x.content; } } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function popUndefined(q) { - var x = q.first; + let x = q.first; if (x === undefined) { - return ; + return; } - var next = x.next; + let next = x.next; if (next === undefined) { clear(q); return x.content; @@ -112,19 +114,19 @@ function popUndefined(q) { } function copy(q) { - var qRes = { + let qRes = { length: q.length, first: undefined, last: undefined }; - var _prev; - var _cell = q.first; + let _prev; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell !== undefined) { - var content = cell.content; - var res = { + let content = cell.content; + let res = { content: content, next: undefined }; @@ -135,7 +137,7 @@ function copy(q) { } _cell = cell.next; _prev = res; - continue ; + continue; } qRes.last = prev; return qRes; @@ -143,19 +145,19 @@ function copy(q) { } function mapU(q, f) { - var qRes = { + let qRes = { length: q.length, first: undefined, last: undefined }; - var _prev; - var _cell = q.first; + let _prev; + let _cell = q.first; while(true) { - var cell = _cell; - var prev = _prev; + let cell = _cell; + let prev = _prev; if (cell !== undefined) { - var content = f(cell.content); - var res = { + let content = f(cell.content); + let res = { content: content, next: undefined }; @@ -166,7 +168,7 @@ function mapU(q, f) { } _cell = cell.next; _prev = res; - continue ; + continue; } qRes.last = prev; return qRes; @@ -175,8 +177,8 @@ function mapU(q, f) { function map(q, f) { return mapU(q, (function (a) { - return f(a); - })); + return f(a); + })); } function isEmpty(q) { @@ -188,51 +190,51 @@ function size(q) { } function forEachU(q, f) { - var _cell = q.first; + let _cell = q.first; while(true) { - var cell = _cell; + let cell = _cell; if (cell === undefined) { - return ; + return; } f(cell.content); _cell = cell.next; - continue ; + continue; }; } function forEach(q, f) { forEachU(q, (function (a) { - f(a); - })); + f(a); + })); } function reduceU(q, accu, f) { - var _accu = accu; - var _cell = q.first; + let _accu = accu; + let _cell = q.first; while(true) { - var cell = _cell; - var accu$1 = _accu; + let cell = _cell; + let accu$1 = _accu; if (cell === undefined) { return accu$1; } - var accu$2 = f(accu$1, cell.content); + let accu$2 = f(accu$1, cell.content); _cell = cell.next; _accu = accu$2; - continue ; + continue; }; } function reduce(q, accu, f) { return reduceU(q, accu, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function transfer(q1, q2) { if (q1.length <= 0) { - return ; + return; } - var l = q2.last; + let l = q2.last; if (l !== undefined) { q2.length = q2.length + q1.length | 0; l.next = q1.first; @@ -248,57 +250,57 @@ function transfer(q1, q2) { function fillAux(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; if (cell === undefined) { - return ; + return; } arr[i] = cell.content; _cell = cell.next; _i = i + 1 | 0; - continue ; + continue; }; } function toArray(x) { - var v = new Array(x.length); + let v = new Array(x.length); fillAux(0, v, x.first); return v; } function fromArray(arr) { - var q = { + let q = { length: 0, first: undefined, last: undefined }; - for(var i = 0 ,i_finish = arr.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = arr.length; i < i_finish; ++i){ add(q, arr[i]); } return q; } export { - make , - clear , - isEmpty , - fromArray , - add , - peek , - peekUndefined , - peekExn , - pop , - popUndefined , - popExn , - copy , - size , - mapU , - map , - forEachU , - forEach , - reduceU , - reduce , - transfer , - toArray , + make, + clear, + isEmpty, + fromArray, + add, + peek, + peekUndefined, + peekExn, + pop, + popUndefined, + popExn, + copy, + size, + mapU, + map, + forEachU, + forEach, + reduceU, + reduce, + transfer, + toArray, } /* No side effect */ diff --git a/belt/src/belt_MutableSet.js b/belt/src/belt_MutableSet.js index 449e943..0f1d5c3 100644 --- a/belt/src/belt_MutableSet.js +++ b/belt/src/belt_MutableSet.js @@ -4,11 +4,11 @@ import * as Belt_SortArray from "./belt_SortArray.js"; import * as Belt_internalAVLset from "./belt_internalAVLset.js"; function remove0(nt, x, cmp) { - var k = nt.v; - var c = cmp(x, k); + let k = nt.v; + let c = cmp(x, k); if (c === 0) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -21,7 +21,7 @@ function remove0(nt, x, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x, cmp); return Belt_internalAVLset.balMutate(nt); @@ -29,7 +29,7 @@ function remove0(nt, x, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x, cmp); return Belt_internalAVLset.balMutate(nt); @@ -39,52 +39,52 @@ function remove0(nt, x, cmp) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var newRoot = remove0(oldRoot, v, d.cmp); + let newRoot = remove0(oldRoot, v, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function removeMany0(_t, xs, _i, len, cmp) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele, cmp); + let ele = xs[i]; + let u = remove0(t, ele, cmp); if (u === undefined) { - return ; + return; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len, d.cmp); } function removeCheck0(nt, x, removed, cmp) { - var k = nt.v; - var c = cmp(x, k); + let k = nt.v; + let c = cmp(x, k); if (c === 0) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -97,7 +97,7 @@ function removeCheck0(nt, x, removed, cmp) { } } if (c < 0) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed, cmp); return Belt_internalAVLset.balMutate(nt); @@ -105,7 +105,7 @@ function removeCheck0(nt, x, removed, cmp) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed, cmp); return Belt_internalAVLset.balMutate(nt); @@ -115,14 +115,14 @@ function removeCheck0(nt, x, removed, cmp) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed, d.cmp); + let newRoot = removeCheck0(oldRoot, v, removed, d.cmp); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -131,15 +131,15 @@ function removeCheck(d, v) { function addCheck0(t, x, added, cmp) { if (t !== undefined) { - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = addCheck0(l, x, added, cmp); + let ll = addCheck0(l, x, added, cmp); t.l = ll; } else { t.r = addCheck0(r, x, added, cmp); @@ -151,11 +151,11 @@ function addCheck0(t, x, added, cmp) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added, m.cmp); + let newRoot = addCheck0(oldRoot, e, added, m.cmp); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -163,18 +163,18 @@ function addCheck(m, e) { } function add(m, e) { - var oldRoot = m.data; - var newRoot = Belt_internalAVLset.addMutate(m.cmp, oldRoot, e); + let oldRoot = m.data; + let newRoot = Belt_internalAVLset.addMutate(m.cmp, oldRoot, e); if (newRoot !== oldRoot) { m.data = newRoot; - return ; + return; } } function addArrayMutate(t, xs, cmp) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalAVLset.addMutate(cmp, v, xs[i]); } return v; @@ -186,9 +186,9 @@ function mergeMany(d, xs) { function make(id) { return { - cmp: id.cmp, - data: undefined - }; + cmp: id.cmp, + data: undefined + }; } function isEmpty(d) { @@ -216,9 +216,9 @@ function forEachU(d, f) { } function forEach(d, f) { - forEachU(d, (function (a) { - f(a); - })); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -227,8 +227,8 @@ function reduceU(d, acc, cb) { function reduce(d, acc, cb) { return reduceU(d, acc, (function (a, b) { - return cb(a, b); - })); + return cb(a, b); + })); } function everyU(d, p) { @@ -236,9 +236,9 @@ function everyU(d, p) { } function every(d, p) { - return everyU(d, (function (a) { - return p(a); - })); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -246,9 +246,9 @@ function someU(d, p) { } function some(d, p) { - return someU(d, (function (a) { - return p(a); - })); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -265,9 +265,9 @@ function toArray(d) { function fromSortedArrayUnsafe(xs, id) { return { - cmp: id.cmp, - data: Belt_internalAVLset.fromSortedArrayUnsafe(xs) - }; + cmp: id.cmp, + data: Belt_internalAVLset.fromSortedArrayUnsafe(xs) + }; } function checkInvariantInternal(d) { @@ -275,11 +275,11 @@ function checkInvariantInternal(d) { } function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { - cmp: cmp, - data: Belt_internalAVLset.fromArray(data, cmp) - }; + cmp: cmp, + data: Belt_internalAVLset.fromArray(data, cmp) + }; } function cmp(d0, d1) { @@ -303,73 +303,73 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var cmp = d.cmp; - var i = Belt_SortArray.binarySearchByU(arr, key, cmp); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let cmp = d.cmp; + let i = Belt_SortArray.binarySearchByU(arr, key, cmp); + let len = arr.length; if (i >= 0) { return [ - [ - { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i) - }, - { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0) - } - ], - true - ]; + [ + { + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i) + }, + { + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0) + } + ], + true + ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ - [ - { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next) - }, - { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0) - } - ], - false - ]; + [ + { + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next) + }, + { + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0) + } + ], + false + ]; } function keepU(d, p) { return { - cmp: d.cmp, - data: Belt_internalAVLset.keepCopyU(d.data, p) - }; + cmp: d.cmp, + data: Belt_internalAVLset.keepCopyU(d.data, p) + }; } function keep(d, p) { return keepU(d, (function (a) { - return p(a); - })); + return p(a); + })); } function partitionU(d, p) { - var cmp = d.cmp; - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let cmp = d.cmp; + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ - { - cmp: cmp, - data: match[0] - }, - { - cmp: cmp, - data: match[1] - } - ]; + { + cmp: cmp, + data: match[0] + }, + { + cmp: cmp, + data: match[1] + } + ]; } function partition(d, p) { return partitionU(d, (function (a) { - return p(a); - })); + return p(a); + })); } function subset(a, b) { @@ -377,111 +377,111 @@ function subset(a, b) { } function intersect(a, b) { - var cmp = a.cmp; - var match = a.data; - var match$1 = b.data; + let cmp = a.cmp; + let match = a.data; + let match$1 = b.data; if (match === undefined) { return { - cmp: cmp, - data: undefined - }; + cmp: cmp, + data: undefined + }; } if (match$1 === undefined) { return { - cmp: cmp, - data: undefined - }; + cmp: cmp, + data: undefined + }; } - var sizea = Belt_internalAVLset.lengthNode(match); - var sizeb = Belt_internalAVLset.lengthNode(match$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(match); + let sizeb = Belt_internalAVLset.lengthNode(match$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(match, 0, tmp); Belt_internalAVLset.fillArray(match$1, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { return { - cmp: cmp, - data: undefined - }; + cmp: cmp, + data: undefined + }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArray.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function diff(a, b) { - var cmp = a.cmp; - var dataa = a.data; - var match = b.data; + let cmp = a.cmp; + let dataa = a.data; + let match = b.data; if (dataa === undefined) { return { - cmp: cmp, - data: undefined - }; + cmp: cmp, + data: undefined + }; } if (match === undefined) { return { - cmp: cmp, - data: Belt_internalAVLset.copy(dataa) - }; + cmp: cmp, + data: Belt_internalAVLset.copy(dataa) + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa); - var sizeb = Belt_internalAVLset.lengthNode(match); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa); + let sizeb = Belt_internalAVLset.lengthNode(match); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(match, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0 || cmp(tmp[totalSize - 1 | 0], tmp[0]) < 0) { return { - cmp: cmp, - data: Belt_internalAVLset.copy(dataa) - }; + cmp: cmp, + data: Belt_internalAVLset.copy(dataa) + }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(sizea); + let k = Belt_SortArray.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function union(a, b) { - var cmp = a.cmp; - var dataa = a.data; - var datab = b.data; + let cmp = a.cmp; + let dataa = a.data; + let datab = b.data; if (dataa === undefined) { return { - cmp: cmp, - data: Belt_internalAVLset.copy(datab) - }; + cmp: cmp, + data: Belt_internalAVLset.copy(datab) + }; } if (datab === undefined) { return { - cmp: cmp, - data: Belt_internalAVLset.copy(dataa) - }; + cmp: cmp, + data: Belt_internalAVLset.copy(dataa) + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa); - var sizeb = Belt_internalAVLset.lengthNode(datab); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa); + let sizeb = Belt_internalAVLset.lengthNode(datab); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa, 0, tmp); Belt_internalAVLset.fillArray(datab, sizea, tmp); if (cmp(tmp[sizea - 1 | 0], tmp[sizea]) < 0) { return { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) - }; + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) + }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); + let tmp2 = new Array(totalSize); + let k = Belt_SortArray.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, cmp); return { - cmp: cmp, - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + cmp: cmp, + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function has(d, x) { @@ -490,59 +490,59 @@ function has(d, x) { function copy(d) { return { - cmp: d.cmp, - data: Belt_internalAVLset.copy(d.data) - }; + cmp: d.cmp, + data: Belt_internalAVLset.copy(d.data) + }; } -var Int; +let Int; -var $$String; +let $$String; export { - Int , - $$String , - make , - fromArray , - fromSortedArrayUnsafe , - copy , - isEmpty , - has , - add , - addCheck , - mergeMany , - remove , - removeCheck , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toList , - toArray , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , + Int, + $$String, + make, + fromArray, + fromSortedArrayUnsafe, + copy, + isEmpty, + has, + add, + addCheck, + mergeMany, + remove, + removeCheck, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toList, + toArray, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_MutableSetInt.js b/belt/src/belt_MutableSetInt.js index 54ec926..6365030 100644 --- a/belt/src/belt_MutableSetInt.js +++ b/belt/src/belt_MutableSetInt.js @@ -5,10 +5,10 @@ import * as Belt_internalAVLset from "./belt_internalAVLset.js"; import * as Belt_internalSetInt from "./belt_internalSetInt.js"; function remove0(nt, x) { - var k = nt.v; + let k = nt.v; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -21,7 +21,7 @@ function remove0(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x); return Belt_internalAVLset.balMutate(nt); @@ -29,7 +29,7 @@ function remove0(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x); return Belt_internalAVLset.balMutate(nt); @@ -39,51 +39,51 @@ function remove0(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var newRoot = remove0(oldRoot, v); + let newRoot = remove0(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function removeMany0(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele); + let ele = xs[i]; + let u = remove0(t, ele); if (u === undefined) { - return ; + return; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len); } function removeCheck0(nt, x, removed) { - var k = nt.v; + let k = nt.v; if (x === k) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -96,7 +96,7 @@ function removeCheck0(nt, x, removed) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -104,7 +104,7 @@ function removeCheck0(nt, x, removed) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -114,14 +114,14 @@ function removeCheck0(nt, x, removed) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed); + let newRoot = removeCheck0(oldRoot, v, removed); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -130,14 +130,14 @@ function removeCheck(d, v) { function addCheck0(t, x, added) { if (t !== undefined) { - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addCheck0(l, x, added); + let ll = addCheck0(l, x, added); t.l = ll; } else { t.r = addCheck0(r, x, added); @@ -149,11 +149,11 @@ function addCheck0(t, x, added) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added); + let newRoot = addCheck0(oldRoot, e, added); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -161,18 +161,18 @@ function addCheck(m, e) { } function add(d, k) { - var oldRoot = d.data; - var v = Belt_internalSetInt.addMutate(oldRoot, k); + let oldRoot = d.data; + let v = Belt_internalSetInt.addMutate(oldRoot, k); if (v !== oldRoot) { d.data = v; - return ; + return; } } function addArrayMutate(t, xs) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalSetInt.addMutate(v, xs[i]); } return v; @@ -184,8 +184,8 @@ function mergeMany(d, arr) { function make() { return { - data: undefined - }; + data: undefined + }; } function isEmpty(d) { @@ -213,9 +213,9 @@ function forEachU(d, f) { } function forEach(d, f) { - forEachU(d, (function (a) { - f(a); - })); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -224,8 +224,8 @@ function reduceU(d, acc, cb) { function reduce(d, acc, cb) { return reduceU(d, acc, (function (a, b) { - return cb(a, b); - })); + return cb(a, b); + })); } function everyU(d, p) { @@ -233,9 +233,9 @@ function everyU(d, p) { } function every(d, p) { - return everyU(d, (function (a) { - return p(a); - })); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -243,9 +243,9 @@ function someU(d, p) { } function some(d, p) { - return someU(d, (function (a) { - return p(a); - })); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -262,8 +262,8 @@ function toArray(d) { function fromSortedArrayUnsafe(xs) { return { - data: Belt_internalAVLset.fromSortedArrayUnsafe(xs) - }; + data: Belt_internalAVLset.fromSortedArrayUnsafe(xs) + }; } function checkInvariantInternal(d) { @@ -272,8 +272,8 @@ function checkInvariantInternal(d) { function fromArray(xs) { return { - data: Belt_internalSetInt.fromArray(xs) - }; + data: Belt_internalSetInt.fromArray(xs) + }; } function cmp(d0, d1) { @@ -297,64 +297,64 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var i = Belt_SortArrayInt.binarySearch(arr, key); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let i = Belt_SortArrayInt.binarySearch(arr, key); + let len = arr.length; if (i >= 0) { return [ - [ - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i) - }, - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0) - } - ], - true - ]; + [ + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i) + }, + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0) + } + ], + true + ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ - [ - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next) - }, - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0) - } - ], - false - ]; + [ + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next) + }, + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0) + } + ], + false + ]; } function keepU(d, p) { return { - data: Belt_internalAVLset.keepCopyU(d.data, p) - }; + data: Belt_internalAVLset.keepCopyU(d.data, p) + }; } function keep(d, p) { return keepU(d, (function (a) { - return p(a); - })); + return p(a); + })); } function partitionU(d, p) { - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ - { - data: match[0] - }, - { - data: match[1] - } - ]; + { + data: match[0] + }, + { + data: match[1] + } + ]; } function partition(d, p) { return partitionU(d, (function (a) { - return p(a); - })); + return p(a); + })); } function subset(a, b) { @@ -362,96 +362,96 @@ function subset(a, b) { } function intersect(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { - data: undefined - }; + data: undefined + }; } if (datab$1 === undefined) { return { - data: undefined - }; + data: undefined + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { return { - data: undefined - }; + data: undefined + }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArrayInt.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function diff(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { - data: undefined - }; + data: undefined + }; } if (datab$1 === undefined) { return { - data: Belt_internalAVLset.copy(dataa$1) - }; + data: Belt_internalAVLset.copy(dataa$1) + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { return { - data: Belt_internalAVLset.copy(dataa$1) - }; + data: Belt_internalAVLset.copy(dataa$1) + }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea); + let k = Belt_SortArrayInt.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function union(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { - data: Belt_internalAVLset.copy(datab$1) - }; + data: Belt_internalAVLset.copy(datab$1) + }; } if (datab$1 === undefined) { return { - data: Belt_internalAVLset.copy(dataa$1) - }; + data: Belt_internalAVLset.copy(dataa$1) + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea]) { return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) + }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(totalSize); + let k = Belt_SortArrayInt.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function has(d, x) { @@ -460,52 +460,52 @@ function has(d, x) { function copy(d) { return { - data: Belt_internalAVLset.copy(d.data) - }; + data: Belt_internalAVLset.copy(d.data) + }; } export { - make , - fromArray , - fromSortedArrayUnsafe , - copy , - isEmpty , - has , - add , - addCheck , - mergeMany , - remove , - removeCheck , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toList , - toArray , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , + make, + fromArray, + fromSortedArrayUnsafe, + copy, + isEmpty, + has, + add, + addCheck, + mergeMany, + remove, + removeCheck, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toList, + toArray, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_MutableSetString.js b/belt/src/belt_MutableSetString.js index 7efe3a7..a846f80 100644 --- a/belt/src/belt_MutableSetString.js +++ b/belt/src/belt_MutableSetString.js @@ -5,10 +5,10 @@ import * as Belt_SortArrayString from "./belt_SortArrayString.js"; import * as Belt_internalSetString from "./belt_internalSetString.js"; function remove0(nt, x) { - var k = nt.v; + let k = nt.v; if (x === k) { - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -21,7 +21,7 @@ function remove0(nt, x) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = remove0(l$1, x); return Belt_internalAVLset.balMutate(nt); @@ -29,7 +29,7 @@ function remove0(nt, x) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = remove0(r$1, x); return Belt_internalAVLset.balMutate(nt); @@ -39,51 +39,51 @@ function remove0(nt, x) { } function remove(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var newRoot = remove0(oldRoot, v); + let newRoot = remove0(oldRoot, v); if (newRoot !== oldRoot) { d.data = newRoot; - return ; + return; } } function removeMany0(_t, xs, _i, len) { while(true) { - var i = _i; - var t = _t; + let i = _i; + let t = _t; if (i >= len) { return t; } - var ele = xs[i]; - var u = remove0(t, ele); + let ele = xs[i]; + let u = remove0(t, ele); if (u === undefined) { - return ; + return; } _i = i + 1 | 0; _t = u; - continue ; + continue; }; } function removeMany(d, xs) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { - return ; + return; } - var len = xs.length; + let len = xs.length; d.data = removeMany0(oldRoot, xs, 0, len); } function removeCheck0(nt, x, removed) { - var k = nt.v; + let k = nt.v; if (x === k) { removed.contents = true; - var l = nt.l; - var r = nt.r; + let l = nt.l; + let r = nt.r; if (l !== undefined) { if (r !== undefined) { nt.r = Belt_internalAVLset.removeMinAuxWithRootMutate(nt, r); @@ -96,7 +96,7 @@ function removeCheck0(nt, x, removed) { } } if (x < k) { - var l$1 = nt.l; + let l$1 = nt.l; if (l$1 !== undefined) { nt.l = removeCheck0(l$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -104,7 +104,7 @@ function removeCheck0(nt, x, removed) { return nt; } } - var r$1 = nt.r; + let r$1 = nt.r; if (r$1 !== undefined) { nt.r = removeCheck0(r$1, x, removed); return Belt_internalAVLset.balMutate(nt); @@ -114,14 +114,14 @@ function removeCheck0(nt, x, removed) { } function removeCheck(d, v) { - var oldRoot = d.data; + let oldRoot = d.data; if (oldRoot === undefined) { return false; } - var removed = { + let removed = { contents: false }; - var newRoot = removeCheck0(oldRoot, v, removed); + let newRoot = removeCheck0(oldRoot, v, removed); if (newRoot !== oldRoot) { d.data = newRoot; } @@ -130,14 +130,14 @@ function removeCheck(d, v) { function addCheck0(t, x, added) { if (t !== undefined) { - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addCheck0(l, x, added); + let ll = addCheck0(l, x, added); t.l = ll; } else { t.r = addCheck0(r, x, added); @@ -149,11 +149,11 @@ function addCheck0(t, x, added) { } function addCheck(m, e) { - var oldRoot = m.data; - var added = { + let oldRoot = m.data; + let added = { contents: false }; - var newRoot = addCheck0(oldRoot, e, added); + let newRoot = addCheck0(oldRoot, e, added); if (newRoot !== oldRoot) { m.data = newRoot; } @@ -161,18 +161,18 @@ function addCheck(m, e) { } function add(d, k) { - var oldRoot = d.data; - var v = Belt_internalSetString.addMutate(oldRoot, k); + let oldRoot = d.data; + let v = Belt_internalSetString.addMutate(oldRoot, k); if (v !== oldRoot) { d.data = v; - return ; + return; } } function addArrayMutate(t, xs) { - var v = t; - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + let v = t; + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ v = Belt_internalSetString.addMutate(v, xs[i]); } return v; @@ -184,8 +184,8 @@ function mergeMany(d, arr) { function make() { return { - data: undefined - }; + data: undefined + }; } function isEmpty(d) { @@ -213,9 +213,9 @@ function forEachU(d, f) { } function forEach(d, f) { - forEachU(d, (function (a) { - f(a); - })); + Belt_internalAVLset.forEachU(d.data, (function (a) { + f(a); + })); } function reduceU(d, acc, cb) { @@ -224,8 +224,8 @@ function reduceU(d, acc, cb) { function reduce(d, acc, cb) { return reduceU(d, acc, (function (a, b) { - return cb(a, b); - })); + return cb(a, b); + })); } function everyU(d, p) { @@ -233,9 +233,9 @@ function everyU(d, p) { } function every(d, p) { - return everyU(d, (function (a) { - return p(a); - })); + return Belt_internalAVLset.everyU(d.data, (function (a) { + return p(a); + })); } function someU(d, p) { @@ -243,9 +243,9 @@ function someU(d, p) { } function some(d, p) { - return someU(d, (function (a) { - return p(a); - })); + return Belt_internalAVLset.someU(d.data, (function (a) { + return p(a); + })); } function size(d) { @@ -262,8 +262,8 @@ function toArray(d) { function fromSortedArrayUnsafe(xs) { return { - data: Belt_internalAVLset.fromSortedArrayUnsafe(xs) - }; + data: Belt_internalAVLset.fromSortedArrayUnsafe(xs) + }; } function checkInvariantInternal(d) { @@ -272,8 +272,8 @@ function checkInvariantInternal(d) { function fromArray(xs) { return { - data: Belt_internalSetString.fromArray(xs) - }; + data: Belt_internalSetString.fromArray(xs) + }; } function cmp(d0, d1) { @@ -297,64 +297,64 @@ function getExn(d, x) { } function split(d, key) { - var arr = Belt_internalAVLset.toArray(d.data); - var i = Belt_SortArrayString.binarySearch(arr, key); - var len = arr.length; + let arr = Belt_internalAVLset.toArray(d.data); + let i = Belt_SortArrayString.binarySearch(arr, key); + let len = arr.length; if (i >= 0) { return [ - [ - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i) - }, - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0) - } - ], - true - ]; + [ + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, i) + }, + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, i + 1 | 0, (len - i | 0) - 1 | 0) + } + ], + true + ]; } - var next = (-i | 0) - 1 | 0; + let next = (-i | 0) - 1 | 0; return [ - [ - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next) - }, - { - data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0) - } - ], - false - ]; + [ + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, 0, next) + }, + { + data: Belt_internalAVLset.fromSortedArrayAux(arr, next, len - next | 0) + } + ], + false + ]; } function keepU(d, p) { return { - data: Belt_internalAVLset.keepCopyU(d.data, p) - }; + data: Belt_internalAVLset.keepCopyU(d.data, p) + }; } function keep(d, p) { return keepU(d, (function (a) { - return p(a); - })); + return p(a); + })); } function partitionU(d, p) { - var match = Belt_internalAVLset.partitionCopyU(d.data, p); + let match = Belt_internalAVLset.partitionCopyU(d.data, p); return [ - { - data: match[0] - }, - { - data: match[1] - } - ]; + { + data: match[0] + }, + { + data: match[1] + } + ]; } function partition(d, p) { return partitionU(d, (function (a) { - return p(a); - })); + return p(a); + })); } function subset(a, b) { @@ -362,96 +362,96 @@ function subset(a, b) { } function intersect(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { - data: undefined - }; + data: undefined + }; } if (datab$1 === undefined) { return { - data: undefined - }; + data: undefined + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { return { - data: undefined - }; + data: undefined + }; } - var tmp2 = new Array(sizea < sizeb ? sizea : sizeb); - var k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea < sizeb ? sizea : sizeb); + let k = Belt_SortArrayString.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function diff(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { - data: undefined - }; + data: undefined + }; } if (datab$1 === undefined) { return { - data: Belt_internalAVLset.copy(dataa$1) - }; + data: Belt_internalAVLset.copy(dataa$1) + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea] || tmp[totalSize - 1 | 0] < tmp[0]) { return { - data: Belt_internalAVLset.copy(dataa$1) - }; + data: Belt_internalAVLset.copy(dataa$1) + }; } - var tmp2 = new Array(sizea); - var k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(sizea); + let k = Belt_SortArrayString.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function union(dataa, datab) { - var dataa$1 = dataa.data; - var datab$1 = datab.data; + let dataa$1 = dataa.data; + let datab$1 = datab.data; if (dataa$1 === undefined) { return { - data: Belt_internalAVLset.copy(datab$1) - }; + data: Belt_internalAVLset.copy(datab$1) + }; } if (datab$1 === undefined) { return { - data: Belt_internalAVLset.copy(dataa$1) - }; + data: Belt_internalAVLset.copy(dataa$1) + }; } - var sizea = Belt_internalAVLset.lengthNode(dataa$1); - var sizeb = Belt_internalAVLset.lengthNode(datab$1); - var totalSize = sizea + sizeb | 0; - var tmp = new Array(totalSize); + let sizea = Belt_internalAVLset.lengthNode(dataa$1); + let sizeb = Belt_internalAVLset.lengthNode(datab$1); + let totalSize = sizea + sizeb | 0; + let tmp = new Array(totalSize); Belt_internalAVLset.fillArray(dataa$1, 0, tmp); Belt_internalAVLset.fillArray(datab$1, sizea, tmp); if (tmp[sizea - 1 | 0] < tmp[sizea]) { return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp, 0, totalSize) + }; } - var tmp2 = new Array(totalSize); - var k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); + let tmp2 = new Array(totalSize); + let k = Belt_SortArrayString.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0); return { - data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) - }; + data: Belt_internalAVLset.fromSortedArrayAux(tmp2, 0, k) + }; } function has(d, x) { @@ -460,52 +460,52 @@ function has(d, x) { function copy(d) { return { - data: Belt_internalAVLset.copy(d.data) - }; + data: Belt_internalAVLset.copy(d.data) + }; } export { - make , - fromArray , - fromSortedArrayUnsafe , - copy , - isEmpty , - has , - add , - addCheck , - mergeMany , - remove , - removeCheck , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toList , - toArray , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , + make, + fromArray, + fromSortedArrayUnsafe, + copy, + isEmpty, + has, + add, + addCheck, + mergeMany, + remove, + removeCheck, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toList, + toArray, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_MutableStack.js b/belt/src/belt_MutableStack.js index 1bbc5a9..616ac3d 100644 --- a/belt/src/belt_MutableStack.js +++ b/belt/src/belt_MutableStack.js @@ -4,8 +4,8 @@ import * as Caml_option from "rescript/lib/es6/caml_option.js"; function make() { return { - root: undefined - }; + root: undefined + }; } function clear(s) { @@ -14,8 +14,8 @@ function clear(s) { function copy(s) { return { - root: s.root - }; + root: s.root + }; } function push(s, x) { @@ -26,7 +26,7 @@ function push(s, x) { } function topUndefined(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { return x.head; } @@ -34,7 +34,7 @@ function topUndefined(s) { } function top(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { return Caml_option.some(x.head); } @@ -46,7 +46,7 @@ function isEmpty(s) { } function popUndefined(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { s.root = x.tail; return x.head; @@ -55,7 +55,7 @@ function popUndefined(s) { } function pop(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { s.root = x.tail; return Caml_option.some(x.head); @@ -64,20 +64,20 @@ function pop(s) { } function size(s) { - var x = s.root; + let x = s.root; if (x !== undefined) { - var _x = x; - var _acc = 0; + let _x = x; + let _acc = 0; while(true) { - var acc = _acc; - var x$1 = _x; - var x$2 = x$1.tail; + let acc = _acc; + let x$1 = _x; + let x$2 = x$1.tail; if (x$2 === undefined) { return acc + 1 | 0; } _acc = acc + 1 | 0; _x = x$2; - continue ; + continue; }; } else { return 0; @@ -85,56 +85,56 @@ function size(s) { } function forEachU(s, f) { - var _s = s.root; + let _s = s.root; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 === undefined) { - return ; + return; } f(s$1.head); _s = s$1.tail; - continue ; + continue; }; } function forEach(s, f) { forEachU(s, (function (x) { - f(x); - })); + f(x); + })); } function dynamicPopIterU(s, f) { while(true) { - var match = s.root; + let match = s.root; if (match === undefined) { - return ; + return; } s.root = match.tail; f(match.head); - continue ; + continue; }; } function dynamicPopIter(s, f) { dynamicPopIterU(s, (function (x) { - f(x); - })); + f(x); + })); } export { - make , - clear , - copy , - push , - popUndefined , - pop , - topUndefined , - top , - isEmpty , - size , - forEachU , - forEach , - dynamicPopIterU , - dynamicPopIter , + make, + clear, + copy, + push, + popUndefined, + pop, + topUndefined, + top, + isEmpty, + size, + forEachU, + forEach, + dynamicPopIterU, + dynamicPopIter, } /* No side effect */ diff --git a/belt/src/belt_Option.js b/belt/src/belt_Option.js index d73a30e..8dfa304 100644 --- a/belt/src/belt_Option.js +++ b/belt/src/belt_Option.js @@ -11,8 +11,8 @@ function keepU(opt, p) { function keep(opt, p) { return keepU(opt, (function (x) { - return p(x); - })); + return p(x); + })); } function forEachU(opt, f) { @@ -24,18 +24,19 @@ function forEachU(opt, f) { function forEach(opt, f) { forEachU(opt, (function (x) { - f(x); - })); + f(x); + })); } function getExn(x) { if (x !== undefined) { return Caml_option.valFromOption(x); } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function mapWithDefaultU(opt, $$default, f) { @@ -48,8 +49,8 @@ function mapWithDefaultU(opt, $$default, f) { function mapWithDefault(opt, $$default, f) { return mapWithDefaultU(opt, $$default, (function (x) { - return f(x); - })); + return f(x); + })); } function mapU(opt, f) { @@ -61,8 +62,8 @@ function mapU(opt, f) { function map(opt, f) { return mapU(opt, (function (x) { - return f(x); - })); + return f(x); + })); } function flatMapU(opt, f) { @@ -74,8 +75,8 @@ function flatMapU(opt, f) { function flatMap(opt, f) { return flatMapU(opt, (function (x) { - return f(x); - })); + return f(x); + })); } function getWithDefault(opt, $$default) { @@ -116,8 +117,8 @@ function eqU(a, b, f) { function eq(a, b, f) { return eqU(a, b, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } function cmpU(a, b, f) { @@ -136,29 +137,29 @@ function cmpU(a, b, f) { function cmp(a, b, f) { return cmpU(a, b, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } export { - keepU , - keep , - forEachU , - forEach , - getExn , - mapWithDefaultU , - mapWithDefault , - mapU , - map , - flatMapU , - flatMap , - getWithDefault , - orElse , - isSome , - isNone , - eqU , - eq , - cmpU , - cmp , + keepU, + keep, + forEachU, + forEach, + getExn, + mapWithDefaultU, + mapWithDefault, + mapU, + map, + flatMapU, + flatMap, + getWithDefault, + orElse, + isSome, + isNone, + eqU, + eq, + cmpU, + cmp, } /* No side effect */ diff --git a/belt/src/belt_Range.js b/belt/src/belt_Range.js index a1e95b7..6dc8c01 100644 --- a/belt/src/belt_Range.js +++ b/belt/src/belt_Range.js @@ -2,20 +2,20 @@ function forEachU(s, f, action) { - for(var i = s; i <= f; ++i){ + for(let i = s; i <= f; ++i){ action(i); } } function forEach(s, f, action) { forEachU(s, f, (function (a) { - action(a); - })); + action(a); + })); } function everyU(_s, f, p) { while(true) { - var s = _s; + let s = _s; if (s > f) { return true; } @@ -23,21 +23,21 @@ function everyU(_s, f, p) { return false; } _s = s + 1 | 0; - continue ; + continue; }; } function every(s, f, p) { return everyU(s, f, (function (a) { - return p(a); - })); + return p(a); + })); } function everyByU(s, f, step, p) { if (step > 0) { - var _s = s; + let _s = s; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 > f) { return true; } @@ -45,7 +45,7 @@ function everyByU(s, f, step, p) { return false; } _s = s$1 + step | 0; - continue ; + continue; }; } else { return true; @@ -54,13 +54,13 @@ function everyByU(s, f, step, p) { function everyBy(s, f, step, p) { return everyByU(s, f, step, (function (a) { - return p(a); - })); + return p(a); + })); } function someU(_s, f, p) { while(true) { - var s = _s; + let s = _s; if (s > f) { return false; } @@ -68,21 +68,21 @@ function someU(_s, f, p) { return true; } _s = s + 1 | 0; - continue ; + continue; }; } function some(s, f, p) { return someU(s, f, (function (a) { - return p(a); - })); + return p(a); + })); } function someByU(s, f, step, p) { if (step > 0) { - var _s = s; + let _s = s; while(true) { - var s$1 = _s; + let s$1 = _s; if (s$1 > f) { return false; } @@ -90,7 +90,7 @@ function someByU(s, f, step, p) { return true; } _s = s$1 + step | 0; - continue ; + continue; }; } else { return false; @@ -99,20 +99,20 @@ function someByU(s, f, step, p) { function someBy(s, f, step, p) { return someByU(s, f, step, (function (a) { - return p(a); - })); + return p(a); + })); } export { - forEachU , - forEach , - everyU , - every , - everyByU , - everyBy , - someU , - some , - someByU , - someBy , + forEachU, + forEach, + everyU, + every, + everyByU, + everyBy, + someU, + some, + someByU, + someBy, } /* No side effect */ diff --git a/belt/src/belt_Result.js b/belt/src/belt_Result.js index 4aa95d1..e3594b9 100644 --- a/belt/src/belt_Result.js +++ b/belt/src/belt_Result.js @@ -5,10 +5,11 @@ function getExn(x) { if (x.TAG === "Ok") { return x._0; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function mapWithDefaultU(opt, $$default, f) { @@ -21,28 +22,28 @@ function mapWithDefaultU(opt, $$default, f) { function mapWithDefault(opt, $$default, f) { return mapWithDefaultU(opt, $$default, (function (x) { - return f(x); - })); + return f(x); + })); } function mapU(opt, f) { if (opt.TAG === "Ok") { return { - TAG: "Ok", - _0: f(opt._0) - }; + TAG: "Ok", + _0: f(opt._0) + }; } else { return { - TAG: "Error", - _0: opt._0 - }; + TAG: "Error", + _0: opt._0 + }; } } function map(opt, f) { return mapU(opt, (function (x) { - return f(x); - })); + return f(x); + })); } function flatMapU(opt, f) { @@ -50,16 +51,16 @@ function flatMapU(opt, f) { return f(opt._0); } else { return { - TAG: "Error", - _0: opt._0 - }; + TAG: "Error", + _0: opt._0 + }; } } function flatMap(opt, f) { return flatMapU(opt, (function (x) { - return f(x); - })); + return f(x); + })); } function getWithDefault(opt, $$default) { @@ -102,8 +103,8 @@ function eqU(a, b, f) { function eq(a, b, f) { return eqU(a, b, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } function cmpU(a, b, f) { @@ -122,24 +123,24 @@ function cmpU(a, b, f) { function cmp(a, b, f) { return cmpU(a, b, (function (x, y) { - return f(x, y); - })); + return f(x, y); + })); } export { - getExn , - mapWithDefaultU , - mapWithDefault , - mapU , - map , - flatMapU , - flatMap , - getWithDefault , - isOk , - isError , - eqU , - eq , - cmpU , - cmp , + getExn, + mapWithDefaultU, + mapWithDefault, + mapU, + map, + flatMapU, + flatMap, + getWithDefault, + isOk, + isError, + eqU, + eq, + cmpU, + cmp, } /* No side effect */ diff --git a/belt/src/belt_Set.js b/belt/src/belt_Set.js index 81885fd..e2046a6 100644 --- a/belt/src/belt_Set.js +++ b/belt/src/belt_Set.js @@ -3,110 +3,110 @@ import * as Belt_SetDict from "./belt_SetDict.js"; function fromArray(data, id) { - var cmp = id.cmp; + let cmp = id.cmp; return { - cmp: cmp, - data: Belt_SetDict.fromArray(data, cmp) - }; + cmp: cmp, + data: Belt_SetDict.fromArray(data, cmp) + }; } function remove(m, e) { - var data = m.data; - var cmp = m.cmp; - var newData = Belt_SetDict.remove(data, e, cmp); + let data = m.data; + let cmp = m.cmp; + let newData = Belt_SetDict.remove(data, e, cmp); if (newData === data) { return m; } else { return { - cmp: cmp, - data: newData - }; + cmp: cmp, + data: newData + }; } } function add(m, e) { - var data = m.data; - var cmp = m.cmp; - var newData = Belt_SetDict.add(data, e, cmp); + let data = m.data; + let cmp = m.cmp; + let newData = Belt_SetDict.add(data, e, cmp); if (newData === data) { return m; } else { return { - cmp: cmp, - data: newData - }; + cmp: cmp, + data: newData + }; } } function mergeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_SetDict.mergeMany(m.data, e, cmp) - }; + cmp: cmp, + data: Belt_SetDict.mergeMany(m.data, e, cmp) + }; } function removeMany(m, e) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_SetDict.removeMany(m.data, e, cmp) - }; + cmp: cmp, + data: Belt_SetDict.removeMany(m.data, e, cmp) + }; } function union(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_SetDict.union(m.data, n.data, cmp) - }; + cmp: cmp, + data: Belt_SetDict.union(m.data, n.data, cmp) + }; } function intersect(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_SetDict.intersect(m.data, n.data, cmp) - }; + cmp: cmp, + data: Belt_SetDict.intersect(m.data, n.data, cmp) + }; } function diff(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp, - data: Belt_SetDict.diff(m.data, n.data, cmp) - }; + cmp: cmp, + data: Belt_SetDict.diff(m.data, n.data, cmp) + }; } function subset(m, n) { - var cmp = m.cmp; + let cmp = m.cmp; return Belt_SetDict.subset(m.data, n.data, cmp); } function split(m, e) { - var cmp = m.cmp; - var match = Belt_SetDict.split(m.data, e, cmp); - var match$1 = match[0]; + let cmp = m.cmp; + let match = Belt_SetDict.split(m.data, e, cmp); + let match$1 = match[0]; return [ - [ - { - cmp: cmp, - data: match$1[0] - }, - { - cmp: cmp, - data: match$1[1] - } - ], - match[1] - ]; + [ + { + cmp: cmp, + data: match$1[0] + }, + { + cmp: cmp, + data: match$1[1] + } + ], + match[1] + ]; } function make(id) { return { - cmp: id.cmp, - data: undefined - }; + cmp: id.cmp, + data: undefined + }; } function isEmpty(m) { @@ -114,7 +114,7 @@ function isEmpty(m) { } function cmp(m, n) { - var cmp$1 = m.cmp; + let cmp$1 = m.cmp; return Belt_SetDict.cmp(m.data, n.data, cmp$1); } @@ -127,9 +127,9 @@ function forEachU(m, f) { } function forEach(m, f) { - forEachU(m, (function (a) { - f(a); - })); + Belt_SetDict.forEachU(m.data, (function (a) { + f(a); + })); } function reduceU(m, acc, f) { @@ -138,8 +138,8 @@ function reduceU(m, acc, f) { function reduce(m, acc, f) { return reduceU(m, acc, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function everyU(m, f) { @@ -147,9 +147,9 @@ function everyU(m, f) { } function every(m, f) { - return everyU(m, (function (a) { - return f(a); - })); + return Belt_SetDict.everyU(m.data, (function (a) { + return f(a); + })); } function someU(m, f) { @@ -157,43 +157,43 @@ function someU(m, f) { } function some(m, f) { - return someU(m, (function (a) { - return f(a); - })); + return Belt_SetDict.someU(m.data, (function (a) { + return f(a); + })); } function keepU(m, f) { return { - cmp: m.cmp, - data: Belt_SetDict.keepU(m.data, f) - }; + cmp: m.cmp, + data: Belt_SetDict.keepU(m.data, f) + }; } function keep(m, f) { return keepU(m, (function (a) { - return f(a); - })); + return f(a); + })); } function partitionU(m, f) { - var match = Belt_SetDict.partitionU(m.data, f); - var cmp = m.cmp; + let match = Belt_SetDict.partitionU(m.data, f); + let cmp = m.cmp; return [ - { - cmp: cmp, - data: match[0] - }, - { - cmp: cmp, - data: match[1] - } - ]; + { + cmp: cmp, + data: match[0] + }, + { + cmp: cmp, + data: match[1] + } + ]; } function partition(m, f) { return partitionU(m, (function (a) { - return f(a); - })); + return f(a); + })); } function size(m) { @@ -242,9 +242,9 @@ function has(m, e) { function fromSortedArrayUnsafe(xs, id) { return { - cmp: id.cmp, - data: Belt_SetDict.fromSortedArrayUnsafe(xs) - }; + cmp: id.cmp, + data: Belt_SetDict.fromSortedArrayUnsafe(xs) + }; } function getData(m) { @@ -252,74 +252,74 @@ function getData(m) { } function getId(m) { - var cmp = m.cmp; + let cmp = m.cmp; return { - cmp: cmp - }; + cmp: cmp + }; } function packIdData(id, data) { return { - cmp: id.cmp, - data: data - }; + cmp: id.cmp, + data: data + }; } function checkInvariantInternal(d) { Belt_SetDict.checkInvariantInternal(d.data); } -var Int; +let Int; -var $$String; +let $$String; -var Dict; +let Dict; export { - Int , - $$String , - Dict , - make , - fromArray , - fromSortedArrayUnsafe , - isEmpty , - has , - add , - mergeMany , - remove , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toArray , - toList , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , - getData , - getId , - packIdData , + Int, + $$String, + Dict, + make, + fromArray, + fromSortedArrayUnsafe, + isEmpty, + has, + add, + mergeMany, + remove, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toArray, + toList, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, + getData, + getId, + packIdData, } /* No side effect */ diff --git a/belt/src/belt_SetDict.js b/belt/src/belt_SetDict.js index c003562..4231c26 100644 --- a/belt/src/belt_SetDict.js +++ b/belt/src/belt_SetDict.js @@ -6,22 +6,22 @@ function add(t, x, cmp) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = add(l, x, cmp); + let ll = add(l, x, cmp); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, k, r); } } - var rr = add(r, x, cmp); + let rr = add(r, x, cmp); if (rr === r) { return t; } else { @@ -33,10 +33,10 @@ function remove(t, x, cmp) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; - var c = cmp(x, v); + let v = t.v; + let l = t.l; + let r = t.r; + let c = cmp(x, v); if (c === 0) { if (l === undefined) { return r; @@ -44,21 +44,21 @@ function remove(t, x, cmp) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (c < 0) { - var ll = remove(l, x, cmp); + let ll = remove(l, x, cmp); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x, cmp); + let rr = remove(r, x, cmp); if (rr === r) { return t; } else { @@ -67,118 +67,118 @@ function remove(t, x, cmp) { } function mergeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key, cmp); } return v; } function removeMany(h, arr, cmp) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key, cmp); } return v; } function splitAuxNoPivot(cmp, n, x) { - var v = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { return [ - l, - r - ]; + l, + r + ]; } if (c < 0) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxNoPivot(cmp, l, x); + let match = splitAuxNoPivot(cmp, l, x); return [ - match[0], - Belt_internalAVLset.joinShared(match[1], v, r) - ]; + match[0], + Belt_internalAVLset.joinShared(match[1], v, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxNoPivot(cmp, r, x); + let match$1 = splitAuxNoPivot(cmp, r, x); return [ - Belt_internalAVLset.joinShared(l, v, match$1[0]), - match$1[1] - ]; + Belt_internalAVLset.joinShared(l, v, match$1[0]), + match$1[1] + ]; } function splitAuxPivot(cmp, n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; - var c = cmp(x, v); + let v = n.v; + let l = n.l; + let r = n.r; + let c = cmp(x, v); if (c === 0) { pres.contents = true; return [ - l, - r - ]; + l, + r + ]; } if (c < 0) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxPivot(cmp, l, x, pres); + let match = splitAuxPivot(cmp, l, x, pres); return [ - match[0], - Belt_internalAVLset.joinShared(match[1], v, r) - ]; + match[0], + Belt_internalAVLset.joinShared(match[1], v, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxPivot(cmp, r, x, pres); + let match$1 = splitAuxPivot(cmp, r, x, pres); return [ - Belt_internalAVLset.joinShared(l, v, match$1[0]), - match$1[1] - ]; + Belt_internalAVLset.joinShared(l, v, match$1[0]), + match$1[1] + ]; } function split(t, x, cmp) { if (t === undefined) { return [ - [ - undefined, - undefined - ], - false - ]; + [ + undefined, + undefined + ], + false + ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(cmp, t, x, pres); + let v = splitAuxPivot(cmp, t, x, pres); return [ - v, - pres.contents - ]; + v, + pres.contents + ]; } function union(s1, s2, cmp) { @@ -188,44 +188,44 @@ function union(s1, s2, cmp) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v, cmp); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(cmp, s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(cmp, s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0], cmp), v1, union(r1, match[1], cmp)); } if (h1 === 1) { return add(s2, s1.v, cmp); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(cmp, s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(cmp, s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2, cmp), v2, union(match$1[1], r2, cmp)); } function intersect(s1, s2, cmp) { if (s1 === undefined) { - return ; + return; } if (s2 === undefined) { - return ; + return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(cmp, s2, v1, pres); - var ll = intersect(l1, match[0], cmp); - var rr = intersect(r1, match[1], cmp); + let match = splitAuxPivot(cmp, s2, v1, pres); + let ll = intersect(l1, match[0], cmp); + let rr = intersect(r1, match[1], cmp); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -240,15 +240,15 @@ function diff(s1, s2, cmp) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(cmp, s2, v1, pres); - var ll = diff(l1, match[0], cmp); - var rr = diff(r1, match[1], cmp); + let match = splitAuxPivot(cmp, s2, v1, pres); + let ll = diff(l1, match[0], cmp); + let rr = diff(r1, match[1], cmp); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -256,107 +256,107 @@ function diff(s1, s2, cmp) { } } -var empty; +let empty; -var fromArray = Belt_internalAVLset.fromArray; +let fromArray = Belt_internalAVLset.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalAVLset.has; +let has = Belt_internalAVLset.has; -var subset = Belt_internalAVLset.subset; +let subset = Belt_internalAVLset.subset; -var cmp = Belt_internalAVLset.cmp; +let cmp = Belt_internalAVLset.cmp; -var eq = Belt_internalAVLset.eq; +let eq = Belt_internalAVLset.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalAVLset.get; +let get = Belt_internalAVLset.get; -var getUndefined = Belt_internalAVLset.getUndefined; +let getUndefined = Belt_internalAVLset.getUndefined; -var getExn = Belt_internalAVLset.getExn; +let getExn = Belt_internalAVLset.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; export { - empty , - fromArray , - fromSortedArrayUnsafe , - isEmpty , - has , - add , - mergeMany , - remove , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toList , - toArray , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , + empty, + fromArray, + fromSortedArrayUnsafe, + isEmpty, + has, + add, + mergeMany, + remove, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toList, + toArray, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_SetInt.js b/belt/src/belt_SetInt.js index be6bc9f..6c172f6 100644 --- a/belt/src/belt_SetInt.js +++ b/belt/src/belt_SetInt.js @@ -7,21 +7,21 @@ function add(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var v = t.v; + let v = t.v; if (x === v) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < v) { - var ll = add(l, x); + let ll = add(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = add(r, x); + let rr = add(r, x); if (rr === r) { return t; } else { @@ -30,10 +30,10 @@ function add(t, x) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key); } return v; @@ -43,9 +43,9 @@ function remove(t, x) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; + let v = t.v; + let l = t.l; + let r = t.r; if (x === v) { if (l === undefined) { return r; @@ -53,21 +53,21 @@ function remove(t, x) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (x < v) { - var ll = remove(l, x); + let ll = remove(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x); + let rr = remove(r, x); if (rr === r) { return t; } else { @@ -76,106 +76,106 @@ function remove(t, x) { } function removeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key); } return v; } function splitAuxNoPivot(n, x) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ - l, - r - ]; + l, + r + ]; } if (x < v) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxNoPivot(l, x); + let match = splitAuxNoPivot(l, x); return [ - match[0], - Belt_internalAVLset.joinShared(match[1], v, r) - ]; + match[0], + Belt_internalAVLset.joinShared(match[1], v, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxNoPivot(r, x); + let match$1 = splitAuxNoPivot(r, x); return [ - Belt_internalAVLset.joinShared(l, v, match$1[0]), - match$1[1] - ]; + Belt_internalAVLset.joinShared(l, v, match$1[0]), + match$1[1] + ]; } function splitAuxPivot(n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { pres.contents = true; return [ - l, - r - ]; + l, + r + ]; } if (x < v) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxPivot(l, x, pres); + let match = splitAuxPivot(l, x, pres); return [ - match[0], - Belt_internalAVLset.joinShared(match[1], v, r) - ]; + match[0], + Belt_internalAVLset.joinShared(match[1], v, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxPivot(r, x, pres); + let match$1 = splitAuxPivot(r, x, pres); return [ - Belt_internalAVLset.joinShared(l, v, match$1[0]), - match$1[1] - ]; + Belt_internalAVLset.joinShared(l, v, match$1[0]), + match$1[1] + ]; } function split(t, x) { if (t === undefined) { return [ - [ - undefined, - undefined - ], - false - ]; + [ + undefined, + undefined + ], + false + ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(t, x, pres); + let v = splitAuxPivot(t, x, pres); return [ - v, - pres.contents - ]; + v, + pres.contents + ]; } function union(s1, s2) { @@ -185,44 +185,44 @@ function union(s1, s2) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0]), v1, union(r1, match[1])); } if (h1 === 1) { return add(s2, s1.v); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2), v2, union(match$1[1], r2)); } function intersect(s1, s2) { if (s1 === undefined) { - return ; + return; } if (s2 === undefined) { - return ; + return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = intersect(l1, match[0]); - var rr = intersect(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = intersect(l1, match[0]); + let rr = intersect(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -237,15 +237,15 @@ function diff(s1, s2) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = diff(l1, match[0]); - var rr = diff(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = diff(l1, match[0]); + let rr = diff(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -253,107 +253,107 @@ function diff(s1, s2) { } } -var empty; +let empty; -var fromArray = Belt_internalSetInt.fromArray; +let fromArray = Belt_internalSetInt.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalSetInt.has; +let has = Belt_internalSetInt.has; -var subset = Belt_internalSetInt.subset; +let subset = Belt_internalSetInt.subset; -var cmp = Belt_internalSetInt.cmp; +let cmp = Belt_internalSetInt.cmp; -var eq = Belt_internalSetInt.eq; +let eq = Belt_internalSetInt.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalSetInt.get; +let get = Belt_internalSetInt.get; -var getUndefined = Belt_internalSetInt.getUndefined; +let getUndefined = Belt_internalSetInt.getUndefined; -var getExn = Belt_internalSetInt.getExn; +let getExn = Belt_internalSetInt.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; export { - empty , - fromArray , - fromSortedArrayUnsafe , - isEmpty , - has , - add , - mergeMany , - remove , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toList , - toArray , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , + empty, + fromArray, + fromSortedArrayUnsafe, + isEmpty, + has, + add, + mergeMany, + remove, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toList, + toArray, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_SetString.js b/belt/src/belt_SetString.js index 6236c00..3322ff2 100644 --- a/belt/src/belt_SetString.js +++ b/belt/src/belt_SetString.js @@ -7,21 +7,21 @@ function add(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var v = t.v; + let v = t.v; if (x === v) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < v) { - var ll = add(l, x); + let ll = add(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = add(r, x); + let rr = add(r, x); if (rr === r) { return t; } else { @@ -30,10 +30,10 @@ function add(t, x) { } function mergeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = add(v, key); } return v; @@ -43,9 +43,9 @@ function remove(t, x) { if (t === undefined) { return t; } - var v = t.v; - var l = t.l; - var r = t.r; + let v = t.v; + let l = t.l; + let r = t.r; if (x === v) { if (l === undefined) { return r; @@ -53,21 +53,21 @@ function remove(t, x) { if (r === undefined) { return l; } - var v$1 = { + let v$1 = { contents: r.v }; - var r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); + let r$1 = Belt_internalAVLset.removeMinAuxWithRef(r, v$1); return Belt_internalAVLset.bal(l, v$1.contents, r$1); } if (x < v) { - var ll = remove(l, x); + let ll = remove(l, x); if (ll === l) { return t; } else { return Belt_internalAVLset.bal(ll, v, r); } } - var rr = remove(r, x); + let rr = remove(r, x); if (rr === r) { return t; } else { @@ -76,106 +76,106 @@ function remove(t, x) { } function removeMany(h, arr) { - var len = arr.length; - var v = h; - for(var i = 0; i < len; ++i){ - var key = arr[i]; + let len = arr.length; + let v = h; + for(let i = 0; i < len; ++i){ + let key = arr[i]; v = remove(v, key); } return v; } function splitAuxNoPivot(n, x) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ - l, - r - ]; + l, + r + ]; } if (x < v) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxNoPivot(l, x); + let match = splitAuxNoPivot(l, x); return [ - match[0], - Belt_internalAVLset.joinShared(match[1], v, r) - ]; + match[0], + Belt_internalAVLset.joinShared(match[1], v, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxNoPivot(r, x); + let match$1 = splitAuxNoPivot(r, x); return [ - Belt_internalAVLset.joinShared(l, v, match$1[0]), - match$1[1] - ]; + Belt_internalAVLset.joinShared(l, v, match$1[0]), + match$1[1] + ]; } function splitAuxPivot(n, x, pres) { - var v = n.v; - var l = n.l; - var r = n.r; + let v = n.v; + let l = n.l; + let r = n.r; if (x === v) { pres.contents = true; return [ - l, - r - ]; + l, + r + ]; } if (x < v) { if (l === undefined) { return [ - undefined, - n - ]; + undefined, + n + ]; } - var match = splitAuxPivot(l, x, pres); + let match = splitAuxPivot(l, x, pres); return [ - match[0], - Belt_internalAVLset.joinShared(match[1], v, r) - ]; + match[0], + Belt_internalAVLset.joinShared(match[1], v, r) + ]; } if (r === undefined) { return [ - n, - undefined - ]; + n, + undefined + ]; } - var match$1 = splitAuxPivot(r, x, pres); + let match$1 = splitAuxPivot(r, x, pres); return [ - Belt_internalAVLset.joinShared(l, v, match$1[0]), - match$1[1] - ]; + Belt_internalAVLset.joinShared(l, v, match$1[0]), + match$1[1] + ]; } function split(t, x) { if (t === undefined) { return [ - [ - undefined, - undefined - ], - false - ]; + [ + undefined, + undefined + ], + false + ]; } - var pres = { + let pres = { contents: false }; - var v = splitAuxPivot(t, x, pres); + let v = splitAuxPivot(t, x, pres); return [ - v, - pres.contents - ]; + v, + pres.contents + ]; } function union(s1, s2) { @@ -185,44 +185,44 @@ function union(s1, s2) { if (s2 === undefined) { return s1; } - var h1 = s1.h; - var h2 = s2.h; + let h1 = s1.h; + let h2 = s2.h; if (h1 >= h2) { if (h2 === 1) { return add(s1, s2.v); } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = splitAuxNoPivot(s2, v1); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = splitAuxNoPivot(s2, v1); return Belt_internalAVLset.joinShared(union(l1, match[0]), v1, union(r1, match[1])); } if (h1 === 1) { return add(s2, s1.v); } - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = splitAuxNoPivot(s1, v2); + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = splitAuxNoPivot(s1, v2); return Belt_internalAVLset.joinShared(union(match$1[0], l2), v2, union(match$1[1], r2)); } function intersect(s1, s2) { if (s1 === undefined) { - return ; + return; } if (s2 === undefined) { - return ; + return; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = intersect(l1, match[0]); - var rr = intersect(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = intersect(l1, match[0]); + let rr = intersect(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.joinShared(ll, v1, rr); } else { @@ -237,15 +237,15 @@ function diff(s1, s2) { if (s2 === undefined) { return s1; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var pres = { + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let pres = { contents: false }; - var match = splitAuxPivot(s2, v1, pres); - var ll = diff(l1, match[0]); - var rr = diff(r1, match[1]); + let match = splitAuxPivot(s2, v1, pres); + let ll = diff(l1, match[0]); + let rr = diff(r1, match[1]); if (pres.contents) { return Belt_internalAVLset.concatShared(ll, rr); } else { @@ -253,107 +253,107 @@ function diff(s1, s2) { } } -var empty; +let empty; -var fromArray = Belt_internalSetString.fromArray; +let fromArray = Belt_internalSetString.fromArray; -var fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; +let fromSortedArrayUnsafe = Belt_internalAVLset.fromSortedArrayUnsafe; -var isEmpty = Belt_internalAVLset.isEmpty; +let isEmpty = Belt_internalAVLset.isEmpty; -var has = Belt_internalSetString.has; +let has = Belt_internalSetString.has; -var subset = Belt_internalSetString.subset; +let subset = Belt_internalSetString.subset; -var cmp = Belt_internalSetString.cmp; +let cmp = Belt_internalSetString.cmp; -var eq = Belt_internalSetString.eq; +let eq = Belt_internalSetString.eq; -var forEachU = Belt_internalAVLset.forEachU; +let forEachU = Belt_internalAVLset.forEachU; -var forEach = Belt_internalAVLset.forEach; +let forEach = Belt_internalAVLset.forEach; -var reduceU = Belt_internalAVLset.reduceU; +let reduceU = Belt_internalAVLset.reduceU; -var reduce = Belt_internalAVLset.reduce; +let reduce = Belt_internalAVLset.reduce; -var everyU = Belt_internalAVLset.everyU; +let everyU = Belt_internalAVLset.everyU; -var every = Belt_internalAVLset.every; +let every = Belt_internalAVLset.every; -var someU = Belt_internalAVLset.someU; +let someU = Belt_internalAVLset.someU; -var some = Belt_internalAVLset.some; +let some = Belt_internalAVLset.some; -var keepU = Belt_internalAVLset.keepSharedU; +let keepU = Belt_internalAVLset.keepSharedU; -var keep = Belt_internalAVLset.keepShared; +let keep = Belt_internalAVLset.keepShared; -var partitionU = Belt_internalAVLset.partitionSharedU; +let partitionU = Belt_internalAVLset.partitionSharedU; -var partition = Belt_internalAVLset.partitionShared; +let partition = Belt_internalAVLset.partitionShared; -var size = Belt_internalAVLset.size; +let size = Belt_internalAVLset.size; -var toList = Belt_internalAVLset.toList; +let toList = Belt_internalAVLset.toList; -var toArray = Belt_internalAVLset.toArray; +let toArray = Belt_internalAVLset.toArray; -var minimum = Belt_internalAVLset.minimum; +let minimum = Belt_internalAVLset.minimum; -var minUndefined = Belt_internalAVLset.minUndefined; +let minUndefined = Belt_internalAVLset.minUndefined; -var maximum = Belt_internalAVLset.maximum; +let maximum = Belt_internalAVLset.maximum; -var maxUndefined = Belt_internalAVLset.maxUndefined; +let maxUndefined = Belt_internalAVLset.maxUndefined; -var get = Belt_internalSetString.get; +let get = Belt_internalSetString.get; -var getUndefined = Belt_internalSetString.getUndefined; +let getUndefined = Belt_internalSetString.getUndefined; -var getExn = Belt_internalSetString.getExn; +let getExn = Belt_internalSetString.getExn; -var checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; +let checkInvariantInternal = Belt_internalAVLset.checkInvariantInternal; export { - empty , - fromArray , - fromSortedArrayUnsafe , - isEmpty , - has , - add , - mergeMany , - remove , - removeMany , - union , - intersect , - diff , - subset , - cmp , - eq , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - keepU , - keep , - partitionU , - partition , - size , - toList , - toArray , - minimum , - minUndefined , - maximum , - maxUndefined , - get , - getUndefined , - getExn , - split , - checkInvariantInternal , + empty, + fromArray, + fromSortedArrayUnsafe, + isEmpty, + has, + add, + mergeMany, + remove, + removeMany, + union, + intersect, + diff, + subset, + cmp, + eq, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + keepU, + keep, + partitionU, + partition, + size, + toList, + toArray, + minimum, + minUndefined, + maximum, + maxUndefined, + get, + getUndefined, + getExn, + split, + checkInvariantInternal, } /* No side effect */ diff --git a/belt/src/belt_SortArray.js b/belt/src/belt_SortArray.js index 0ced917..1181083 100644 --- a/belt/src/belt_SortArray.js +++ b/belt/src/belt_SortArray.js @@ -4,44 +4,44 @@ import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len, lt) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (!lt(v, prec)) { return acc; } _acc = acc + 1 | 0; _prec = v; - continue ; + continue; }; } function strictlySortedLengthU(xs, lt) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (lt(x0, x1)) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (!lt(prec, v)) { return acc; } _acc = acc + 1 | 0; _prec = v; - continue ; + continue; }; } else if (lt(x1, x0)) { return -sortedLengthAuxMore(xs, x1, 2, len, lt) | 0; @@ -52,19 +52,19 @@ function strictlySortedLengthU(xs, lt) { function strictlySortedLength(xs, lt) { return strictlySortedLengthU(xs, (function (x, y) { - return lt(x, y); - })); + return lt(x, y); + })); } function isSortedU(a, cmp) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -72,87 +72,87 @@ function isSortedU(a, cmp) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } } function isSorted(a, cmp) { return isSortedU(a, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (cmp(s1, s2) <= 0) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } _d = d + 1 | 0; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } _d = d + 1 | 0; _s2 = src2[i2$1]; _i2 = i2$1; - continue ; + continue; }; } function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } Belt_Array.blitUnsafe(src2, i2, dst, d$1, src2r - i2 | 0); return (d$1 + src2r | 0) - i2 | 0; } if (c === 0) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -167,16 +167,16 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; } Belt_Array.blitUnsafe(src, i1, dst, d$3, src1r - i1 | 0); return (d$3 + src1r | 0) - i1 | 0; @@ -185,39 +185,39 @@ function unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { return unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } if (c === 0) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -226,54 +226,54 @@ function intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; }; } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { return intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; - var c = cmp(s1, s2); + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; + let c = cmp(s1, s2); if (c < 0) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } _d = d$1; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } if (c === 0) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -286,13 +286,13 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; } Belt_Array.blitUnsafe(src, i1, dst, d, src1r - i1 | 0); return (d + src1r | 0) - i1 | 0; @@ -301,14 +301,14 @@ function diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) { return diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function insertionSort(src, srcofs, dst, dstofs, len, cmp) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && cmp(dst[j], e) > 0) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -321,21 +321,21 @@ function sortTo(src, srcofs, dst, dstofs, len, cmp) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len, cmp); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2, cmp); sortTo(src, srcofs, src, srcofs + l2 | 0, l1, cmp); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs, cmp); } function stableSortInPlaceByU(a, cmp) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l, cmp); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2, cmp); sortTo(a, 0, a, l2, l1, cmp); merge(a, l2, l1, t, 0, l2, a, 0, cmp); @@ -343,45 +343,45 @@ function stableSortInPlaceByU(a, cmp) { function stableSortInPlaceBy(a, cmp) { stableSortInPlaceByU(a, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function stableSortByU(a, cmp) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlaceByU(b, cmp); return b; } function stableSortBy(a, cmp) { return stableSortByU(a, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } function binarySearchByU(sorted, key, cmp) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; - var c = cmp(key, lo); + let lo = sorted[0]; + let c = cmp(key, lo); if (c < 0) { return -1; } - var hi = sorted[len - 1 | 0]; - var c2 = cmp(key, hi); + let hi = sorted[len - 1 | 0]; + let c2 = cmp(key, hi); if (c2 > 0) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; - var c$1 = cmp(key, midVal); + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; + let c$1 = cmp(key, midVal); if (c$1 === 0) { return mid; } @@ -394,7 +394,7 @@ function binarySearchByU(sorted, key, cmp) { } } _hi = mid; - continue ; + continue; } if (lo$1 === mid) { if (cmp(sorted[hi$1], key) === 0) { @@ -404,39 +404,39 @@ function binarySearchByU(sorted, key, cmp) { } } _lo = mid; - continue ; + continue; }; } } function binarySearchBy(sorted, key, cmp) { return binarySearchByU(sorted, key, (function (x, y) { - return cmp(x, y); - })); + return cmp(x, y); + })); } -var Int; +let Int; -var $$String; +let $$String; export { - Int , - $$String , - strictlySortedLengthU , - strictlySortedLength , - isSortedU , - isSorted , - stableSortInPlaceByU , - stableSortInPlaceBy , - stableSortByU , - stableSortBy , - binarySearchByU , - binarySearchBy , - unionU , - union , - intersectU , - intersect , - diffU , - diff , + Int, + $$String, + strictlySortedLengthU, + strictlySortedLength, + isSortedU, + isSorted, + stableSortInPlaceByU, + stableSortInPlaceBy, + stableSortByU, + stableSortBy, + binarySearchByU, + binarySearchBy, + unionU, + union, + intersectU, + intersect, + diffU, + diff, } /* No side effect */ diff --git a/belt/src/belt_SortArrayInt.js b/belt/src/belt_SortArrayInt.js index fa13cac..2ba1e57 100644 --- a/belt/src/belt_SortArrayInt.js +++ b/belt/src/belt_SortArrayInt.js @@ -4,44 +4,44 @@ import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec <= v) { return acc; } _acc = acc + 1 | 0; _prec = v; - continue ; + continue; }; } function strictlySortedLength(xs) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (x0 < x1) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec >= v) { return acc; } _acc = acc + 1 | 0; _prec = v; - continue ; + continue; }; } else if (x0 > x1) { return -sortedLengthAuxMore(xs, x1, 2, len) | 0; @@ -51,14 +51,14 @@ function strictlySortedLength(xs) { } function isSorted(a) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -66,80 +66,80 @@ function isSorted(a) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 <= s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } _d = d + 1 | 0; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } _d = d + 1 | 0; _s2 = src2[i2$1]; _i2 = i2$1; - continue ; + continue; }; } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } Belt_Array.blitUnsafe(src2, i2, dst, d$1, src2r - i2 | 0); return (d$1 + src2r | 0) - i2 | 0; } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -154,16 +154,16 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; } Belt_Array.blitUnsafe(src, i1, dst, d$3, src1r - i1 | 0); return (d$3 + src1r | 0) - i1 | 0; @@ -171,33 +171,33 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -206,47 +206,47 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; }; } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } _d = d$1; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } if (s1 === s2) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -259,13 +259,13 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; } Belt_Array.blitUnsafe(src, i1, dst, d, src1r - i1 | 0); return (d + src1r | 0) - i1 | 0; @@ -273,9 +273,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function insertionSort(src, srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && dst[j] > e) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -288,52 +288,52 @@ function sortTo(src, srcofs, dst, dstofs, len) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortTo(src, srcofs, src, srcofs + l2 | 0, l1); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); } function stableSortInPlace(a) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2); sortTo(a, 0, a, l2, l1); merge(a, l2, l1, t, 0, l2, a, 0); } function stableSort(a) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlace(b); return b; } function binarySearch(sorted, key) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; + let lo = sorted[0]; if (key < lo) { return -1; } - var hi = sorted[len - 1 | 0]; + let hi = sorted[len - 1 | 0]; if (key > hi) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; if (key === midVal) { return mid; } @@ -346,7 +346,7 @@ function binarySearch(sorted, key) { } } _hi = mid; - continue ; + continue; } if (lo$1 === mid) { if (sorted[hi$1] === key) { @@ -356,19 +356,19 @@ function binarySearch(sorted, key) { } } _lo = mid; - continue ; + continue; }; } } export { - strictlySortedLength , - isSorted , - stableSortInPlace , - stableSort , - binarySearch , - union , - intersect , - diff , + strictlySortedLength, + isSorted, + stableSortInPlace, + stableSort, + binarySearch, + union, + intersect, + diff, } /* No side effect */ diff --git a/belt/src/belt_SortArrayString.js b/belt/src/belt_SortArrayString.js index fa13cac..2ba1e57 100644 --- a/belt/src/belt_SortArrayString.js +++ b/belt/src/belt_SortArrayString.js @@ -4,44 +4,44 @@ import * as Belt_Array from "./belt_Array.js"; function sortedLengthAuxMore(xs, _prec, _acc, len) { while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec <= v) { return acc; } _acc = acc + 1 | 0; _prec = v; - continue ; + continue; }; } function strictlySortedLength(xs) { - var len = xs.length; + let len = xs.length; if (len === 0 || len === 1) { return len; } - var x0 = xs[0]; - var x1 = xs[1]; + let x0 = xs[0]; + let x1 = xs[1]; if (x0 < x1) { - var _prec = x1; - var _acc = 2; + let _prec = x1; + let _acc = 2; while(true) { - var acc = _acc; - var prec = _prec; + let acc = _acc; + let prec = _prec; if (acc >= len) { return acc; } - var v = xs[acc]; + let v = xs[acc]; if (prec >= v) { return acc; } _acc = acc + 1 | 0; _prec = v; - continue ; + continue; }; } else if (x0 > x1) { return -sortedLengthAuxMore(xs, x1, 2, len) | 0; @@ -51,14 +51,14 @@ function strictlySortedLength(xs) { } function isSorted(a) { - var len = a.length; + let len = a.length; if (len === 0) { return true; } else { - var _i = 0; - var last_bound = len - 1 | 0; + let _i = 0; + let last_bound = len - 1 | 0; while(true) { - var i = _i; + let i = _i; if (i === last_bound) { return true; } @@ -66,80 +66,80 @@ function isSorted(a) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } } function merge(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 <= s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return Belt_Array.blitUnsafe(src2, i2, dst, d + 1 | 0, src2r - i2 | 0); } _d = d + 1 | 0; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } dst[d] = s2; - var i2$1 = i2 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (i2$1 >= src2r) { return Belt_Array.blitUnsafe(src, i1, dst, d + 1 | 0, src1r - i1 | 0); } _d = d + 1 | 0; _s2 = src2[i2$1]; _i2 = i2$1; - continue ; + continue; }; } function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var i1$1 = i1 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; if (i1$1 < src1r) { _d = d$1; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } Belt_Array.blitUnsafe(src2, i2, dst, d$1, src2r - i2 | 0); return (d$1 + src2r | 0) - i2 | 0; } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$2 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$2 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { Belt_Array.blitUnsafe(src2, i2$1, dst, d$2, src2r - i2$1 | 0); @@ -154,16 +154,16 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } dst[d] = s2; - var i2$2 = i2 + 1 | 0; - var d$3 = d + 1 | 0; + let i2$2 = i2 + 1 | 0; + let d$3 = d + 1 | 0; if (i2$2 < src2r) { _d = d$3; _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; } Belt_Array.blitUnsafe(src, i1, dst, d$3, src1r - i1 | 0); return (d$3 + src1r | 0) - i1 | 0; @@ -171,33 +171,33 @@ function union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { - var i1$1 = i1 + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d; } _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } if (s1 === s2) { dst[d] = s1; - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; - var d$1 = d + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; + let d$1 = d + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { return d$1; } @@ -206,47 +206,47 @@ function intersect(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 >= src2r) { return d; } _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; }; } function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { - var src1r = src1ofs + src1len | 0; - var src2r = src2ofs + src2len | 0; - var _i1 = src1ofs; - var _s1 = src[src1ofs]; - var _i2 = src2ofs; - var _s2 = src2[src2ofs]; - var _d = dstofs; + let src1r = src1ofs + src1len | 0; + let src2r = src2ofs + src2len | 0; + let _i1 = src1ofs; + let _s1 = src[src1ofs]; + let _i2 = src2ofs; + let _s2 = src2[src2ofs]; + let _d = dstofs; while(true) { - var d = _d; - var s2 = _s2; - var i2 = _i2; - var s1 = _s1; - var i1 = _i1; + let d = _d; + let s2 = _s2; + let i2 = _i2; + let s1 = _s1; + let i1 = _i1; if (s1 < s2) { dst[d] = s1; - var d$1 = d + 1 | 0; - var i1$1 = i1 + 1 | 0; + let d$1 = d + 1 | 0; + let i1$1 = i1 + 1 | 0; if (i1$1 >= src1r) { return d$1; } _d = d$1; _s1 = src[i1$1]; _i1 = i1$1; - continue ; + continue; } if (s1 === s2) { - var i1$2 = i1 + 1 | 0; - var i2$1 = i2 + 1 | 0; + let i1$2 = i1 + 1 | 0; + let i2$1 = i2 + 1 | 0; if (!(i1$2 < src1r && i2$1 < src2r)) { if (i1$2 === src1r) { return d; @@ -259,13 +259,13 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { _i2 = i2$1; _s1 = src[i1$2]; _i1 = i1$2; - continue ; + continue; } - var i2$2 = i2 + 1 | 0; + let i2$2 = i2 + 1 | 0; if (i2$2 < src2r) { _s2 = src2[i2$2]; _i2 = i2$2; - continue ; + continue; } Belt_Array.blitUnsafe(src, i1, dst, d, src1r - i1 | 0); return (d + src1r | 0) - i1 | 0; @@ -273,9 +273,9 @@ function diff(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) { } function insertionSort(src, srcofs, dst, dstofs, len) { - for(var i = 0; i < len; ++i){ - var e = src[srcofs + i | 0]; - var j = (dstofs + i | 0) - 1 | 0; + for(let i = 0; i < len; ++i){ + let e = src[srcofs + i | 0]; + let j = (dstofs + i | 0) - 1 | 0; while(j >= dstofs && dst[j] > e) { dst[j + 1 | 0] = dst[j]; j = j - 1 | 0; @@ -288,52 +288,52 @@ function sortTo(src, srcofs, dst, dstofs, len) { if (len <= 5) { return insertionSort(src, srcofs, dst, dstofs, len); } - var l1 = len / 2 | 0; - var l2 = len - l1 | 0; + let l1 = len / 2 | 0; + let l2 = len - l1 | 0; sortTo(src, srcofs + l1 | 0, dst, dstofs + l1 | 0, l2); sortTo(src, srcofs, src, srcofs + l2 | 0, l1); merge(src, srcofs + l2 | 0, l1, dst, dstofs + l1 | 0, l2, dst, dstofs); } function stableSortInPlace(a) { - var l = a.length; + let l = a.length; if (l <= 5) { return insertionSort(a, 0, a, 0, l); } - var l1 = l / 2 | 0; - var l2 = l - l1 | 0; - var t = new Array(l2); + let l1 = l / 2 | 0; + let l2 = l - l1 | 0; + let t = new Array(l2); sortTo(a, l1, t, 0, l2); sortTo(a, 0, a, l2, l1); merge(a, l2, l1, t, 0, l2, a, 0); } function stableSort(a) { - var b = a.slice(0); + let b = a.slice(0); stableSortInPlace(b); return b; } function binarySearch(sorted, key) { - var len = sorted.length; + let len = sorted.length; if (len === 0) { return -1; } - var lo = sorted[0]; + let lo = sorted[0]; if (key < lo) { return -1; } - var hi = sorted[len - 1 | 0]; + let hi = sorted[len - 1 | 0]; if (key > hi) { return -(len + 1 | 0) | 0; } else { - var _lo = 0; - var _hi = len - 1 | 0; + let _lo = 0; + let _hi = len - 1 | 0; while(true) { - var hi$1 = _hi; - var lo$1 = _lo; - var mid = (lo$1 + hi$1 | 0) / 2 | 0; - var midVal = sorted[mid]; + let hi$1 = _hi; + let lo$1 = _lo; + let mid = (lo$1 + hi$1 | 0) / 2 | 0; + let midVal = sorted[mid]; if (key === midVal) { return mid; } @@ -346,7 +346,7 @@ function binarySearch(sorted, key) { } } _hi = mid; - continue ; + continue; } if (lo$1 === mid) { if (sorted[hi$1] === key) { @@ -356,19 +356,19 @@ function binarySearch(sorted, key) { } } _lo = mid; - continue ; + continue; }; } } export { - strictlySortedLength , - isSorted , - stableSortInPlace , - stableSort , - binarySearch , - union , - intersect , - diff , + strictlySortedLength, + isSorted, + stableSortInPlace, + stableSort, + binarySearch, + union, + intersect, + diff, } /* No side effect */ diff --git a/belt/src/belt_internalAVLset.js b/belt/src/belt_internalAVLset.js index 5d904e7..ad986a9 100644 --- a/belt/src/belt_internalAVLset.js +++ b/belt/src/belt_internalAVLset.js @@ -6,36 +6,36 @@ import * as Belt_SortArray from "./belt_SortArray.js"; function copy(n) { if (n !== undefined) { return { - v: n.v, - h: n.h, - l: copy(n.l), - r: copy(n.r) - }; + v: n.v, + h: n.h, + l: copy(n.l), + r: copy(n.r) + }; } else { return n; } } function create(l, v, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; return { - v: v, - h: ( - hl >= hr ? hl : hr - ) + 1 | 0, - l: l, - r: r - }; + v: v, + h: ( + hl >= hr ? hl : hr + ) + 1 | 0, + l: l, + r: r + }; } function singleton(x) { return { - v: x, - h: 1, - l: undefined, - r: undefined - }; + v: x, + h: 1, + l: undefined, + r: undefined + }; } function heightGe(l, r) { @@ -51,45 +51,91 @@ function heightGe(l, r) { } function bal(l, v, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (hr + 2 | 0)) { - var ll = l.l; - var lr = l.r; - if (heightGe(ll, lr)) { - return create(ll, l.v, create(lr, v, r)); - } else { - return create(create(ll, l.v, lr.l), lr.v, create(lr.r, v, r)); + if (l !== undefined) { + let ll = l.l; + let lr = l.r; + if (heightGe(ll, lr)) { + return create(ll, l.v, create(lr, v, r)); + } + if (lr !== undefined) { + return create(create(ll, l.v, lr.l), lr.v, create(lr.r, v, r)); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 102, + 18 + ] + } + }); } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 96, + 14 + ] + } + }); } if (hr <= (hl + 2 | 0)) { return { - v: v, - h: ( - hl >= hr ? hl : hr - ) + 1 | 0, - l: l, - r: r - }; - } - var rl = r.l; - var rr = r.r; - if (heightGe(rr, rl)) { - return create(create(l, v, rl), r.v, rr); - } else { - return create(create(l, v, rl.l), rl.v, create(rl.r, r.v, rr)); + v: v, + h: ( + hl >= hr ? hl : hr + ) + 1 | 0, + l: l, + r: r + }; + } + if (r !== undefined) { + let rl = r.l; + let rr = r.r; + if (heightGe(rr, rl)) { + return create(create(l, v, rl), r.v, rr); + } + if (rl !== undefined) { + return create(create(l, v, rl.l), rl.v, create(rl.r, r.v, rr)); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 115, + 18 + ] + } + }); } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 109, + 14 + ] + } + }); } function min0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return n.v; } _n = n$1; - continue ; + continue; }; } @@ -109,13 +155,13 @@ function minUndefined(n) { function max0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return n.v; } _n = n$1; - continue ; + continue; }; } @@ -134,7 +180,7 @@ function maxUndefined(n) { } function removeMinAuxWithRef(n, v) { - var ln = n.l; + let ln = n.l; if (ln !== undefined) { return bal(removeMinAuxWithRef(ln, v), n.v, n.r); } else { @@ -149,8 +195,8 @@ function isEmpty(n) { function stackAllLeft(_v, _s) { while(true) { - var s = _s; - var v = _v; + let s = _s; + let v = _v; if (v === undefined) { return s; } @@ -159,51 +205,51 @@ function stackAllLeft(_v, _s) { tl: s }; _v = v.l; - continue ; + continue; }; } function forEachU(_n, f) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } forEachU(n.l, f); f(n.v); _n = n.r; - continue ; + continue; }; } function forEach(n, f) { forEachU(n, (function (a) { - f(a); - })); + f(a); + })); } function reduceU(_s, _accu, f) { while(true) { - var accu = _accu; - var s = _s; + let accu = _accu; + let s = _s; if (s === undefined) { return accu; } _accu = f(reduceU(s.l, accu, f), s.v); _s = s.r; - continue ; + continue; }; } function reduce(s, accu, f) { return reduceU(s, accu, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function everyU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return true; } @@ -214,19 +260,19 @@ function everyU(_n, p) { return false; } _n = n.r; - continue ; + continue; }; } function every(n, p) { return everyU(n, (function (a) { - return p(a); - })); + return p(a); + })); } function someU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } @@ -237,14 +283,14 @@ function someU(_n, p) { return true; } _n = n.r; - continue ; + continue; }; } function some(n, p) { return someU(n, (function (a) { - return p(a); - })); + return p(a); + })); } function addMinElement(n, v) { @@ -270,8 +316,8 @@ function joinShared(ln, v, rn) { if (rn === undefined) { return addMaxElement(ln, v); } - var lh = ln.h; - var rh = rn.h; + let lh = ln.h; + let rh = rn.h; if (lh > (rh + 2 | 0)) { return bal(ln.l, ln.v, joinShared(ln.r, v, rn)); } else if (rh > (lh + 2 | 0)) { @@ -288,52 +334,52 @@ function concatShared(t1, t2) { if (t2 === undefined) { return t1; } - var v = { + let v = { contents: t2.v }; - var t2r = removeMinAuxWithRef(t2, v); + let t2r = removeMinAuxWithRef(t2, v); return joinShared(t1, v.contents, t2r); } function partitionSharedU(n, p) { if (n === undefined) { return [ - undefined, - undefined - ]; - } - var value = n.v; - var match = partitionSharedU(n.l, p); - var lf = match[1]; - var lt = match[0]; - var pv = p(value); - var match$1 = partitionSharedU(n.r, p); - var rf = match$1[1]; - var rt = match$1[0]; + undefined, + undefined + ]; + } + let value = n.v; + let match = partitionSharedU(n.l, p); + let lf = match[1]; + let lt = match[0]; + let pv = p(value); + let match$1 = partitionSharedU(n.r, p); + let rf = match$1[1]; + let rt = match$1[0]; if (pv) { return [ - joinShared(lt, value, rt), - concatShared(lf, rf) - ]; + joinShared(lt, value, rt), + concatShared(lf, rf) + ]; } else { return [ - concatShared(lt, rt), - joinShared(lf, value, rf) - ]; + concatShared(lt, rt), + joinShared(lf, value, rf) + ]; } } function partitionShared(n, p) { return partitionSharedU(n, (function (a) { - return p(a); - })); + return p(a); + })); } function lengthNode(n) { - var l = n.l; - var r = n.r; - var sizeL = l !== undefined ? lengthNode(l) : 0; - var sizeR = r !== undefined ? lengthNode(r) : 0; + let l = n.l; + let r = n.r; + let sizeL = l !== undefined ? lengthNode(l) : 0; + let sizeR = r !== undefined ? lengthNode(r) : 0; return (1 + sizeL | 0) + sizeR | 0; } @@ -347,8 +393,8 @@ function size(n) { function toListAux(_n, _accu) { while(true) { - var accu = _accu; - var n = _n; + let accu = _accu; + let n = _n; if (n === undefined) { return accu; } @@ -357,7 +403,7 @@ function toListAux(_n, _accu) { tl: toListAux(n.r, accu) }; _n = n.l; - continue ; + continue; }; } @@ -367,94 +413,95 @@ function toList(s) { function checkInvariantInternal(_v) { while(true) { - var v = _v; + let v = _v; if (v === undefined) { - return ; + return; } - var l = v.l; - var r = v.r; - var diff = ( + let l = v.l; + let r = v.r; + let diff = ( l !== undefined ? l.h : 0 ) - ( r !== undefined ? r.h : 0 ) | 0; if (!(diff <= 2 && diff >= -2)) { - throw { - RE_EXN_ID: "Assert_failure", - _1: [ - "belt_internalAVLset.res", - 319, - 4 - ], - Error: new Error() - }; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 319, + 4 + ] + } + }); } checkInvariantInternal(l); _v = r; - continue ; + continue; }; } function fillArray(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArray(l, i, arr) : i; + let i = _i; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArray(l, i, arr) : i; arr[next] = v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } _i = rnext; _n = r; - continue ; + continue; }; } function fillArrayWithPartition(_n, cursor, arr, p) { while(true) { - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; if (l !== undefined) { fillArrayWithPartition(l, cursor, arr, p); } if (p(v)) { - var c = cursor.forward; + let c = cursor.forward; arr[c] = v; cursor.forward = c + 1 | 0; } else { - var c$1 = cursor.backward; + let c$1 = cursor.backward; arr[c$1] = v; cursor.backward = c$1 - 1 | 0; } if (r === undefined) { - return ; + return; } _n = r; - continue ; + continue; }; } function fillArrayWithFilter(_n, _i, arr, p) { while(true) { - var i = _i; - var n = _n; - var v = n.v; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; - var rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; + let i = _i; + let n = _n; + let v = n.v; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayWithFilter(l, i, arr, p) : i; + let rnext = p(v) ? (arr[next] = v, next + 1 | 0) : next; if (r === undefined) { return rnext; } _i = rnext; _n = r; - continue ; + continue; }; } @@ -462,8 +509,8 @@ function toArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArray(n, 0, v); return v; } @@ -471,33 +518,33 @@ function toArray(n) { function fromSortedArrayRevAux(arr, off, len) { switch (len) { case 0 : - return ; + return; case 1 : return singleton(arr[off]); case 2 : - var x0 = arr[off]; - var x1 = arr[off - 1 | 0]; + let x0 = arr[off]; + let x1 = arr[off - 1 | 0]; return { - v: x1, - h: 2, - l: singleton(x0), - r: undefined - }; + v: x1, + h: 2, + l: singleton(x0), + r: undefined + }; case 3 : - var x0$1 = arr[off]; - var x1$1 = arr[off - 1 | 0]; - var x2 = arr[off - 2 | 0]; + let x0$1 = arr[off]; + let x1$1 = arr[off - 1 | 0]; + let x2 = arr[off - 2 | 0]; return { - v: x1$1, - h: 2, - l: singleton(x0$1), - r: singleton(x2) - }; + v: x1$1, + h: 2, + l: singleton(x0$1), + r: singleton(x2) + }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayRevAux(arr, off, nl); - var mid = arr[off - nl | 0]; - var right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayRevAux(arr, off, nl); + let mid = arr[off - nl | 0]; + let right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); return create(left, mid, right); } } @@ -505,33 +552,33 @@ function fromSortedArrayRevAux(arr, off, len) { function fromSortedArrayAux(arr, off, len) { switch (len) { case 0 : - return ; + return; case 1 : return singleton(arr[off]); case 2 : - var x0 = arr[off]; - var x1 = arr[off + 1 | 0]; + let x0 = arr[off]; + let x1 = arr[off + 1 | 0]; return { - v: x1, - h: 2, - l: singleton(x0), - r: undefined - }; + v: x1, + h: 2, + l: singleton(x0), + r: undefined + }; case 3 : - var x0$1 = arr[off]; - var x1$1 = arr[off + 1 | 0]; - var x2 = arr[off + 2 | 0]; + let x0$1 = arr[off]; + let x1$1 = arr[off + 1 | 0]; + let x2 = arr[off + 2 | 0]; return { - v: x1$1, - h: 2, - l: singleton(x0$1), - r: singleton(x2) - }; + v: x1$1, + h: 2, + l: singleton(x0$1), + r: singleton(x2) + }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayAux(arr, off, nl); - var mid = arr[off + nl | 0]; - var right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayAux(arr, off, nl); + let mid = arr[off + nl | 0]; + let right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); return create(left, mid, right); } } @@ -542,14 +589,14 @@ function fromSortedArrayUnsafe(arr) { function keepSharedU(n, p) { if (n === undefined) { - return ; - } - var v = n.v; - var l = n.l; - var r = n.r; - var newL = keepSharedU(l, p); - var pv = p(v); - var newR = keepSharedU(r, p); + return; + } + let v = n.v; + let l = n.l; + let r = n.r; + let newL = keepSharedU(l, p); + let pv = p(v); + let newR = keepSharedU(r, p); if (pv) { if (l === newL && r === newR) { return n; @@ -563,94 +610,94 @@ function keepSharedU(n, p) { function keepShared(n, p) { return keepSharedU(n, (function (a) { - return p(a); - })); + return p(a); + })); } function keepCopyU(n, p) { if (n === undefined) { - return ; + return; } - var size = lengthNode(n); - var v = new Array(size); - var last = fillArrayWithFilter(n, 0, v, p); + let size = lengthNode(n); + let v = new Array(size); + let last = fillArrayWithFilter(n, 0, v, p); return fromSortedArrayAux(v, 0, last); } function keepCopy(n, p) { return keepCopyU(n, (function (x) { - return p(x); - })); + return p(x); + })); } function partitionCopyU(n, p) { if (n === undefined) { return [ - undefined, - undefined - ]; - } - var size = lengthNode(n); - var v = new Array(size); - var backward = size - 1 | 0; - var cursor = { + undefined, + undefined + ]; + } + let size = lengthNode(n); + let v = new Array(size); + let backward = size - 1 | 0; + let cursor = { forward: 0, backward: backward }; fillArrayWithPartition(n, cursor, v, p); - var forwardLen = cursor.forward; + let forwardLen = cursor.forward; return [ - fromSortedArrayAux(v, 0, forwardLen), - fromSortedArrayRevAux(v, backward, size - forwardLen | 0) - ]; + fromSortedArrayAux(v, 0, forwardLen), + fromSortedArrayRevAux(v, backward, size - forwardLen | 0) + ]; } function partitionCopy(n, p) { return partitionCopyU(n, (function (a) { - return p(a); - })); + return p(a); + })); } function has(_t, x, cmp) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; - var c = cmp(x, v); + let v = t.v; + let c = cmp(x, v); if (c === 0) { return true; } _t = c < 0 ? t.l : t.r; - continue ; + continue; }; } function cmp(s1, s2, cmp$1) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = cmp$1(h1.v, h2.v); + let h2 = e2.hd; + let h1 = e1.hd; + let c = cmp$1(h1.v, h2.v); if (c !== 0) { return c; } _e2 = stackAllLeft(h2.r, e2.tl); _e1 = stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } else if (len1 < len2) { return -1; @@ -665,154 +712,203 @@ function eq(s1, s2, c) { function subset(_s1, _s2, cmp) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var c = cmp(v1, v2); + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let c = cmp(v1, v2); if (c === 0) { if (!subset(l1, l2, cmp)) { return false; } _s2 = r2; _s1 = r1; - continue ; + continue; } if (c < 0) { if (!subset(create(l1, v1, undefined), l2, cmp)) { return false; } _s1 = r1; - continue ; + continue; } if (!subset(create(undefined, v1, r1), r2, cmp)) { return false; } _s1 = l1; - continue ; + continue; }; } function get(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return Caml_option.some(v); } _n = c < 0 ? n.l : n.r; - continue ; + continue; }; } function getUndefined(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return v; } _n = c < 0 ? n.l : n.r; - continue ; + continue; }; } function getExn(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; - var c = cmp(x, v); + let v = n.v; + let c = cmp(x, v); if (c === 0) { return v; } _n = c < 0 ? n.l : n.r; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } function rotateWithLeftChild(k2) { - var k1 = k2.l; - k2.l = k1.r; - k1.r = k2; - var n = k2.l; - var hlk2 = n !== undefined ? n.h : 0; - var n$1 = k2.r; - var hrk2 = n$1 !== undefined ? n$1.h : 0; - k2.h = ( - hlk2 > hrk2 ? hlk2 : hrk2 - ) + 1 | 0; - var n$2 = k1.l; - var hlk1 = n$2 !== undefined ? n$2.h : 0; - var hk2 = k2.h; - k1.h = ( - hlk1 > hk2 ? hlk1 : hk2 - ) + 1 | 0; - return k1; + let k1 = k2.l; + if (k1 !== undefined) { + k2.l = k1.r; + k1.r = k2; + let n = k2.l; + let hlk2 = n !== undefined ? n.h : 0; + let n$1 = k2.r; + let hrk2 = n$1 !== undefined ? n$1.h : 0; + k2.h = ( + hlk2 > hrk2 ? hlk2 : hrk2 + ) + 1 | 0; + let n$2 = k1.l; + let hlk1 = n$2 !== undefined ? n$2.h : 0; + let hk2 = k2.h; + k1.h = ( + hlk1 > hk2 ? hlk1 : hk2 + ) + 1 | 0; + return k1; + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 633, + 12 + ] + } + }); } function rotateWithRightChild(k1) { - var k2 = k1.r; - k1.r = k2.l; - k2.l = k1; - var n = k1.l; - var hlk1 = n !== undefined ? n.h : 0; - var n$1 = k1.r; - var hrk1 = n$1 !== undefined ? n$1.h : 0; - k1.h = ( - hlk1 > hrk1 ? hlk1 : hrk1 - ) + 1 | 0; - var n$2 = k2.r; - var hrk2 = n$2 !== undefined ? n$2.h : 0; - var hk1 = k1.h; - k2.h = ( - hrk2 > hk1 ? hrk2 : hk1 - ) + 1 | 0; - return k2; + let k2 = k1.r; + if (k2 !== undefined) { + k1.r = k2.l; + k2.l = k1; + let n = k1.l; + let hlk1 = n !== undefined ? n.h : 0; + let n$1 = k1.r; + let hrk1 = n$1 !== undefined ? n$1.h : 0; + k1.h = ( + hlk1 > hrk1 ? hlk1 : hrk1 + ) + 1 | 0; + let n$2 = k2.r; + let hrk2 = n$2 !== undefined ? n$2.h : 0; + let hk1 = k1.h; + k2.h = ( + hrk2 > hk1 ? hrk2 : hk1 + ) + 1 | 0; + return k2; + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 646, + 12 + ] + } + }); } function doubleWithLeftChild(k3) { - var k3l = k3.l; - var v = rotateWithRightChild(k3l); - k3.l = v; - return rotateWithLeftChild(k3); + let k3l = k3.l; + if (k3l !== undefined) { + let v = rotateWithRightChild(k3l); + k3.l = v; + return rotateWithLeftChild(k3); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 663, + 12 + ] + } + }); } function doubleWithRightChild(k2) { - var k2r = k2.r; - var v = rotateWithLeftChild(k2r); - k2.r = v; - return rotateWithRightChild(k2); + let k2r = k2.r; + if (k2r !== undefined) { + let v = rotateWithLeftChild(k2r); + k2.r = v; + return rotateWithRightChild(k2); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 672, + 12 + ] + } + }); } function heightUpdateMutate(t) { - var n = t.l; - var hlt = n !== undefined ? n.h : 0; - var n$1 = t.r; - var hrt = n$1 !== undefined ? n$1.h : 0; + let n = t.l; + let hlt = n !== undefined ? n.h : 0; + let n$1 = t.r; + let hrt = n$1 !== undefined ? n$1.h : 0; t.h = ( hlt > hrt ? hlt : hrt ) + 1 | 0; @@ -820,27 +916,51 @@ function heightUpdateMutate(t) { } function balMutate(nt) { - var l = nt.l; - var r = nt.r; - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let l = nt.l; + let r = nt.r; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (2 + hr | 0)) { - var ll = l.l; - var lr = l.r; - if (heightGe(ll, lr)) { - return heightUpdateMutate(rotateWithLeftChild(nt)); - } else { - return heightUpdateMutate(doubleWithLeftChild(nt)); + if (l !== undefined) { + let ll = l.l; + let lr = l.r; + if (heightGe(ll, lr)) { + return heightUpdateMutate(rotateWithLeftChild(nt)); + } else { + return heightUpdateMutate(doubleWithLeftChild(nt)); + } } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 690, + 14 + ] + } + }); } if (hr > (2 + hl | 0)) { - var rl = r.l; - var rr = r.r; - if (heightGe(rr, rl)) { - return heightUpdateMutate(rotateWithRightChild(nt)); - } else { - return heightUpdateMutate(doubleWithRightChild(nt)); + if (r !== undefined) { + let rl = r.l; + let rr = r.r; + if (heightGe(rr, rl)) { + return heightUpdateMutate(rotateWithRightChild(nt)); + } else { + return heightUpdateMutate(doubleWithRightChild(nt)); + } } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLset.res", + 700, + 14 + ] + } + }); } nt.h = ( hl > hr ? hl : hr @@ -852,15 +972,15 @@ function addMutate(cmp, t, x) { if (t === undefined) { return singleton(x); } - var k = t.v; - var c = cmp(x, k); + let k = t.v; + let c = cmp(x, k); if (c === 0) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = addMutate(cmp, l, x); + let ll = addMutate(cmp, l, x); t.l = ll; } else { t.r = addMutate(cmp, r, x); @@ -869,29 +989,29 @@ function addMutate(cmp, t, x) { } function fromArray(xs, cmp) { - var len = xs.length; + let len = xs.length; if (len === 0) { - return ; + return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { - return cmp(x, y) < 0; - })); - var result; + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (x, y) { + return cmp(x, y) < 0; + })); + let result; if (next >= 0) { result = fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(cmp, result, xs[i]); } return result; } function removeMinAuxWithRootMutate(nt, n) { - var ln = n.l; - var rn = n.r; + let ln = n.l; + let rn = n.r; if (ln !== undefined) { n.l = removeMinAuxWithRootMutate(nt, ln); return balMutate(n); @@ -902,54 +1022,54 @@ function removeMinAuxWithRootMutate(nt, n) { } export { - copy , - create , - bal , - singleton , - minimum , - minUndefined , - maximum , - maxUndefined , - removeMinAuxWithRef , - isEmpty , - stackAllLeft , - forEachU , - forEach , - reduceU , - reduce , - everyU , - every , - someU , - some , - joinShared , - concatShared , - keepSharedU , - keepShared , - keepCopyU , - keepCopy , - partitionSharedU , - partitionShared , - partitionCopyU , - partitionCopy , - lengthNode , - size , - toList , - checkInvariantInternal , - fillArray , - toArray , - fromSortedArrayAux , - fromSortedArrayRevAux , - fromSortedArrayUnsafe , - has , - cmp , - eq , - subset , - get , - getUndefined , - getExn , - fromArray , - addMutate , - balMutate , - removeMinAuxWithRootMutate , + copy, + create, + bal, + singleton, + minimum, + minUndefined, + maximum, + maxUndefined, + removeMinAuxWithRef, + isEmpty, + stackAllLeft, + forEachU, + forEach, + reduceU, + reduce, + everyU, + every, + someU, + some, + joinShared, + concatShared, + keepSharedU, + keepShared, + keepCopyU, + keepCopy, + partitionSharedU, + partitionShared, + partitionCopyU, + partitionCopy, + lengthNode, + size, + toList, + checkInvariantInternal, + fillArray, + toArray, + fromSortedArrayAux, + fromSortedArrayRevAux, + fromSortedArrayUnsafe, + has, + cmp, + eq, + subset, + get, + getUndefined, + getExn, + fromArray, + addMutate, + balMutate, + removeMinAuxWithRootMutate, } /* No side effect */ diff --git a/belt/src/belt_internalAVLtree.js b/belt/src/belt_internalAVLtree.js index c1ddfa0..8db4bbc 100644 --- a/belt/src/belt_internalAVLtree.js +++ b/belt/src/belt_internalAVLtree.js @@ -14,37 +14,37 @@ function treeHeight(n) { function copy(n) { if (n !== undefined) { return { - k: n.k, - v: n.v, - h: n.h, - l: copy(n.l), - r: copy(n.r) - }; + k: n.k, + v: n.v, + h: n.h, + l: copy(n.l), + r: copy(n.r) + }; } else { return n; } } function create(l, x, d, r) { - var hl = treeHeight(l); - var hr = treeHeight(r); + let hl = treeHeight(l); + let hr = treeHeight(r); return { - k: x, - v: d, - h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0, - l: l, - r: r - }; + k: x, + v: d, + h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0, + l: l, + r: r + }; } function singleton(x, d) { return { - k: x, - v: d, - h: 1, - l: undefined, - r: undefined - }; + k: x, + v: d, + h: 1, + l: undefined, + r: undefined + }; } function heightGe(l, r) { @@ -64,54 +64,100 @@ function updateValue(n, newValue) { return n; } else { return { - k: n.k, - v: newValue, - h: n.h, - l: n.l, - r: n.r - }; + k: n.k, + v: newValue, + h: n.h, + l: n.l, + r: n.r + }; } } function bal(l, x, d, r) { - var hl = l !== undefined ? l.h : 0; - var hr = r !== undefined ? r.h : 0; + let hl = l !== undefined ? l.h : 0; + let hr = r !== undefined ? r.h : 0; if (hl > (hr + 2 | 0)) { - var ll = l.l; - var lr = l.r; - if (treeHeight(ll) >= treeHeight(lr)) { - return create(ll, l.k, l.v, create(lr, x, d, r)); - } else { - return create(create(ll, l.k, l.v, lr.l), lr.k, lr.v, create(lr.r, x, d, r)); + if (l !== undefined) { + let ll = l.l; + let lr = l.r; + if (treeHeight(ll) >= treeHeight(lr)) { + return create(ll, l.k, l.v, create(lr, x, d, r)); + } + if (lr !== undefined) { + return create(create(ll, l.k, l.v, lr.l), lr.k, lr.v, create(lr.r, x, d, r)); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 97, + 18 + ] + } + }); } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 91, + 14 + ] + } + }); } if (hr <= (hl + 2 | 0)) { return { - k: x, - v: d, - h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0, - l: l, - r: r - }; + k: x, + v: d, + h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0, + l: l, + r: r + }; } - var rl = r.l; - var rr = r.r; - if (treeHeight(rr) >= treeHeight(rl)) { - return create(create(l, x, d, rl), r.k, r.v, rr); - } else { - return create(create(l, x, d, rl.l), rl.k, rl.v, create(rl.r, r.k, r.v, rr)); + if (r !== undefined) { + let rl = r.l; + let rr = r.r; + if (treeHeight(rr) >= treeHeight(rl)) { + return create(create(l, x, d, rl), r.k, r.v, rr); + } + if (rl !== undefined) { + return create(create(l, x, d, rl.l), rl.k, rl.v, create(rl.r, r.k, r.v, rr)); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 111, + 18 + ] + } + }); } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 105, + 14 + ] + } + }); } function minKey0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return n.k; } _n = n$1; - continue ; + continue; }; } @@ -131,13 +177,13 @@ function minKeyUndefined(n) { function maxKey0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return n.k; } _n = n$1; - continue ; + continue; }; } @@ -157,16 +203,16 @@ function maxKeyUndefined(n) { function minKV0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.l; + let n = _n; + let n$1 = n.l; if (n$1 === undefined) { return [ - n.k, - n.v - ]; + n.k, + n.v + ]; } _n = n$1; - continue ; + continue; }; } @@ -186,16 +232,16 @@ function minUndefined(n) { function maxKV0Aux(_n) { while(true) { - var n = _n; - var n$1 = n.r; + let n = _n; + let n$1 = n.r; if (n$1 === undefined) { return [ - n.k, - n.v - ]; + n.k, + n.v + ]; } _n = n$1; - continue ; + continue; }; } @@ -214,7 +260,7 @@ function maxUndefined(n) { } function removeMinAuxWithRef(n, kr, vr) { - var ln = n.l; + let ln = n.l; if (ln !== undefined) { return bal(removeMinAuxWithRef(ln, kr, vr), n.k, n.v, n.r); } else { @@ -230,8 +276,8 @@ function isEmpty(x) { function stackAllLeft(_v, _s) { while(true) { - var s = _s; - var v = _v; + let s = _s; + let v = _v; if (v === undefined) { return s; } @@ -240,28 +286,28 @@ function stackAllLeft(_v, _s) { tl: s }; _v = v.l; - continue ; + continue; }; } function findFirstByU(n, p) { if (n === undefined) { - return ; + return; } - var left = findFirstByU(n.l, p); + let left = findFirstByU(n.l, p); if (left !== undefined) { return left; } - var v = n.k; - var d = n.v; - var pvd = p(v, d); + let v = n.k; + let d = n.v; + let pvd = p(v, d); if (pvd) { return [ - v, - d - ]; + v, + d + ]; } - var right = findFirstByU(n.r, p); + let right = findFirstByU(n.r, p); if (right !== undefined) { return right; } @@ -270,100 +316,100 @@ function findFirstByU(n, p) { function findFirstBy(n, p) { return findFirstByU(n, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function forEachU(_n, f) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } forEachU(n.l, f); f(n.k, n.v); _n = n.r; - continue ; + continue; }; } function forEach(n, f) { forEachU(n, (function (a, b) { - f(a, b); - })); + f(a, b); + })); } function mapU(n, f) { if (n === undefined) { - return ; + return; } - var newLeft = mapU(n.l, f); - var newD = f(n.v); - var newRight = mapU(n.r, f); + let newLeft = mapU(n.l, f); + let newD = f(n.v); + let newRight = mapU(n.r, f); return { - k: n.k, - v: newD, - h: n.h, - l: newLeft, - r: newRight - }; + k: n.k, + v: newD, + h: n.h, + l: newLeft, + r: newRight + }; } function map(n, f) { return mapU(n, (function (a) { - return f(a); - })); + return f(a); + })); } function mapWithKeyU(n, f) { if (n === undefined) { - return ; + return; } - var key = n.k; - var newLeft = mapWithKeyU(n.l, f); - var newD = f(key, n.v); - var newRight = mapWithKeyU(n.r, f); + let key = n.k; + let newLeft = mapWithKeyU(n.l, f); + let newD = f(key, n.v); + let newRight = mapWithKeyU(n.r, f); return { - k: key, - v: newD, - h: n.h, - l: newLeft, - r: newRight - }; + k: key, + v: newD, + h: n.h, + l: newLeft, + r: newRight + }; } function mapWithKey(n, f) { return mapWithKeyU(n, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function reduceU(_m, _accu, f) { while(true) { - var accu = _accu; - var m = _m; + let accu = _accu; + let m = _m; if (m === undefined) { return accu; } - var v = m.k; - var d = m.v; - var l = m.l; - var r = m.r; + let v = m.k; + let d = m.v; + let l = m.l; + let r = m.r; _accu = f(reduceU(l, accu, f), v, d); _m = r; - continue ; + continue; }; } function reduce(m, accu, f) { return reduceU(m, accu, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function everyU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return true; } @@ -374,19 +420,19 @@ function everyU(_n, p) { return false; } _n = n.r; - continue ; + continue; }; } function every(n, p) { return everyU(n, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function someU(_n, p) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } @@ -397,14 +443,14 @@ function someU(_n, p) { return true; } _n = n.r; - continue ; + continue; }; } function some(n, p) { return someU(n, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function addMinElement(n, k, v) { @@ -430,16 +476,16 @@ function join(ln, v, d, rn) { if (rn === undefined) { return addMaxElement(ln, v, d); } - var lv = ln.k; - var ld = ln.v; - var lh = ln.h; - var ll = ln.l; - var lr = ln.r; - var rv = rn.k; - var rd = rn.v; - var rh = rn.h; - var rl = rn.l; - var rr = rn.r; + let lv = ln.k; + let ld = ln.v; + let lh = ln.h; + let ll = ln.l; + let lr = ln.r; + let rv = rn.k; + let rd = rn.v; + let rh = rn.h; + let rl = rn.l; + let rr = rn.r; if (lh > (rh + 2 | 0)) { return bal(ll, lv, ld, join(lr, v, d, rn)); } else if (rh > (lh + 2 | 0)) { @@ -456,13 +502,13 @@ function concat(t1, t2) { if (t2 === undefined) { return t1; } - var kr = { + let kr = { contents: t2.k }; - var vr = { + let vr = { contents: t2.v }; - var t2r = removeMinAuxWithRef(t2, kr, vr); + let t2r = removeMinAuxWithRef(t2, kr, vr); return join(t1, kr.contents, vr.contents, t2r); } @@ -476,13 +522,13 @@ function concatOrJoin(t1, v, d, t2) { function keepSharedU(n, p) { if (n === undefined) { - return ; + return; } - var v = n.k; - var d = n.v; - var newLeft = keepSharedU(n.l, p); - var pvd = p(v, d); - var newRight = keepSharedU(n.r, p); + let v = n.k; + let d = n.v; + let newLeft = keepSharedU(n.l, p); + let pvd = p(v, d); + let newRight = keepSharedU(n.r, p); if (pvd) { return join(newLeft, v, d, newRight); } else { @@ -492,19 +538,19 @@ function keepSharedU(n, p) { function keepShared(n, p) { return keepSharedU(n, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function keepMapU(n, p) { if (n === undefined) { - return ; + return; } - var v = n.k; - var d = n.v; - var newLeft = keepMapU(n.l, p); - var pvd = p(v, d); - var newRight = keepMapU(n.r, p); + let v = n.k; + let d = n.v; + let newLeft = keepMapU(n.l, p); + let pvd = p(v, d); + let newRight = keepMapU(n.r, p); if (pvd !== undefined) { return join(newLeft, v, Caml_option.valFromOption(pvd), newRight); } else { @@ -514,50 +560,50 @@ function keepMapU(n, p) { function keepMap(n, p) { return keepMapU(n, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function partitionSharedU(n, p) { if (n === undefined) { return [ - undefined, - undefined - ]; + undefined, + undefined + ]; } - var key = n.k; - var value = n.v; - var match = partitionSharedU(n.l, p); - var lf = match[1]; - var lt = match[0]; - var pvd = p(key, value); - var match$1 = partitionSharedU(n.r, p); - var rf = match$1[1]; - var rt = match$1[0]; + let key = n.k; + let value = n.v; + let match = partitionSharedU(n.l, p); + let lf = match[1]; + let lt = match[0]; + let pvd = p(key, value); + let match$1 = partitionSharedU(n.r, p); + let rf = match$1[1]; + let rt = match$1[0]; if (pvd) { return [ - join(lt, key, value, rt), - concat(lf, rf) - ]; + join(lt, key, value, rt), + concat(lf, rf) + ]; } else { return [ - concat(lt, rt), - join(lf, key, value, rf) - ]; + concat(lt, rt), + join(lf, key, value, rf) + ]; } } function partitionShared(n, p) { return partitionSharedU(n, (function (a, b) { - return p(a, b); - })); + return p(a, b); + })); } function lengthNode(n) { - var l = n.l; - var r = n.r; - var sizeL = l !== undefined ? lengthNode(l) : 0; - var sizeR = r !== undefined ? lengthNode(r) : 0; + let l = n.l; + let r = n.r; + let sizeL = l !== undefined ? lengthNode(l) : 0; + let sizeR = r !== undefined ? lengthNode(r) : 0; return (1 + sizeL | 0) + sizeR | 0; } @@ -571,15 +617,15 @@ function size(n) { function toListAux(_n, _accu) { while(true) { - var accu = _accu; - var n = _n; + let accu = _accu; + let n = _n; if (n === undefined) { return accu; } - var k = n.k; - var v = n.v; - var l = n.l; - var r = n.r; + let k = n.k; + let v = n.v; + let l = n.l; + let r = n.r; _accu = { hd: [ k, @@ -588,7 +634,7 @@ function toListAux(_n, _accu) { tl: toListAux(r, accu) }; _n = l; - continue ; + continue; }; } @@ -598,86 +644,87 @@ function toList(s) { function checkInvariantInternal(_v) { while(true) { - var v = _v; + let v = _v; if (v === undefined) { - return ; + return; } - var l = v.l; - var r = v.r; - var diff = treeHeight(l) - treeHeight(r) | 0; + let l = v.l; + let r = v.r; + let diff = treeHeight(l) - treeHeight(r) | 0; if (!(diff <= 2 && diff >= -2)) { - throw { - RE_EXN_ID: "Assert_failure", - _1: [ - "belt_internalAVLtree.res", - 457, - 4 - ], - Error: new Error() - }; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 457, + 4 + ] + } + }); } checkInvariantInternal(l); _v = r; - continue ; + continue; }; } function fillArrayKey(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var v = n.k; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayKey(l, i, arr) : i; + let i = _i; + let n = _n; + let v = n.k; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayKey(l, i, arr) : i; arr[next] = v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } _i = rnext; _n = r; - continue ; + continue; }; } function fillArrayValue(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var l = n.l; - var r = n.r; - var next = l !== undefined ? fillArrayValue(l, i, arr) : i; + let i = _i; + let n = _n; + let l = n.l; + let r = n.r; + let next = l !== undefined ? fillArrayValue(l, i, arr) : i; arr[next] = n.v; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } _i = rnext; _n = r; - continue ; + continue; }; } function fillArray(_n, _i, arr) { while(true) { - var i = _i; - var n = _n; - var l = n.l; - var v = n.k; - var r = n.r; - var next = l !== undefined ? fillArray(l, i, arr) : i; + let i = _i; + let n = _n; + let l = n.l; + let v = n.k; + let r = n.r; + let next = l !== undefined ? fillArray(l, i, arr) : i; arr[next] = [ v, n.v ]; - var rnext = next + 1 | 0; + let rnext = next + 1 | 0; if (r === undefined) { return rnext; } _i = rnext; _n = r; - continue ; + continue; }; } @@ -685,8 +732,8 @@ function toArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArray(n, 0, v); return v; } @@ -695,8 +742,8 @@ function keysToArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArrayKey(n, 0, v); return v; } @@ -705,8 +752,8 @@ function valuesToArray(n) { if (n === undefined) { return []; } - var size = lengthNode(n); - var v = new Array(size); + let size = lengthNode(n); + let v = new Array(size); fillArrayValue(n, 0, v); return v; } @@ -714,41 +761,41 @@ function valuesToArray(n) { function fromSortedArrayRevAux(arr, off, len) { switch (len) { case 0 : - return ; + return; case 1 : - var match = arr[off]; + let match = arr[off]; return singleton(match[0], match[1]); case 2 : - var match_0 = arr[off]; - var match_1 = arr[off - 1 | 0]; - var match$1 = match_1; - var match$2 = match_0; + let match_0 = arr[off]; + let match_1 = arr[off - 1 | 0]; + let match$1 = match_1; + let match$2 = match_0; return { - k: match$1[0], - v: match$1[1], - h: 2, - l: singleton(match$2[0], match$2[1]), - r: undefined - }; + k: match$1[0], + v: match$1[1], + h: 2, + l: singleton(match$2[0], match$2[1]), + r: undefined + }; case 3 : - var match_0$1 = arr[off]; - var match_1$1 = arr[off - 1 | 0]; - var match_2 = arr[off - 2 | 0]; - var match$3 = match_2; - var match$4 = match_1$1; - var match$5 = match_0$1; + let match_0$1 = arr[off]; + let match_1$1 = arr[off - 1 | 0]; + let match_2 = arr[off - 2 | 0]; + let match$3 = match_2; + let match$4 = match_1$1; + let match$5 = match_0$1; return { - k: match$4[0], - v: match$4[1], - h: 2, - l: singleton(match$5[0], match$5[1]), - r: singleton(match$3[0], match$3[1]) - }; + k: match$4[0], + v: match$4[1], + h: 2, + l: singleton(match$5[0], match$5[1]), + r: singleton(match$3[0], match$3[1]) + }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayRevAux(arr, off, nl); - var match$6 = arr[off - nl | 0]; - var right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayRevAux(arr, off, nl); + let match$6 = arr[off - nl | 0]; + let right = fromSortedArrayRevAux(arr, (off - nl | 0) - 1 | 0, (len - nl | 0) - 1 | 0); return create(left, match$6[0], match$6[1], right); } } @@ -756,41 +803,41 @@ function fromSortedArrayRevAux(arr, off, len) { function fromSortedArrayAux(arr, off, len) { switch (len) { case 0 : - return ; + return; case 1 : - var match = arr[off]; + let match = arr[off]; return singleton(match[0], match[1]); case 2 : - var match_0 = arr[off]; - var match_1 = arr[off + 1 | 0]; - var match$1 = match_1; - var match$2 = match_0; + let match_0 = arr[off]; + let match_1 = arr[off + 1 | 0]; + let match$1 = match_1; + let match$2 = match_0; return { - k: match$1[0], - v: match$1[1], - h: 2, - l: singleton(match$2[0], match$2[1]), - r: undefined - }; + k: match$1[0], + v: match$1[1], + h: 2, + l: singleton(match$2[0], match$2[1]), + r: undefined + }; case 3 : - var match_0$1 = arr[off]; - var match_1$1 = arr[off + 1 | 0]; - var match_2 = arr[off + 2 | 0]; - var match$3 = match_2; - var match$4 = match_1$1; - var match$5 = match_0$1; + let match_0$1 = arr[off]; + let match_1$1 = arr[off + 1 | 0]; + let match_2 = arr[off + 2 | 0]; + let match$3 = match_2; + let match$4 = match_1$1; + let match$5 = match_0$1; return { - k: match$4[0], - v: match$4[1], - h: 2, - l: singleton(match$5[0], match$5[1]), - r: singleton(match$3[0], match$3[1]) - }; + k: match$4[0], + v: match$4[1], + h: 2, + l: singleton(match$5[0], match$5[1]), + r: singleton(match$3[0], match$3[1]) + }; default: - var nl = len / 2 | 0; - var left = fromSortedArrayAux(arr, off, nl); - var match$6 = arr[off + nl | 0]; - var right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); + let nl = len / 2 | 0; + let left = fromSortedArrayAux(arr, off, nl); + let match$6 = arr[off + nl | 0]; + let right = fromSortedArrayAux(arr, (off + nl | 0) + 1 | 0, (len - nl | 0) - 1 | 0); return create(left, match$6[0], match$6[1], right); } } @@ -800,33 +847,33 @@ function fromSortedArrayUnsafe(arr) { } function cmpU(s1, s2, kcmp, vcmp) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = kcmp(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = kcmp(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } _e2 = stackAllLeft(h2.r, e2.tl); _e1 = stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } else if (len1 < len2) { return -1; @@ -837,33 +884,33 @@ function cmpU(s1, s2, kcmp, vcmp) { function cmp(s1, s2, kcmp, vcmp) { return cmpU(s1, s2, kcmp, (function (a, b) { - return vcmp(a, b); - })); + return vcmp(a, b); + })); } function eqU(s1, s2, kcmp, veq) { - var len1 = size(s1); - var len2 = size(s2); + let len1 = size(s1); + let len2 = size(s2); if (len1 === len2) { - var _e1 = stackAllLeft(s1, /* [] */0); - var _e2 = stackAllLeft(s2, /* [] */0); + let _e1 = stackAllLeft(s1, /* [] */0); + let _e2 = stackAllLeft(s2, /* [] */0); while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(kcmp(h1.k, h2.k) === 0 && veq(h1.v, h2.v))) { return false; } _e2 = stackAllLeft(h2.r, e2.tl); _e1 = stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } else { return false; @@ -872,144 +919,199 @@ function eqU(s1, s2, kcmp, veq) { function eq(s1, s2, kcmp, veq) { return eqU(s1, s2, kcmp, (function (a, b) { - return veq(a, b); - })); + return veq(a, b); + })); } function get(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return Caml_option.some(n.v); } _n = c < 0 ? n.l : n.r; - continue ; + continue; }; } function getUndefined(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } _n = c < 0 ? n.l : n.r; - continue ; + continue; }; } function getExn(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } _n = c < 0 ? n.l : n.r; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } function getWithDefault(_n, x, def, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return n.v; } _n = c < 0 ? n.l : n.r; - continue ; + continue; }; } function has(_n, x, cmp) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; - var c = cmp(x, v); + let v = n.k; + let c = cmp(x, v); if (c === 0) { return true; } _n = c < 0 ? n.l : n.r; - continue ; + continue; }; } function rotateWithLeftChild(k2) { - var k1 = k2.l; - k2.l = k1.r; - k1.r = k2; - var hlk2 = treeHeight(k2.l); - var hrk2 = treeHeight(k2.r); - k2.h = ( - hlk2 > hrk2 ? hlk2 : hrk2 - ) + 1 | 0; - var hlk1 = treeHeight(k1.l); - var hk2 = k2.h; - k1.h = ( - hlk1 > hk2 ? hlk1 : hk2 - ) + 1 | 0; - return k1; + let k1 = k2.l; + if (k1 !== undefined) { + k2.l = k1.r; + k1.r = k2; + let hlk2 = treeHeight(k2.l); + let hrk2 = treeHeight(k2.r); + k2.h = ( + hlk2 > hrk2 ? hlk2 : hrk2 + ) + 1 | 0; + let hlk1 = treeHeight(k1.l); + let hk2 = k2.h; + k1.h = ( + hlk1 > hk2 ? hlk1 : hk2 + ) + 1 | 0; + return k1; + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 804, + 12 + ] + } + }); } function rotateWithRightChild(k1) { - var k2 = k1.r; - k1.r = k2.l; - k2.l = k1; - var hlk1 = treeHeight(k1.l); - var hrk1 = treeHeight(k1.r); - k1.h = ( - hlk1 > hrk1 ? hlk1 : hrk1 - ) + 1 | 0; - var hrk2 = treeHeight(k2.r); - var hk1 = k1.h; - k2.h = ( - hrk2 > hk1 ? hrk2 : hk1 - ) + 1 | 0; - return k2; + let k2 = k1.r; + if (k2 !== undefined) { + k1.r = k2.l; + k2.l = k1; + let hlk1 = treeHeight(k1.l); + let hrk1 = treeHeight(k1.r); + k1.h = ( + hlk1 > hrk1 ? hlk1 : hrk1 + ) + 1 | 0; + let hrk2 = treeHeight(k2.r); + let hk1 = k1.h; + k2.h = ( + hrk2 > hk1 ? hrk2 : hk1 + ) + 1 | 0; + return k2; + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 817, + 12 + ] + } + }); } function doubleWithLeftChild(k3) { - var x = k3.l; - var v = rotateWithRightChild(x); + let x = k3.l; + let k3l; + if (x !== undefined) { + k3l = x; + } else { + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 833, + 12 + ] + } + }); + } + let v = rotateWithRightChild(k3l); k3.l = v; return rotateWithLeftChild(k3); } function doubleWithRightChild(k2) { - var x = k2.r; - var v = rotateWithLeftChild(x); + let x = k2.r; + let k2r; + if (x !== undefined) { + k2r = x; + } else { + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 843, + 12 + ] + } + }); + } + let v = rotateWithLeftChild(k2r); k2.r = v; return rotateWithRightChild(k2); } function heightUpdateMutate(t) { - var hlt = treeHeight(t.l); - var hrt = treeHeight(t.r); + let hlt = treeHeight(t.l); + let hrt = treeHeight(t.r); t.h = ( hlt > hrt ? hlt : hrt ) + 1 | 0; @@ -1017,27 +1119,51 @@ function heightUpdateMutate(t) { } function balMutate(nt) { - var l = nt.l; - var r = nt.r; - var hl = treeHeight(l); - var hr = treeHeight(r); + let l = nt.l; + let r = nt.r; + let hl = treeHeight(l); + let hr = treeHeight(r); if (hl > (2 + hr | 0)) { - var ll = l.l; - var lr = l.r; - if (heightGe(ll, lr)) { - return heightUpdateMutate(rotateWithLeftChild(nt)); - } else { - return heightUpdateMutate(doubleWithLeftChild(nt)); + if (l !== undefined) { + let ll = l.l; + let lr = l.r; + if (heightGe(ll, lr)) { + return heightUpdateMutate(rotateWithLeftChild(nt)); + } else { + return heightUpdateMutate(doubleWithLeftChild(nt)); + } } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 862, + 14 + ] + } + }); } if (hr > (2 + hl | 0)) { - var rl = r.l; - var rr = r.r; - if (heightGe(rr, rl)) { - return heightUpdateMutate(rotateWithRightChild(nt)); - } else { - return heightUpdateMutate(doubleWithRightChild(nt)); + if (r !== undefined) { + let rl = r.l; + let rr = r.r; + if (heightGe(rr, rl)) { + return heightUpdateMutate(rotateWithRightChild(nt)); + } else { + return heightUpdateMutate(doubleWithRightChild(nt)); + } } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalAVLtree.res", + 872, + 14 + ] + } + }); } nt.h = ( hl > hr ? hl : hr @@ -1049,16 +1175,16 @@ function updateMutate(t, x, data, cmp) { if (t === undefined) { return singleton(x, data); } - var k = t.k; - var c = cmp(x, k); + let k = t.k; + let c = cmp(x, k); if (c === 0) { t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (c < 0) { - var ll = updateMutate(l, x, data, cmp); + let ll = updateMutate(l, x, data, cmp); t.l = ll; } else { t.r = updateMutate(r, x, data, cmp); @@ -1067,30 +1193,30 @@ function updateMutate(t, x, data, cmp) { } function fromArray(xs, cmp) { - var len = xs.length; + let len = xs.length; if (len === 0) { - return ; + return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { - return cmp(param[0], param$1[0]) < 0; - })); - var result; + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + return cmp(param[0], param$1[0]) < 0; + })); + let result; if (next >= 0) { result = fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = updateMutate(result, match[0], match[1], cmp); } return result; } function removeMinAuxWithRootMutate(nt, n) { - var rn = n.r; - var ln = n.l; + let rn = n.r; + let ln = n.l; if (ln !== undefined) { n.l = removeMinAuxWithRootMutate(nt, ln); return balMutate(n); @@ -1102,68 +1228,68 @@ function removeMinAuxWithRootMutate(nt, n) { } export { - copy , - create , - bal , - singleton , - updateValue , - minKey , - minKeyUndefined , - maxKey , - maxKeyUndefined , - minimum , - minUndefined , - maximum , - maxUndefined , - removeMinAuxWithRef , - isEmpty , - stackAllLeft , - findFirstByU , - findFirstBy , - forEachU , - forEach , - mapU , - map , - mapWithKeyU , - mapWithKey , - reduceU , - reduce , - everyU , - every , - someU , - some , - join , - concat , - concatOrJoin , - keepSharedU , - keepShared , - keepMapU , - keepMap , - partitionSharedU , - partitionShared , - lengthNode , - size , - toList , - checkInvariantInternal , - fillArray , - toArray , - keysToArray , - valuesToArray , - fromSortedArrayAux , - fromSortedArrayRevAux , - fromSortedArrayUnsafe , - cmpU , - cmp , - eqU , - eq , - get , - getUndefined , - getWithDefault , - getExn , - has , - fromArray , - updateMutate , - balMutate , - removeMinAuxWithRootMutate , + copy, + create, + bal, + singleton, + updateValue, + minKey, + minKeyUndefined, + maxKey, + maxKeyUndefined, + minimum, + minUndefined, + maximum, + maxUndefined, + removeMinAuxWithRef, + isEmpty, + stackAllLeft, + findFirstByU, + findFirstBy, + forEachU, + forEach, + mapU, + map, + mapWithKeyU, + mapWithKey, + reduceU, + reduce, + everyU, + every, + someU, + some, + join, + concat, + concatOrJoin, + keepSharedU, + keepShared, + keepMapU, + keepMap, + partitionSharedU, + partitionShared, + lengthNode, + size, + toList, + checkInvariantInternal, + fillArray, + toArray, + keysToArray, + valuesToArray, + fromSortedArrayAux, + fromSortedArrayRevAux, + fromSortedArrayUnsafe, + cmpU, + cmp, + eqU, + eq, + get, + getUndefined, + getWithDefault, + getExn, + has, + fromArray, + updateMutate, + balMutate, + removeMinAuxWithRootMutate, } /* No side effect */ diff --git a/belt/src/belt_internalBuckets.js b/belt/src/belt_internalBuckets.js index 3e57133..6a22071 100644 --- a/belt/src/belt_internalBuckets.js +++ b/belt/src/belt_internalBuckets.js @@ -7,7 +7,7 @@ function copyBucket(c) { if (c === undefined) { return c; } - var head = { + let head = { key: c.key, value: c.value, next: undefined @@ -18,12 +18,12 @@ function copyBucket(c) { function copyAuxCont(_c, _prec) { while(true) { - var prec = _prec; - var c = _c; + let prec = _prec; + let c = _c; if (c === undefined) { - return ; + return; } - var ncopy = { + let ncopy = { key: c.key, value: c.value, next: undefined @@ -31,14 +31,14 @@ function copyAuxCont(_c, _prec) { prec.next = ncopy; _prec = ncopy; _c = c.next; - continue ; + continue; }; } function copyBuckets(buckets) { - var len = buckets.length; - var newBuckets = new Array(len); - for(var i = 0; i < len; ++i){ + let len = buckets.length; + let newBuckets = new Array(len); + for(let i = 0; i < len; ++i){ newBuckets[i] = copyBucket(buckets[i]); } return newBuckets; @@ -46,68 +46,68 @@ function copyBuckets(buckets) { function copy(x) { return { - size: x.size, - buckets: copyBuckets(x.buckets), - hash: x.hash, - eq: x.eq - }; + size: x.size, + buckets: copyBuckets(x.buckets), + hash: x.hash, + eq: x.eq + }; } function bucketLength(_accu, _buckets) { while(true) { - var buckets = _buckets; - var accu = _accu; + let buckets = _buckets; + let accu = _accu; if (buckets === undefined) { return accu; } _buckets = buckets.next; _accu = accu + 1 | 0; - continue ; + continue; }; } function do_bucket_iter(f, _buckets) { while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { - return ; + return; } f(buckets.key, buckets.value); _buckets = buckets.next; - continue ; + continue; }; } function forEachU(h, f) { - var d = h.buckets; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ do_bucket_iter(f, d[i]); } } function forEach(h, f) { forEachU(h, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function do_bucket_fold(f, _b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (b === undefined) { return accu; } _accu = f(accu, b.key, b.value); _b = b.next; - continue ; + continue; }; } function reduceU(h, init, f) { - var d = h.buckets; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = do_bucket_fold(f, d[i], accu); } return accu; @@ -115,48 +115,48 @@ function reduceU(h, init, f) { function reduce(h, init, f) { return reduceU(h, init, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function getMaxBucketLength(h) { return Belt_Array.reduceU(h.buckets, 0, (function (m, b) { - var len = bucketLength(0, b); - if (m > len) { - return m; - } else { - return len; - } - })); + let len = bucketLength(0, b); + if (m > len) { + return m; + } else { + return len; + } + })); } function getBucketHistogram(h) { - var mbl = getMaxBucketLength(h); - var histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { - return 0; - })); + let mbl = getMaxBucketLength(h); + let histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { + return 0; + })); Belt_Array.forEachU(h.buckets, (function (b) { - var l = bucketLength(0, b); - histo[l] = histo[l] + 1 | 0; - })); + let l = bucketLength(0, b); + histo[l] = histo[l] + 1 | 0; + })); return histo; } function logStats(h) { - var histogram = getBucketHistogram(h); + let histogram = getBucketHistogram(h); console.log({ - bindings: h.size, - buckets: h.buckets.length, - histogram: histogram - }); + bindings: h.size, + buckets: h.buckets.length, + histogram: histogram + }); } function filterMapInplaceBucket(f, h, i, _prec, _cell) { while(true) { - var cell = _cell; - var prec = _prec; - var n = cell.next; - var data = f(cell.key, cell.value); + let cell = _cell; + let prec = _prec; + let n = cell.next; + let data = f(cell.key, cell.value); if (data !== undefined) { if (prec !== undefined) { cell.next = cell; @@ -166,11 +166,11 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) { cell.value = Caml_option.valFromOption(data); if (n === undefined) { cell.next = n; - return ; + return; } _cell = n; _prec = cell; - continue ; + continue; } h.size = h.size - 1 | 0; if (n === undefined) { @@ -179,17 +179,17 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) { } else { h.buckets[i] = prec; } - return ; + return; } _cell = n; - continue ; + continue; }; } function keepMapInPlaceU(h, f) { - var h_buckets = h.buckets; - for(var i = 0 ,i_finish = h_buckets.length; i < i_finish; ++i){ - var v = h_buckets[i]; + let h_buckets = h.buckets; + for(let i = 0 ,i_finish = h_buckets.length; i < i_finish; ++i){ + let v = h_buckets[i]; if (v !== undefined) { filterMapInplaceBucket(f, h, i, undefined, v); } @@ -199,49 +199,49 @@ function keepMapInPlaceU(h, f) { function keepMapInPlace(h, f) { keepMapInPlaceU(h, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function fillArray(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = [ cell.key, cell.value ]; - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } _cell = v; _i = i + 1 | 0; - continue ; + continue; }; } function fillArrayMap(_i, arr, _cell, f) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = f(cell); - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } _cell = v; _i = i + 1 | 0; - continue ; + continue; }; } function linear(h, f) { - var d = h.buckets; - var current = 0; - var arr = new Array(h.size); - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ - var cell = d[i]; + let d = h.buckets; + let current = 0; + let arr = new Array(h.size); + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let cell = d[i]; if (cell !== undefined) { current = fillArrayMap(current, arr, cell, f); } @@ -252,41 +252,41 @@ function linear(h, f) { function keysToArray(h) { return linear(h, (function (x) { - return x.key; - })); + return x.key; + })); } function valuesToArray(h) { return linear(h, (function (x) { - return x.value; - })); + return x.value; + })); } function toArray(h) { return linear(h, (function (x) { - return [ - x.key, - x.value - ]; - })); + return [ + x.key, + x.value + ]; + })); } -var C; +let C; export { - C , - copy , - forEachU , - forEach , - reduceU , - reduce , - logStats , - keepMapInPlaceU , - keepMapInPlace , - fillArray , - keysToArray , - valuesToArray , - toArray , - getBucketHistogram , + C, + copy, + forEachU, + forEach, + reduceU, + reduce, + logStats, + keepMapInPlaceU, + keepMapInPlace, + fillArray, + keysToArray, + valuesToArray, + toArray, + getBucketHistogram, } /* No side effect */ diff --git a/belt/src/belt_internalBucketsType.js b/belt/src/belt_internalBucketsType.js index 2a1c30d..39d523f 100644 --- a/belt/src/belt_internalBucketsType.js +++ b/belt/src/belt_internalBucketsType.js @@ -3,7 +3,7 @@ function power_2_above(_x, n) { while(true) { - var x = _x; + let x = _x; if (x >= n) { return x; } @@ -11,25 +11,25 @@ function power_2_above(_x, n) { return x; } _x = (x << 1); - continue ; + continue; }; } function make(hash, eq, hintSize) { - var s = power_2_above(16, hintSize); + let s = power_2_above(16, hintSize); return { - size: 0, - buckets: new Array(s), - hash: hash, - eq: eq - }; + size: 0, + buckets: new Array(s), + hash: hash, + eq: eq + }; } function clear(h) { h.size = 0; - var h_buckets = h.buckets; - var len = h_buckets.length; - for(var i = 0; i < len; ++i){ + let h_buckets = h.buckets; + let len = h_buckets.length; + for(let i = 0; i < len; ++i){ h_buckets[i] = undefined; } } @@ -38,12 +38,12 @@ function isEmpty(h) { return h.size === 0; } -var emptyOpt; +let emptyOpt; export { - emptyOpt , - make , - clear , - isEmpty , + emptyOpt, + make, + clear, + isEmpty, } /* No side effect */ diff --git a/belt/src/belt_internalMapInt.js b/belt/src/belt_internalMapInt.js index 04b822c..852e536 100644 --- a/belt/src/belt_internalMapInt.js +++ b/belt/src/belt_internalMapInt.js @@ -9,11 +9,11 @@ function add(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { return Belt_internalAVLtree.updateValue(t, data); } - var v = t.v; + let v = t.v; if (x < k) { return Belt_internalAVLtree.bal(add(t.l, x, data), k, v, t.r); } else { @@ -23,79 +23,80 @@ function add(t, x, data) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.k; + let v = n.k; if (x === v) { return Caml_option.some(n.v); } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; + let v = n.k; if (x === v) { return n.v; } _n = x < v ? n.l : n.r; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } function getWithDefault(_n, x, def) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function has(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; + let v = n.k; if (x === v) { return true; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } @@ -103,9 +104,9 @@ function remove(n, x) { if (n === undefined) { return n; } - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x !== v) { if (x < v) { return Belt_internalAVLtree.bal(remove(l, x), v, n.v, r); @@ -119,56 +120,56 @@ function remove(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } function splitAux(x, n) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ - l, - Caml_option.some(d), - r - ]; + l, + Caml_option.some(d), + r + ]; } if (x < v) { if (l === undefined) { return [ - undefined, - undefined, - n - ]; + undefined, + undefined, + n + ]; } - var match = splitAux(x, l); + let match = splitAux(x, l); return [ - match[0], - match[1], - Belt_internalAVLtree.join(match[2], v, d, r) - ]; + match[0], + match[1], + Belt_internalAVLtree.join(match[2], v, d, r) + ]; } if (r === undefined) { return [ - n, - undefined, - undefined - ]; + n, + undefined, + undefined + ]; } - var match$1 = splitAux(x, r); + let match$1 = splitAux(x, r); return [ - Belt_internalAVLtree.join(l, v, d, match$1[0]), - match$1[1], - match$1[2] - ]; + Belt_internalAVLtree.join(l, v, d, match$1[0]), + match$1[1], + match$1[2] + ]; } function split(x, n) { @@ -176,10 +177,10 @@ function split(x, n) { return splitAux(x, n); } else { return [ - undefined, - undefined, - undefined - ]; + undefined, + undefined, + undefined + ]; } } @@ -188,60 +189,72 @@ function mergeU(s1, s2, f) { if (s1.h >= ( s2 !== undefined ? s2.h : 0 )) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = split(v1, s2); + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = split(v1, s2); return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { - return ; + return; } - var v2 = s2.k; - var d2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = split(v2, s1); - return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + if (s2 !== undefined) { + let v2 = s2.k; + let d2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = split(v2, s1); + return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalMapInt.res", + 187, + 9 + ] + } + }); } function merge(s1, s2, f) { return mergeU(s1, s2, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function compareAux(_e1, _e2, vcmp) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = Caml.int_compare(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = Caml.int_compare(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); _e1 = Belt_internalAVLtree.stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } function cmpU(s1, s2, cmp) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), cmp); } else if (len1 < len2) { @@ -253,34 +266,34 @@ function cmpU(s1, s2, cmp) { function cmp(s1, s2, f) { return cmpU(s1, s2, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function eqAux(_e1, _e2, eq) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); _e1 = Belt_internalAVLtree.stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } function eqU(s1, s2, eq) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return eqAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), eq); } else { @@ -290,24 +303,24 @@ function eqU(s1, s2, eq) { function eq(s1, s2, f) { return eqU(s1, s2, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function addMutate(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { t.k = x; t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addMutate(l, x, data); + let ll = addMutate(l, x, data); t.l = ll; } else { t.r = addMutate(r, x, data); @@ -316,55 +329,55 @@ function addMutate(t, x, data) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { - return ; + return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { - return param[0] < param$1[0]; - })); - var result; + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + return param[0] < param$1[0]; + })); + let result; if (next >= 0) { result = Belt_internalAVLtree.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLtree.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = addMutate(result, match[0], match[1]); } return result; } -var N; +let N; -var A; +let A; -var S; +let S; export { - N , - A , - S , - add , - get , - getUndefined , - getExn , - getWithDefault , - has , - remove , - splitAux , - split , - mergeU , - merge , - compareAux , - cmpU , - cmp , - eqAux , - eqU , - eq , - addMutate , - fromArray , + N, + A, + S, + add, + get, + getUndefined, + getExn, + getWithDefault, + has, + remove, + splitAux, + split, + mergeU, + merge, + compareAux, + cmpU, + cmp, + eqAux, + eqU, + eq, + addMutate, + fromArray, } /* No side effect */ diff --git a/belt/src/belt_internalMapString.js b/belt/src/belt_internalMapString.js index 9c115c6..dca86ae 100644 --- a/belt/src/belt_internalMapString.js +++ b/belt/src/belt_internalMapString.js @@ -9,11 +9,11 @@ function add(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { return Belt_internalAVLtree.updateValue(t, data); } - var v = t.v; + let v = t.v; if (x < k) { return Belt_internalAVLtree.bal(add(t.l, x, data), k, v, t.r); } else { @@ -23,79 +23,80 @@ function add(t, x, data) { function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.k; + let v = n.k; if (x === v) { return Caml_option.some(n.v); } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.k; + let v = n.k; if (x === v) { return n.v; } _n = x < v ? n.l : n.r; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } function getWithDefault(_n, x, def) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return def; } - var v = n.k; + let v = n.k; if (x === v) { return n.v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function has(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { return false; } - var v = n.k; + let v = n.k; if (x === v) { return true; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } @@ -103,9 +104,9 @@ function remove(n, x) { if (n === undefined) { return n; } - var v = n.k; - var l = n.l; - var r = n.r; + let v = n.k; + let l = n.l; + let r = n.r; if (x !== v) { if (x < v) { return Belt_internalAVLtree.bal(remove(l, x), v, n.v, r); @@ -119,56 +120,56 @@ function remove(n, x) { if (r === undefined) { return l; } - var kr = { + let kr = { contents: r.k }; - var vr = { + let vr = { contents: r.v }; - var r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); + let r$1 = Belt_internalAVLtree.removeMinAuxWithRef(r, kr, vr); return Belt_internalAVLtree.bal(l, kr.contents, vr.contents, r$1); } function splitAux(x, n) { - var v = n.k; - var d = n.v; - var l = n.l; - var r = n.r; + let v = n.k; + let d = n.v; + let l = n.l; + let r = n.r; if (x === v) { return [ - l, - Caml_option.some(d), - r - ]; + l, + Caml_option.some(d), + r + ]; } if (x < v) { if (l === undefined) { return [ - undefined, - undefined, - n - ]; + undefined, + undefined, + n + ]; } - var match = splitAux(x, l); + let match = splitAux(x, l); return [ - match[0], - match[1], - Belt_internalAVLtree.join(match[2], v, d, r) - ]; + match[0], + match[1], + Belt_internalAVLtree.join(match[2], v, d, r) + ]; } if (r === undefined) { return [ - n, - undefined, - undefined - ]; + n, + undefined, + undefined + ]; } - var match$1 = splitAux(x, r); + let match$1 = splitAux(x, r); return [ - Belt_internalAVLtree.join(l, v, d, match$1[0]), - match$1[1], - match$1[2] - ]; + Belt_internalAVLtree.join(l, v, d, match$1[0]), + match$1[1], + match$1[2] + ]; } function split(x, n) { @@ -176,10 +177,10 @@ function split(x, n) { return splitAux(x, n); } else { return [ - undefined, - undefined, - undefined - ]; + undefined, + undefined, + undefined + ]; } } @@ -188,60 +189,72 @@ function mergeU(s1, s2, f) { if (s1.h >= ( s2 !== undefined ? s2.h : 0 )) { - var v1 = s1.k; - var d1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var match = split(v1, s2); + let v1 = s1.k; + let d1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let match = split(v1, s2); return Belt_internalAVLtree.concatOrJoin(mergeU(l1, match[0], f), v1, f(v1, Caml_option.some(d1), match[1]), mergeU(r1, match[2], f)); } } else if (s2 === undefined) { - return ; + return; } - var v2 = s2.k; - var d2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; - var match$1 = split(v2, s1); - return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + if (s2 !== undefined) { + let v2 = s2.k; + let d2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; + let match$1 = split(v2, s1); + return Belt_internalAVLtree.concatOrJoin(mergeU(match$1[0], l2, f), v2, f(v2, match$1[1], Caml_option.some(d2)), mergeU(match$1[2], r2, f)); + } + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "belt_internalMapString.res", + 187, + 9 + ] + } + }); } function merge(s1, s2, f) { return mergeU(s1, s2, (function (a, b, c) { - return f(a, b, c); - })); + return f(a, b, c); + })); } function compareAux(_e1, _e2, vcmp) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var c = Caml.string_compare(h1.k, h2.k); + let h2 = e2.hd; + let h1 = e1.hd; + let c = Caml.string_compare(h1.k, h2.k); if (c !== 0) { return c; } - var cx = vcmp(h1.v, h2.v); + let cx = vcmp(h1.v, h2.v); if (cx !== 0) { return cx; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); _e1 = Belt_internalAVLtree.stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } function cmpU(s1, s2, cmp) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), cmp); } else if (len1 < len2) { @@ -253,34 +266,34 @@ function cmpU(s1, s2, cmp) { function cmp(s1, s2, f) { return cmpU(s1, s2, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function eqAux(_e1, _e2, eq) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return true; } if (!e2) { return true; } - var h2 = e2.hd; - var h1 = e1.hd; + let h2 = e2.hd; + let h1 = e1.hd; if (!(h1.k === h2.k && eq(h1.v, h2.v))) { return false; } _e2 = Belt_internalAVLtree.stackAllLeft(h2.r, e2.tl); _e1 = Belt_internalAVLtree.stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } function eqU(s1, s2, eq) { - var len1 = Belt_internalAVLtree.size(s1); - var len2 = Belt_internalAVLtree.size(s2); + let len1 = Belt_internalAVLtree.size(s1); + let len2 = Belt_internalAVLtree.size(s2); if (len1 === len2) { return eqAux(Belt_internalAVLtree.stackAllLeft(s1, /* [] */0), Belt_internalAVLtree.stackAllLeft(s2, /* [] */0), eq); } else { @@ -290,24 +303,24 @@ function eqU(s1, s2, eq) { function eq(s1, s2, f) { return eqU(s1, s2, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function addMutate(t, x, data) { if (t === undefined) { return Belt_internalAVLtree.singleton(x, data); } - var k = t.k; + let k = t.k; if (x === k) { t.k = x; t.v = data; return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { - var ll = addMutate(l, x, data); + let ll = addMutate(l, x, data); t.l = ll; } else { t.r = addMutate(r, x, data); @@ -316,55 +329,55 @@ function addMutate(t, x, data) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { - return ; + return; } - var next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { - return param[0] < param$1[0]; - })); - var result; + let next = Belt_SortArray.strictlySortedLengthU(xs, (function (param, param$1) { + return param[0] < param$1[0]; + })); + let result; if (next >= 0) { result = Belt_internalAVLtree.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLtree.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ - var match = xs[i]; + for(let i = next; i < len; ++i){ + let match = xs[i]; result = addMutate(result, match[0], match[1]); } return result; } -var N; +let N; -var A; +let A; -var S; +let S; export { - N , - A , - S , - add , - get , - getUndefined , - getExn , - getWithDefault , - has , - remove , - splitAux , - split , - mergeU , - merge , - compareAux , - cmpU , - cmp , - eqAux , - eqU , - eq , - addMutate , - fromArray , + N, + A, + S, + add, + get, + getUndefined, + getExn, + getWithDefault, + has, + remove, + splitAux, + split, + mergeU, + merge, + compareAux, + cmpU, + cmp, + eqAux, + eqU, + eq, + addMutate, + fromArray, } /* No side effect */ diff --git a/belt/src/belt_internalSetBuckets.js b/belt/src/belt_internalSetBuckets.js index 642baa8..e4b289d 100644 --- a/belt/src/belt_internalSetBuckets.js +++ b/belt/src/belt_internalSetBuckets.js @@ -2,40 +2,40 @@ import * as Belt_Array from "./belt_Array.js"; -function copyBucket(c) { - if (c === undefined) { - return c; - } - var head = { - key: c.key, - next: undefined - }; - copyAuxCont(c.next, head); - return head; -} - function copyAuxCont(_c, _prec) { while(true) { - var prec = _prec; - var c = _c; + let prec = _prec; + let c = _c; if (c === undefined) { - return ; + return; } - var ncopy = { + let ncopy = { key: c.key, next: undefined }; prec.next = ncopy; _prec = ncopy; _c = c.next; - continue ; + continue; + }; +} + +function copyBucket(c) { + if (c === undefined) { + return c; + } + let head = { + key: c.key, + next: undefined }; + copyAuxCont(c.next, head); + return head; } function copyBuckets(buckets) { - var len = buckets.length; - var newBuckets = new Array(len); - for(var i = 0; i < len; ++i){ + let len = buckets.length; + let newBuckets = new Array(len); + for(let i = 0; i < len; ++i){ newBuckets[i] = copyBucket(buckets[i]); } return newBuckets; @@ -43,72 +43,72 @@ function copyBuckets(buckets) { function copy(x) { return { - size: x.size, - buckets: copyBuckets(x.buckets), - hash: x.hash, - eq: x.eq - }; + size: x.size, + buckets: copyBuckets(x.buckets), + hash: x.hash, + eq: x.eq + }; } function bucketLength(_accu, _buckets) { while(true) { - var buckets = _buckets; - var accu = _accu; + let buckets = _buckets; + let accu = _accu; if (buckets === undefined) { return accu; } _buckets = buckets.next; _accu = accu + 1 | 0; - continue ; + continue; }; } function doBucketIter(f, _buckets) { while(true) { - var buckets = _buckets; + let buckets = _buckets; if (buckets === undefined) { - return ; + return; } f(buckets.key); _buckets = buckets.next; - continue ; + continue; }; } function forEachU(h, f) { - var d = h.buckets; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ doBucketIter(f, d[i]); } } function forEach(h, f) { forEachU(h, (function (a) { - f(a); - })); + f(a); + })); } function fillArray(_i, arr, _cell) { while(true) { - var cell = _cell; - var i = _i; + let cell = _cell; + let i = _i; arr[i] = cell.key; - var v = cell.next; + let v = cell.next; if (v === undefined) { return i + 1 | 0; } _cell = v; _i = i + 1 | 0; - continue ; + continue; }; } function toArray(h) { - var d = h.buckets; - var current = 0; - var arr = new Array(h.size); - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ - var cell = d[i]; + let d = h.buckets; + let current = 0; + let arr = new Array(h.size); + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let cell = d[i]; if (cell !== undefined) { current = fillArray(current, arr, cell); } @@ -119,21 +119,21 @@ function toArray(h) { function doBucketFold(f, _b, _accu) { while(true) { - var accu = _accu; - var b = _b; + let accu = _accu; + let b = _b; if (b === undefined) { return accu; } _accu = f(accu, b.key); _b = b.next; - continue ; + continue; }; } function reduceU(h, init, f) { - var d = h.buckets; - var accu = init; - for(var i = 0 ,i_finish = d.length; i < i_finish; ++i){ + let d = h.buckets; + let accu = init; + for(let i = 0 ,i_finish = d.length; i < i_finish; ++i){ accu = doBucketFold(f, d[i], accu); } return accu; @@ -141,54 +141,54 @@ function reduceU(h, init, f) { function reduce(h, init, f) { return reduceU(h, init, (function (a, b) { - return f(a, b); - })); + return f(a, b); + })); } function getMaxBucketLength(h) { return Belt_Array.reduceU(h.buckets, 0, (function (m, b) { - var len = bucketLength(0, b); - if (m > len) { - return m; - } else { - return len; - } - })); + let len = bucketLength(0, b); + if (m > len) { + return m; + } else { + return len; + } + })); } function getBucketHistogram(h) { - var mbl = getMaxBucketLength(h); - var histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { - return 0; - })); + let mbl = getMaxBucketLength(h); + let histo = Belt_Array.makeByU(mbl + 1 | 0, (function (param) { + return 0; + })); Belt_Array.forEachU(h.buckets, (function (b) { - var l = bucketLength(0, b); - histo[l] = histo[l] + 1 | 0; - })); + let l = bucketLength(0, b); + histo[l] = histo[l] + 1 | 0; + })); return histo; } function logStats(h) { - var histogram = getBucketHistogram(h); + let histogram = getBucketHistogram(h); console.log({ - bindings: h.size, - buckets: h.buckets.length, - histogram: histogram - }); + bindings: h.size, + buckets: h.buckets.length, + histogram: histogram + }); } -var C; +let C; export { - C , - copy , - forEachU , - forEach , - fillArray , - toArray , - reduceU , - reduce , - logStats , - getBucketHistogram , + C, + copy, + forEachU, + forEach, + fillArray, + toArray, + reduceU, + reduce, + logStats, + getBucketHistogram, } /* No side effect */ diff --git a/belt/src/belt_internalSetInt.js b/belt/src/belt_internalSetInt.js index 6a271f0..94952bb 100644 --- a/belt/src/belt_internalSetInt.js +++ b/belt/src/belt_internalSetInt.js @@ -5,33 +5,33 @@ import * as Belt_internalAVLset from "./belt_internalAVLset.js"; function has(_t, x) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; + let v = t.v; if (x === v) { return true; } _t = x < v ? t.l : t.r; - continue ; + continue; }; } function compareAux(_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var k1 = h1.v; - var k2 = h2.v; + let h2 = e2.hd; + let h1 = e1.hd; + let k1 = h1.v; + let k2 = h2.v; if (k1 !== k2) { if (k1 < k2) { return -1; @@ -41,13 +41,13 @@ function compareAux(_e1, _e2) { } _e2 = Belt_internalAVLset.stackAllLeft(h2.r, e2.tl); _e1 = Belt_internalAVLset.stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } function cmp(s1, s2) { - var len1 = Belt_internalAVLset.size(s1); - var len2 = Belt_internalAVLset.size(s2); + let len1 = Belt_internalAVLset.size(s1); + let len2 = Belt_internalAVLset.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLset.stackAllLeft(s1, /* [] */0), Belt_internalAVLset.stackAllLeft(s2, /* [] */0)); } else if (len1 < len2) { @@ -63,88 +63,89 @@ function eq(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; if (v1 === v2) { if (!subset(l1, l2)) { return false; } _s2 = r2; _s1 = r1; - continue ; + continue; } if (v1 < v2) { if (!subset(Belt_internalAVLset.create(l1, v1, undefined), l2)) { return false; } _s1 = r1; - continue ; + continue; } if (!subset(Belt_internalAVLset.create(undefined, v1, r1), r2)) { return false; } _s1 = l1; - continue ; + continue; }; } function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; + let v = n.v; if (x === v) { return v; } _n = x < v ? n.l : n.r; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } @@ -152,12 +153,12 @@ function addMutate(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { t.l = addMutate(l, x); } else { @@ -167,43 +168,43 @@ function addMutate(t, x) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { - return ; + return; } - var next = Belt_SortArrayInt.strictlySortedLength(xs); - var result; + let next = Belt_SortArrayInt.strictlySortedLength(xs); + let result; if (next >= 0) { result = Belt_internalAVLset.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLset.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(result, xs[i]); } return result; } -var S; +let S; -var N; +let N; -var A; +let A; export { - S , - N , - A , - has , - compareAux , - cmp , - eq , - subset , - get , - getUndefined , - getExn , - addMutate , - fromArray , + S, + N, + A, + has, + compareAux, + cmp, + eq, + subset, + get, + getUndefined, + getExn, + addMutate, + fromArray, } /* No side effect */ diff --git a/belt/src/belt_internalSetString.js b/belt/src/belt_internalSetString.js index bd5096a..120bbcf 100644 --- a/belt/src/belt_internalSetString.js +++ b/belt/src/belt_internalSetString.js @@ -5,33 +5,33 @@ import * as Belt_SortArrayString from "./belt_SortArrayString.js"; function has(_t, x) { while(true) { - var t = _t; + let t = _t; if (t === undefined) { return false; } - var v = t.v; + let v = t.v; if (x === v) { return true; } _t = x < v ? t.l : t.r; - continue ; + continue; }; } function compareAux(_e1, _e2) { while(true) { - var e2 = _e2; - var e1 = _e1; + let e2 = _e2; + let e1 = _e1; if (!e1) { return 0; } if (!e2) { return 0; } - var h2 = e2.hd; - var h1 = e1.hd; - var k1 = h1.v; - var k2 = h2.v; + let h2 = e2.hd; + let h1 = e1.hd; + let k1 = h1.v; + let k2 = h2.v; if (k1 !== k2) { if (k1 < k2) { return -1; @@ -41,13 +41,13 @@ function compareAux(_e1, _e2) { } _e2 = Belt_internalAVLset.stackAllLeft(h2.r, e2.tl); _e1 = Belt_internalAVLset.stackAllLeft(h1.r, e1.tl); - continue ; + continue; }; } function cmp(s1, s2) { - var len1 = Belt_internalAVLset.size(s1); - var len2 = Belt_internalAVLset.size(s2); + let len1 = Belt_internalAVLset.size(s1); + let len2 = Belt_internalAVLset.size(s2); if (len1 === len2) { return compareAux(Belt_internalAVLset.stackAllLeft(s1, /* [] */0), Belt_internalAVLset.stackAllLeft(s2, /* [] */0)); } else if (len1 < len2) { @@ -63,88 +63,89 @@ function eq(s1, s2) { function subset(_s1, _s2) { while(true) { - var s2 = _s2; - var s1 = _s1; + let s2 = _s2; + let s1 = _s1; if (s1 === undefined) { return true; } if (s2 === undefined) { return false; } - var v1 = s1.v; - var l1 = s1.l; - var r1 = s1.r; - var v2 = s2.v; - var l2 = s2.l; - var r2 = s2.r; + let v1 = s1.v; + let l1 = s1.l; + let r1 = s1.r; + let v2 = s2.v; + let l2 = s2.l; + let r2 = s2.r; if (v1 === v2) { if (!subset(l1, l2)) { return false; } _s2 = r2; _s1 = r1; - continue ; + continue; } if (v1 < v2) { if (!subset(Belt_internalAVLset.create(l1, v1, undefined), l2)) { return false; } _s1 = r1; - continue ; + continue; } if (!subset(Belt_internalAVLset.create(undefined, v1, r1), r2)) { return false; } _s1 = l1; - continue ; + continue; }; } function get(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getUndefined(_n, x) { while(true) { - var n = _n; + let n = _n; if (n === undefined) { - return ; + return; } - var v = n.v; + let v = n.v; if (x === v) { return v; } _n = x < v ? n.l : n.r; - continue ; + continue; }; } function getExn(_n, x) { while(true) { - var n = _n; + let n = _n; if (n !== undefined) { - var v = n.v; + let v = n.v; if (x === v) { return v; } _n = x < v ? n.l : n.r; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } @@ -152,12 +153,12 @@ function addMutate(t, x) { if (t === undefined) { return Belt_internalAVLset.singleton(x); } - var k = t.v; + let k = t.v; if (x === k) { return t; } - var l = t.l; - var r = t.r; + let l = t.l; + let r = t.r; if (x < k) { t.l = addMutate(l, x); } else { @@ -167,43 +168,43 @@ function addMutate(t, x) { } function fromArray(xs) { - var len = xs.length; + let len = xs.length; if (len === 0) { - return ; + return; } - var next = Belt_SortArrayString.strictlySortedLength(xs); - var result; + let next = Belt_SortArrayString.strictlySortedLength(xs); + let result; if (next >= 0) { result = Belt_internalAVLset.fromSortedArrayAux(xs, 0, next); } else { next = -next | 0; result = Belt_internalAVLset.fromSortedArrayRevAux(xs, next - 1 | 0, next); } - for(var i = next; i < len; ++i){ + for(let i = next; i < len; ++i){ result = addMutate(result, xs[i]); } return result; } -var S; +let S; -var N; +let N; -var A; +let A; export { - S , - N , - A , - has , - compareAux , - cmp , - eq , - subset , - get , - getUndefined , - getExn , - addMutate , - fromArray , + S, + N, + A, + has, + compareAux, + cmp, + eq, + subset, + get, + getUndefined, + getExn, + addMutate, + fromArray, } /* No side effect */ diff --git a/core/rescript.json b/core/rescript.json index 4f9e61f..2ce1507 100644 --- a/core/rescript.json +++ b/core/rescript.json @@ -4,7 +4,7 @@ "dir": "src", "subdirs": true }, - "bs-dependencies": ["stdlib-mini"], + "bs-dependencies": ["stdlib-mini", "runtime"], "bsc-flags": [ "-nostdlib", "-nopervasives", diff --git a/core/src/Core__Array.js b/core/src/Core__Array.js index c3793a9..1ab42a6 100644 --- a/core/src/Core__Array.js +++ b/core/src/Core__Array.js @@ -6,7 +6,7 @@ function make(length, x) { if (length <= 0) { return []; } - var arr = new Array(length); + let arr = new Array(length); arr.fill(x); return arr; } @@ -15,19 +15,19 @@ function fromInitializer(length, f) { if (length <= 0) { return []; } - var arr = new Array(length); - for(var i = 0; i < length; ++i){ + let arr = new Array(length); + for(let i = 0; i < length; ++i){ arr[i] = f(i); } return arr; } function equal(a, b, eq) { - var len = a.length; + let len = a.length; if (len === b.length) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len) { return true; } @@ -35,7 +35,7 @@ function equal(a, b, eq) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } else { return false; @@ -43,31 +43,31 @@ function equal(a, b, eq) { } function compare(a, b, cmp) { - var lenA = a.length; - var lenB = b.length; + let lenA = a.length; + let lenB = b.length; if (lenA < lenB) { return -1; } else if (lenA > lenB) { return 1; } else { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === lenA) { return 0; } - var c = cmp(a[i], b[i]); + let c = cmp(a[i], b[i]); if (c !== 0) { return c; } _i = i + 1 | 0; - continue ; + continue; }; } } function indexOfOpt(arr, item) { - var index = arr.indexOf(item); + let index = arr.indexOf(item); if (index !== -1) { return index; } @@ -75,7 +75,7 @@ function indexOfOpt(arr, item) { } function lastIndexOfOpt(arr, item) { - var index = arr.lastIndexOf(item); + let index = arr.lastIndexOf(item); if (index !== -1) { return index; } @@ -99,7 +99,7 @@ function reduceRightWithIndex(arr, init, f) { } function findIndexOpt(array, finder) { - var index = array.findIndex(finder); + let index = array.findIndex(finder); if (index !== -1) { return index; } @@ -107,7 +107,7 @@ function findIndexOpt(array, finder) { } function swapUnsafe(xs, i, j) { - var tmp = xs[i]; + let tmp = xs[i]; xs[i] = xs[j]; xs[j] = tmp; } @@ -117,25 +117,25 @@ function random_int(min, max) { } function shuffle(xs) { - var len = xs.length; - for(var i = 0; i < len; ++i){ + let len = xs.length; + for(let i = 0; i < len; ++i){ swapUnsafe(xs, i, random_int(i, len)); } } function toShuffled(xs) { - var result = xs.slice(); + let result = xs.slice(); shuffle(result); return result; } function filterMap(a, f) { - var l = a.length; - var r = new Array(l); - var j = 0; - for(var i = 0; i < l; ++i){ - var v = a[i]; - var v$1 = f(v); + let l = a.length; + let r = new Array(l); + let j = 0; + for(let i = 0; i < l; ++i){ + let v = a[i]; + let v$1 = f(v); if (v$1 !== undefined) { r[j] = Caml_option.valFromOption(v$1); j = j + 1 | 0; @@ -148,23 +148,23 @@ function filterMap(a, f) { function keepSome(__x) { return filterMap(__x, (function (x) { - return x; - })); + return x; + })); } function findMap(arr, f) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === arr.length) { - return ; + return; } - var r = f(arr[i]); + let r = f(arr[i]); if (r !== undefined) { return r; } _i = i + 1 | 0; - continue ; + continue; }; } @@ -173,22 +173,22 @@ function last(a) { } export { - make , - fromInitializer , - equal , - compare , - indexOfOpt , - lastIndexOfOpt , - reduce , - reduceWithIndex , - reduceRight , - reduceRightWithIndex , - findIndexOpt , - filterMap , - keepSome , - toShuffled , - shuffle , - findMap , - last , + make, + fromInitializer, + equal, + compare, + indexOfOpt, + lastIndexOfOpt, + reduce, + reduceWithIndex, + reduceRight, + reduceRightWithIndex, + findIndexOpt, + filterMap, + keepSome, + toShuffled, + shuffle, + findMap, + last, } /* No side effect */ diff --git a/core/src/Core__AsyncIterator.js b/core/src/Core__AsyncIterator.js index f5bed6a..195edc4 100644 --- a/core/src/Core__AsyncIterator.js +++ b/core/src/Core__AsyncIterator.js @@ -2,15 +2,15 @@ async function forEach(iterator, f) { - var iteratorDone = false; + let iteratorDone = false; while(!iteratorDone) { - var match = await iterator.next(); + let match = await iterator.next(); f(match.value); iteratorDone = match.done; }; } export { - forEach , + forEach, } /* No side effect */ diff --git a/core/src/Core__BigInt.js b/core/src/Core__BigInt.js index e8c1209..483f59a 100644 --- a/core/src/Core__BigInt.js +++ b/core/src/Core__BigInt.js @@ -10,7 +10,7 @@ function lnot(x) { } export { - toInt , - lnot , + toInt, + lnot, } /* No side effect */ diff --git a/core/src/Core__Date.js b/core/src/Core__Date.js index 4a08dd0..d0021b6 100644 --- a/core/src/Core__Date.js +++ b/core/src/Core__Date.js @@ -2,7 +2,7 @@ import * as Core__Float from "./Core__Float.js"; -var UTC = {}; +let UTC = {}; function equal(a, b) { return a.getTime() === b.getTime(); @@ -13,8 +13,8 @@ function compare(a, b) { } export { - UTC , - equal , - compare , + UTC, + equal, + compare, } /* No side effect */ diff --git a/core/src/Core__Dict.js b/core/src/Core__Dict.js index 113b173..fe6412a 100644 --- a/core/src/Core__Dict.js +++ b/core/src/Core__Dict.js @@ -7,28 +7,28 @@ function $$delete$1(dict, string) { function forEach(dict, f) { Object.values(dict).forEach(function (value) { - f(value); - }); + f(value); + }); } function forEachWithKey(dict, f) { Object.entries(dict).forEach(function (param) { - f(param[1], param[0]); - }); + f(param[1], param[0]); + }); } function mapValues(dict, f) { - var target = {}; + let target = {}; forEachWithKey(dict, (function (value, key) { - target[key] = f(value); - })); + target[key] = f(value); + })); return target; } export { $$delete$1 as $$delete, - forEach , - forEachWithKey , - mapValues , + forEach, + forEachWithKey, + mapValues, } /* No side effect */ diff --git a/core/src/Core__Error.js b/core/src/Core__Error.js index 93e2d0a..9fe3fa5 100644 --- a/core/src/Core__Error.js +++ b/core/src/Core__Error.js @@ -1,29 +1,31 @@ -var $$EvalError = {}; +let $$EvalError = {}; -var $$RangeError = {}; +let $$RangeError = {}; -var $$ReferenceError = {}; +let $$ReferenceError = {}; -var $$SyntaxError = {}; +let $$SyntaxError = {}; -var $$TypeError = {}; +let $$TypeError = {}; -var $$URIError = {}; +let $$URIError = {}; function panic(msg) { - throw new Error("Panic! " + msg); + throw new Error(new Error("Panic! " + msg).RE_EXN_ID, { + cause: new Error("Panic! " + msg) + }); } export { - $$EvalError , - $$RangeError , - $$ReferenceError , - $$SyntaxError , - $$TypeError , - $$URIError , - panic , + $$EvalError, + $$RangeError, + $$ReferenceError, + $$SyntaxError, + $$TypeError, + $$URIError, + panic, } /* No side effect */ diff --git a/core/src/Core__Float.js b/core/src/Core__Float.js index e8c156c..a3a68ce 100644 --- a/core/src/Core__Float.js +++ b/core/src/Core__Float.js @@ -1,7 +1,7 @@ -var Constants = {}; +let Constants = {}; function equal(a, b) { return a === b; @@ -18,16 +18,16 @@ function compare(a, b) { } function fromString(i) { - var i$1 = parseFloat(i); + let i$1 = parseFloat(i); if (isNaN(i$1)) { - return ; + return; } else { return i$1; } } function clamp(min, max, value) { - var value$1 = max !== undefined && max < value ? max : value; + let value$1 = max !== undefined && max < value ? max : value; if (min !== undefined && min > value$1) { return min; } else { @@ -36,10 +36,10 @@ function clamp(min, max, value) { } export { - Constants , - equal , - compare , - fromString , - clamp , + Constants, + equal, + compare, + fromString, + clamp, } /* No side effect */ diff --git a/core/src/Core__Int.js b/core/src/Core__Int.js index 748c704..231a883 100644 --- a/core/src/Core__Int.js +++ b/core/src/Core__Int.js @@ -17,9 +17,9 @@ function compare(a, b) { } function fromString(x, radix) { - var maybeInt = radix !== undefined ? parseInt(x, radix) : parseInt(x); + let maybeInt = radix !== undefined ? parseInt(x, radix) : parseInt(x); if (isNaN(maybeInt) || maybeInt > 2147483647 || maybeInt < -2147483648) { - return ; + return; } else { return maybeInt | 0; } @@ -34,35 +34,37 @@ function abs(x) { } function range(start, end, optionsOpt) { - var options = optionsOpt !== undefined ? optionsOpt : ({}); - var isInverted = start > end; - var n = options.step; - var step; + let options = optionsOpt !== undefined ? optionsOpt : ({}); + let isInverted = start > end; + let n = options.step; + let step; if (n !== undefined) { if (n !== 0) { step = n; } else { if (start !== end) { - throw new RangeError("Incorrect range arguments"); + throw new Error(new RangeError("Incorrect range arguments").RE_EXN_ID, { + cause: new RangeError("Incorrect range arguments") + }); } step = n; } } else { step = isInverted ? -1 : 1; } - var length; + let length; if (isInverted === step >= 0) { length = 0; } else if (step === 0) { length = options.inclusive === true ? 1 : 0; } else { - var range$1 = isInverted ? start - end | 0 : end - start | 0; - var range$2 = options.inclusive === true ? range$1 + 1 | 0 : range$1; + let range$1 = isInverted ? start - end | 0 : end - start | 0; + let range$2 = options.inclusive === true ? range$1 + 1 | 0 : range$1; length = Math.ceil(range$2 / abs(step)) | 0; } return Core__Array.fromInitializer(length, (function (i) { - return start + Math.imul(i, step) | 0; - })); + return start + Math.imul(i, step) | 0; + })); } function rangeWithOptions(start, end, options) { @@ -70,7 +72,7 @@ function rangeWithOptions(start, end, options) { } function clamp(min, max, value) { - var value$1 = max !== undefined && max < value ? max : value; + let value$1 = max !== undefined && max < value ? max : value; if (min !== undefined && min > value$1) { return min; } else { @@ -78,18 +80,18 @@ function clamp(min, max, value) { } } -var Constants = { +let Constants = { minValue: -2147483648, maxValue: 2147483647 }; export { - Constants , - equal , - compare , - fromString , - range , - rangeWithOptions , - clamp , + Constants, + equal, + compare, + fromString, + range, + rangeWithOptions, + clamp, } /* No side effect */ diff --git a/core/src/Core__Intl.js b/core/src/Core__Intl.js index 76fb3b3..17f2e18 100644 --- a/core/src/Core__Intl.js +++ b/core/src/Core__Intl.js @@ -1,36 +1,36 @@ -var Common; +let Common; -var Collator; +let Collator; -var DateTimeFormat; +let DateTimeFormat; -var ListFormat; +let ListFormat; -var Locale; +let Locale; -var NumberFormat; +let NumberFormat; -var PluralRules; +let PluralRules; -var RelativeTimeFormat; +let RelativeTimeFormat; -var Segmenter; +let Segmenter; -var Segments; +let Segments; export { - Common , - Collator , - DateTimeFormat , - ListFormat , - Locale , - NumberFormat , - PluralRules , - RelativeTimeFormat , - Segmenter , - Segments , + Common, + Collator, + DateTimeFormat, + ListFormat, + Locale, + NumberFormat, + PluralRules, + RelativeTimeFormat, + Segmenter, + Segments, } /* No side effect */ diff --git a/core/src/Core__Iterator.js b/core/src/Core__Iterator.js index 86dc12a..810d17b 100644 --- a/core/src/Core__Iterator.js +++ b/core/src/Core__Iterator.js @@ -2,15 +2,15 @@ function forEach(iterator, f) { - var iteratorDone = false; + let iteratorDone = false; while(!iteratorDone) { - var match = iterator.next(); + let match = iterator.next(); f(match.value); iteratorDone = match.done; }; } export { - forEach , + forEach, } /* No side effect */ diff --git a/core/src/Core__JSON.js b/core/src/Core__JSON.js index 5914f38..e4fa1c8 100644 --- a/core/src/Core__JSON.js +++ b/core/src/Core__JSON.js @@ -2,43 +2,43 @@ function classify(value) { - var match = Object.prototype.toString.call(value); + let match = Object.prototype.toString.call(value); switch (match) { case "[object Array]" : return { - TAG: "Array", - _0: value - }; + TAG: "Array", + _0: value + }; case "[object Boolean]" : return { - TAG: "Bool", - _0: value - }; + TAG: "Bool", + _0: value + }; case "[object Null]" : return "Null"; case "[object Number]" : return { - TAG: "Number", - _0: value - }; + TAG: "Number", + _0: value + }; case "[object String]" : return { - TAG: "String", - _0: value - }; + TAG: "String", + _0: value + }; default: return { - TAG: "Object", - _0: value - }; + TAG: "Object", + _0: value + }; } } -var Classify = { +let Classify = { classify: classify }; -var Encode = {}; +let Encode = {}; function bool(json) { if (typeof json === "boolean") { @@ -61,7 +61,7 @@ function string(json) { } -function $$float(json) { +function float(json) { if (typeof json === "number") { return json; } @@ -82,18 +82,18 @@ function array(json) { } -var Decode = { +let Decode = { bool: bool, $$null: $$null, string: string, - $$float: $$float, + float: float, object: object, array: array }; export { - Classify , - Encode , - Decode , + Classify, + Encode, + Decode, } /* No side effect */ diff --git a/core/src/Core__List.js b/core/src/Core__List.js index 424ef6c..d47b5ea 100644 --- a/core/src/Core__List.js +++ b/core/src/Core__List.js @@ -14,10 +14,11 @@ function headExn(x) { if (x) { return x.hd; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function tail(x) { @@ -31,79 +32,82 @@ function tailExn(x) { if (x) { return x.tl; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function add(xs, x) { return { - hd: x, - tl: xs - }; + hd: x, + tl: xs + }; } function get(x, n) { if (n < 0) { - return ; + return; } else { - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (!x$1) { - return ; + return; } if (n$1 === 0) { return Caml_option.some(x$1.hd); } _n = n$1 - 1 | 0; _x = x$1.tl; - continue ; + continue; }; } } function getExn(x, n) { if (n < 0) { - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } - var _x = x; - var _n = n; + let _x = x; + let _n = n; while(true) { - var n$1 = _n; - var x$1 = _x; + let n$1 = _n; + let x$1 = _x; if (x$1) { if (n$1 === 0) { return x$1.hd; } _n = n$1 - 1 | 0; _x = x$1.tl; - continue ; + continue; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); }; } function partitionAux(p, _cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { - return ; + return; } - var t = cell.tl; - var h = cell.hd; - var next = { + let t = cell.tl; + let h = cell.hd; + let next = { hd: h, tl: /* [] */0 }; @@ -111,29 +115,29 @@ function partitionAux(p, _cell, _precX, _precY) { precX.tl = next; _precX = next; _cell = t; - continue ; + continue; } precY.tl = next; _precY = next; _cell = t; - continue ; + continue; }; } function splitAux(_cell, _precX, _precY) { while(true) { - var precY = _precY; - var precX = _precX; - var cell = _cell; + let precY = _precY; + let precX = _precX; + let cell = _cell; if (!cell) { - return ; + return; } - var match = cell.hd; - var nextA = { + let match = cell.hd; + let nextA = { hd: match[0], tl: /* [] */0 }; - var nextB = { + let nextB = { hd: match[1], tl: /* [] */0 }; @@ -142,64 +146,64 @@ function splitAux(_cell, _precX, _precY) { _precY = nextB; _precX = nextA; _cell = cell.tl; - continue ; + continue; }; } function copyAuxCont(_cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return prec; } - var next = { + let next = { hd: cellX.hd, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = cellX.tl; - continue ; + continue; }; } function copyAuxWitFilter(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; } _cellX = t; - continue ; + continue; }; } function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { while(true) { - var i = _i; - var prec = _prec; - var cellX = _cellX; + let i = _i; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h, i)) { - var next = { + let next = { hd: h, tl: /* [] */0 }; @@ -207,71 +211,71 @@ function copyAuxWithFilterIndex(f, _cellX, _prec, _i) { _i = i + 1 | 0; _prec = next; _cellX = t; - continue ; + continue; } _i = i + 1 | 0; _cellX = t; - continue ; + continue; }; } function copyAuxWitFilterMap(f, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var t = cellX.tl; - var h = f(cellX.hd); + let t = cellX.tl; + let h = f(cellX.hd); if (h !== undefined) { - var next = { + let next = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; } _cellX = t; - continue ; + continue; }; } function removeAssocAuxWithMap(_cellX, x, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (f(h[0], x)) { prec.tl = t; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; }; } function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { return false; } - var t = cellX.tl; - var h = cellX.hd; + let t = cellX.tl; + let h = cellX.hd; if (eq(h[0], x)) { prec.tl = { hd: [ @@ -282,47 +286,47 @@ function setAssocAuxWithMap(_cellX, x, k, _prec, eq) { }; return true; } - var next = { + let next = { hd: h, tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = t; - continue ; + continue; }; } function copyAuxWithMap(_cellX, _prec, f) { while(true) { - var prec = _prec; - var cellX = _cellX; + let prec = _prec; + let cellX = _cellX; if (!cellX) { - return ; + return; } - var next = { + let next = { hd: f(cellX.hd), tl: /* [] */0 }; prec.tl = next; _prec = next; _cellX = cellX.tl; - continue ; + continue; }; } function zipAux(_cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { - return ; + return; } if (!cellY) { - return ; + return; } - var next = { + let next = { hd: [ cellX.hd, cellY.hd @@ -333,22 +337,22 @@ function zipAux(_cellX, _cellY, _prec) { _prec = next; _cellY = cellY.tl; _cellX = cellX.tl; - continue ; + continue; }; } function copyAuxWithMap2(f, _cellX, _cellY, _prec) { while(true) { - var prec = _prec; - var cellY = _cellY; - var cellX = _cellX; + let prec = _prec; + let cellY = _cellY; + let cellX = _cellX; if (!cellX) { - return ; + return; } if (!cellY) { - return ; + return; } - var next = { + let next = { hd: f(cellX.hd, cellY.hd), tl: /* [] */0 }; @@ -356,19 +360,19 @@ function copyAuxWithMap2(f, _cellX, _cellY, _prec) { _prec = next; _cellY = cellY.tl; _cellX = cellX.tl; - continue ; + continue; }; } function copyAuxWithMapI(f, _i, _cellX, _prec) { while(true) { - var prec = _prec; - var cellX = _cellX; - var i = _i; + let prec = _prec; + let cellX = _cellX; + let i = _i; if (!cellX) { - return ; + return; } - var next = { + let next = { hd: f(cellX.hd, i), tl: /* [] */0 }; @@ -376,22 +380,22 @@ function copyAuxWithMapI(f, _i, _cellX, _prec) { _prec = next; _cellX = cellX.tl; _i = i + 1 | 0; - continue ; + continue; }; } function takeAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return true; } if (!cell) { return false; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -399,22 +403,22 @@ function takeAux(_n, _cell, _prec) { _prec = cell$1; _cell = cell.tl; _n = n - 1 | 0; - continue ; + continue; }; } function splitAtAux(_n, _cell, _prec) { while(true) { - var prec = _prec; - var cell = _cell; - var n = _n; + let prec = _prec; + let cell = _cell; + let n = _n; if (n === 0) { return cell; } if (!cell) { - return ; + return; } - var cell$1 = { + let cell$1 = { hd: cell.hd, tl: /* [] */0 }; @@ -422,25 +426,25 @@ function splitAtAux(_n, _cell, _prec) { _prec = cell$1; _cell = cell.tl; _n = n - 1 | 0; - continue ; + continue; }; } function take(lst, n) { if (n < 0) { - return ; + return; } if (n === 0) { return /* [] */0; } if (!lst) { - return ; + return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var has = takeAux(n - 1 | 0, lst.tl, cell); + let has = takeAux(n - 1 | 0, lst.tl, cell); if (has) { return cell; } @@ -449,49 +453,49 @@ function take(lst, n) { function drop(lst, n) { if (n < 0) { - return ; + return; } else { - var _l = lst; - var _n = n; + let _l = lst; + let _n = n; while(true) { - var n$1 = _n; - var l = _l; + let n$1 = _n; + let l = _l; if (n$1 === 0) { return l; } if (!l) { - return ; + return; } _n = n$1 - 1 | 0; _l = l.tl; - continue ; + continue; }; } } function splitAt(lst, n) { if (n < 0) { - return ; + return; } if (n === 0) { return [ - /* [] */0, - lst - ]; + /* [] */0, + lst + ]; } if (!lst) { - return ; + return; } - var cell = { + let cell = { hd: lst.hd, tl: /* [] */0 }; - var rest = splitAtAux(n - 1 | 0, lst.tl, cell); + let rest = splitAtAux(n - 1 | 0, lst.tl, cell); if (rest !== undefined) { return [ - cell, - rest - ]; + cell, + rest + ]; } } @@ -500,7 +504,7 @@ function concat(xs, ys) { if (!xs) { return ys; } - var cell = { + let cell = { hd: xs.hd, tl: /* [] */0 }; @@ -512,7 +516,7 @@ function map(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(xs.hd), tl: /* [] */0 }; @@ -527,7 +531,7 @@ function zipBy(l1, l2, f) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: f(l1.hd, l2.hd), tl: /* [] */0 }; @@ -539,7 +543,7 @@ function mapWithIndex(xs, f) { if (!xs) { return /* [] */0; } - var cell = { + let cell = { hd: f(xs.hd, 0), tl: /* [] */0 }; @@ -551,14 +555,14 @@ function fromInitializer(n, f) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: f(0), tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v = { + let v = { hd: f(i), tl: /* [] */0 }; @@ -573,14 +577,14 @@ function make(n, v) { if (n <= 0) { return /* [] */0; } - var headX = { + let headX = { hd: v, tl: /* [] */0 }; - var cur = headX; - var i = 1; + let cur = headX; + let i = 1; while(i < n) { - var v$1 = { + let v$1 = { hd: v, tl: /* [] */0 }; @@ -592,40 +596,40 @@ function make(n, v) { } function length(xs) { - var _x = xs; - var _acc = 0; + let _x = xs; + let _acc = 0; while(true) { - var acc = _acc; - var x = _x; + let acc = _acc; + let x = _x; if (!x) { return acc; } _acc = acc + 1 | 0; _x = x.tl; - continue ; + continue; }; } function fillAux(arr, _i, _x) { while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { - return ; + return; } arr[i] = x.hd; _x = x.tl; _i = i + 1 | 0; - continue ; + continue; }; } function fromArray(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -634,27 +638,27 @@ function fromArray(a) { tl: res }; _i = i - 1 | 0; - continue ; + continue; }; } function toArray(x) { - var len = length(x); - var arr = new Array(len); + let len = length(x); + let arr = new Array(len); fillAux(arr, 0, x); return arr; } function toShuffled(xs) { - var v = toArray(xs); + let v = toArray(xs); Core__Array.shuffle(v); return fromArray(v); } function reverseConcat(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -663,7 +667,7 @@ function reverseConcat(_l1, _l2) { tl: l2 }; _l1 = l1.tl; - continue ; + continue; }; } @@ -673,27 +677,27 @@ function reverse(l) { function flatAux(_prec, _xs) { while(true) { - var xs = _xs; - var prec = _prec; + let xs = _xs; + let prec = _prec; if (xs) { _xs = xs.tl; _prec = copyAuxCont(xs.hd, prec); - continue ; + continue; } prec.tl = /* [] */0; - return ; + return; }; } function flat(_xs) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var match = xs.hd; + let match = xs.hd; if (match) { - var cell = { + let cell = { hd: match.hd, tl: /* [] */0 }; @@ -701,32 +705,32 @@ function flat(_xs) { return cell; } _xs = xs.tl; - continue ; + continue; }; } function concatMany(xs) { - var len = xs.length; + let len = xs.length; if (len === 1) { return xs[0]; } if (len === 0) { return /* [] */0; } - var len$1 = xs.length; - var v = xs[len$1 - 1 | 0]; - for(var i = len$1 - 2 | 0; i >= 0; --i){ + let len$1 = xs.length; + let v = xs[len$1 - 1 | 0]; + for(let i = len$1 - 2 | 0; i >= 0; --i){ v = concat(xs[i], v); } return v; } function mapReverse(l, f) { - var _accu = /* [] */0; - var _xs = l; + let _accu = /* [] */0; + let _xs = l; while(true) { - var xs = _xs; - var accu = _accu; + let xs = _xs; + let accu = _accu; if (!xs) { return accu; } @@ -735,48 +739,48 @@ function mapReverse(l, f) { hd: f(xs.hd), tl: accu }; - continue ; + continue; }; } function forEach(_xs, f) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { - return ; + return; } f(xs.hd); _xs = xs.tl; - continue ; + continue; }; } function forEachWithIndex(l, f) { - var _xs = l; - var _i = 0; + let _xs = l; + let _i = 0; while(true) { - var i = _i; - var xs = _xs; + let i = _i; + let xs = _xs; if (!xs) { - return ; + return; } f(xs.hd, i); _i = i + 1 | 0; _xs = xs.tl; - continue ; + continue; }; } function reduce(_l, _accu, f) { while(true) { - var accu = _accu; - var l = _l; + let accu = _accu; + let l = _l; if (!l) { return accu; } _accu = f(accu, l.hd); _l = l.tl; - continue ; + continue; }; } @@ -789,13 +793,13 @@ function reduceReverseUnsafe(l, accu, f) { } function reduceReverse(l, acc, f) { - var len = length(l); + let len = length(l); if (len < 1000) { return reduceReverseUnsafe(l, acc, f); } else { - var a = toArray(l); - var r = acc; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let a = toArray(l); + let r = acc; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(r, a[i]); } return r; @@ -803,31 +807,31 @@ function reduceReverse(l, acc, f) { } function reduceWithIndex(l, acc, f) { - var _l = l; - var _acc = acc; - var _i = 0; + let _l = l; + let _acc = acc; + let _i = 0; while(true) { - var i = _i; - var acc$1 = _acc; - var l$1 = _l; + let i = _i; + let acc$1 = _acc; + let l$1 = _l; if (!l$1) { return acc$1; } _i = i + 1 | 0; _acc = f(acc$1, l$1.hd, i); _l = l$1.tl; - continue ; + continue; }; } function mapReverse2(l1, l2, f) { - var _l1 = l1; - var _l2 = l2; - var _accu = /* [] */0; + let _l1 = l1; + let _l2 = l2; + let _accu = /* [] */0; while(true) { - var accu = _accu; - var l2$1 = _l2; - var l1$1 = _l1; + let accu = _accu; + let l2$1 = _l2; + let l1$1 = _l1; if (!l1$1) { return accu; } @@ -840,32 +844,32 @@ function mapReverse2(l1, l2, f) { }; _l2 = l2$1.tl; _l1 = l1$1.tl; - continue ; + continue; }; } function forEach2(_l1, _l2, f) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { - return ; + return; } if (!l2) { - return ; + return; } f(l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function reduce2(_l1, _l2, _accu, f) { while(true) { - var accu = _accu; - var l2 = _l2; - var l1 = _l1; + let accu = _accu; + let l2 = _l2; + let l1 = _l1; if (!l1) { return accu; } @@ -875,7 +879,7 @@ function reduce2(_l1, _l2, _accu, f) { _accu = f(accu, l1.hd, l2.hd); _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } @@ -888,15 +892,15 @@ function reduceReverse2Unsafe(l1, l2, accu, f) { } function reduceReverse2(l1, l2, acc, f) { - var len = length(l1); + let len = length(l1); if (len < 1000) { return reduceReverse2Unsafe(l1, l2, acc, f); } else { - var a = toArray(l1); - var b = toArray(l2); - var r = acc; - var len$1 = a.length < b.length ? a.length : b.length; - for(var i = len$1 - 1 | 0; i >= 0; --i){ + let a = toArray(l1); + let b = toArray(l2); + let r = acc; + let len$1 = a.length < b.length ? a.length : b.length; + for(let i = len$1 - 1 | 0; i >= 0; --i){ r = f(r, a[i], b[i]); } return r; @@ -905,7 +909,7 @@ function reduceReverse2(l1, l2, acc, f) { function every(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return true; } @@ -913,13 +917,13 @@ function every(_xs, p) { return false; } _xs = xs.tl; - continue ; + continue; }; } function some(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -927,14 +931,14 @@ function some(_xs, p) { return true; } _xs = xs.tl; - continue ; + continue; }; } function every2(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return true; } @@ -946,14 +950,14 @@ function every2(_l1, _l2, p) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function compareLength(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -966,14 +970,14 @@ function compareLength(_l1, _l2) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function compare(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return -1; @@ -984,20 +988,20 @@ function compare(_l1, _l2, p) { if (!l2) { return 1; } - var c = p(l1.hd, l2.hd); + let c = p(l1.hd, l2.hd); if (c !== 0) { return c; } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function equal(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { if (l2) { return false; @@ -1013,14 +1017,14 @@ function equal(_l1, _l2, p) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function some2(_l1, _l2, p) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return false; } @@ -1032,13 +1036,13 @@ function some2(_l1, _l2, p) { } _l2 = l2.tl; _l1 = l1.tl; - continue ; + continue; }; } function has(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1046,28 +1050,28 @@ function has(_xs, x, eq) { return true; } _xs = xs.tl; - continue ; + continue; }; } function getAssoc(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { - return ; + return; } - var match = xs.hd; + let match = xs.hd; if (eq(match[0], x)) { return Caml_option.some(match[1]); } _xs = xs.tl; - continue ; + continue; }; } function hasAssoc(_xs, x, eq) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return false; } @@ -1075,7 +1079,7 @@ function hasAssoc(_xs, x, eq) { return true; } _xs = xs.tl; - continue ; + continue; }; } @@ -1083,16 +1087,16 @@ function removeAssoc(xs, x, eq) { if (!xs) { return /* [] */0; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return l; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var removed = removeAssocAuxWithMap(l, x, cell, eq); + let removed = removeAssocAuxWithMap(l, x, cell, eq); if (removed) { return cell; } else { @@ -1103,73 +1107,73 @@ function removeAssoc(xs, x, eq) { function setAssoc(xs, x, k, eq) { if (!xs) { return { - hd: [ - x, - k - ], - tl: /* [] */0 - }; + hd: [ + x, + k + ], + tl: /* [] */0 + }; } - var l = xs.tl; - var pair = xs.hd; + let l = xs.tl; + let pair = xs.hd; if (eq(pair[0], x)) { return { - hd: [ - x, - k - ], - tl: l - }; + hd: [ + x, + k + ], + tl: l + }; } - var cell = { + let cell = { hd: pair, tl: /* [] */0 }; - var replaced = setAssocAuxWithMap(l, x, k, cell, eq); + let replaced = setAssocAuxWithMap(l, x, k, cell, eq); if (replaced) { return cell; } else { return { - hd: [ - x, - k - ], - tl: xs - }; + hd: [ + x, + k + ], + tl: xs + }; } } function sort(xs, cmp) { - var arr = toArray(xs); + let arr = toArray(xs); arr.sort(cmp); return fromArray(arr); } function find(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { - return ; + return; } - var x = xs.hd; + let x = xs.hd; if (p(x)) { return Caml_option.some(x); } _xs = xs.tl; - continue ; + continue; }; } function filter(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = xs.hd; + let t = xs.tl; + let h = xs.hd; if (p(h)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1177,23 +1181,23 @@ function filter(_xs, p) { return cell; } _xs = t; - continue ; + continue; }; } function filterWithIndex(xs, p) { - var _xs = xs; - var _i = 0; + let _xs = xs; + let _i = 0; while(true) { - var i = _i; - var xs$1 = _xs; + let i = _i; + let xs$1 = _xs; if (!xs$1) { return /* [] */0; } - var t = xs$1.tl; - var h = xs$1.hd; + let t = xs$1.tl; + let h = xs$1.hd; if (p(h, i)) { - var cell = { + let cell = { hd: h, tl: /* [] */0 }; @@ -1202,20 +1206,20 @@ function filterWithIndex(xs, p) { } _i = i + 1 | 0; _xs = t; - continue ; + continue; }; } function filterMap(_xs, p) { while(true) { - var xs = _xs; + let xs = _xs; if (!xs) { return /* [] */0; } - var t = xs.tl; - var h = p(xs.hd); + let t = xs.tl; + let h = p(xs.hd); if (h !== undefined) { - var cell = { + let cell = { hd: Caml_option.valFromOption(h), tl: /* [] */0 }; @@ -1223,62 +1227,62 @@ function filterMap(_xs, p) { return cell; } _xs = t; - continue ; + continue; }; } function partition(l, p) { if (!l) { return [ - /* [] */0, - /* [] */0 - ]; + /* [] */0, + /* [] */0 + ]; } - var h = l.hd; - var nextX = { + let h = l.hd; + let nextX = { hd: h, tl: /* [] */0 }; - var nextY = { + let nextY = { hd: h, tl: /* [] */0 }; - var b = p(h); + let b = p(h); partitionAux(p, l.tl, nextX, nextY); if (b) { return [ - nextX, - nextY.tl - ]; + nextX, + nextY.tl + ]; } else { return [ - nextX.tl, - nextY - ]; + nextX.tl, + nextY + ]; } } function unzip(xs) { if (!xs) { return [ - /* [] */0, - /* [] */0 - ]; + /* [] */0, + /* [] */0 + ]; } - var match = xs.hd; - var cellX = { + let match = xs.hd; + let cellX = { hd: match[0], tl: /* [] */0 }; - var cellY = { + let cellY = { hd: match[1], tl: /* [] */0 }; splitAux(xs.tl, cellX, cellY); return [ - cellX, - cellY - ]; + cellX, + cellY + ]; } function zip(l1, l2) { @@ -1288,7 +1292,7 @@ function zip(l1, l2) { if (!l2) { return /* [] */0; } - var cell = { + let cell = { hd: [ l1.hd, l2.hd @@ -1299,63 +1303,63 @@ function zip(l1, l2) { return cell; } -var size = length; +let size = length; export { - length , - size , - head , - headExn , - tail , - tailExn , - add , - get , - getExn , - make , - fromInitializer , - toShuffled , - drop , - take , - splitAt , - concat , - concatMany , - reverseConcat , - flat , - map , - zip , - zipBy , - mapWithIndex , - fromArray , - toArray , - reverse , - mapReverse , - forEach , - forEachWithIndex , - reduce , - reduceWithIndex , - reduceReverse , - mapReverse2 , - forEach2 , - reduce2 , - reduceReverse2 , - every , - some , - every2 , - some2 , - compareLength , - compare , - equal , - has , - find , - filter , - filterWithIndex , - filterMap , - partition , - unzip , - getAssoc , - hasAssoc , - removeAssoc , - setAssoc , - sort , + length, + size, + head, + headExn, + tail, + tailExn, + add, + get, + getExn, + make, + fromInitializer, + toShuffled, + drop, + take, + splitAt, + concat, + concatMany, + reverseConcat, + flat, + map, + zip, + zipBy, + mapWithIndex, + fromArray, + toArray, + reverse, + mapReverse, + forEach, + forEachWithIndex, + reduce, + reduceWithIndex, + reduceReverse, + mapReverse2, + forEach2, + reduce2, + reduceReverse2, + every, + some, + every2, + some2, + compareLength, + compare, + equal, + has, + find, + filter, + filterWithIndex, + filterMap, + partition, + unzip, + getAssoc, + hasAssoc, + removeAssoc, + setAssoc, + sort, } /* No side effect */ diff --git a/core/src/Core__Math.js b/core/src/Core__Math.js index 6a3f67c..964eb21 100644 --- a/core/src/Core__Math.js +++ b/core/src/Core__Math.js @@ -1,7 +1,7 @@ -var Constants = {}; +let Constants = {}; function floor(f) { return Math.floor(f) | 0; @@ -12,18 +12,18 @@ function ceil(f) { } function random(min, max) { - var f = Math.random() * (max - min | 0); + let f = Math.random() * (max - min | 0); return (Math.floor(f) | 0) + min | 0; } -var Int = { +let Int = { floor: floor, ceil: ceil, random: random }; export { - Constants , - Int , + Constants, + Int, } /* No side effect */ diff --git a/core/src/Core__Null.js b/core/src/Core__Null.js index d78e80a..1f534d6 100644 --- a/core/src/Core__Null.js +++ b/core/src/Core__Null.js @@ -31,11 +31,12 @@ function getExn(value) { if (value !== null) { return value; } - throw { - RE_EXN_ID: "Invalid_argument", - _1: "Null.getExn: value is null", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "Null.getExn: value is null" + } + }); } function forEach(value, f) { @@ -69,21 +70,21 @@ function flatMap(value, f) { } } -var getWithDefault = getOr; +let getWithDefault = getOr; -var mapWithDefault = mapOr; +let mapWithDefault = mapOr; export { - equal , - compare , - fromOption , - getOr , - getWithDefault , - getExn , - forEach , - map , - mapOr , - mapWithDefault , - flatMap , + equal, + compare, + fromOption, + getOr, + getWithDefault, + getExn, + forEach, + map, + mapOr, + mapWithDefault, + flatMap, } /* No side effect */ diff --git a/core/src/Core__Nullable.js b/core/src/Core__Nullable.js index 02bdccc..0d56720 100644 --- a/core/src/Core__Nullable.js +++ b/core/src/Core__Nullable.js @@ -30,11 +30,12 @@ function getExn(value) { if (!(value == null)) { return value; } - throw { - RE_EXN_ID: "Invalid_argument", - _1: "Nullable.getExn: value is null or undefined", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "Nullable.getExn: value is null or undefined" + } + }); } function forEach(value, f) { @@ -68,21 +69,21 @@ function flatMap(value, f) { } } -var getWithDefault = getOr; +let getWithDefault = getOr; -var mapWithDefault = mapOr; +let mapWithDefault = mapOr; export { - equal , - compare , - fromOption , - getOr , - getWithDefault , - getExn , - forEach , - map , - mapOr , - mapWithDefault , - flatMap , + equal, + compare, + fromOption, + getOr, + getWithDefault, + getExn, + forEach, + map, + mapOr, + mapWithDefault, + flatMap, } /* No side effect */ diff --git a/core/src/Core__Option.js b/core/src/Core__Option.js index 516964f..9aa41a9 100644 --- a/core/src/Core__Option.js +++ b/core/src/Core__Option.js @@ -97,24 +97,24 @@ function compare(a, b, cmp) { } } -var mapWithDefault = mapOr; +let mapWithDefault = mapOr; -var getWithDefault = getOr; +let getWithDefault = getOr; export { - filter , - forEach , - getExn , - mapOr , - mapWithDefault , - map , - flatMap , - getOr , - getWithDefault , - orElse , - isSome , - isNone , - equal , - compare , + filter, + forEach, + getExn, + mapOr, + mapWithDefault, + map, + flatMap, + getOr, + getWithDefault, + orElse, + isSome, + isNone, + equal, + compare, } /* No side effect */ diff --git a/core/src/Core__Ordering.js b/core/src/Core__Ordering.js index 4d2e32d..c249cde 100644 --- a/core/src/Core__Ordering.js +++ b/core/src/Core__Ordering.js @@ -28,10 +28,10 @@ function fromInt(n) { } export { - isLess , - isEqual , - isGreater , - invert , - fromInt , + isLess, + isEqual, + isGreater, + invert, + fromInt, } /* No side effect */ diff --git a/core/src/Core__Promise.js b/core/src/Core__Promise.js index f1a34f6..ebf49d5 100644 --- a/core/src/Core__Promise.js +++ b/core/src/Core__Promise.js @@ -4,11 +4,11 @@ import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js"; function $$catch(promise, callback) { return promise.catch(function (err) { - return callback(Caml_js_exceptions.internalToOCamlException(err)); - }); + return callback(Caml_js_exceptions.internalToOCamlException(err)); + }); } export { - $$catch , + $$catch, } /* No side effect */ diff --git a/core/src/Core__RegExp.js b/core/src/Core__RegExp.js index aee5b2f..e3ed577 100644 --- a/core/src/Core__RegExp.js +++ b/core/src/Core__RegExp.js @@ -1,9 +1,9 @@ -var Result = {}; +let Result = {}; export { - Result , + Result, } /* No side effect */ diff --git a/core/src/Core__Result.js b/core/src/Core__Result.js index 09490e3..471da83 100644 --- a/core/src/Core__Result.js +++ b/core/src/Core__Result.js @@ -5,10 +5,11 @@ function getExn(x) { if (x.TAG === "Ok") { return x._0; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } function mapOr(opt, $$default, f) { @@ -22,9 +23,9 @@ function mapOr(opt, $$default, f) { function map(opt, f) { if (opt.TAG === "Ok") { return { - TAG: "Ok", - _0: f(opt._0) - }; + TAG: "Ok", + _0: f(opt._0) + }; } else { return opt; } @@ -102,29 +103,29 @@ function mapError(r, f) { return r; } else { return { - TAG: "Error", - _0: f(r._0) - }; + TAG: "Error", + _0: f(r._0) + }; } } -var mapWithDefault = mapOr; +let mapWithDefault = mapOr; -var getWithDefault = getOr; +let getWithDefault = getOr; export { - getExn , - mapOr , - mapWithDefault , - map , - flatMap , - getOr , - getWithDefault , - isOk , - isError , - equal , - compare , - forEach , - mapError , + getExn, + mapOr, + mapWithDefault, + map, + flatMap, + getOr, + getWithDefault, + isOk, + isError, + equal, + compare, + forEach, + mapError, } /* No side effect */ diff --git a/core/src/Core__String.js b/core/src/Core__String.js index a11ada9..d003c8e 100644 --- a/core/src/Core__String.js +++ b/core/src/Core__String.js @@ -16,7 +16,7 @@ function compare(a, b) { } function indexOfOpt(s, search) { - var index = s.indexOf(search); + let index = s.indexOf(search); if (index !== -1) { return index; } @@ -24,7 +24,7 @@ function indexOfOpt(s, search) { } function lastIndexOfOpt(s, search) { - var index = s.lastIndexOf(search); + let index = s.lastIndexOf(search); if (index !== -1) { return index; } @@ -32,7 +32,7 @@ function lastIndexOfOpt(s, search) { } function searchOpt(s, re) { - var index = s.search(re); + let index = s.search(re); if (index !== -1) { return index; } @@ -40,10 +40,10 @@ function searchOpt(s, re) { } export { - equal , - compare , - indexOfOpt , - lastIndexOfOpt , - searchOpt , + equal, + compare, + indexOfOpt, + lastIndexOfOpt, + searchOpt, } /* No side effect */ diff --git a/core/src/Core__Type.js b/core/src/Core__Type.js index c08d9d9..1656f95 100644 --- a/core/src/Core__Type.js +++ b/core/src/Core__Type.js @@ -2,57 +2,57 @@ function classify(value) { - var match = Object.prototype.toString.call(value); + let match = Object.prototype.toString.call(value); switch (match) { case "[object BigInt]" : return { - TAG: "BigInt", - _0: value - }; + TAG: "BigInt", + _0: value + }; case "[object Boolean]" : return { - TAG: "Bool", - _0: value - }; + TAG: "Bool", + _0: value + }; case "[object AsyncFunction]" : case "[object Function]" : case "[object GeneratorFunction]" : return { - TAG: "Function", - _0: value - }; + TAG: "Function", + _0: value + }; case "[object Null]" : return "Null"; case "[object Number]" : return { - TAG: "Number", - _0: value - }; + TAG: "Number", + _0: value + }; case "[object String]" : return { - TAG: "String", - _0: value - }; + TAG: "String", + _0: value + }; case "[object Symbol]" : return { - TAG: "Symbol", - _0: value - }; + TAG: "Symbol", + _0: value + }; case "[object Undefined]" : return "Undefined"; default: return { - TAG: "Object", - _0: value - }; + TAG: "Object", + _0: value + }; } } -var Classify = { +let Classify = { classify: classify }; export { - Classify , + Classify, } /* No side effect */ diff --git a/core/src/RescriptCore.js b/core/src/RescriptCore.js index 04f6998..51d9cb8 100644 --- a/core/src/RescriptCore.js +++ b/core/src/RescriptCore.js @@ -2,141 +2,141 @@ import * as Core__Error from "./Core__Error.js"; -var $$Array; +let $$Array; -var Console; +let Console; -var $$DataView; +let $$DataView; -var $$Date; +let $$Date; -var Dict; +let Dict; -var $$Error; +let $$Error; -var Float; +let Float; -var Int; +let Int; -var $$BigInt; +let $$BigInt; -var $$Math; +let $$Math; -var Null; +let Null; -var Nullable; +let Nullable; -var $$Object; +let $$Object; -var Ordering; +let Ordering; -var $$Promise; +let $$Promise; -var $$RegExp; +let $$RegExp; -var $$String; +let $$String; -var $$Symbol; +let $$Symbol; -var Type; +let Type; -var $$JSON; +let $$JSON; -var Iterator; +let $$Iterator; -var AsyncIterator; +let $$AsyncIterator; -var $$Map; +let $$Map; -var $$WeakMap; +let $$WeakMap; -var $$Set; +let $$Set; -var $$WeakSet; +let $$WeakSet; -var $$ArrayBuffer; +let $$ArrayBuffer; -var TypedArray; +let $$TypedArray; -var $$Float32Array; +let $$Float32Array; -var $$Float64Array; +let $$Float64Array; -var $$Int8Array; +let $$Int8Array; -var $$Int16Array; +let $$Int16Array; -var $$Int32Array; +let $$Int32Array; -var $$Uint8Array; +let $$Uint8Array; -var $$Uint16Array; +let $$Uint16Array; -var $$Uint32Array; +let $$Uint32Array; -var $$Uint8ClampedArray; +let $$Uint8ClampedArray; -var $$BigInt64Array; +let $$BigInt64Array; -var $$BigUint64Array; +let $$BigUint64Array; -var $$Intl; +let $$Intl; -var Re; +let Re; -var $$Option; +let Option; -var List; +let List; -var Result; +let Result; -var panic = Core__Error.panic; +let panic = Core__Error.panic; export { - $$Array , - Console , - $$DataView , - $$Date , - Dict , - $$Error , - Float , - Int , - $$BigInt , - $$Math , - Null , - Nullable , - $$Object , - Ordering , - $$Promise , - $$RegExp , - $$String , - $$Symbol , - Type , - $$JSON , - Iterator , - AsyncIterator , - $$Map , - $$WeakMap , - $$Set , - $$WeakSet , - $$ArrayBuffer , - TypedArray , - $$Float32Array , - $$Float64Array , - $$Int8Array , - $$Int16Array , - $$Int32Array , - $$Uint8Array , - $$Uint16Array , - $$Uint32Array , - $$Uint8ClampedArray , - $$BigInt64Array , - $$BigUint64Array , - $$Intl , - Re , - $$Option , - List , - Result , - panic , + $$Array, + Console, + $$DataView, + $$Date, + Dict, + $$Error, + Float, + Int, + $$BigInt, + $$Math, + Null, + Nullable, + $$Object, + Ordering, + $$Promise, + $$RegExp, + $$String, + $$Symbol, + Type, + $$JSON, + $$Iterator, + $$AsyncIterator, + $$Map, + $$WeakMap, + $$Set, + $$WeakSet, + $$ArrayBuffer, + $$TypedArray, + $$Float32Array, + $$Float64Array, + $$Int8Array, + $$Int16Array, + $$Int32Array, + $$Uint8Array, + $$Uint16Array, + $$Uint32Array, + $$Uint8ClampedArray, + $$BigInt64Array, + $$BigUint64Array, + $$Intl, + Re, + Option, + List, + Result, + panic, } /* No side effect */ diff --git a/core/src/intl/Core__Intl__NumberFormat.js b/core/src/intl/Core__Intl__NumberFormat.js index 013b1a8..4b29a9b 100644 --- a/core/src/intl/Core__Intl__NumberFormat.js +++ b/core/src/intl/Core__Intl__NumberFormat.js @@ -1,9 +1,9 @@ -var Grouping; +let Grouping; export { - Grouping , + Grouping, } /* No side effect */ diff --git a/core/src/intl/Core__Intl__NumberFormat__Grouping.js b/core/src/intl/Core__Intl__NumberFormat__Grouping.js index 2293c03..f6ff6e0 100644 --- a/core/src/intl/Core__Intl__NumberFormat__Grouping.js +++ b/core/src/intl/Core__Intl__NumberFormat__Grouping.js @@ -3,16 +3,16 @@ import * as Core__Type from "../Core__Type.js"; function parseJsValue(value) { - var value$1 = Core__Type.Classify.classify(value); + let value$1 = Core__Type.Classify.classify(value); if (typeof value$1 !== "object") { - return ; + return; } switch (value$1.TAG) { case "Bool" : return { - NAME: "bool", - VAL: value$1._0 - }; + NAME: "bool", + VAL: value$1._0 + }; case "String" : switch (value$1._0) { case "always" : @@ -22,14 +22,14 @@ function parseJsValue(value) { case "min2" : return "min2"; default: - return ; + return; } default: - return ; + return; } } export { - parseJsValue , + parseJsValue, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__BigInt64Array.js b/core/src/typed-arrays/Core__BigInt64Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__BigInt64Array.js +++ b/core/src/typed-arrays/Core__BigInt64Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__BigUint64Array.js b/core/src/typed-arrays/Core__BigUint64Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__BigUint64Array.js +++ b/core/src/typed-arrays/Core__BigUint64Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Float32Array.js b/core/src/typed-arrays/Core__Float32Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Float32Array.js +++ b/core/src/typed-arrays/Core__Float32Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Float64Array.js b/core/src/typed-arrays/Core__Float64Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Float64Array.js +++ b/core/src/typed-arrays/Core__Float64Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Int16Array.js b/core/src/typed-arrays/Core__Int16Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Int16Array.js +++ b/core/src/typed-arrays/Core__Int16Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Int32Array.js b/core/src/typed-arrays/Core__Int32Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Int32Array.js +++ b/core/src/typed-arrays/Core__Int32Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Int8Array.js b/core/src/typed-arrays/Core__Int8Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Int8Array.js +++ b/core/src/typed-arrays/Core__Int8Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Uint16Array.js b/core/src/typed-arrays/Core__Uint16Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Uint16Array.js +++ b/core/src/typed-arrays/Core__Uint16Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Uint32Array.js b/core/src/typed-arrays/Core__Uint32Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Uint32Array.js +++ b/core/src/typed-arrays/Core__Uint32Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Uint8Array.js b/core/src/typed-arrays/Core__Uint8Array.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Uint8Array.js +++ b/core/src/typed-arrays/Core__Uint8Array.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/core/src/typed-arrays/Core__Uint8ClampedArray.js b/core/src/typed-arrays/Core__Uint8ClampedArray.js index 99ad68e..cd16874 100644 --- a/core/src/typed-arrays/Core__Uint8ClampedArray.js +++ b/core/src/typed-arrays/Core__Uint8ClampedArray.js @@ -1,9 +1,9 @@ -var Constants = {}; +let Constants = {}; export { - Constants , + Constants, } /* No side effect */ diff --git a/js/src/js.js b/js/src/js.js index af0e7bd..f973eb6 100644 --- a/js/src/js.js +++ b/js/src/js.js @@ -1,114 +1,114 @@ -var Internal = {}; +let Internal = {}; -var Null; +let Null; -var Undefined; +let Undefined; -var Nullable; +let Nullable; -var Null_undefined; +let Null_undefined; -var Exn; +let Exn; -var $$Array; +let $$Array; -var Array2; +let Array2; -var $$String; +let $$String; -var String2; +let String2; -var Re; +let Re; -var $$Promise; +let $$Promise; -var Promise2; +let Promise2; -var $$Date; +let $$Date; -var Dict; +let Dict; -var Global; +let Global; -var Json; +let Json; -var $$Math; +let $$Math; -var Obj; +let Obj; -var Typed_array; +let Typed_array; -var TypedArray2; +let TypedArray2; -var Types; +let Types; -var Float; +let Float; -var Int; +let Int; -var $$BigInt; +let $$BigInt; -var $$File; +let File; -var $$Blob; +let Blob; -var $$Option; +let Option; -var Result; +let Result; -var List; +let List; -var Vector; +let Vector; -var Console; +let Console; -var $$Set; +let $$Set; -var $$WeakSet; +let $$WeakSet; -var $$Map; +let $$Map; -var $$WeakMap; +let $$WeakMap; export { - Internal , - Null , - Undefined , - Nullable , - Null_undefined , - Exn , - $$Array , - Array2 , - $$String , - String2 , - Re , - $$Promise , - Promise2 , - $$Date , - Dict , - Global , - Json , - $$Math , - Obj , - Typed_array , - TypedArray2 , - Types , - Float , - Int , - $$BigInt , - $$File , - $$Blob , - $$Option , - Result , - List , - Vector , - Console , - $$Set , - $$WeakSet , - $$Map , - $$WeakMap , + Internal, + Null, + Undefined, + Nullable, + Null_undefined, + Exn, + $$Array, + Array2, + $$String, + String2, + Re, + $$Promise, + Promise2, + $$Date, + Dict, + Global, + Json, + $$Math, + Obj, + Typed_array, + TypedArray2, + Types, + Float, + Int, + $$BigInt, + File, + Blob, + Option, + Result, + List, + Vector, + Console, + $$Set, + $$WeakSet, + $$Map, + $$WeakMap, } /* No side effect */ diff --git a/js/src/js_OO.js b/js/src/js_OO.js index 2233497..c6841bd 100644 --- a/js/src/js_OO.js +++ b/js/src/js_OO.js @@ -1,9 +1,9 @@ -var Callback = {}; +let Callback = {}; export { - Callback , + Callback, } /* No side effect */ diff --git a/js/src/js_bigint.js b/js/src/js_bigint.js index 7255018..c548d1a 100644 --- a/js/src/js_bigint.js +++ b/js/src/js_bigint.js @@ -6,6 +6,6 @@ function lnot(x) { } export { - lnot , + lnot, } /* No side effect */ diff --git a/js/src/js_dict.js b/js/src/js_dict.js index 84bb4be..1e415d5 100644 --- a/js/src/js_dict.js +++ b/js/src/js_dict.js @@ -9,16 +9,16 @@ function get(dict, k) { } -var unsafeDeleteKey = (function (dict,key){ +let unsafeDeleteKey = (function (dict,key){ delete dict[key]; }); function entries(dict) { - var keys = Object.keys(dict); - var l = keys.length; - var values = new Array(l); - for(var i = 0; i < l; ++i){ - var key = keys[i]; + let keys = Object.keys(dict); + let l = keys.length; + let values = new Array(l); + for(let i = 0; i < l; ++i){ + let key = keys[i]; values[i] = [ key, dict[key] @@ -28,58 +28,58 @@ function entries(dict) { } function values(dict) { - var keys = Object.keys(dict); - var l = keys.length; - var values$1 = new Array(l); - for(var i = 0; i < l; ++i){ + let keys = Object.keys(dict); + let l = keys.length; + let values$1 = new Array(l); + for(let i = 0; i < l; ++i){ values$1[i] = dict[keys[i]]; } return values$1; } function fromList(entries) { - var dict = {}; - var _x = entries; + let dict = {}; + let _x = entries; while(true) { - var x = _x; + let x = _x; if (!x) { return dict; } - var match = x.hd; + let match = x.hd; dict[match[0]] = match[1]; _x = x.tl; - continue ; + continue; }; } function fromArray(entries) { - var dict = {}; - var l = entries.length; - for(var i = 0; i < l; ++i){ - var match = entries[i]; + let dict = {}; + let l = entries.length; + for(let i = 0; i < l; ++i){ + let match = entries[i]; dict[match[0]] = match[1]; } return dict; } function map(f, source) { - var target = {}; - var keys = Object.keys(source); - var l = keys.length; - for(var i = 0; i < l; ++i){ - var key = keys[i]; + let target = {}; + let keys = Object.keys(source); + let l = keys.length; + for(let i = 0; i < l; ++i){ + let key = keys[i]; target[key] = f(source[key]); } return target; } export { - get , - unsafeDeleteKey , - entries , - values , - fromList , - fromArray , - map , + get, + unsafeDeleteKey, + entries, + values, + fromList, + fromArray, + map, } /* No side effect */ diff --git a/js/src/js_exn.js b/js/src/js_exn.js index 8894fa6..6df4f31 100644 --- a/js/src/js_exn.js +++ b/js/src/js_exn.js @@ -2,43 +2,57 @@ function raiseError(str) { - throw new Error(str); + throw new Error(new Error(str).RE_EXN_ID, { + cause: new Error(str) + }); } function raiseEvalError(str) { - throw new EvalError(str); + throw new Error(new EvalError(str).RE_EXN_ID, { + cause: new EvalError(str) + }); } function raiseRangeError(str) { - throw new RangeError(str); + throw new Error(new RangeError(str).RE_EXN_ID, { + cause: new RangeError(str) + }); } function raiseReferenceError(str) { - throw new ReferenceError(str); + throw new Error(new ReferenceError(str).RE_EXN_ID, { + cause: new ReferenceError(str) + }); } function raiseSyntaxError(str) { - throw new SyntaxError(str); + throw new Error(new SyntaxError(str).RE_EXN_ID, { + cause: new SyntaxError(str) + }); } function raiseTypeError(str) { - throw new TypeError(str); + throw new Error(new TypeError(str).RE_EXN_ID, { + cause: new TypeError(str) + }); } function raiseUriError(str) { - throw new URIError(str); + throw new Error(new URIError(str).RE_EXN_ID, { + cause: new URIError(str) + }); } -var $$Error$1 = "JsError"; +let $$Error$1 = "JsError"; export { $$Error$1 as $$Error, - raiseError , - raiseEvalError , - raiseRangeError , - raiseReferenceError , - raiseSyntaxError , - raiseTypeError , - raiseUriError , + raiseError, + raiseEvalError, + raiseRangeError, + raiseReferenceError, + raiseSyntaxError, + raiseTypeError, + raiseUriError, } /* No side effect */ diff --git a/js/src/js_int.js b/js/src/js_int.js index 78b6290..53a2d18 100644 --- a/js/src/js_int.js +++ b/js/src/js_int.js @@ -5,13 +5,13 @@ function equal(x, y) { return x === y; } -var max = 2147483647; +let max = 2147483647; -var min = -2147483648; +let min = -2147483648; export { - equal , - max , - min , + equal, + max, + min, } /* No side effect */ diff --git a/js/src/js_json.js b/js/src/js_json.js index 0969a93..da59041 100644 --- a/js/src/js_json.js +++ b/js/src/js_json.js @@ -1,20 +1,20 @@ -var Kind = {}; +let Kind = {}; function classify(x) { - var ty = typeof x; + let ty = typeof x; if (ty === "string") { return { - TAG: "JSONString", - _0: x - }; + TAG: "JSONString", + _0: x + }; } else if (ty === "number") { return { - TAG: "JSONNumber", - _0: x - }; + TAG: "JSONNumber", + _0: x + }; } else if (ty === "boolean") { if (x === true) { return "JSONTrue"; @@ -25,14 +25,14 @@ function classify(x) { return "JSONNull"; } else if (Array.isArray(x)) { return { - TAG: "JSONArray", - _0: x - }; + TAG: "JSONArray", + _0: x + }; } else { return { - TAG: "JSONObject", - _0: x - }; + TAG: "JSONObject", + _0: x + }; } } @@ -100,7 +100,7 @@ function decodeNull(json) { } -var patch = (function (json) { +let patch = (function (json) { var x = [json]; var q = [{ kind: 0, i: 0, parent: x }]; while (q.length !== 0) { @@ -159,16 +159,16 @@ function deserializeUnsafe(s) { } export { - Kind , - classify , - test , - decodeString , - decodeNumber , - decodeObject , - decodeArray , - decodeBoolean , - decodeNull , - deserializeUnsafe , - serializeExn , + Kind, + classify, + test, + decodeString, + decodeNumber, + decodeObject, + decodeArray, + decodeBoolean, + decodeNull, + deserializeUnsafe, + serializeExn, } /* No side effect */ diff --git a/js/src/js_list.js b/js/src/js_list.js index 95fe8d1..bebfe79 100644 --- a/js/src/js_list.js +++ b/js/src/js_list.js @@ -4,25 +4,25 @@ import * as Js_vector from "./js_vector.js"; import * as Caml_option from "rescript/lib/es6/caml_option.js"; function length(l) { - var _len = 0; - var _x = l; + let _len = 0; + let _x = l; while(true) { - var x = _x; - var len = _len; + let x = _x; + let len = _len; if (!x) { return len; } _x = x.tl; _len = len + 1 | 0; - continue ; + continue; }; } function cons(x, xs) { return { - hd: x, - tl: xs - }; + hd: x, + tl: xs + }; } function isEmpty(x) { @@ -45,29 +45,29 @@ function tl(x) { function nth(l, n) { if (n < 0) { - return ; + return; } - var _l = l; - var _n = n; + let _l = l; + let _n = n; while(true) { - var n$1 = _n; - var l$1 = _l; + let n$1 = _n; + let l$1 = _l; if (!l$1) { - return ; + return; } if (n$1 === 0) { return Caml_option.some(l$1.hd); } _n = n$1 - 1 | 0; _l = l$1.tl; - continue ; + continue; }; } function revAppend(_l1, _l2) { while(true) { - var l2 = _l2; - var l1 = _l1; + let l2 = _l2; + let l1 = _l1; if (!l1) { return l2; } @@ -76,7 +76,7 @@ function revAppend(_l1, _l2) { tl: l2 }; _l1 = l1.tl; - continue ; + continue; }; } @@ -86,8 +86,8 @@ function rev(l) { function mapRevAux(f, _acc, _ls) { while(true) { - var ls = _ls; - var acc = _acc; + let ls = _ls; + let acc = _acc; if (!ls) { return acc; } @@ -96,7 +96,7 @@ function mapRevAux(f, _acc, _ls) { hd: f(ls.hd), tl: acc }; - continue ; + continue; }; } @@ -110,65 +110,65 @@ function map(f, ls) { function iter(f, _x) { while(true) { - var x = _x; + let x = _x; if (!x) { - return ; + return; } f(x.hd); _x = x.tl; - continue ; + continue; }; } function iteri(f, l) { - var _i = 0; - var _x = l; + let _i = 0; + let _x = l; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { - return ; + return; } f(i, x.hd); _x = x.tl; _i = i + 1 | 0; - continue ; + continue; }; } function foldLeft(f, _accu, _l) { while(true) { - var l = _l; - var accu = _accu; + let l = _l; + let accu = _accu; if (!l) { return accu; } _l = l.tl; _accu = f(accu, l.hd); - continue ; + continue; }; } function tailLoop(f, _acc, _x) { while(true) { - var x = _x; - var acc = _acc; + let x = _x; + let acc = _acc; if (!x) { return acc; } _x = x.tl; _acc = f(x.hd, acc); - continue ; + continue; }; } function foldRight(f, l, init) { - var loop = function (n, x) { + let loop = function (n, x) { if (!x) { return init; } - var t = x.tl; - var h = x.hd; + let t = x.tl; + let h = x.hd; if (n < 1000) { return f(h, loop(n + 1 | 0, t)); } else { @@ -179,39 +179,39 @@ function foldRight(f, l, init) { } function flatten(lx) { - var _acc = /* [] */0; - var _lx = lx; + let _acc = /* [] */0; + let _lx = lx; while(true) { - var lx$1 = _lx; - var acc = _acc; + let lx$1 = _lx; + let acc = _acc; if (!lx$1) { return revAppend(acc, /* [] */0); } _lx = lx$1.tl; _acc = revAppend(lx$1.hd, acc); - continue ; + continue; }; } function filterRevAux(f, _acc, _xs) { while(true) { - var xs = _xs; - var acc = _acc; + let xs = _xs; + let acc = _acc; if (!xs) { return acc; } - var ys = xs.tl; - var y = xs.hd; + let ys = xs.tl; + let y = xs.hd; if (f(y)) { _xs = ys; _acc = { hd: y, tl: acc }; - continue ; + continue; } _xs = ys; - continue ; + continue; }; } @@ -221,23 +221,23 @@ function filter(f, xs) { function filterMapRevAux(f, _acc, _xs) { while(true) { - var xs = _xs; - var acc = _acc; + let xs = _xs; + let acc = _acc; if (!xs) { return acc; } - var ys = xs.tl; - var z = f(xs.hd); + let ys = xs.tl; + let z = f(xs.hd); if (z !== undefined) { _xs = ys; _acc = { hd: Caml_option.valFromOption(z), tl: acc }; - continue ; + continue; } _xs = ys; - continue ; + continue; }; } @@ -246,17 +246,17 @@ function filterMap(f, xs) { } function countBy(f, xs) { - var _acc = 0; - var _xs = xs; + let _acc = 0; + let _xs = xs; while(true) { - var xs$1 = _xs; - var acc = _acc; + let xs$1 = _xs; + let acc = _acc; if (!xs$1) { return acc; } _xs = xs$1.tl; _acc = f(xs$1.hd) ? acc + 1 | 0 : acc; - continue ; + continue; }; } @@ -268,26 +268,26 @@ function toVector(xs) { if (!xs) { return []; } - var a = new Array(length(xs)); - var _i = 0; - var _x = xs; + let a = new Array(length(xs)); + let _i = 0; + let _x = xs; while(true) { - var x = _x; - var i = _i; + let x = _x; + let i = _i; if (!x) { return a; } a[i] = x.hd; _x = x.tl; _i = i + 1 | 0; - continue ; + continue; }; } function equal(cmp, _xs, _ys) { while(true) { - var ys = _ys; - var xs = _xs; + let ys = _ys; + let xs = _xs; if (!xs) { if (ys) { return false; @@ -303,31 +303,31 @@ function equal(cmp, _xs, _ys) { } _ys = ys.tl; _xs = xs.tl; - continue ; + continue; }; } export { - length , - cons , - isEmpty , - hd , - tl , - nth , - revAppend , - rev , - mapRev , - map , - iter , - iteri , - foldLeft , - foldRight , - flatten , - filter , - filterMap , - countBy , - init , - toVector , - equal , + length, + cons, + isEmpty, + hd, + tl, + nth, + revAppend, + rev, + mapRev, + map, + iter, + iteri, + foldLeft, + foldRight, + flatten, + filter, + filterMap, + countBy, + init, + toVector, + equal, } /* No side effect */ diff --git a/js/src/js_math.js b/js/src/js_math.js index 6a108fc..a7efd1a 100644 --- a/js/src/js_math.js +++ b/js/src/js_math.js @@ -34,17 +34,17 @@ function random_int(min, max) { return floor_int(Math.random() * (max - min | 0)) + min | 0; } -var ceil = ceil_int; +let ceil = ceil_int; -var floor = floor_int; +let floor = floor_int; export { - unsafe_ceil , - ceil_int , - ceil , - unsafe_floor , - floor_int , - floor , - random_int , + unsafe_ceil, + ceil_int, + ceil, + unsafe_floor, + floor_int, + floor, + random_int, } /* No side effect */ diff --git a/js/src/js_math.ml b/js/src/js_math.res similarity index 76% rename from js/src/js_math.ml rename to js/src/js_math.res index 977af91..15e5649 100644 --- a/js/src/js_math.ml +++ b/js/src/js_math.res @@ -1,4 +1,4 @@ -(* Copyright (C) 2015-2016 Bloomberg Finance L.P. +/* Copyright (C) 2015-2016 Bloomberg Finance L.P. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -20,151 +20,167 @@ * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -(** +/*** Provide utilities for JS Math. Note: The constants `_E`, `_LN10`, `_LN2`, `_LOG10E`, `_LOG2E`, `_PI`, `_SQRT1_2`, and `_SQRT2` begin with an underscore because ReScript variable names cannot begin with a capital letter. (Module names begin with upper case.) -*) +*/ -external _E : float = "E" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Euler's number; ≈ 2.718281828459045. See [`Math.E`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/E) on MDN. -*) +*/ +external _E: float = "E" -external _LN2 : float = "LN2" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Natural logarithm of 2; ≈ 0.6931471805599453. See [`Math.LN2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LN2) on MDN. -*) +*/ +external _LN2: float = "LN2" -external _LN10 : float = "LN10" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Natural logarithm of 10; ≈ 2.302585092994046. See [`Math.LN10`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LN10) on MDN. -*) +*/ +external _LN10: float = "LN10" -external _LOG2E : float = "LOG2E" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Base 2 logarithm of E; ≈ 1.4426950408889634. See [`Math.LOG2E`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LOG2E) on MDN. -*) +*/ +external _LOG2E: float = "LOG2E" -external _LOG10E : float = "LOG10E" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Base 10 logarithm of E; ≈ 0.4342944819032518. See [`Math.LOG10E`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LOG10E) on MDN. -*) +*/ +external _LOG10E: float = "LOG10E" -external _PI : float = "PI" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Pi - ratio of the circumference to the diameter of a circle; ≈ 3.141592653589793. See [`Math.PI`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/PI) on MDN. -*) +*/ +external _PI: float = "PI" -external _SQRT1_2 : float = "SQRT1_2" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Square root of 1/2; ≈ 0.7071067811865476. See [`Math.SQRT1_2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/SQRT1_2) on MDN. -*) +*/ +external _SQRT1_2: float = "SQRT1_2" -external _SQRT2 : float = "SQRT2" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Square root of 2; ≈ 1.4142135623730951. See [`Math.SQRT2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/SQRT2) on MDN. -*) +*/ +external _SQRT2: float = "SQRT2" -external abs_int : int -> int = "abs" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Absolute value for integer argument. See [`Math.abs`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/abs) on MDN. -*) +*/ +external abs_int: int => int = "abs" -external abs_float : float -> float = "abs" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Absolute value for float argument. See [`Math.abs`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/abs) on MDN. -*) +*/ +external abs_float: float => float = "abs" -external acos : float -> float = "acos" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Arccosine (in radians) of argument; returns `NaN` if the argument is outside the range [-1.0, 1.0]. See [`Math.acos`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/acos) on MDN. -*) +*/ +external acos: float => float = "acos" -external acosh : float -> float = "acosh" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Hyperbolic arccosine (in radians) of argument; returns `NaN` if the argument is less than 1.0. See [`Math.acosh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/acosh) on MDN. -*) +*/ +external acosh: float => float = "acosh" -external asin : float -> float = "asin" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Arcsine (in radians) of argument; returns `NaN` if the argument is outside the range [-1.0, 1.0]. See [`Math.asin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/asin) on MDN. -*) +*/ +external asin: float => float = "asin" -external asinh : float -> float = "asinh" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Hyperbolic arcsine (in radians) of argument. See [`Math.asinh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/asinh) on MDN. -*) +*/ +external asinh: float => float = "asinh" -external atan : float -> float = "atan" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Arctangent (in radians) of argument. See [`Math.atan`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/atan) on MDN. -*) +*/ +external atan: float => float = "atan" -external atanh : float -> float = "atanh" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Hyperbolic arctangent (in radians) of argument; returns `NaN` if the argument is is outside the range [-1.0, 1.0]. Returns `-Infinity` and `Infinity` for arguments -1.0 and 1.0. See [`Math.atanh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/atanh) on MDN. -*) +*/ +external atanh: float => float = "atanh" -external atan2 : y:float -> x:float -> unit -> float = "atan2" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the angle (in radians) of the quotient `y /. x`. It is also the angle between the *x*-axis and point (*x*, *y*). See [`Math.atan2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/atan2) @@ -179,19 +195,21 @@ Js.Math.atan2(~x=-5.0, ~y=5.0, ()) Js.Math.atan2(~x=-5.0, ~y=5.0, ()) == 3.0 *. Js.Math._PI /. 4.0 Js.Math.atan2(~x=-0.0, ~y=-5.0, ()) == -.Js.Math._PI /. 2.0 ``` -*) +*/ +external atan2: (~y: float, ~x: float, unit) => float = "atan2" -external cbrt : float -> float = "cbrt" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Cube root. See [`Math.cbrt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cbrt) on MDN -*) +*/ +external cbrt: float => float = "cbrt" -external unsafe_ceil_int : float -> int = "ceil" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the smallest integer greater than or equal to the argument. This function may return values not representable by `int`, whose range is -2147483648 to 2147483647. This is because, in JavaScript, there are only @@ -208,12 +226,12 @@ Js.Math.unsafe_ceil_int(3.0) == 3 Js.Math.unsafe_ceil_int(-3.1) == -3 Js.Math.unsafe_ceil_int(1.0e15) // result is outside range of int datatype ``` -*) +*/ +external unsafe_ceil_int: float => int = "ceil" -let unsafe_ceil = unsafe_ceil_int -[@@deprecated "Please use `unsafe_ceil_int` instead"] +@deprecated("Please use `unsafe_ceil_int` instead") let unsafe_ceil = unsafe_ceil_int -(** +/** Returns the smallest `int` greater than or equal to the argument; the result is pinned to the range of the `int` data type: -2147483648 to 2147483647. See [`Math.ceil`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/ceil) @@ -228,17 +246,21 @@ Js.Math.ceil_int(-3.1) == -3 Js.Math.ceil_int(-1.0e15) == -2147483648 Js.Math.ceil_int(1.0e15) == 2147483647 ``` -*) -let ceil_int (f : float) : int = - if f > Js_int.toFloat Js_int.max then Js_int.max - else if f < Js_int.toFloat Js_int.min then Js_int.min - else unsafe_ceil_int f - -let ceil = ceil_int [@@deprecated "Please use `ceil_int` instead"] - -external ceil_float : float -> float = "ceil" -[@@val] [@@scope "Math"] -(** +*/ +let ceil_int = (f: float): int => + if f > Js_int.toFloat(Js_int.max) { + Js_int.max + } else if f < Js_int.toFloat(Js_int.min) { + Js_int.min + } else { + unsafe_ceil_int(f) + } + +@deprecated("Please use `ceil_int` instead") let ceil = ceil_int + +@val +@scope("Math") +/** Returns the smallest integral value greater than or equal to the argument. The result is a `float` and is not restricted to the `int` data type range. See @@ -253,11 +275,12 @@ Js.Math.ceil_float(3.0) == 3.0 Js.Math.ceil_float(-3.1) == -3.0 Js.Math.ceil_float(2_150_000_000.3) == 2_150_000_001.0 ``` -*) +*/ +external ceil_float: float => float = "ceil" -external clz32 : int -> int = "clz32" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Number of leading zero bits of the argument's 32 bit int representation. See [`Math.clz32`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32) on MDN. @@ -269,45 +292,50 @@ Js.Math.clz32(0) == 32 Js.Math.clz32(-1) == 0 Js.Math.clz32(255) == 24 ``` -*) +*/ +external clz32: int => int = "clz32" -external cos : float -> float = "cos" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Cosine of argument, which must be specified in radians. See [`Math.cos`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cos) on MDN. -*) +*/ +external cos: float => float = "cos" -external cosh : float -> float = "cosh" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Hyperbolic cosine of argument, which must be specified in radians. See [`Math.cosh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cosh) on MDN. -*) +*/ +external cosh: float => float = "cosh" -external exp : float -> float = "exp" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Natural exponentional; returns *e* (the base of natural logarithms) to the power of the given argument. See [`Math.exp`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/exp) on MDN. -*) +*/ +external exp: float => float = "exp" -external expm1 : float -> float = "expm1" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns *e* (the base of natural logarithms) to the power of the given argument minus 1. See [`Math.expm1`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/expm1) on MDN. -*) +*/ +external expm1: float => float = "expm1" -external unsafe_floor_int : float -> int = "floor" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the largest integer less than or equal to the argument. This function may return values not representable by `int`, whose range is -2147483648 to 2147483647. This is because, in JavaScript, there are only 64-bit floating @@ -324,12 +352,12 @@ Js.Math.unsafe_floor_int(3.0) == 3 Js.Math.unsafe_floor_int(-3.7) == -4 Js.Math.unsafe_floor_int(1.0e15) // result is outside range of int datatype ``` -*) +*/ +external unsafe_floor_int: float => int = "floor" -let unsafe_floor = unsafe_floor_int -[@@deprecated "Please use `unsafe_floor_int` instead"] +@deprecated("Please use `unsafe_floor_int` instead") let unsafe_floor = unsafe_floor_int -(** +/** Returns the largest `int` less than or equal to the argument; the result is pinned to the range of the `int` data type: -2147483648 to 2147483647. See [`Math.floor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/floor) @@ -344,17 +372,21 @@ Js.Math.floor_int(-3.1) == -4 Js.Math.floor_int(-1.0e15) == -2147483648 Js.Math.floor_int(1.0e15) == 2147483647 ``` -*) -let floor_int f = - if f > Js_int.toFloat Js_int.max then Js_int.max - else if f < Js_int.toFloat Js_int.min then Js_int.min - else unsafe_floor f - -let floor = floor_int [@@deprecated "Please use `floor_int` instead"] - -external floor_float : float -> float = "floor" -[@@val] [@@scope "Math"] -(** +*/ +let floor_int = f => + if f > Js_int.toFloat(Js_int.max) { + Js_int.max + } else if f < Js_int.toFloat(Js_int.min) { + Js_int.min + } else { + unsafe_floor(f) + } + +@deprecated("Please use `floor_int` instead") let floor = floor_int + +@val +@scope("Math") +/** Returns the largest integral value less than or equal to the argument. The result is a `float` and is not restricted to the `int` data type range. See [`Math.floor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/floor) @@ -368,11 +400,12 @@ Js.Math.floor_float(3.0) == 3.0 Js.Math.floor_float(-3.1) == -4.0 Js.Math.floor_float(2_150_000_000.3) == 2_150_000_000.0 ``` -*) +*/ +external floor_float: float => float = "floor" -external fround : float -> float = "fround" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Round to nearest single precision float. See [`Math.fround`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/fround) on MDN. @@ -383,20 +416,23 @@ on MDN. Js.Math.fround(5.5) == 5.5 Js.Math.fround(5.05) == 5.050000190734863 ``` -*) +*/ +external fround: float => float = "fround" -external hypot : float -> float -> float = "hypot" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the square root of the sum of squares of its two arguments (the Pythagorean formula). See [`Math.hypot`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/hypot) on MDN. -*) +*/ +external hypot: (float, float) => float = "hypot" -external hypotMany : float array -> float = "hypot" -[@@val] [@@variadic] [@@scope "Math"] -(** +@val +@variadic +@scope("Math") +/** Returns the square root of the sum of squares of the numbers in the array argument (generalized Pythagorean equation). Using an array allows you to have more than two items. See @@ -408,20 +444,22 @@ on MDN. ```rescript Js.Math.hypotMany([3.0, 4.0, 12.0]) == 13.0 ``` -*) +*/ +external hypotMany: array => float = "hypot" -external imul : int -> int -> int = "imul" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** 32-bit integer multiplication. Use this only when you need to optimize performance of multiplication of numbers stored as 32-bit integers. See [`Math.imul`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul) on MDN. -*) +*/ +external imul: (int, int) => int = "imul" -external log : float -> float = "log" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the natural logarithm of its argument; this is the number *x* such that *e**x* equals the argument. Returns `NaN` for negative arguments. See @@ -434,11 +472,12 @@ on MDN. Js.Math.log(Js.Math._E) == 1.0 Js.Math.log(100.0) == 4.605170185988092 ``` -*) +*/ +external log: float => float = "log" -external log1p : float -> float = "log1p" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the natural logarithm of one plus the argument. Returns `NaN` for arguments less than -1. See [`Math.log1p`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log1p) @@ -450,11 +489,12 @@ on MDN. Js.Math.log1p(Js.Math._E -. 1.0) == 1.0 Js.Math.log1p(99.0) == 4.605170185988092 ``` -*) +*/ +external log1p: float => float = "log1p" -external log10 : float -> float = "log10" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the base 10 logarithm of its argument. Returns `NaN` for negative arguments. See [`Math.log10`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log10) @@ -467,11 +507,12 @@ Js.Math.log10(1000.0) == 3.0 Js.Math.log10(0.01) == -2.0 Js.Math.log10(Js.Math.sqrt(10.0)) == 0.5 ``` -*) +*/ +external log10: float => float = "log10" -external log2 : float -> float = "log2" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the base 2 logarithm of its argument. Returns `NaN` for negative arguments. See [`Math.log2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log2) @@ -484,77 +525,89 @@ Js.Math.log2(512.0) == 9.0 Js.Math.log2(0.125) == -3.0 Js.Math.log2(Js.Math._SQRT2) == 0.5000000000000001 // due to precision ``` -*) +*/ +external log2: float => float = "log2" -external max_int : int -> int -> int = "max" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the maximum of its two integer arguments. See [`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max) on MDN. -*) +*/ +external max_int: (int, int) => int = "max" -external maxMany_int : int array -> int = "max" -[@@val] [@@variadic] [@@scope "Math"] -(** +@val +@variadic +@scope("Math") +/** Returns the maximum of the integers in the given array. See [`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max) on MDN. -*) +*/ +external maxMany_int: array => int = "max" -external max_float : float -> float -> float = "max" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the maximum of its two floating point arguments. See [`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max) on MDN. -*) +*/ +external max_float: (float, float) => float = "max" -external maxMany_float : float array -> float = "max" -[@@val] [@@variadic] [@@scope "Math"] -(** +@val +@variadic +@scope("Math") +/** Returns the maximum of the floating point values in the given array. See [`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max) on MDN. -*) +*/ +external maxMany_float: array => float = "max" -external min_int : int -> int -> int = "min" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the minimum of its two integer arguments. See [`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min) on MDN. -*) +*/ +external min_int: (int, int) => int = "min" -external minMany_int : int array -> int = "min" -[@@val] [@@variadic] [@@scope "Math"] -(** +@val +@variadic +@scope("Math") +/** Returns the minimum of the integers in the given array. See [`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min) on MDN. -*) +*/ +external minMany_int: array => int = "min" -external min_float : float -> float -> float = "min" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the minimum of its two floating point arguments. See [`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min) on MDN. -*) +*/ +external min_float: (float, float) => float = "min" -external minMany_float : float array -> float = "min" -[@@val] [@@variadic] [@@scope "Math"] -(** +@val +@variadic +@scope("Math") +/** Returns the minimum of the floating point values in the given array. See [`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min) on MDN. -*) +*/ +external minMany_float: array => float = "min" -external pow_int : base:int -> exp:int -> int = "pow" -[@@val] -[@@scope "Math"] -[@@deprecated "use `pow_float` instead, the return type may be not int"] -(** +@val +@scope("Math") +@deprecated("use `pow_float` instead, the return type may be not int") +/** Raises the given base to the given exponent. (Arguments and result are integers.) See [`Math.pow`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/pow) @@ -565,11 +618,12 @@ on MDN. ```rescript Js.Math.pow_int(~base=3, ~exp=4) == 81 ``` -*) +*/ +external pow_int: (~base: int, ~exp: int) => int = "pow" -external pow_float : base:float -> exp:float -> float = "pow" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Raises the given base to the given exponent. (Arguments and result are floats.) Returns `NaN` if the result would be imaginary. See [`Math.pow`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/pow) @@ -584,27 +638,29 @@ Js.Math.pow_float(~base=625.0, ~exp=0.5) == 25.0 Js.Math.pow_float(~base=625.0, ~exp=-0.5) == 0.04 Js.Float.isNaN(Js.Math.pow_float(~base=-2.0, ~exp=0.5)) == true ``` -*) +*/ +external pow_float: (~base: float, ~exp: float) => float = "pow" -external random : unit -> float = "random" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns a random number in the half-closed interval [0,1). See [`Math.random`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random) on MDN. -*) +*/ +external random: unit => float = "random" -(** +/** A call to `random_int(minVal, maxVal)` returns a random number in the half-closed interval [minVal, maxVal). See [`Math.random`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random) on MDN. -*) -let random_int min max = floor (random () *. Js_int.toFloat (max - min)) + min +*/ +let random_int = (min, max) => floor(random() *. Js_int.toFloat(max - min)) + min -external unsafe_round : float -> int = "round" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Rounds its argument to nearest integer. For numbers with a fractional portion of exactly 0.5, the argument is rounded to the next integer in the direction of positive infinity. This function may return values not representable by @@ -621,78 +677,87 @@ Js.Math.unsafe_round(3.7) == 4 Js.Math.unsafe_round(-3.5) == -3 Js.Math.unsafe_round(2_150_000_000_000.3) // out of range for int ``` -*) +*/ +external unsafe_round: float => int = "round" -external round : float -> float = "round" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Rounds to nearest integral value (expressed as a float). See [`Math.round`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round) on MDN. -*) +*/ +external round: float => float = "round" -external sign_int : int -> int = "sign" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the sign of its integer argument: -1 if negative, 0 if zero, 1 if positive. See [`Math.sign`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sign) on MDN. -*) +*/ +external sign_int: int => int = "sign" -external sign_float : float -> float = "sign" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Returns the sign of its float argument: -1.0 if negative, 0.0 if zero, 1.0 if positive. See [`Math.sign`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sign) on MDN. -*) +*/ +external sign_float: float => float = "sign" -external sin : float -> float = "sin" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Sine of argument, which must be specified in radians. See [`Math.sin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sin) on MDN. -*) +*/ +external sin: float => float = "sin" -external sinh : float -> float = "sinh" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Hyperbolic sine of argument, which must be specified in radians. See [`Math.sinh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sinh) on MDN. -*) +*/ +external sinh: float => float = "sinh" -external sqrt : float -> float = "sqrt" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Square root. If the argument is negative, this function returns `NaN`. See [`Math.sqrt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sqrt) on MDN. -*) +*/ +external sqrt: float => float = "sqrt" -external tan : float -> float = "tan" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Tangent of argument, which must be specified in radians. Returns `NaN` if the argument is positive infinity or negative infinity. See [`Math.cos`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cos) on MDN. -*) +*/ +external tan: float => float = "tan" -external tanh : float -> float = "tanh" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Hyperbolic tangent of argument, which must be specified in radians. See [`Math.tanh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/tanh) on MDN. -*) +*/ +external tanh: float => float = "tanh" -external unsafe_trunc : float -> int = "trunc" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Truncates its argument; i.e., removes fractional digits. This function may return values not representable by `int`, whose range is -2147483648 to 2147483647. This is because, in JavaScript, there are only 64-bit floating @@ -700,12 +765,14 @@ point numbers, which can represent integers in the range ±(253-1) exactly. See [`Math.trunc`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc) on MDN. -*) +*/ +external unsafe_trunc: float => int = "trunc" -external trunc : float -> float = "trunc" -[@@val] [@@scope "Math"] -(** +@val +@scope("Math") +/** Truncates its argument; i.e., removes fractional digits. See [`Math.trunc`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc) on MDN. -*) +*/ +external trunc: float => float = "trunc" diff --git a/js/src/js_null.js b/js/src/js_null.js index 06066a9..075141d 100644 --- a/js/src/js_null.js +++ b/js/src/js_null.js @@ -38,14 +38,14 @@ function fromOption(x) { } } -var from_opt = fromOption; +let from_opt = fromOption; export { - test , - getExn , - bind , - iter , - fromOption , - from_opt , + test, + getExn, + bind, + iter, + fromOption, + from_opt, } /* No side effect */ diff --git a/js/src/js_null_undefined.js b/js/src/js_null_undefined.js index 0aef2ee..ffff34f 100644 --- a/js/src/js_null_undefined.js +++ b/js/src/js_null_undefined.js @@ -24,12 +24,12 @@ function fromOption(x) { } -var from_opt = fromOption; +let from_opt = fromOption; export { - bind , - iter , - fromOption , - from_opt , + bind, + iter, + fromOption, + from_opt, } /* No side effect */ diff --git a/js/src/js_option.js b/js/src/js_option.js index fd2274c..9c2ecf7 100644 --- a/js/src/js_option.js +++ b/js/src/js_option.js @@ -67,9 +67,9 @@ function getWithDefault(a, x) { function filter(f, x) { if (x === undefined) { - return ; + return; } - var x$1 = Caml_option.valFromOption(x); + let x$1 = Caml_option.valFromOption(x); if (f(x$1)) { return Caml_option.some(x$1); } @@ -82,24 +82,24 @@ function firstSome(a, b) { } else if (b !== undefined) { return b; } else { - return ; + return; } } -var $$default = getWithDefault; +let $$default = getWithDefault; export { - some , - isSome , - isSomeValue , - isNone , - getExn , - equal , - andThen , - map , - getWithDefault , + some, + isSome, + isSomeValue, + isNone, + getExn, + equal, + andThen, + map, + getWithDefault, $$default as default, - filter , - firstSome , + filter, + firstSome, } /* No side effect */ diff --git a/js/src/js_promise2.js b/js/src/js_promise2.js index 0015d9d..727ab7e 100644 --- a/js/src/js_promise2.js +++ b/js/src/js_promise2.js @@ -1,16 +1,16 @@ -var then = (function(p, cont) { +let then = (function(p, cont) { return Promise.resolve(p).then(cont) }); -var $$catch = (function(p, cont) { +let $$catch = (function(p, cont) { return Promise.resolve(p).catch(cont) }); export { - then , - $$catch , + then, + $$catch, } /* No side effect */ diff --git a/js/src/js_typed_array.js b/js/src/js_typed_array.js index 4167f26..5e2a72d 100644 --- a/js/src/js_typed_array.js +++ b/js/src/js_typed_array.js @@ -1,48 +1,48 @@ -var $$ArrayBuffer = {}; +let $$ArrayBuffer = {}; -var $$Int8Array = {}; +let $$Int8Array = {}; -var $$Uint8Array = {}; +let $$Uint8Array = {}; -var $$Uint8ClampedArray = {}; +let $$Uint8ClampedArray = {}; -var $$Int16Array = {}; +let $$Int16Array = {}; -var $$Uint16Array = {}; +let $$Uint16Array = {}; -var $$Int32Array = {}; +let $$Int32Array = {}; -var $$Uint32Array = {}; +let $$Uint32Array = {}; -var $$Float32Array = {}; +let $$Float32Array = {}; -var $$Float64Array = {}; +let $$Float64Array = {}; -var $$DataView = {}; +let $$DataView = {}; -var Int32_array; +let Int32_array; -var Float32_array; +let Float32_array; -var Float64_array; +let Float64_array; export { - $$ArrayBuffer , - $$Int8Array , - $$Uint8Array , - $$Uint8ClampedArray , - $$Int16Array , - $$Uint16Array , - $$Int32Array , - Int32_array , - $$Uint32Array , - $$Float32Array , - Float32_array , - $$Float64Array , - Float64_array , - $$DataView , + $$ArrayBuffer, + $$Int8Array, + $$Uint8Array, + $$Uint8ClampedArray, + $$Int16Array, + $$Uint16Array, + $$Int32Array, + Int32_array, + $$Uint32Array, + $$Float32Array, + Float32_array, + $$Float64Array, + Float64_array, + $$DataView, } /* No side effect */ diff --git a/js/src/js_typed_array2.js b/js/src/js_typed_array2.js index dc062b0..0ebdb87 100644 --- a/js/src/js_typed_array2.js +++ b/js/src/js_typed_array2.js @@ -1,39 +1,39 @@ -var $$ArrayBuffer = {}; +let $$ArrayBuffer = {}; -var $$Int8Array = {}; +let $$Int8Array = {}; -var $$Uint8Array = {}; +let $$Uint8Array = {}; -var $$Uint8ClampedArray = {}; +let $$Uint8ClampedArray = {}; -var $$Int16Array = {}; +let $$Int16Array = {}; -var $$Uint16Array = {}; +let $$Uint16Array = {}; -var $$Int32Array = {}; +let $$Int32Array = {}; -var $$Uint32Array = {}; +let $$Uint32Array = {}; -var $$Float32Array = {}; +let $$Float32Array = {}; -var $$Float64Array = {}; +let $$Float64Array = {}; -var $$DataView = {}; +let $$DataView = {}; export { - $$ArrayBuffer , - $$Int8Array , - $$Uint8Array , - $$Uint8ClampedArray , - $$Int16Array , - $$Uint16Array , - $$Int32Array , - $$Uint32Array , - $$Float32Array , - $$Float64Array , - $$DataView , + $$ArrayBuffer, + $$Int8Array, + $$Uint8Array, + $$Uint8ClampedArray, + $$Int16Array, + $$Uint16Array, + $$Int32Array, + $$Uint32Array, + $$Float32Array, + $$Float64Array, + $$DataView, } /* No side effect */ diff --git a/js/src/js_types.js b/js/src/js_types.js index c6dcb9c..4cefeba 100644 --- a/js/src/js_types.js +++ b/js/src/js_types.js @@ -2,26 +2,26 @@ function classify(x) { - var ty = typeof x; + let ty = typeof x; if (ty === "undefined") { return "JSUndefined"; } else if (x === null) { return "JSNull"; } else if (ty === "number") { return { - TAG: "JSNumber", - _0: x - }; + TAG: "JSNumber", + _0: x + }; } else if (ty === "bigint") { return { - TAG: "JSBigInt", - _0: x - }; + TAG: "JSBigInt", + _0: x + }; } else if (ty === "string") { return { - TAG: "JSString", - _0: x - }; + TAG: "JSString", + _0: x + }; } else if (ty === "boolean") { if (x === true) { return "JSTrue"; @@ -30,19 +30,19 @@ function classify(x) { } } else if (ty === "symbol") { return { - TAG: "JSSymbol", - _0: x - }; + TAG: "JSSymbol", + _0: x + }; } else if (ty === "function") { return { - TAG: "JSFunction", - _0: x - }; + TAG: "JSFunction", + _0: x + }; } else { return { - TAG: "JSObject", - _0: x - }; + TAG: "JSObject", + _0: x + }; } } @@ -71,7 +71,7 @@ function test(x, v) { } export { - test , - classify , + test, + classify, } /* No side effect */ diff --git a/js/src/js_undefined.js b/js/src/js_undefined.js index c0b359b..4b87eb7 100644 --- a/js/src/js_undefined.js +++ b/js/src/js_undefined.js @@ -40,15 +40,15 @@ function fromOption(x) { } -var from_opt = fromOption; +let from_opt = fromOption; export { - test , - testAny , - getExn , - bind , - iter , - fromOption , - from_opt , + test, + testAny, + getExn, + bind, + iter, + fromOption, + from_opt, } /* No side effect */ diff --git a/js/src/js_vector.js b/js/src/js_vector.js index 67200d0..ccbecab 100644 --- a/js/src/js_vector.js +++ b/js/src/js_vector.js @@ -2,10 +2,10 @@ function filterInPlace(p, a) { - var i = 0; - var j = 0; + let i = 0; + let j = 0; while(i < a.length) { - var v = a[i]; + let v = a[i]; if (p(v)) { a[j] = v; j = j + 1 | 0; @@ -28,23 +28,23 @@ function memByRef(x, xs) { } function iter(f, xs) { - for(var i = 0 ,i_finish = xs.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = xs.length; i < i_finish; ++i){ f(xs[i]); } } function iteri(f, a) { - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ f(i, a[i]); } } function toList(a) { - var _i = a.length - 1 | 0; - var _res = /* [] */0; + let _i = a.length - 1 | 0; + let _res = /* [] */0; while(true) { - var res = _res; - var i = _i; + let res = _res; + let i = _i; if (i < 0) { return res; } @@ -53,59 +53,59 @@ function toList(a) { tl: res }; _i = i - 1 | 0; - continue ; + continue; }; } function init(n, f) { - var v = new Array(n); - for(var i = 0; i < n; ++i){ + let v = new Array(n); + for(let i = 0; i < n; ++i){ v[i] = f(i); } return v; } function copy(x) { - var len = x.length; - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let len = x.length; + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = x[i]; } return b; } function map(f, a) { - var l = a.length; - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let l = a.length; + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(a[i]); } return r; } function foldLeft(f, x, a) { - var r = x; - for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){ + let r = x; + for(let i = 0 ,i_finish = a.length; i < i_finish; ++i){ r = f(r, a[i]); } return r; } function foldRight(f, a, x) { - var r = x; - for(var i = a.length - 1 | 0; i >= 0; --i){ + let r = x; + for(let i = a.length - 1 | 0; i >= 0; --i){ r = f(a[i], r); } return r; } function mapi(f, a) { - var l = a.length; + let l = a.length; if (l === 0) { return []; } - var r = new Array(l); - for(var i = 0; i < l; ++i){ + let r = new Array(l); + for(let i = 0; i < l; ++i){ r[i] = f(i, a[i]); } return r; @@ -116,19 +116,19 @@ function append(x, a) { } export { - filterInPlace , - empty , - pushBack , - copy , - memByRef , - iter , - iteri , - toList , - map , - mapi , - foldLeft , - foldRight , - init , - append , + filterInPlace, + empty, + pushBack, + copy, + memByRef, + iter, + iteri, + toList, + map, + mapi, + foldLeft, + foldRight, + init, + append, } /* No side effect */ diff --git a/js/src/jsxEvent.js b/js/src/jsxEvent.js index 986f617..268c4a4 100644 --- a/js/src/jsxEvent.js +++ b/js/src/jsxEvent.js @@ -5,55 +5,55 @@ function MakeEventWithType(Type) { return {}; } -var Synthetic = {}; +let Synthetic = {}; -var Clipboard = {}; +let Clipboard = {}; -var Composition = {}; +let Composition = {}; -var Keyboard = {}; +let Keyboard = {}; -var Focus = {}; +let Focus = {}; -var Form = {}; +let Form = {}; -var Mouse = {}; +let Mouse = {}; -var Pointer = {}; +let Pointer = {}; -var $$Selection = {}; +let Selection = {}; -var $$Touch = {}; +let Touch = {}; -var UI = {}; +let UI = {}; -var Wheel = {}; +let Wheel = {}; -var Media = {}; +let Media = {}; -var $$Image = {}; +let Image = {}; -var $$Animation = {}; +let Animation = {}; -var Transition = {}; +let Transition = {}; export { - MakeEventWithType , - Synthetic , - Clipboard , - Composition , - Keyboard , - Focus , - Form , - Mouse , - Pointer , - $$Selection , - $$Touch , - UI , - Wheel , - Media , - $$Image , - $$Animation , - Transition , + MakeEventWithType, + Synthetic, + Clipboard, + Composition, + Keyboard, + Focus, + Form, + Mouse, + Pointer, + Selection, + Touch, + UI, + Wheel, + Media, + Image, + Animation, + Transition, } /* No side effect */ diff --git a/js/src/jsxPPXReactSupport.js b/js/src/jsxPPXReactSupport.js index c0c4602..60dc3d1 100644 --- a/js/src/jsxPPXReactSupport.js +++ b/js/src/jsxPPXReactSupport.js @@ -5,22 +5,22 @@ import * as Caml_splice_call from "rescript/lib/es6/caml_splice_call.js"; function createElementWithKey(key, component, props) { return React.createElement(component, key !== undefined ? Object.assign({ - key: key - }, props) : props); + key: key + }, props) : props); } function createElementVariadicWithKey(key, component, props, elements) { return Caml_splice_call.spliceApply(React.createElement, [ - component, - key !== undefined ? Object.assign({ - key: key - }, props) : props, - elements - ]); + component, + key !== undefined ? Object.assign({ + key: key + }, props) : props, + elements + ]); } export { - createElementWithKey , - createElementVariadicWithKey , + createElementWithKey, + createElementVariadicWithKey, } /* react Not a pure module */ diff --git a/package-lock.json b/package-lock.json index a5ce8b3..dda8fe7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "js" ], "dependencies": { - "rescript": "^11.1.3-rc.1" + "rescript": "^12.0.0-alpha.1" }, "devDependencies": { "@rolandpeelen/rewatch": "^1.0.8" @@ -53,17 +53,18 @@ "link": true }, "node_modules/rescript": { - "version": "11.1.3-rc.1", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.1.3-rc.1.tgz", - "integrity": "sha512-10xNwulgobj4z5wRZRsgk/XUf8IXY13A/jvzidk1cqqzzXQEuefcKSDzVch6OMdX4BmrK2NxqPhfAGGExOPlcQ==", + "version": "12.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-12.0.0-alpha.1.tgz", + "integrity": "sha512-dYUjUsRxl2m2kMt8wyYRpNDp6ahuL64mE2TFMZwv+wOdn0C6rh+FxMDSg+c8CQaCJnfErDIjCwwb0r/6Ag1Dxg==", "hasInstallScript": true, "bin": { "bsc": "bsc", "bstracing": "lib/bstracing", - "rescript": "rescript" + "rescript": "rescript", + "rewatch": "scripts/rewatch" }, "engines": { - "node": ">=10" + "node": ">=18" } }, "node_modules/runtime": { diff --git a/package.json b/package.json index 79651d5..7839dde 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,6 @@ "@rolandpeelen/rewatch": "^1.0.8" }, "dependencies": { - "rescript": "^11.1.3-rc.1" + "rescript": "^12.0.0-alpha.1" } } diff --git a/runtime/src/caml.js b/runtime/src/caml.js index afee09c..a85e255 100644 --- a/runtime/src/caml.js +++ b/runtime/src/caml.js @@ -132,8 +132,8 @@ function i64_eq(x, y) { } function i64_ge(param, param$1) { - var other_hi = param$1[0]; - var hi = param[0]; + let other_hi = param$1[0]; + let hi = param[0]; if (hi > other_hi) { return true; } else if (hi < other_hi) { @@ -166,10 +166,10 @@ function i64_le(x, y) { } function i64_min(x, y) { - if (i64_lt(x, y)) { - return x; - } else { + if (i64_ge(x, y)) { return y; + } else { + return x; } } @@ -182,26 +182,26 @@ function i64_max(x, y) { } export { - int_compare , - bool_compare , - float_compare , - bigint_compare , - string_compare , - bool_min , - int_min , - float_min , - string_min , - bool_max , - int_max , - float_max , - string_max , - i64_eq , - i64_neq , - i64_lt , - i64_gt , - i64_le , - i64_ge , - i64_min , - i64_max , + int_compare, + bool_compare, + float_compare, + bigint_compare, + string_compare, + bool_min, + int_min, + float_min, + string_min, + bool_max, + int_max, + float_max, + string_max, + i64_eq, + i64_neq, + i64_lt, + i64_gt, + i64_le, + i64_ge, + i64_min, + i64_max, } /* No side effect */ diff --git a/runtime/src/caml_array.js b/runtime/src/caml_array.js index a24867b..80fad5d 100644 --- a/runtime/src/caml_array.js +++ b/runtime/src/caml_array.js @@ -2,9 +2,9 @@ function sub(x, offset, len) { - var result = new Array(len); - var j = 0; - var i = offset; + let result = new Array(len); + let j = 0; + let i = offset; while(j < len) { result[j] = x[i]; j = j + 1 | 0; @@ -15,28 +15,28 @@ function sub(x, offset, len) { function len(_acc, _l) { while(true) { - var l = _l; - var acc = _acc; + let l = _l; + let acc = _acc; if (!l) { return acc; } _l = l.tl; _acc = l.hd.length + acc | 0; - continue ; + continue; }; } function fill(arr, _i, _l) { while(true) { - var l = _l; - var i = _i; + let l = _l; + let i = _i; if (!l) { - return ; + return; } - var x = l.hd; - var l$1 = x.length; - var k = i; - var j = 0; + let x = l.hd; + let l$1 = x.length; + let k = i; + let j = 0; while(j < l$1) { arr[k] = x[j]; k = k + 1 | 0; @@ -44,50 +44,52 @@ function fill(arr, _i, _l) { }; _l = l.tl; _i = k; - continue ; + continue; }; } function concat(l) { - var v = len(0, l); - var result = new Array(v); + let v = len(0, l); + let result = new Array(v); fill(result, 0, l); return result; } function set(xs, index, newval) { if (index < 0 || index >= xs.length) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "index out of bounds", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "index out of bounds" + } + }); } xs[index] = newval; } function get(xs, index) { if (index < 0 || index >= xs.length) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "index out of bounds", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "index out of bounds" + } + }); } return xs[index]; } function make(len, init) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = init; } return b; } function make_float(len) { - var b = new Array(len); - for(var i = 0; i < len; ++i){ + let b = new Array(len); + for(let i = 0; i < len; ++i){ b[i] = 0; } return b; @@ -95,12 +97,12 @@ function make_float(len) { function blit(a1, i1, a2, i2, len) { if (i2 <= i1) { - for(var j = 0; j < len; ++j){ + for(let j = 0; j < len; ++j){ a2[j + i2 | 0] = a1[j + i1 | 0]; } - return ; + return; } - for(var j$1 = len - 1 | 0; j$1 >= 0; --j$1){ + for(let j$1 = len - 1 | 0; j$1 >= 0; --j$1){ a2[j$1 + i2 | 0] = a1[j$1 + i1 | 0]; } } @@ -110,13 +112,13 @@ function dup(prim) { } export { - dup , - sub , - concat , - make , - make_float , - blit , - get , - set , + dup, + sub, + concat, + make, + make_float, + blit, + get, + set, } /* No side effect */ diff --git a/runtime/src/caml_bigint.js b/runtime/src/caml_bigint.js index fa5d6c8..82eb6a5 100644 --- a/runtime/src/caml_bigint.js +++ b/runtime/src/caml_bigint.js @@ -3,26 +3,28 @@ function div(x, y) { if (y === 0n) { - throw { - RE_EXN_ID: "Division_by_zero", - Error: new Error() - }; + throw new Error("Division_by_zero", { + cause: { + RE_EXN_ID: "Division_by_zero" + } + }); } return x / y; } function mod_(x, y) { if (y === 0n) { - throw { - RE_EXN_ID: "Division_by_zero", - Error: new Error() - }; + throw new Error("Division_by_zero", { + cause: { + RE_EXN_ID: "Division_by_zero" + } + }); } return x % y; } export { - div , - mod_ , + div, + mod_, } /* No side effect */ diff --git a/runtime/src/caml_bytes.js b/runtime/src/caml_bytes.js index 757efb0..423dc9b 100644 --- a/runtime/src/caml_bytes.js +++ b/runtime/src/caml_bytes.js @@ -3,36 +3,39 @@ function set(s, i, ch) { if (i < 0 || i >= s.length) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "index out of bounds", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "index out of bounds" + } + }); } s[i] = ch; } function get(s, i) { if (i < 0 || i >= s.length) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "index out of bounds", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "index out of bounds" + } + }); } return s[i]; } function create(len) { if (len < 0) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "String.create", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "String.create" + } + }); } - var result = new Array(len); - for(var i = 0; i < len; ++i){ + let result = new Array(len); + for(let i = 0; i < len; ++i){ result[i] = /* '\000' */0; } return result; @@ -40,12 +43,12 @@ function create(len) { function bytes_compare_aux(s1, s2, _off, len, def) { while(true) { - var off = _off; + let off = _off; if (off >= len) { return def; } - var a = s1[off]; - var b = s2[off]; + let a = s1[off]; + let b = s2[off]; if (a > b) { return 1; } @@ -53,13 +56,13 @@ function bytes_compare_aux(s1, s2, _off, len, def) { return -1; } _off = off + 1 | 0; - continue ; + continue; }; } function bytes_compare(s1, s2) { - var len1 = s1.length; - var len2 = s2.length; + let len1 = s1.length; + let len2 = s2.length; if (len1 === len2) { return bytes_compare_aux(s1, s2, 0, len1, 0); } else if (len1 < len2) { @@ -70,22 +73,22 @@ function bytes_compare(s1, s2) { } function bytes_equal(s1, s2) { - var len1 = s1.length; - var len2 = s2.length; + let len1 = s1.length; + let len2 = s2.length; if (len1 === len2) { - var _off = 0; + let _off = 0; while(true) { - var off = _off; + let off = _off; if (off === len1) { return true; } - var a = s1[off]; - var b = s2[off]; + let a = s1[off]; + let b = s2[off]; if (a !== b) { return false; } _off = off + 1 | 0; - continue ; + continue; }; } else { return false; @@ -109,14 +112,14 @@ function bytes_lessequal(s1, s2) { } export { - create , - get , - set , - bytes_compare , - bytes_greaterthan , - bytes_greaterequal , - bytes_lessthan , - bytes_lessequal , - bytes_equal , + create, + get, + set, + bytes_compare, + bytes_greaterthan, + bytes_greaterequal, + bytes_lessthan, + bytes_lessequal, + bytes_equal, } /* No side effect */ diff --git a/runtime/src/caml_exceptions.js b/runtime/src/caml_exceptions.js index 8fc9945..63b488a 100644 --- a/runtime/src/caml_exceptions.js +++ b/runtime/src/caml_exceptions.js @@ -1,13 +1,13 @@ -var idMap = new Map(); +let idMap = new Map(); function create(str) { - var v = idMap.get(str); - var id; + let v = idMap.get(str); + let id; if (v !== undefined) { - var id$1 = v + 1 | 0; + let id$1 = v + 1 | 0; idMap.set(str, id$1); id = id$1; } else { @@ -30,8 +30,8 @@ function exn_slot_name(x) { } export { - create , - is_extension , - exn_slot_name , + create, + is_extension, + exn_slot_name, } /* idMap Not a pure module */ diff --git a/runtime/src/caml_external_polyfill.js b/runtime/src/caml_external_polyfill.js index 818c834..dac6524 100644 --- a/runtime/src/caml_external_polyfill.js +++ b/runtime/src/caml_external_polyfill.js @@ -1,7 +1,7 @@ -var getGlobalThis = (function(){ +let getGlobalThis = (function(){ if (typeof globalThis !== 'undefined') return globalThis; if (typeof self !== 'undefined') return self; if (typeof window !== 'undefined') return window; @@ -10,7 +10,7 @@ var getGlobalThis = (function(){ throw new Error('Unable to locate global this'); }); -var resolve = (function(s){ +let resolve = (function(s){ var myGlobal = getGlobalThis(); if (myGlobal[s] === undefined){ throw new Error(s + " not polyfilled by ReScript yet\n") @@ -18,15 +18,15 @@ var resolve = (function(s){ return myGlobal[s] }); -var register = (function(s,fn){ +let register = (function(s,fn){ var myGlobal = getGlobalThis(); myGlobal[s] = fn return 0 }); export { - getGlobalThis , - resolve , - register , + getGlobalThis, + resolve, + register, } /* No side effect */ diff --git a/runtime/src/caml_float.js b/runtime/src/caml_float.js index 41c0ad0..4cd67ed 100644 --- a/runtime/src/caml_float.js +++ b/runtime/src/caml_float.js @@ -1,11 +1,11 @@ -var int_float_of_bits = (function(x){ +let int_float_of_bits = (function(x){ return new Float32Array(new Int32Array([x]).buffer)[0] }); -var int_bits_of_float = (function(x){ +let int_bits_of_float = (function(x){ return new Int32Array(new Float32Array([x]).buffer)[0] }); @@ -13,36 +13,36 @@ function modf_float(x) { if (!isFinite(x)) { if (isNaN(x)) { return [ - NaN, - NaN - ]; + NaN, + NaN + ]; } else { return [ - 1 / x, - x - ]; + 1 / x, + x + ]; } } - var neg = 1 / x < 0; - var x$1 = Math.abs(x); - var i = Math.floor(x$1); - var f = x$1 - i; + let neg = 1 / x < 0; + let x$1 = Math.abs(x); + let i = Math.floor(x$1); + let f = x$1 - i; if (neg) { return [ - - f, - - i - ]; + - f, + - i + ]; } else { return [ - f, - i - ]; + f, + i + ]; } } function ldexp_float(x, exp) { - var x$p = x; - var exp$p = exp; + let x$p = x; + let exp$p = exp; if (exp$p > 1023) { exp$p = exp$p - 1023; x$p = x$p * Math.pow(2, 1023); @@ -61,13 +61,13 @@ function ldexp_float(x, exp) { function frexp_float(x) { if (x === 0 || !isFinite(x)) { return [ - x, - 0 - ]; + x, + 0 + ]; } - var neg = x < 0; - var x$p = Math.abs(x); - var exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1; + let neg = x < 0; + let x$p = Math.abs(x); + let exp = Math.floor(Math.LOG2E * Math.log(x$p)) + 1; x$p = x$p * Math.pow(2, - exp); if (x$p < 0.5) { x$p = x$p * 2; @@ -77,14 +77,14 @@ function frexp_float(x) { x$p = - x$p; } return [ - x$p, - exp | 0 - ]; + x$p, + exp | 0 + ]; } function copysign_float(x, y) { - var x$1 = Math.abs(x); - var y$1 = y === 0 ? 1 / y : y; + let x$1 = Math.abs(x); + let y$1 = y === 0 ? 1 / y : y; if (y$1 < 0) { return - x$1; } else { @@ -93,8 +93,8 @@ function copysign_float(x, y) { } function expm1_float(x) { - var y = Math.exp(x); - var z = y - 1; + let y = Math.exp(x); + let z = y - 1; if (Math.abs(x) > 1) { return z; } else if (z === 0) { @@ -105,10 +105,10 @@ function expm1_float(x) { } function hypot_float(x, y) { - var x0 = Math.abs(x); - var y0 = Math.abs(y); - var a = x0 > y0 ? x0 : y0; - var b = ( + let x0 = Math.abs(x); + let y0 = Math.abs(y); + let a = x0 > y0 ? x0 : y0; + let b = ( x0 < y0 ? x0 : y0 ) / ( a !== 0 ? a : 1 @@ -117,13 +117,13 @@ function hypot_float(x, y) { } export { - int_float_of_bits , - int_bits_of_float , - modf_float , - ldexp_float , - frexp_float , - copysign_float , - expm1_float , - hypot_float , + int_float_of_bits, + int_bits_of_float, + modf_float, + ldexp_float, + frexp_float, + copysign_float, + expm1_float, + hypot_float, } /* No side effect */ diff --git a/runtime/src/caml_format.js b/runtime/src/caml_format.js index 17629da..ce4c0a6 100644 --- a/runtime/src/caml_format.js +++ b/runtime/src/caml_format.js @@ -39,10 +39,10 @@ function int_of_string_base(x) { } function parse_sign_and_base(s) { - var sign = 1; - var base = "Dec"; - var i = 0; - var match = s.codePointAt(i); + let sign = 1; + let base = "Dec"; + let i = 0; + let match = s.codePointAt(i); switch (match) { case 43 : i = i + 1 | 0; @@ -55,7 +55,7 @@ function parse_sign_and_base(s) { } if (s.codePointAt(i) === /* '0' */48) { - var match$1 = s.codePointAt(i + 1 | 0); + let match$1 = s.codePointAt(i + 1 | 0); if (match$1 >= 89) { if (match$1 >= 111) { if (match$1 < 121) { @@ -120,79 +120,83 @@ function parse_sign_and_base(s) { } } return [ - i, - sign, - base - ]; + i, + sign, + base + ]; } function int_of_string(s) { - var match = parse_sign_and_base(s); - var i = match[0]; - var base = int_of_string_base(match[2]); - var threshold = 4294967295; - var len = s.length; - var c = i < len ? s.codePointAt(i) : /* '\000' */0; - var d = parse_digit(c); + let match = parse_sign_and_base(s); + let i = match[0]; + let base = int_of_string_base(match[2]); + let threshold = 4294967295; + let len = s.length; + let c = i < len ? s.codePointAt(i) : /* '\000' */0; + let d = parse_digit(c); if (d < 0 || d >= base) { - throw { - RE_EXN_ID: "Failure", - _1: "int_of_string", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int_of_string" + } + }); } - var aux = function (_acc, _k) { + let aux = function (_acc, _k) { while(true) { - var k = _k; - var acc = _acc; + let k = _k; + let acc = _acc; if (k === len) { return acc; } - var a = s.codePointAt(k); + let a = s.codePointAt(k); if (a === /* '_' */95) { _k = k + 1 | 0; - continue ; + continue; } - var v = parse_digit(a); + let v = parse_digit(a); if (v < 0 || v >= base) { - throw { - RE_EXN_ID: "Failure", - _1: "int_of_string", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int_of_string" + } + }); } - var acc$1 = base * acc + v; + let acc$1 = base * acc + v; if (acc$1 > threshold) { - throw { - RE_EXN_ID: "Failure", - _1: "int_of_string", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int_of_string" + } + }); } _k = k + 1 | 0; _acc = acc$1; - continue ; + continue; }; }; - var res = match[1] * aux(d, i + 1 | 0); - var or_res = res | 0; + let res = match[1] * aux(d, i + 1 | 0); + let or_res = res | 0; if (base === 10 && res !== or_res) { - throw { - RE_EXN_ID: "Failure", - _1: "int_of_string", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int_of_string" + } + }); } return or_res; } function int64_of_string(s) { - var match = parse_sign_and_base(s); - var hbase = match[2]; - var i = match[0]; - var base = Caml_int64.of_int32(int_of_string_base(hbase)); - var sign = Caml_int64.of_int32(match[1]); - var threshold; + let match = parse_sign_and_base(s); + let hbase = match[2]; + let i = match[0]; + let base = Caml_int64.of_int32(int_of_string_base(hbase)); + let sign = Caml_int64.of_int32(match[1]); + let threshold; switch (hbase) { case "Oct" : threshold = [ @@ -217,53 +221,56 @@ function int64_of_string(s) { break; } - var len = s.length; - var c = i < len ? s.codePointAt(i) : /* '\000' */0; - var d = Caml_int64.of_int32(parse_digit(c)); + let len = s.length; + let c = i < len ? s.codePointAt(i) : /* '\000' */0; + let d = Caml_int64.of_int32(parse_digit(c)); if (Caml.i64_lt(d, Caml_int64.zero) || Caml.i64_ge(d, base)) { - throw { - RE_EXN_ID: "Failure", - _1: "int64_of_string", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int64_of_string" + } + }); } - var aux = function (_acc, _k) { + let aux = function (_acc, _k) { while(true) { - var k = _k; - var acc = _acc; + let k = _k; + let acc = _acc; if (k === len) { return acc; } - var a = s.codePointAt(k); + let a = s.codePointAt(k); if (a === /* '_' */95) { _k = k + 1 | 0; - continue ; + continue; } - var v = Caml_int64.of_int32(parse_digit(a)); + let v = Caml_int64.of_int32(parse_digit(a)); if (Caml.i64_lt(v, Caml_int64.zero) || Caml.i64_ge(v, base) || Caml.i64_gt(acc, threshold)) { - throw { - RE_EXN_ID: "Failure", - _1: "int64_of_string", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int64_of_string" + } + }); } - var acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v); + let acc$1 = Caml_int64.add(Caml_int64.mul(base, acc), v); _k = k + 1 | 0; _acc = acc$1; - continue ; + continue; }; }; - var res = Caml_int64.mul(sign, aux(d, i + 1 | 0)); - var or_res = Caml_int64.or_(res, Caml_int64.zero); + let res = Caml_int64.mul(sign, aux(d, i + 1 | 0)); + let or_res = Caml_int64.or_(res, Caml_int64.zero); if (Caml.i64_eq(base, [ - 0, - 10 - ]) && Caml.i64_neq(res, or_res)) { - throw { - RE_EXN_ID: "Failure", - _1: "int64_of_string", - Error: new Error() - }; + 0, + 10 + ]) && Caml.i64_neq(res, or_res)) { + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "int64_of_string" + } + }); } return or_res; } @@ -289,15 +296,16 @@ function lowercase(c) { } function parse_format(fmt) { - var len = fmt.length; + let len = fmt.length; if (len > 31) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "format_int: format too long", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "format_int: format too long" + } + }); } - var f = { + let f = { justify: "+", signstyle: "-", filter: " ", @@ -310,14 +318,14 @@ function parse_format(fmt) { prec: -1, conv: "f" }; - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i >= len) { return f; } - var c = Caml_string.get(fmt, i); - var exit = 0; + let c = Caml_string.get(fmt, i); + let exit = 0; if (c >= 69) { if (c >= 88) { if (c >= 121) { @@ -328,7 +336,7 @@ function parse_format(fmt) { f.base = "Hex"; f.uppercase = true; _i = i + 1 | 0; - continue ; + continue; case 101 : case 102 : case 103 : @@ -341,11 +349,11 @@ function parse_format(fmt) { case 111 : f.base = "Oct"; _i = i + 1 | 0; - continue ; + continue; case 117 : f.base = "Dec"; _i = i + 1 | 0; - continue ; + continue; case 89 : case 90 : case 91 : @@ -375,7 +383,7 @@ function parse_format(fmt) { case 120 : f.base = "Hex"; _i = i + 1 | 0; - continue ; + continue; } } @@ -386,14 +394,14 @@ function parse_format(fmt) { f.uppercase = true; f.conv = String.fromCharCode(lowercase(c)); _i = i + 1 | 0; - continue ; + continue; } } else { switch (c) { case 35 : f.alternate = true; _i = i + 1 | 0; - continue ; + continue; case 32 : case 43 : exit = 2; @@ -401,25 +409,23 @@ function parse_format(fmt) { case 45 : f.justify = "-"; _i = i + 1 | 0; - continue ; + continue; case 46 : f.prec = 0; - var j = i + 1 | 0; - while((function(j){ - return function () { - var w = fmt.codePointAt(j) - 48 | 0; - return w >= 0 && w <= 9; - } - }(j))()) { + let j = i + 1 | 0; + while((function () { + let w = fmt.codePointAt(j) - 48 | 0; + return w >= 0 && w <= 9; + })()) { f.prec = (Math.imul(f.prec, 10) + fmt.codePointAt(j) | 0) - 48 | 0; j = j + 1 | 0; }; _i = j; - continue ; + continue; case 48 : f.filter = "0"; _i = i + 1 | 0; - continue ; + continue; case 49 : case 50 : case 51 : @@ -438,51 +444,49 @@ function parse_format(fmt) { switch (exit) { case 1 : _i = i + 1 | 0; - continue ; + continue; case 2 : f.signstyle = String.fromCharCode(c); _i = i + 1 | 0; - continue ; + continue; case 3 : f.width = 0; - var j$1 = i; - while((function(j$1){ - return function () { - var w = fmt.codePointAt(j$1) - 48 | 0; - return w >= 0 && w <= 9; - } - }(j$1))()) { + let j$1 = i; + while((function () { + let w = fmt.codePointAt(j$1) - 48 | 0; + return w >= 0 && w <= 9; + })()) { f.width = (Math.imul(f.width, 10) + fmt.codePointAt(j$1) | 0) - 48 | 0; j$1 = j$1 + 1 | 0; }; _i = j$1; - continue ; + continue; case 4 : f.signedconv = true; f.base = "Dec"; _i = i + 1 | 0; - continue ; + continue; case 5 : f.signedconv = true; f.conv = String.fromCharCode(c); _i = i + 1 | 0; - continue ; + continue; } }; } function finish_formatting(config, rawbuffer) { - var justify = config.justify; - var signstyle = config.signstyle; - var filter = config.filter; - var alternate = config.alternate; - var base = config.base; - var signedconv = config.signedconv; - var width = config.width; - var uppercase = config.uppercase; - var sign = config.sign; - var len = rawbuffer.length; + let justify = config.justify; + let signstyle = config.signstyle; + let filter = config.filter; + let alternate = config.alternate; + let base = config.base; + let signedconv = config.signedconv; + let width = config.width; + let uppercase = config.uppercase; + let sign = config.sign; + let len = rawbuffer.length; if (signedconv && (sign < 0 || signstyle !== "-")) { len = len + 1 | 0; } @@ -494,9 +498,9 @@ function finish_formatting(config, rawbuffer) { } } - var buffer = ""; + let buffer = ""; if (justify === "+" && filter === " ") { - for(var _for = len; _for < width; ++_for){ + for(let _for = len; _for < width; ++_for){ buffer = buffer + filter; } } @@ -515,13 +519,13 @@ function finish_formatting(config, rawbuffer) { buffer = buffer + "0x"; } if (justify === "+" && filter === "0") { - for(var _for$1 = len; _for$1 < width; ++_for$1){ + for(let _for$1 = len; _for$1 < width; ++_for$1){ buffer = buffer + filter; } } buffer = uppercase ? buffer + rawbuffer.toUpperCase() : buffer + rawbuffer; if (justify === "-") { - for(var _for$2 = len; _for$2 < width; ++_for$2){ + for(let _for$2 = len; _for$2 < width; ++_for$2){ buffer = buffer + " "; } } @@ -532,14 +536,14 @@ function format_int(fmt, i) { if (fmt === "%d") { return String(i); } - var f = parse_format(fmt); - var i$1 = i < 0 ? ( + let f = parse_format(fmt); + let i$1 = i < 0 ? ( f.signedconv ? (f.sign = -1, (-i >>> 0)) : (i >>> 0) ) : i; - var s = i$1.toString(int_of_base(f.base)); + let s = i$1.toString(int_of_base(f.base)); if (f.prec >= 0) { f.filter = " "; - var n = f.prec - s.length | 0; + let n = f.prec - s.length | 0; if (n > 0) { s = "0".repeat(n) + s; } @@ -552,52 +556,52 @@ function dec_of_pos_int64(x) { if (!Caml.i64_lt(x, Caml_int64.zero)) { return Caml_int64.to_string(x); } - var wbase = [ + let wbase = [ 0, 10 ]; - var y = Caml_int64.discard_sign(x); - var match = Caml_int64.div_mod(y, wbase); - var match$1 = Caml_int64.div_mod(Caml_int64.add([ - 0, - 8 - ], match[1]), wbase); - var quotient = Caml_int64.add(Caml_int64.add([ - 214748364, - 3435973836 - ], match[0]), match$1[0]); + let y = Caml_int64.discard_sign(x); + let match = Caml_int64.div_mod(y, wbase); + let match$1 = Caml_int64.div_mod(Caml_int64.add([ + 0, + 8 + ], match[1]), wbase); + let quotient = Caml_int64.add(Caml_int64.add([ + 214748364, + 3435973836 + ], match[0]), match$1[0]); return Caml_int64.to_string(quotient) + "0123456789"[Caml_int64.to_int32(match$1[1])]; } function oct_of_int64(x) { - var s = ""; - var wbase = [ + let s = ""; + let wbase = [ 0, 8 ]; - var cvtbl = "01234567"; + let cvtbl = "01234567"; if (Caml.i64_lt(x, Caml_int64.zero)) { - var y = Caml_int64.discard_sign(x); - var match = Caml_int64.div_mod(y, wbase); - var quotient = Caml_int64.add([ - 268435456, - 0 - ], match[0]); - var modulus = match[1]; + let y = Caml_int64.discard_sign(x); + let match = Caml_int64.div_mod(y, wbase); + let quotient = Caml_int64.add([ + 268435456, + 0 + ], match[0]); + let modulus = match[1]; s = cvtbl[Caml_int64.to_int32(modulus)] + s; while(Caml.i64_neq(quotient, Caml_int64.zero)) { - var match$1 = Caml_int64.div_mod(quotient, wbase); + let match$1 = Caml_int64.div_mod(quotient, wbase); quotient = match$1[0]; modulus = match$1[1]; s = cvtbl[Caml_int64.to_int32(modulus)] + s; }; } else { - var match$2 = Caml_int64.div_mod(x, wbase); - var quotient$1 = match$2[0]; - var modulus$1 = match$2[1]; + let match$2 = Caml_int64.div_mod(x, wbase); + let quotient$1 = match$2[0]; + let modulus$1 = match$2[1]; s = cvtbl[Caml_int64.to_int32(modulus$1)] + s; while(Caml.i64_neq(quotient$1, Caml_int64.zero)) { - var match$3 = Caml_int64.div_mod(quotient$1, wbase); + let match$3 = Caml_int64.div_mod(quotient$1, wbase); quotient$1 = match$3[0]; modulus$1 = match$3[1]; s = cvtbl[Caml_int64.to_int32(modulus$1)] + s; @@ -610,10 +614,10 @@ function int64_format(fmt, x) { if (fmt === "%d") { return Caml_int64.to_string(x); } - var f = parse_format(fmt); - var x$1 = f.signedconv && Caml.i64_lt(x, Caml_int64.zero) ? (f.sign = -1, Caml_int64.neg(x)) : x; - var match = f.base; - var s; + let f = parse_format(fmt); + let x$1 = f.signedconv && Caml.i64_lt(x, Caml_int64.zero) ? (f.sign = -1, Caml_int64.neg(x)) : x; + let match = f.base; + let s; switch (match) { case "Oct" : s = oct_of_int64(x$1); @@ -626,10 +630,10 @@ function int64_format(fmt, x) { break; } - var fill_s; + let fill_s; if (f.prec >= 0) { f.filter = " "; - var n = f.prec - s.length | 0; + let n = f.prec - s.length | 0; fill_s = n > 0 ? "0".repeat(n) + s : s; } else { fill_s = s; @@ -638,19 +642,19 @@ function int64_format(fmt, x) { } function format_float(fmt, x) { - var f = parse_format(fmt); - var prec = f.prec < 0 ? 6 : f.prec; - var x$1 = x < 0 ? (f.sign = -1, - x) : x; - var s = ""; + let f = parse_format(fmt); + let prec = f.prec < 0 ? 6 : f.prec; + let x$1 = x < 0 ? (f.sign = -1, - x) : x; + let s = ""; if (isNaN(x$1)) { s = "nan"; f.filter = " "; } else if (isFinite(x$1)) { - var match = f.conv; + let match = f.conv; switch (match) { case "e" : s = x$1.toExponential(prec); - var i = s.length; + let i = s.length; if (Caml_string.get(s, i - 3 | 0) === /* 'e' */101) { s = s.slice(0, i - 1 | 0) + ("0" + s.slice(i - 1 | 0)); } @@ -659,12 +663,12 @@ function format_float(fmt, x) { s = x$1.toFixed(prec); break; case "g" : - var prec$1 = prec !== 0 ? prec : 1; + let prec$1 = prec !== 0 ? prec : 1; s = x$1.toExponential(prec$1 - 1 | 0); - var j = s.indexOf("e"); - var exp = Number(s.slice(j + 1 | 0)) | 0; + let j = s.indexOf("e"); + let exp = Number(s.slice(j + 1 | 0)) | 0; if (exp < -4 || x$1 >= 1e21 || x$1.toFixed().length > prec$1) { - var i$1 = j - 1 | 0; + let i$1 = j - 1 | 0; while(Caml_string.get(s, i$1) === /* '0' */48) { i$1 = i$1 - 1 | 0; }; @@ -672,26 +676,26 @@ function format_float(fmt, x) { i$1 = i$1 - 1 | 0; } s = s.slice(0, i$1 + 1 | 0) + s.slice(j); - var i$2 = s.length; + let i$2 = s.length; if (Caml_string.get(s, i$2 - 3 | 0) === /* 'e' */101) { s = s.slice(0, i$2 - 1 | 0) + ("0" + s.slice(i$2 - 1 | 0)); } } else { - var p = prec$1; + let p = prec$1; if (exp < 0) { p = p - (exp + 1 | 0) | 0; s = x$1.toFixed(p); } else { while((function () { - s = x$1.toFixed(p); - return s.length > (prec$1 + 1 | 0); - })()) { + s = x$1.toFixed(p); + return s.length > (prec$1 + 1 | 0); + })()) { p = p - 1 | 0; }; } if (p !== 0) { - var k = s.length - 1 | 0; + let k = s.length - 1 | 0; while(Caml_string.get(s, k) === /* '0' */48) { k = k - 1 | 0; }; @@ -713,7 +717,7 @@ function format_float(fmt, x) { return finish_formatting(f, s); } -var hexstring_of_float = (function(x,prec,style){ +let hexstring_of_float = (function(x,prec,style){ if (!isFinite(x)) { if (isNaN(x)) return "nan"; return x > 0 ? "infinity":"-infinity"; @@ -759,7 +763,7 @@ var hexstring_of_float = (function(x,prec,style){ return (sign_str + '0x' + x_str + 'p' + exp_sign + exp.toString(10)); }); -var float_of_string = (function(s,exn){ +let float_of_string = (function(s,exn){ var res = +s; if ((s.length > 0) && (res === res)) @@ -787,18 +791,18 @@ var float_of_string = (function(s,exn){ function float_of_string$1(s) { return float_of_string(s, { - RE_EXN_ID: "Failure", - _1: "float_of_string" - }); + RE_EXN_ID: "Failure", + _1: "float_of_string" + }); } export { - format_float , - hexstring_of_float , - format_int , + format_float, + hexstring_of_float, + format_int, float_of_string$1 as float_of_string, - int64_format , - int_of_string , - int64_of_string , + int64_format, + int_of_string, + int64_of_string, } /* No side effect */ diff --git a/runtime/src/caml_hash.js b/runtime/src/caml_hash.js index 1dc3c4f..41be4c6 100644 --- a/runtime/src/caml_hash.js +++ b/runtime/src/caml_hash.js @@ -3,11 +3,11 @@ import * as Caml_hash_primitive from "./caml_hash_primitive.js"; function push_back(q, v) { - var cell = { + let cell = { content: v, next: undefined }; - var last = q.last; + let last = q.last; if (last !== undefined) { q.length = q.length + 1 | 0; last.next = cell; @@ -20,8 +20,8 @@ function push_back(q, v) { } function unsafe_pop(q) { - var cell = q.first; - var next = cell.next; + let cell = q.first; + let next = cell.next; if (next === undefined) { q.length = 0; q.first = undefined; @@ -34,9 +34,9 @@ function unsafe_pop(q) { } function hash(count, _limit, seed, obj) { - var s = seed; + let s = seed; if (typeof obj === "number") { - var u = obj | 0; + let u = obj | 0; s = Caml_hash_primitive.hash_mix_int(s, (u + u | 0) + 1 | 0); return Caml_hash_primitive.hash_final_mix(s); } @@ -44,40 +44,40 @@ function hash(count, _limit, seed, obj) { s = Caml_hash_primitive.hash_mix_string(s, obj); return Caml_hash_primitive.hash_final_mix(s); } - var queue = { + let queue = { length: 0, first: undefined, last: undefined }; - var num = count; + let num = count; push_back(queue, obj); num = num - 1 | 0; while(queue.length !== 0 && num > 0) { - var obj$1 = unsafe_pop(queue); + let obj$1 = unsafe_pop(queue); if (typeof obj$1 === "number") { - var u$1 = obj$1 | 0; + let u$1 = obj$1 | 0; s = Caml_hash_primitive.hash_mix_int(s, (u$1 + u$1 | 0) + 1 | 0); num = num - 1 | 0; } else if (typeof obj$1 === "string") { s = Caml_hash_primitive.hash_mix_string(s, obj$1); num = num - 1 | 0; } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined" && typeof obj$1 !== "symbol" && typeof obj$1 !== "function") { - var size = obj$1.length | 0; + let size = obj$1.length | 0; if (size !== 0) { - var obj_tag = obj$1.TAG; - var tag = (size << 10) | obj_tag; + let obj_tag = obj$1.TAG; + let tag = (size << 10) | obj_tag; if (obj_tag === 248) { s = Caml_hash_primitive.hash_mix_int(s, obj$1[1]); } else { s = Caml_hash_primitive.hash_mix_int(s, tag); - var v = size - 1 | 0; - var block = v < num ? v : num; - for(var i = 0; i <= block; ++i){ + let v = size - 1 | 0; + let block = v < num ? v : num; + for(let i = 0; i <= block; ++i){ push_back(queue, obj$1[i]); } } } else { - var size$1 = (function(obj,cb){ + let size$1 = (function(obj,cb){ var size = 0 for(var k in obj){ cb(obj[k]) @@ -85,8 +85,8 @@ function hash(count, _limit, seed, obj) { } return size })(obj$1, (function (v) { - push_back(queue, v); - })); + push_back(queue, v); + })); s = Caml_hash_primitive.hash_mix_int(s, (size$1 << 10) | 0); } } @@ -96,6 +96,6 @@ function hash(count, _limit, seed, obj) { } export { - hash , + hash, } /* No side effect */ diff --git a/runtime/src/caml_hash_primitive.js b/runtime/src/caml_hash_primitive.js index a99e4d2..2407c20 100644 --- a/runtime/src/caml_hash_primitive.js +++ b/runtime/src/caml_hash_primitive.js @@ -6,17 +6,17 @@ function rotl32(x, n) { } function hash_mix_int(h, d) { - var d$1 = d; + let d$1 = d; d$1 = Math.imul(d$1, -862048943); d$1 = rotl32(d$1, 15); d$1 = Math.imul(d$1, 461845907); - var h$1 = h ^ d$1; + let h$1 = h ^ d$1; h$1 = rotl32(h$1, 13); return (h$1 + (h$1 << 2) | 0) - 430675100 | 0; } function hash_final_mix(h) { - var h$1 = h ^ (h >>> 16); + let h$1 = h ^ (h >>> 16); h$1 = Math.imul(h$1, -2048144789); h$1 = h$1 ^ (h$1 >>> 13); h$1 = Math.imul(h$1, -1028477387); @@ -24,17 +24,17 @@ function hash_final_mix(h) { } function hash_mix_string(h, s) { - var len = s.length; - var block = (len / 4 | 0) - 1 | 0; - var hash = h; - for(var i = 0; i <= block; ++i){ - var j = (i << 2); - var w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24); + let len = s.length; + let block = (len / 4 | 0) - 1 | 0; + let hash = h; + for(let i = 0; i <= block; ++i){ + let j = (i << 2); + let w = s.charCodeAt(j) | (s.charCodeAt(j + 1 | 0) << 8) | (s.charCodeAt(j + 2 | 0) << 16) | (s.charCodeAt(j + 3 | 0) << 24); hash = hash_mix_int(hash, w); } - var modulo = len & 3; + let modulo = len & 3; if (modulo !== 0) { - var w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : ( + let w$1 = modulo === 3 ? (s.charCodeAt(len - 1 | 0) << 16) | (s.charCodeAt(len - 2 | 0) << 8) | s.charCodeAt(len - 3 | 0) : ( modulo === 2 ? (s.charCodeAt(len - 1 | 0) << 8) | s.charCodeAt(len - 2 | 0) : s.charCodeAt(len - 1 | 0) ); hash = hash_mix_int(hash, w$1); @@ -44,8 +44,8 @@ function hash_mix_string(h, s) { } export { - hash_mix_int , - hash_mix_string , - hash_final_mix , + hash_mix_int, + hash_mix_string, + hash_final_mix, } /* No side effect */ diff --git a/runtime/src/caml_int32.js b/runtime/src/caml_int32.js index cca893a..d1e7064 100644 --- a/runtime/src/caml_int32.js +++ b/runtime/src/caml_int32.js @@ -3,26 +3,28 @@ function div(x, y) { if (y === 0) { - throw { - RE_EXN_ID: "Division_by_zero", - Error: new Error() - }; + throw new Error("Division_by_zero", { + cause: { + RE_EXN_ID: "Division_by_zero" + } + }); } return x / y | 0; } function mod_(x, y) { if (y === 0) { - throw { - RE_EXN_ID: "Division_by_zero", - Error: new Error() - }; + throw new Error("Division_by_zero", { + cause: { + RE_EXN_ID: "Division_by_zero" + } + }); } return x % y; } export { - div , - mod_ , + div, + mod_, } /* No side effect */ diff --git a/runtime/src/caml_int64.js b/runtime/src/caml_int64.js index 220d8eb..be9d575 100644 --- a/runtime/src/caml_int64.js +++ b/runtime/src/caml_int64.js @@ -4,32 +4,32 @@ import * as Caml from "./caml.js"; function mk(lo, hi) { return [ - hi, - (lo >>> 0) - ]; + hi, + (lo >>> 0) + ]; } -var min_int = [ +let min_int = [ -2147483648, 0 ]; -var max_int = [ +let max_int = [ 2147483647, 4294967295 ]; -var one = [ +let one = [ 0, 1 ]; -var zero = [ +let zero = [ 0, 0 ]; -var neg_one = [ +let neg_one = [ -1, 4294967295 ]; @@ -43,35 +43,35 @@ function non_neg_signed(x) { } function succ(param) { - var x_lo = param[1]; - var x_hi = param[0]; - var lo = x_lo + 1 | 0; + let x_lo = param[1]; + let x_hi = param[0]; + let lo = x_lo + 1 | 0; return [ - x_hi + ( - lo === 0 ? 1 : 0 - ) | 0, - (lo >>> 0) - ]; + x_hi + ( + lo === 0 ? 1 : 0 + ) | 0, + (lo >>> 0) + ]; } function neg(param) { - var other_lo = (param[1] ^ -1) + 1 | 0; + let other_lo = (param[1] ^ -1) + 1 | 0; return [ - (param[0] ^ -1) + ( - other_lo === 0 ? 1 : 0 - ) | 0, - (other_lo >>> 0) - ]; + (param[0] ^ -1) + ( + other_lo === 0 ? 1 : 0 + ) | 0, + (other_lo >>> 0) + ]; } function add_aux(param, y_lo, y_hi) { - var x_lo = param[1]; - var lo = x_lo + y_lo | 0; - var overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0; + let x_lo = param[1]; + let lo = x_lo + y_lo | 0; + let overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0; return [ - param[0] + y_hi + overflow | 0, - (lo >>> 0) - ]; + param[0] + y_hi + overflow | 0, + (lo >>> 0) + ]; } function add(self, param) { @@ -111,8 +111,8 @@ function equal_nullable(x, y) { } function sub_aux(x, lo, hi) { - var y_lo = ((lo ^ -1) + 1 >>> 0); - var y_hi = (hi ^ -1) + ( + let y_lo = ((lo ^ -1) + 1 >>> 0); + let y_hi = (hi ^ -1) + ( y_lo === 0 ? 1 : 0 ) | 0; return add_aux(x, y_lo, y_hi); @@ -126,17 +126,17 @@ function lsl_(x, numBits) { if (numBits === 0) { return x; } - var lo = x[1]; + let lo = x[1]; if (numBits >= 32) { return [ - (lo << (numBits - 32 | 0)), - 0 - ]; + (lo << (numBits - 32 | 0)), + 0 + ]; } else { return [ - (lo >>> (32 - numBits | 0)) | (x[0] << numBits), - ((lo << numBits) >>> 0) - ]; + (lo >>> (32 - numBits | 0)) | (x[0] << numBits), + ((lo << numBits) >>> 0) + ]; } } @@ -144,23 +144,23 @@ function lsr_(x, numBits) { if (numBits === 0) { return x; } - var hi = x[0]; - var offset = numBits - 32 | 0; + let hi = x[0]; + let offset = numBits - 32 | 0; if (offset === 0) { return [ - 0, - (hi >>> 0) - ]; + 0, + (hi >>> 0) + ]; } else if (offset > 0) { return [ - 0, - (hi >>> offset) - ]; + 0, + (hi >>> offset) + ]; } else { return [ - (hi >>> numBits), - (((hi << (-offset | 0)) | (x[1] >>> numBits)) >>> 0) - ]; + (hi >>> numBits), + (((hi << (-offset | 0)) | (x[1] >>> numBits)) >>> 0) + ]; } } @@ -168,17 +168,17 @@ function asr_(x, numBits) { if (numBits === 0) { return x; } - var hi = x[0]; + let hi = x[0]; if (numBits < 32) { return [ - (hi >> numBits), - (((hi << (32 - numBits | 0)) | (x[1] >>> numBits)) >>> 0) - ]; + (hi >> numBits), + (((hi << (32 - numBits | 0)) | (x[1] >>> numBits)) >>> 0) + ]; } else { return [ - hi >= 0 ? 0 : -1, - ((hi >> (numBits - 32 | 0)) >>> 0) - ]; + hi >= 0 ? 0 : -1, + ((hi >> (numBits - 32 | 0)) >>> 0) + ]; } } @@ -192,13 +192,13 @@ function is_zero(x) { function mul(_this, _other) { while(true) { - var other = _other; - var $$this = _this; - var lo; - var this_hi = $$this[0]; - var exit = 0; - var exit$1 = 0; - var exit$2 = 0; + let other = _other; + let $$this = _this; + let lo; + let this_hi = $$this[0]; + let exit = 0; + let exit$1 = 0; + let exit$2 = 0; if (this_hi !== 0) { exit$2 = 4; } else { @@ -225,39 +225,39 @@ function mul(_this, _other) { } } if (exit === 2) { - var other_hi = other[0]; - var lo$1 = $$this[1]; - var exit$3 = 0; + let other_hi = other[0]; + let lo$1 = $$this[1]; + let exit$3 = 0; if (other_hi !== -2147483648 || other[1] !== 0) { exit$3 = 3; } else { lo = lo$1; } if (exit$3 === 3) { - var other_lo = other[1]; + let other_lo = other[1]; if (this_hi < 0) { if (other_hi >= 0) { return neg(mul(neg($$this), other)); } _other = neg(other); _this = neg($$this); - continue ; + continue; } if (other_hi < 0) { return neg(mul($$this, neg(other))); } - var a48 = (this_hi >>> 16); - var a32 = this_hi & 65535; - var a16 = (lo$1 >>> 16); - var a00 = lo$1 & 65535; - var b48 = (other_hi >>> 16); - var b32 = other_hi & 65535; - var b16 = (other_lo >>> 16); - var b00 = other_lo & 65535; - var c48 = 0; - var c32 = 0; - var c16 = 0; - var c00 = a00 * b00; + let a48 = (this_hi >>> 16); + let a32 = this_hi & 65535; + let a16 = (lo$1 >>> 16); + let a00 = lo$1 & 65535; + let b48 = (other_hi >>> 16); + let b32 = other_hi & 65535; + let b16 = (other_lo >>> 16); + let b00 = other_lo & 65535; + let c48 = 0; + let c32 = 0; + let c16 = 0; + let c00 = a00 * b00; c16 = (c00 >>> 16) + a16 * b00; c32 = (c16 >>> 16); c16 = (c16 & 65535) + a00 * b16; @@ -270,9 +270,9 @@ function mul(_this, _other) { c32 = c32 & 65535; c48 = c48 + (a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48) & 65535; return [ - c32 | (c48 << 16), - ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0) - ]; + c32 | (c48 << 16), + ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0) + ]; } } @@ -286,23 +286,23 @@ function mul(_this, _other) { function xor(param, param$1) { return [ - param[0] ^ param$1[0], - ((param[1] ^ param$1[1]) >>> 0) - ]; + param[0] ^ param$1[0], + ((param[1] ^ param$1[1]) >>> 0) + ]; } function or_(param, param$1) { return [ - param[0] | param$1[0], - ((param[1] | param$1[1]) >>> 0) - ]; + param[0] | param$1[0], + ((param[1] | param$1[1]) >>> 0) + ]; } function and_(param, param$1) { return [ - param[0] & param$1[0], - ((param[1] & param$1[1]) >>> 0) - ]; + param[0] & param$1[0], + ((param[1] & param$1[1]) >>> 0) + ]; } function to_float(param) { @@ -322,17 +322,17 @@ function of_float(x) { if (x < 0) { return neg(of_float(- x)); } - var hi = x / 4294967296 | 0; - var lo = x % 4294967296 | 0; + let hi = x / 4294967296 | 0; + let lo = x % 4294967296 | 0; return [ - hi, - (lo >>> 0) - ]; + hi, + (lo >>> 0) + ]; } function isSafeInteger(param) { - var hi = param[0]; - var top11Bits = (hi >> 21); + let hi = param[0]; + let top11Bits = (hi >> 21); if (top11Bits === 0) { return true; } else if (top11Bits === -1) { @@ -353,40 +353,41 @@ function to_string(self) { return "-" + to_string(neg(self)); } } - var approx_div1 = of_float(Math.floor(to_float(self) / 10)); - var lo = approx_div1[1]; - var hi = approx_div1[0]; - var match = sub_aux(sub_aux(self, (lo << 3), (lo >>> 29) | (hi << 3)), (lo << 1), (lo >>> 31) | (hi << 1)); - var rem_lo = match[1]; - var rem_hi = match[0]; + let approx_div1 = of_float(Math.floor(to_float(self) / 10)); + let lo = approx_div1[1]; + let hi = approx_div1[0]; + let match = sub_aux(sub_aux(self, (lo << 3), (lo >>> 29) | (hi << 3)), (lo << 1), (lo >>> 31) | (hi << 1)); + let rem_lo = match[1]; + let rem_hi = match[0]; if (rem_lo === 0 && rem_hi === 0) { return to_string(approx_div1) + "0"; } if (rem_hi < 0) { - var rem_lo$1 = ((rem_lo ^ -1) + 1 >>> 0); - var delta = Math.ceil(rem_lo$1 / 10); - var remainder = 10 * delta - rem_lo$1; + let rem_lo$1 = ((rem_lo ^ -1) + 1 >>> 0); + let delta = Math.ceil(rem_lo$1 / 10); + let remainder = 10 * delta - rem_lo$1; return to_string(sub_aux(approx_div1, delta | 0, 0)) + String(remainder | 0); } - var delta$1 = Math.floor(rem_lo / 10); - var remainder$1 = rem_lo - 10 * delta$1; + let delta$1 = Math.floor(rem_lo / 10); + let remainder$1 = rem_lo - 10 * delta$1; return to_string(add_aux(approx_div1, delta$1 | 0, 0)) + String(remainder$1 | 0); } function div(_self, _other) { while(true) { - var other = _other; - var self = _self; - var self_hi = self[0]; - var exit = 0; - var exit$1 = 0; + let other = _other; + let self = _self; + let self_hi = self[0]; + let exit = 0; + let exit$1 = 0; if (other[0] !== 0 || other[1] !== 0) { exit$1 = 2; } else { - throw { - RE_EXN_ID: "Division_by_zero", - Error: new Error() - }; + throw new Error("Division_by_zero", { + cause: { + RE_EXN_ID: "Division_by_zero" + } + }); } if (exit$1 === 2) { if (self_hi !== -2147483648) { @@ -407,9 +408,9 @@ function div(_self, _other) { if (Caml.i64_eq(other, min_int)) { return one; } - var half_this = asr_(self, 1); - var approx = lsl_(div(half_this, other), 1); - var exit$2 = 0; + let half_this = asr_(self, 1); + let approx = lsl_(div(half_this, other), 1); + let exit$2 = 0; if (approx[0] !== 0) { exit$2 = 3; } else { @@ -423,15 +424,15 @@ function div(_self, _other) { exit$2 = 3; } if (exit$2 === 3) { - var rem = sub(self, mul(other, approx)); + let rem = sub(self, mul(other, approx)); return add(approx, div(rem, other)); } } } if (exit === 1) { - var other_hi = other[0]; - var exit$3 = 0; + let other_hi = other[0]; + let exit$3 = 0; if (other_hi !== -2147483648) { exit$3 = 2; } else { @@ -447,20 +448,20 @@ function div(_self, _other) { } _other = neg(other); _self = neg(self); - continue ; + continue; } if (other_hi < 0) { return neg(div(self, neg(other))); } - var res = zero; - var rem$1 = self; + let res = zero; + let rem$1 = self; while(Caml.i64_ge(rem$1, other)) { - var b = Math.floor(to_float(rem$1) / to_float(other)); - var approx$1 = 1 > b ? 1 : b; - var log2 = Math.ceil(Math.log(approx$1) / Math.LN2); - var delta = log2 <= 48 ? 1 : Math.pow(2, log2 - 48); - var approxRes = of_float(approx$1); - var approxRem = mul(approxRes, other); + let b = Math.floor(to_float(rem$1) / to_float(other)); + let approx$1 = 1 > b ? 1 : b; + let log2 = Math.ceil(Math.log(approx$1) / Math.LN2); + let delta = log2 <= 48 ? 1 : Math.pow(2, log2 - 48); + let approxRes = of_float(approx$1); + let approxRem = mul(approxRes, other); while(approxRem[0] < 0 || Caml.i64_gt(approxRem, rem$1)) { approx$1 = approx$1 - delta; approxRes = of_float(approx$1); @@ -485,24 +486,24 @@ function mod_(self, other) { } function div_mod(self, other) { - var quotient = div(self, other); + let quotient = div(self, other); return [ - quotient, - sub(self, mul(quotient, other)) - ]; + quotient, + sub(self, mul(quotient, other)) + ]; } function compare(self, other) { - var y = other[0]; - var x = self[0]; - var v = x < y ? -1 : ( + let y = other[0]; + let x = self[0]; + let v = x < y ? -1 : ( x === y ? 0 : 1 ); if (v !== 0) { return v; } - var y$1 = other[1]; - var x$1 = self[1]; + let y$1 = other[1]; + let x$1 = self[1]; if (x$1 < y$1) { return -1; } else if (x$1 === y$1) { @@ -514,9 +515,9 @@ function compare(self, other) { function of_int32(lo) { return [ - lo < 0 ? -1 : 0, - (lo >>> 0) - ]; + lo < 0 ? -1 : 0, + (lo >>> 0) + ]; } function to_int32(x) { @@ -524,9 +525,9 @@ function to_int32(x) { } function to_hex(x) { - var x_lo = x[1]; - var x_hi = x[0]; - var aux = function (v) { + let x_lo = x[1]; + let x_hi = x[0]; + let aux = function (v) { return (v >>> 0).toString(16); }; if (x_hi === 0 && x_lo === 0) { @@ -538,8 +539,8 @@ function to_hex(x) { if (x_hi === 0) { return aux(x_lo); } - var lo = aux(x_lo); - var pad = 8 - lo.length | 0; + let lo = aux(x_lo); + let pad = 8 - lo.length | 0; if (pad <= 0) { return aux(x_hi) + lo; } else { @@ -549,9 +550,9 @@ function to_hex(x) { function discard_sign(x) { return [ - 2147483647 & x[0], - x[1] - ]; + 2147483647 & x[0], + x[1] + ]; } function float_of_bits(x) { @@ -559,48 +560,48 @@ function float_of_bits(x) { } function bits_of_float(x) { - var match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x); + let match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x); return [ - match[1], - (match[0] >>> 0) - ]; + match[1], + (match[0] >>> 0) + ]; } export { - mk , - succ , - min_int , - max_int , - one , - zero , - neg_one , - of_int32 , - to_int32 , - add , - neg , - sub , - lsl_ , - lsr_ , - asr_ , - is_zero , - mul , - xor , - or_ , - and_ , - equal , - equal_null , - equal_undefined , - equal_nullable , - to_float , - of_float , - div , - mod_ , - compare , - float_of_bits , - bits_of_float , - div_mod , - to_hex , - discard_sign , - to_string , + mk, + succ, + min_int, + max_int, + one, + zero, + neg_one, + of_int32, + to_int32, + add, + neg, + sub, + lsl_, + lsr_, + asr_, + is_zero, + mul, + xor, + or_, + and_, + equal, + equal_null, + equal_undefined, + equal_nullable, + to_float, + of_float, + div, + mod_, + compare, + float_of_bits, + bits_of_float, + div_mod, + to_hex, + discard_sign, + to_string, } /* No side effect */ diff --git a/runtime/src/caml_js_exceptions.js b/runtime/src/caml_js_exceptions.js index 8537f58..f793b05 100644 --- a/runtime/src/caml_js_exceptions.js +++ b/runtime/src/caml_js_exceptions.js @@ -3,16 +3,16 @@ import * as Caml_option from "rescript/lib/es6/caml_option.js"; import * as Caml_exceptions from "./caml_exceptions.js"; -var $$Error = "JsError"; +let $$Error = "JsError"; function internalToOCamlException(e) { if (Caml_exceptions.is_extension(e)) { return e; } else { return { - RE_EXN_ID: "JsError", - _1: e - }; + RE_EXN_ID: "JsError", + _1: e + }; } } @@ -24,8 +24,8 @@ function as_js_exn(exn) { } export { - $$Error , - internalToOCamlException , - as_js_exn , + $$Error, + internalToOCamlException, + as_js_exn, } /* Caml_exceptions Not a pure module */ diff --git a/runtime/src/caml_lexer.js b/runtime/src/caml_lexer.js index 542de28..a1ad028 100644 --- a/runtime/src/caml_lexer.js +++ b/runtime/src/caml_lexer.js @@ -31,7 +31,7 @@ function caml_lex_array(s) { } ; -var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ +let caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ if (!Array.isArray(tbl.lex_default)) { tbl.lex_base = caml_lex_array(tbl.lex_base); @@ -101,13 +101,13 @@ var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){ } }); -var empty_token_lit = "lexing: empty token"; +let empty_token_lit = "lexing: empty token"; function lex_engine(tbls, i, buf) { return caml_lex_engine_aux(tbls, i, buf, { - RE_EXN_ID: "Failure", - _1: empty_token_lit - }); + RE_EXN_ID: "Failure", + _1: empty_token_lit + }); } /***********************************************/ @@ -156,7 +156,7 @@ function caml_lex_run_tag(s, i, mem) { } ; -var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { +let caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { if (!Array.isArray(tbl.lex_default)) { tbl.lex_base = caml_lex_array(tbl.lex_base); @@ -246,13 +246,13 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) { function new_lex_engine(tbl, i, buf) { return caml_new_lex_engine_aux(tbl, i, buf, { - RE_EXN_ID: "Failure", - _1: empty_token_lit - }); + RE_EXN_ID: "Failure", + _1: empty_token_lit + }); } export { - lex_engine , - new_lex_engine , + lex_engine, + new_lex_engine, } /* Not a pure module */ diff --git a/runtime/src/caml_md5.js b/runtime/src/caml_md5.js index 17fb4d8..f25333f 100644 --- a/runtime/src/caml_md5.js +++ b/runtime/src/caml_md5.js @@ -2,7 +2,7 @@ function cmn(q, a, b, x, s, t) { - var a$1 = ((a + q | 0) + x | 0) + t | 0; + let a$1 = ((a + q | 0) + x | 0) + t | 0; return ((a$1 << s) | (a$1 >>> (32 - s | 0)) | 0) + b | 0; } @@ -23,10 +23,10 @@ function i(a, b, c, d, x, s, t) { } function cycle(x, k) { - var a = x[0]; - var b = x[1]; - var c = x[2]; - var d = x[3]; + let a = x[0]; + let b = x[1]; + let c = x[2]; + let d = x[3]; a = f(a, b, c, d, k[0], 7, -680876936); d = f(d, a, b, c, k[1], 12, -389564586); c = f(c, d, a, b, k[2], 17, 606105819); @@ -97,14 +97,14 @@ function cycle(x, k) { x[3] = d + x[3] | 0; } -var state = [ +let state = [ 1732584193, -271733879, -1732584194, 271733878 ]; -var md5blk = [ +let md5blk = [ 0, 0, 0, @@ -124,36 +124,36 @@ var md5blk = [ ]; function md5_string(s, start, len) { - var s$1 = s.slice(start, len); - var n = s$1.length; + let s$1 = s.slice(start, len); + let n = s$1.length; state[0] = 1732584193; state[1] = -271733879; state[2] = -1732584194; state[3] = 271733878; - for(var i = 0; i <= 15; ++i){ + for(let i = 0; i <= 15; ++i){ md5blk[i] = 0; } - var i_end = n / 64 | 0; - for(var i$1 = 1; i$1 <= i_end; ++i$1){ - for(var j = 0; j <= 15; ++j){ - var k = ((i$1 << 6) - 64 | 0) + (j << 2) | 0; + let i_end = n / 64 | 0; + for(let i$1 = 1; i$1 <= i_end; ++i$1){ + for(let j = 0; j <= 15; ++j){ + let k = ((i$1 << 6) - 64 | 0) + (j << 2) | 0; md5blk[j] = ((s$1.charCodeAt(k) + (s$1.charCodeAt(k + 1 | 0) << 8) | 0) + (s$1.charCodeAt(k + 2 | 0) << 16) | 0) + (s$1.charCodeAt(k + 3 | 0) << 24) | 0; } cycle(state, md5blk); } - var s_tail = s$1.slice((i_end << 6)); - for(var kk = 0; kk <= 15; ++kk){ + let s_tail = s$1.slice((i_end << 6)); + for(let kk = 0; kk <= 15; ++kk){ md5blk[kk] = 0; } - var i_end$1 = s_tail.length - 1 | 0; - for(var i$2 = 0; i$2 <= i_end$1; ++i$2){ + let i_end$1 = s_tail.length - 1 | 0; + for(let i$2 = 0; i$2 <= i_end$1; ++i$2){ md5blk[i$2 / 4 | 0] = md5blk[i$2 / 4 | 0] | (s_tail.charCodeAt(i$2) << (i$2 % 4 << 3)); } - var i$3 = i_end$1 + 1 | 0; + let i$3 = i_end$1 + 1 | 0; md5blk[i$3 / 4 | 0] = md5blk[i$3 / 4 | 0] | (128 << (i$3 % 4 << 3)); if (i$3 > 55) { cycle(state, md5blk); - for(var i$4 = 0; i$4 <= 15; ++i$4){ + for(let i$4 = 0; i$4 <= 15; ++i$4){ md5blk[i$4] = 0; } } @@ -163,6 +163,6 @@ function md5_string(s, start, len) { } export { - md5_string , + md5_string, } /* No side effect */ diff --git a/runtime/src/caml_module.js b/runtime/src/caml_module.js index e1268d6..29fd105 100644 --- a/runtime/src/caml_module.js +++ b/runtime/src/caml_module.js @@ -3,20 +3,21 @@ import * as Caml_obj from "./caml_obj.js"; function init_mod(loc, shape) { - var undef_module = function (param) { - throw { - RE_EXN_ID: "Undefined_recursive_module", - _1: loc, - Error: new Error() - }; + let undef_module = function (param) { + throw new Error("Undefined_recursive_module", { + cause: { + RE_EXN_ID: "Undefined_recursive_module", + _1: loc + } + }); }; - var loop = function (shape, struct_, idx) { + let loop = function (shape, struct_, idx) { if (typeof shape !== "object") { switch (shape) { case "Function" : case "Lazy" : struct_[idx] = undef_module; - return ; + return; case "Class" : struct_[idx] = [ undef_module, @@ -24,38 +25,38 @@ function init_mod(loc, shape) { undef_module, 0 ]; - return ; + return; } } else { if (shape.TAG === "Module") { - var comps = shape._0; - var v = {}; + let comps = shape._0; + let v = {}; struct_[idx] = v; - var len = comps.length; - for(var i = 0; i < len; ++i){ - var match = comps[i]; + let len = comps.length; + for(let i = 0; i < len; ++i){ + let match = comps[i]; loop(match[0], v, match[1]); } - return ; + return; } struct_[idx] = shape._0; - return ; + return; } }; - var res = {}; - var dummy_name = "dummy"; + let res = {}; + let dummy_name = "dummy"; loop(shape, res, dummy_name); return res[dummy_name]; } function update_mod(shape, o, n) { - var aux = function (shape, o, n, parent, i) { + let aux = function (shape, o, n, parent, i) { if (typeof shape !== "object") { switch (shape) { case "Function" : parent[i] = n; - return ; + return; case "Lazy" : case "Class" : return Caml_obj.update_dummy(o, n); @@ -63,50 +64,52 @@ function update_mod(shape, o, n) { } } else { if (shape.TAG !== "Module") { - return ; + return; } - var comps = shape._0; - for(var i$1 = 0 ,i_finish = comps.length; i$1 < i_finish; ++i$1){ - var match = comps[i$1]; - var name = match[1]; + let comps = shape._0; + for(let i$1 = 0 ,i_finish = comps.length; i$1 < i_finish; ++i$1){ + let match = comps[i$1]; + let name = match[1]; aux(match[0], o[name], n[name], o, name); } - return ; + return; } }; if (typeof shape !== "object") { - throw { - RE_EXN_ID: "Assert_failure", - _1: [ - "caml_module.res", - 109, - 9 - ], - Error: new Error() - }; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "caml_module.res", + 109, + 9 + ] + } + }); } if (shape.TAG === "Module") { - var comps = shape._0; - for(var i = 0 ,i_finish = comps.length; i < i_finish; ++i){ - var match = comps[i]; - var name = match[1]; + let comps = shape._0; + for(let i = 0 ,i_finish = comps.length; i < i_finish; ++i){ + let match = comps[i]; + let name = match[1]; aux(match[0], o[name], n[name], o, name); } - return ; + return; } - throw { - RE_EXN_ID: "Assert_failure", - _1: [ - "caml_module.res", - 109, - 9 - ], - Error: new Error() - }; + throw new Error("Assert_failure", { + cause: { + RE_EXN_ID: "Assert_failure", + _1: [ + "caml_module.res", + 109, + 9 + ] + } + }); } export { - init_mod , - update_mod , + init_mod, + update_mod, } /* No side effect */ diff --git a/runtime/src/caml_obj.js b/runtime/src/caml_obj.js index 6759a76..3c8ca64 100644 --- a/runtime/src/caml_obj.js +++ b/runtime/src/caml_obj.js @@ -3,10 +3,10 @@ import * as Caml from "rescript/lib/es6/caml.js"; import * as Caml_option from "./caml_option.js"; -var for_in = (function(o,foo){ +let for_in = (function(o,foo){ for (var x in o) { foo(x) }}); -var obj_dup = (function(x){ +let obj_dup = (function(x){ if(Array.isArray(x)){ var len = x.length var v = new Array(len) @@ -21,7 +21,7 @@ var obj_dup = (function(x){ return Object.assign({},x) }); -var update_dummy = (function(x,y){ +let update_dummy = (function(x,y){ var k if(Array.isArray(y)){ for(k = 0; k < y.length ; ++k){ @@ -41,8 +41,8 @@ function compare(a, b) { if (a === b) { return 0; } - var a_type = typeof a; - var b_type = typeof b; + let a_type = typeof a; + let b_type = typeof b; switch (a_type) { case "bigint" : if (b_type === "bigint") { @@ -56,11 +56,12 @@ function compare(a, b) { break; case "function" : if (b_type === "function") { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "compare: functional value", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "compare: functional value" + } + }); } break; case "number" : @@ -132,17 +133,18 @@ function compare(a, b) { return -1; } } - var tag_a = a.TAG; - var tag_b = b.TAG; + let tag_a = a.TAG; + let tag_b = b.TAG; if (tag_a === 248) { return Caml.int_compare(a[1], b[1]); } if (tag_a === 251) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "equal: abstract value", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "equal: abstract value" + } + }); } if (tag_a !== tag_b) { if (tag_a < tag_b) { @@ -151,22 +153,22 @@ function compare(a, b) { return 1; } } - var len_a = a.length | 0; - var len_b = b.length | 0; + let len_a = a.length | 0; + let len_b = b.length | 0; if (len_a === len_b) { if (Array.isArray(a)) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len_a) { return 0; } - var res = compare(a[i], b[i]); + let res = compare(a[i], b[i]); if (res !== 0) { return res; } _i = i + 1 | 0; - continue ; + continue; }; } else if ((a instanceof Date && b instanceof Date)) { return (a - b); @@ -174,75 +176,75 @@ function compare(a, b) { return aux_obj_compare(a, b); } } else if (len_a < len_b) { - var _i$1 = 0; + let _i$1 = 0; while(true) { - var i$1 = _i$1; + let i$1 = _i$1; if (i$1 === len_a) { return -1; } - var res$1 = compare(a[i$1], b[i$1]); + let res$1 = compare(a[i$1], b[i$1]); if (res$1 !== 0) { return res$1; } _i$1 = i$1 + 1 | 0; - continue ; + continue; }; } else { - var _i$2 = 0; + let _i$2 = 0; while(true) { - var i$2 = _i$2; + let i$2 = _i$2; if (i$2 === len_b) { return 1; } - var res$2 = compare(a[i$2], b[i$2]); + let res$2 = compare(a[i$2], b[i$2]); if (res$2 !== 0) { return res$2; } _i$2 = i$2 + 1 | 0; - continue ; + continue; }; } } } function aux_obj_compare(a, b) { - var min_key_lhs = { + let min_key_lhs = { contents: undefined }; - var min_key_rhs = { + let min_key_rhs = { contents: undefined }; - var do_key = function (param) { - var min_key = param[2]; - var b = param[1]; - var a = param[0]; + let do_key = function (param) { + let min_key = param[2]; + let b = param[1]; + let a = param[0]; return function (key) { if (!(!Object.prototype.hasOwnProperty.call(b, key) || compare(a[key], b[key]) > 0)) { - return ; + return; } - var mk = min_key.contents; + let mk = min_key.contents; if (mk !== undefined && key >= mk) { - return ; + return; } else { min_key.contents = key; - return ; + return; } }; }; - var do_key_a = do_key([ - a, - b, - min_key_rhs - ]); - var do_key_b = do_key([ - b, - a, - min_key_lhs - ]); + let do_key_a = do_key([ + a, + b, + min_key_rhs + ]); + let do_key_b = do_key([ + b, + a, + min_key_lhs + ]); for_in(a, do_key_a); for_in(b, do_key_b); - var match = min_key_lhs.contents; - var match$1 = min_key_rhs.contents; + let match = min_key_lhs.contents; + let match$1 = min_key_rhs.contents; if (match !== undefined) { if (match$1 !== undefined) { return Caml.string_compare(match, match$1); @@ -260,43 +262,45 @@ function equal(a, b) { if (a === b) { return true; } - var a_type = typeof a; + let a_type = typeof a; if (a_type === "string" || a_type === "number" || a_type === "bigint" || a_type === "boolean" || a_type === "undefined" || a === null) { return false; } - var b_type = typeof b; + let b_type = typeof b; if (a_type === "function" || b_type === "function") { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "equal: functional value", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "equal: functional value" + } + }); } if (b_type === "number" || b_type === "bigint" || b_type === "undefined" || b === null) { return false; } - var tag_a = a.TAG; - var tag_b = b.TAG; + let tag_a = a.TAG; + let tag_b = b.TAG; if (tag_a === 248) { return a[1] === b[1]; } if (tag_a === 251) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "equal: abstract value", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "equal: abstract value" + } + }); } if (tag_a !== tag_b) { return false; } - var len_a = a.length | 0; - var len_b = b.length | 0; + let len_a = a.length | 0; + let len_b = b.length | 0; if (len_a === len_b) { if (Array.isArray(a)) { - var _i = 0; + let _i = 0; while(true) { - var i = _i; + let i = _i; if (i === len_a) { return true; } @@ -304,25 +308,25 @@ function equal(a, b) { return false; } _i = i + 1 | 0; - continue ; + continue; }; } else if ((a instanceof Date && b instanceof Date)) { return !(a > b || a < b); } else { - var result = { + let result = { contents: true }; - var do_key_a = function (key) { + let do_key_a = function (key) { if (!Object.prototype.hasOwnProperty.call(b, key)) { result.contents = false; - return ; + return; } }; - var do_key_b = function (key) { + let do_key_b = function (key) { if (!Object.prototype.hasOwnProperty.call(a, key) || !equal(b[key], a[key])) { result.contents = false; - return ; + return; } }; @@ -418,19 +422,19 @@ function max(x, y) { } export { - obj_dup , - update_dummy , - compare , - equal , - equal_null , - equal_undefined , - equal_nullable , - notequal , - greaterequal , - greaterthan , - lessthan , - lessequal , - min , - max , + obj_dup, + update_dummy, + compare, + equal, + equal_null, + equal_undefined, + equal_nullable, + notequal, + greaterequal, + greaterthan, + lessthan, + lessequal, + min, + max, } /* No side effect */ diff --git a/runtime/src/caml_option.js b/runtime/src/caml_option.js index e7e4934..704efe5 100644 --- a/runtime/src/caml_option.js +++ b/runtime/src/caml_option.js @@ -8,12 +8,12 @@ function isNested(x) { function some(x) { if (x === undefined) { return { - BS_PRIVATE_NESTED_SOME_NONE: 0 - }; + BS_PRIVATE_NESTED_SOME_NONE: 0 + }; } else if (x !== null && x.BS_PRIVATE_NESTED_SOME_NONE !== undefined) { return { - BS_PRIVATE_NESTED_SOME_NONE: x.BS_PRIVATE_NESTED_SOME_NONE + 1 | 0 - }; + BS_PRIVATE_NESTED_SOME_NONE: x.BS_PRIVATE_NESTED_SOME_NONE + 1 | 0 + }; } else { return x; } @@ -21,7 +21,7 @@ function some(x) { function nullable_to_opt(x) { if (x == null) { - return ; + return; } else { return some(x); } @@ -29,7 +29,7 @@ function nullable_to_opt(x) { function undefined_to_opt(x) { if (x === undefined) { - return ; + return; } else { return some(x); } @@ -37,7 +37,7 @@ function undefined_to_opt(x) { function null_to_opt(x) { if (x === null) { - return ; + return; } else { return some(x); } @@ -47,19 +47,19 @@ function valFromOption(x) { if (!(x !== null && x.BS_PRIVATE_NESTED_SOME_NONE !== undefined)) { return x; } - var depth = x.BS_PRIVATE_NESTED_SOME_NONE; + let depth = x.BS_PRIVATE_NESTED_SOME_NONE; if (depth === 0) { - return ; + return; } else { return { - BS_PRIVATE_NESTED_SOME_NONE: depth - 1 | 0 - }; + BS_PRIVATE_NESTED_SOME_NONE: depth - 1 | 0 + }; } } function option_get(x) { if (x === undefined) { - return ; + return; } else { return valFromOption(x); } @@ -74,13 +74,13 @@ function option_unwrap(x) { } export { - nullable_to_opt , - undefined_to_opt , - null_to_opt , - valFromOption , - some , - isNested , - option_get , - option_unwrap , + nullable_to_opt, + undefined_to_opt, + null_to_opt, + valFromOption, + some, + isNested, + option_get, + option_unwrap, } /* No side effect */ diff --git a/runtime/src/caml_parser.js b/runtime/src/caml_parser.js index 7869ec5..cbd8dc7 100644 --- a/runtime/src/caml_parser.js +++ b/runtime/src/caml_parser.js @@ -65,7 +65,7 @@ var Result = { var PARSER_TRACE = false; ; -var parse_engine = (function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) { +let parse_engine = (function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) { var ERRCODE = 256; //var START = 0; //var TOKEN_READ = 1; @@ -290,14 +290,14 @@ var parse_engine = (function (tables /* parser_table */, env /* parser_env */, c return res; }); -var set_parser_trace = (function (v) { +let set_parser_trace = (function (v) { var old = PARSER_TRACE; PARSER_TRACE = v; return old; }); export { - parse_engine , - set_parser_trace , + parse_engine, + set_parser_trace, } /* Not a pure module */ diff --git a/runtime/src/caml_splice_call.js b/runtime/src/caml_splice_call.js index fdc44ff..6de3990 100644 --- a/runtime/src/caml_splice_call.js +++ b/runtime/src/caml_splice_call.js @@ -1,7 +1,7 @@ -var spliceApply = (function(fn,args){ +let spliceApply = (function(fn,args){ var i, argLen; argLen = args.length var applied = [] @@ -15,7 +15,7 @@ var spliceApply = (function(fn,args){ return fn.apply(null,applied) }); -var spliceNewApply = (function (ctor,args){ +let spliceNewApply = (function (ctor,args){ var i, argLen; argLen = args.length var applied = [null] // Function.prototype.bind.apply(fn, args) requires the first element in \`args\` to be \`null\` @@ -30,7 +30,7 @@ var spliceNewApply = (function (ctor,args){ return new C() }); -var spliceObjApply = (function(obj,name,args){ +let spliceObjApply = (function(obj,name,args){ var i, argLen; argLen = args.length var applied = [] @@ -45,8 +45,8 @@ var spliceObjApply = (function(obj,name,args){ }); export { - spliceApply , - spliceNewApply , - spliceObjApply , + spliceApply, + spliceNewApply, + spliceObjApply, } /* No side effect */ diff --git a/runtime/src/caml_string.js b/runtime/src/caml_string.js index af9d98b..4ed21b8 100644 --- a/runtime/src/caml_string.js +++ b/runtime/src/caml_string.js @@ -3,11 +3,12 @@ function get(s, i) { if (i >= s.length || i < 0) { - throw { - RE_EXN_ID: "Invalid_argument", - _1: "index out of bounds", - Error: new Error() - }; + throw new Error("Invalid_argument", { + cause: { + RE_EXN_ID: "Invalid_argument", + _1: "index out of bounds" + } + }); } return s.codePointAt(i); } @@ -17,7 +18,7 @@ function make(n, ch) { } export { - get , - make , + get, + make, } /* No side effect */ diff --git a/runtime/src/caml_sys.js b/runtime/src/caml_sys.js index 58d32dd..d0a2aa2 100644 --- a/runtime/src/caml_sys.js +++ b/runtime/src/caml_sys.js @@ -3,22 +3,24 @@ function sys_getenv(s) { if (typeof process === "undefined" || process.env === undefined) { - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } - var x = process.env[s]; + let x = process.env[s]; if (x !== undefined) { return x; } - throw { - RE_EXN_ID: "Not_found", - Error: new Error() - }; + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); } -var os_type = (function(_){ +let os_type = (function(_){ if(typeof process !== 'undefined' && process.platform === 'win32'){ return "Win32" } @@ -35,7 +37,7 @@ function sys_time() { } } -var sys_getcwd = (function(param){ +let sys_getcwd = (function(param){ if (typeof process === "undefined" || process.cwd === undefined){ return "/" } @@ -45,21 +47,21 @@ var sys_getcwd = (function(param){ function sys_get_argv() { if (typeof process === "undefined") { return [ - "", - [""] - ]; + "", + [""] + ]; } - var argv = process.argv; + let argv = process.argv; if (argv == null) { return [ - "", - [""] - ]; + "", + [""] + ]; } else { return [ - argv[0], - argv - ]; + argv[0], + argv + ]; } } @@ -71,29 +73,31 @@ function sys_exit(exit_code) { } function sys_is_directory(_s) { - throw { - RE_EXN_ID: "Failure", - _1: "sys_is_directory not implemented", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "sys_is_directory not implemented" + } + }); } function sys_file_exists(_s) { - throw { - RE_EXN_ID: "Failure", - _1: "sys_file_exists not implemented", - Error: new Error() - }; + throw new Error("Failure", { + cause: { + RE_EXN_ID: "Failure", + _1: "sys_file_exists not implemented" + } + }); } export { - sys_getenv , - sys_time , - os_type , - sys_getcwd , - sys_get_argv , - sys_exit , - sys_is_directory , - sys_file_exists , + sys_getenv, + sys_time, + os_type, + sys_getcwd, + sys_get_argv, + sys_exit, + sys_is_directory, + sys_file_exists, } /* No side effect */ diff --git a/runtime/src/runtime_deriving.js b/runtime/src/runtime_deriving.js new file mode 100644 index 0000000..e2b665f --- /dev/null +++ b/runtime/src/runtime_deriving.js @@ -0,0 +1,18 @@ + + + +function raiseWhenNotFound(x) { + if (x == null) { + throw new Error("Not_found", { + cause: { + RE_EXN_ID: "Not_found" + } + }); + } + return x; +} + +export { + raiseWhenNotFound, +} +/* No side effect */ diff --git a/runtime/src/runtime_deriving.res b/runtime/src/runtime_deriving.res new file mode 100644 index 0000000..7aa535e --- /dev/null +++ b/runtime/src/runtime_deriving.res @@ -0,0 +1,30 @@ +/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +let raiseWhenNotFound = x => + if Js.testAny(x) { + raise(Not_found) + } else { + x + } diff --git a/runtime/src/runtime_deriving.resi b/runtime/src/runtime_deriving.resi new file mode 100644 index 0000000..fa5cdeb --- /dev/null +++ b/runtime/src/runtime_deriving.resi @@ -0,0 +1,25 @@ +/* Copyright (C) 2017 Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +let raiseWhenNotFound: 'a => 'a diff --git a/runtime/src/runtime_promise.js b/runtime/src/runtime_promise.js new file mode 100644 index 0000000..ae1b9f1 --- /dev/null +++ b/runtime/src/runtime_promise.js @@ -0,0 +1 @@ +/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */ diff --git a/runtime/src/runtime_promise.res b/runtime/src/runtime_promise.res new file mode 100644 index 0000000..e674a1c --- /dev/null +++ b/runtime/src/runtime_promise.res @@ -0,0 +1,28 @@ +/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +external unsafe_async: 'a => promise<'a> = "%identity" +external unsafe_await: promise<'a> => 'a = "?await" + +external import: 'a => promise<'a> = "#import" diff --git a/stdlib-mini/src/stdlib_mini.js b/stdlib-mini/src/stdlib_mini.js index e5c62eb..34aaa1c 100644 --- a/stdlib-mini/src/stdlib_mini.js +++ b/stdlib-mini/src/stdlib_mini.js @@ -1,28 +1,28 @@ -var Obj = {}; +let Obj = {}; -var Pervasives = {}; +let Pervasives = {}; -var $$String = {}; +let $$String = {}; -var $$Promise = {}; +let $$Promise = {}; -var Internal = {}; +let Internal = {}; -var Undefined = {}; +let Undefined = {}; -var Js = { +let Js = { $$Promise: $$Promise, Internal: Internal, Undefined: Undefined }; export { - Obj , - Pervasives , - $$String , - Js , + Obj, + Pervasives, + $$String, + Js, } /* No side effect */