Skip to content

Commit 6ba47f9

Browse files
bobzhangbobzhang
committed
snapshot
1 parent 0f36bac commit 6ba47f9

23 files changed

+224
-131
lines changed

‎jscomp/main/builtin_cmj_datasets.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* d0bce2876e3c70684b48084032bf236f *)
1+
(* df5c260e5bb841abae37d20c5fd9ccf6 *)
22
let module_names : string array = Obj.magic (
33
"Gc" (* 220 *),
44
"Js" (* 23 *),
@@ -114,7 +114,7 @@ let module_names : string array = Obj.magic (
114114
"Belt_MutableSet" (* 2115 *),
115115
"CamlinternalMod" (* 23 *),
116116
"Js_typed_array2" (* 23 *),
117-
"CamlinternalLazy" (* 270 *),
117+
"CamlinternalLazy" (* 194 *),
118118
"Belt_MutableQueue" (* 572 *),
119119
"Belt_MutableStack" (* 530 *),
120120
"Belt_SortArrayInt" (* 184 *),
@@ -255,7 +255,7 @@ let module_data : string array = Obj.magic (
255255
(* Belt_MutableSet *)"\132\149\166\190\000\000\b/\000\000\002J\000\000\007{\000\000\0076\160\b\000\000\168\000\176\"eq\144\160\160B@@@\176#add\144\160\160B@@@\176#cmp\144\160\160B@@@\176#get\144\160\160B@@@\176#has\144\160\160B@@@\176$copy\144\160\160A@@@\176$diff\144\160\160B@@@\176$keep\144\160\160B@@@\176$make\144\160\160A@@\144\180A\160\176\001\005\154\"id@@\151\176\177@\146\160#cmp$dataA\160\151\176\162@\146#cmp\160\144\004\017@\176\192&_none_A@\000\255\004\002A\160\146A@\176\1929others/belt_MutableSet.ml\001\000\192\001\020\235\001\020\237\192\004\002\001\000\192\001\020\235\001\021\b@\176$size\144\160\160A@@\144\180A\160\176\001\005\198!d@@\147\192\151\176\162^\146$size\160\145\176@3Belt_internalAVLsetA@\004\030\160\151\176\162A\161\004,A\160\144\004\020@\176\192\004 \001\000\215\001\023j\001\023s\192\004!\001\000\215\001\023j\001\023{@@\176\192\004#\001\000\215\001\023j\001\023l\004\003@A\176$some\144\160\160B@@@\176%every\144\160\160B@@@\176%keepU\144\160\160B@@@\176%someU\144\160\160B@@\144\180B\160\176\001\005\191!d@\160\176\001\005\192!p@@\147\192\151\176\162Q\146%someU\160\145\0043@\004O\160\151\176\162A\161\004]A\160\144\004\021@\176\192\004Q\001\000\212\001\023\n\001\023\"\192\004R\001\000\212\001\023\n\001\023*@\160\144\004\023@\176\192\004V\001\000\212\001\023\n\001\023\026\192\004W\001\000\212\001\023\n\001\023,@A\176%split\144\160\160B@@@\176%union\144\160\160B@@@\176&everyU\144\160\160B@@\144\180B\160\176\001\005\184!d@\160\176\001\005\185!p@@\147\192\151\176\162O\146&everyU\160\145\004b@\004~\160\151\176\162A\161\004\140A\160\144\004\021@\176\192\004\128\001\000\210\001\022\180\001\022\206\192\004\129\001\000\210\001\022\180\001\022\214@\160\144\004\023@\176\192\004\133\001\000\210\001\022\180\001\022\197\192\004\134\001\000\210\001\022\180\001\022\216@A\176&getExn\144\160\160B@@@\176&reduce\144\160\160C@@@\176&remove\144\160\160B@@@\176&subset\144\160\160B@@@\176&toList\144\160\160A@@\144\180A\160\176\001\005\200!d@@\147\192\151\176\162_\146&toList\160\145\004\152@\004\180\160\151\176\162A\161\004\194A\160\144\004\018@\176\192\004\182\001\000\217\001\023\139\001\023\150\192\004\183\001\000\217\001\023\139\001\023\158@@\176\192\004\185\001\000\217\001\023\139\001\023\141\004\003@A\176'forEach\144\160\160B@@@\176'isEmpty\144\160\160A@@@\176'maximum\144\160\160A@@\144\180A\160\176\001\005\163!d@@\147\192\151\176\162F\146'maximum\160\145\004\193@\004\221\160\151\176\162A\161\004\235A\160\144\004\018@\176\192\004\223\001\000\202\001\021\163\001\021\175\192\004\224\001\000\202\001\021\163\001\021\183@@\176\192\004\226\001\000\202\001\021\163\001\021\165\004\003@A\176'minimum\144\160\160A@@\144\180A\160\176\001\005\159!d@@\147\192\151\176\162D\146'minimum\160\145\004\224@\004\252\160\151\176\162A\161\005\001\nA\160\144\004\018@\176\192\004\254\001\000\198\001\021J\001\021V\192\004\255\001\000\198\001\021J\001\021^@@\176\192\005\001\001\001\000\198\001\021J\001\021L\004\003@A\176'reduceU\144\160\160C@@@\176'toArray\144\160\160A@@\144\180A\160\176\001\005\202!d@@\147\192\151\176\162b\146'toArray\160\145\005\001\004@\005\001 \160\151\176\162A\161\005\001.A\160\144\004\018@\176\192\005\001\"\001\000\219\001\023\176\001\023\188\192\005\001#\001\000\219\001\023\176\001\023\196@@\176\192\005\001%\001\000\219\001\023\176\001\023\178\004\003@A\176(addCheck\144\160\160B@@@\176(forEachU\144\160\160B@@\144\180B\160\176\001\005\167!d@\160\176\001\005\168!f@@\147\192\151\176\162K\146(forEachU\160\145\005\001+@\005\001G\160\151\176\162A\161\005\001UA\160\144\004\021@\176\192\005\001I\001\000\206\001\021\232\001\022\006\192\005\001J\001\000\206\001\021\232\001\022\014@\160\144\004\023@\176\192\005\001N\001\000\206\001\021\232\001\021\251\192\005\001O\001\000\206\001\021\232\001\022\016@A\176)fromArray\144\160\160B@@@\176)intersect\144\160\160B@@@\176)mergeMany\144\160\160B@@@\176)partition\144\160\160B@@@\176*partitionU\144\160\160B@@@\176*removeMany\144\160\160B@@@\176+removeCheck\144\160\160B@@@\176,getUndefined\144\160\160B@@@\176,maxUndefined\144\160\160A@@\144\180A\160\176\001\005\165!d@@\147\192\151\176\162G\146,maxUndefined\160\145\005\001u@\005\001\145\160\151\176\162A\161\005\001\159A\160\144\004\018@\176\192\005\001\147\001\000\204\001\021\205\001\021\222\192\005\001\148\001\000\204\001\021\205\001\021\230@@\176\192\005\001\150\001\000\204\001\021\205\001\021\207\004\003@A\176,minUndefined\144\160\160A@@\144\180A\160\176\001\005\161!d@@\147\192\151\176\162E\146,minUndefined\160\145\005\001\148@\005\001\176\160\151\176\162A\161\005\001\190A\160\144\004\018@\176\192\005\001\178\001\000\200\001\021x\001\021\137\192\005\001\179\001\000\200\001\021x\001\021\145@@\176\192\005\001\181\001\000\200\001\021x\001\021z\004\003@A\1765fromSortedArrayUnsafe\144\160\160B@@\144\180B\160\176\001\005\206\"xs@\160\176\001\005\207\"id@@\151\176\177@\146\160\005\001\216\005\001\215A\160\151\176\162@\146#cmp\160\144\004\015@\005\001\214\160\147\192\151\176\162e\1465fromSortedArrayUnsafe\160\145\005\001\196@\005\001\224\160\144\004\030@\176\192\005\001\221\001\000\223\001\024B\001\024L\192\005\001\222\001\000\223\001\024B\001\024h@A@\176\192\005\001\224\001\000\223\001\024B\001\024D\192\005\001\225\001\000\223\001\024B\001\024v@\1766checkInvariantInternal\144\160\160A@@\144\180A\160\176\001\005\210!d@@\147\192\151\176\162`\1466checkInvariantInternal\160\145\005\001\223@\005\001\251\160\151\176\162A\161\005\002\tA\160\144\004\018@\176\192\005\001\253\001\000\226\001\024\152\001\024\179\192\005\001\254\001\000\226\001\024\152\001\024\187@@\176\192\005\002\000\001\000\226\001\024\152\001\024\154\004\003@AA",
256256
(* CamlinternalMod *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
257257
(* Js_typed_array2 *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
258-
(* CamlinternalLazy *)"\132\149\166\190\000\000\000\250\000\000\000F\000\000\000\230\000\000\000\221\160\208\176%force\144\160\160A@@@\176&is_val\144\160\160A@@\144\180A\160\176\001\004\026!l@@\151\176\152A\160\151\176\162@\161#tagA\160\144\004\r@\176\192>stdlib-406/camlinternalLazy.mla\001\006\015\001\006\017\192\004\002a\001\006\015\001\006+@\160\146\144\001\000\246@\176\192\004\007\000o\001\014%\001\014D\192\004\b\000o\001\014%\001\014U@\176(from_fun\144\160\160A@@\144\180A\160\176\001\003\255!f@@\151\176\177@\146\160\004\028\"_0A\160\004\022\160\144\004\011@\176\192\004\029k\001\007y\001\007|\192\004\030k\001\007y\001\007\142@\176(from_val\144\160\160A@@@\176)force_val\144\160\160A@@@A",
258+
(* CamlinternalLazy *)"\132\149\166\190\000\000\000\174\000\000\0000\000\000\000\157\000\000\000\147\160\208\176%force\144\160\160A@@@\176&is_val\144\160\160A@@@\176(from_fun\144\160\160A@@\144\180A\160\176\001\003\250!f@@\151\176\177@\146\160#tag%valueA\160\146\144\001\000\246\160\144\004\014@\176\192>stdlib-406/camlinternalLazy.mlh\001\006\185\001\006\194\192\004\002h\001\006\185\001\006\221@\176(from_val\144\160\160A@@@\176)force_val\144\160\160A@@@A",
259259
(* Belt_MutableQueue *)"\132\149\166\190\000\000\002(\000\000\000\168\000\000\002\031\000\000\002\004\160\b\000\000T\000\176#add\144\160\160B@@@\176#map\144\160\160B@@@\176#pop\144\160\160A@@@\176$copy\144\160\160A@@@\176$make\144\160\160A@@\144\180A\160\176\001\003\245%param@@\151\176\177@\146\176&length%first$lastA\160\146\144@\160\146A\160\146A@\176\192;others/belt_MutableQueue.mlb\001\005\176\001\005\180\192\004\002e\001\005\220\001\005\239@\176$mapU\144\160\160B@@@\176$peek\144\160\160A@@@\176$size\144\160\160A@@\144\180A\160\176\001\004\180!q@@\151\176\162@\161\004&A\160\144\004\b@\176\192\004\030\001\000\163\001\016Y\001\016[\192\004\031\001\000\163\001\016Y\001\016c@\176%clear\144\160\160A@@@\176&popExn\144\160\160A@@@\176&reduce\144\160\160C@@@\176'forEach\144\160\160B@@@\176'isEmpty\144\160\160A@@\144\180A\160\176\001\004\178!q@@\151\176\152@\160\151\176\162@\161\004QA\160\144\004\012@\176\192\004I\001\000\160\001\016<\001\016>\192\004J\001\000\160\001\016<\001\016F@\160\146\144@@\176\004\006\192\004O\001\000\160\001\016<\001\016J@\176'peekExn\144\160\160A@@@\176'reduceU\144\160\160C@@@\176'toArray\144\160\160A@@@\176(forEachU\144\160\160B@@@\176(transfer\144\160\160B@@@\176)fromArray\144\160\160A@@@\176,popUndefined\144\160\160A@@@\176-peekUndefined\144\160\160A@@@A",
260260
(* Belt_MutableStack *)"\132\149\166\190\000\000\001\254\000\000\000\150\000\000\001\237\000\000\001\216\160\b\000\0008\000\176#pop\144\160\160A@@@\176#top\144\160\160A@@@\176$copy\144\160\160A@@\144\180A\160\176\001\003\246!s@@\151\176\177@\146\144$rootA\160\151\176\162@\161\004\006A\160\144\004\015@\176\192;others/belt_MutableStack.mlf\001\005\219\001\005\254\192\004\002f\001\005\219\001\006\004@@\176\192\004\004f\001\005\219\001\005\246\192\004\005f\001\005\219\001\006\005@\176$make\144\160\160A@@\144\180A\160\176\001\003\242%param@@\151\176\177@\146\144\004\030A\160\146A@\176\192\004\024b\001\005\159\001\005\173\192\004\025b\001\005\159\001\005\186@\176$push\144\160\160B@@@\176$size\144\160\160A@@@\176%clear\144\160\160A@@\144\180A\160\176\001\003\244!s@@\151\176\163@\144\004;\160\144\004\b\160\146A@\176\192\0047d\001\005\188\001\005\203\192\0048d\001\005\188\001\005\217@\176'forEach\144\160\160B@@@\176'isEmpty\144\160\160A@@\144\180A\160\176\001\004`!s@@\151\176\152@\160\151\176\162@\161\004YA\160\144\004\012@\176\192\004Su\001\007\014\001\007\030\192\004Tu\001\007\014\001\007$@\160\146A@\176\004\005\192\004Xu\001\007\014\001\007+@\176(forEachU\144\160\160B@@@\176,popUndefined\144\160\160A@@@\176,topUndefined\144\160\160A@@@\176.dynamicPopIter\144\160\160B@@@\176/dynamicPopIterU\144\160\160B@@@A",
261261
(* Belt_SortArrayInt *)"\132\149\166\190\000\000\000\164\000\000\000*\000\000\000\144\000\000\000\132\160\b\000\000 \000\176$diff\144\160\160H@@@\176%union\144\160\160H@@@\176(isSorted\144\160\160A@@@\176)intersect\144\160\160H@@@\176*stableSort\144\160\160A@@@\176,binarySearch\144\160\160B@@@\1761stableSortInPlace\144\160\160A@@@\1764strictlySortedLength\144\160\160A@@@A",

‎jscomp/test/ext_filename_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var node_current = ".";
2727

2828
var cwd = {
2929
tag: 246,
30-
_0: (function (param) {
30+
value: (function (param) {
3131
return Caml_sys.caml_sys_getcwd(undefined);
3232
})
3333
};
@@ -219,7 +219,7 @@ function find_package_json_dir(cwd) {
219219

220220
var package_dir = {
221221
tag: 246,
222-
_0: (function (param) {
222+
value: (function (param) {
223223
var cwd$1 = CamlinternalLazy.force(cwd);
224224
return find_root_filename(cwd$1, Test_literals.bsconfig_json);
225225
})

‎jscomp/test/gpr_3697_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
55
function fix(param) {
66
return /* Fix */[{
77
tag: 246,
8-
_0: (function (param) {
8+
value: (function (param) {
99
return fix(undefined);
1010
})
1111
}];

‎jscomp/test/hamming_test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function pr(param) {
120120
function map(f, l) {
121121
return {
122122
tag: 246,
123-
_0: (function (param) {
123+
value: (function (param) {
124124
var match = CamlinternalLazy.force(l);
125125
return /* Cons */[
126126
Curry._1(f, match[0]),
@@ -133,7 +133,7 @@ function map(f, l) {
133133
function merge(cmp, l1, l2) {
134134
return {
135135
tag: 246,
136-
_0: (function (param) {
136+
value: (function (param) {
137137
var match = CamlinternalLazy.force(l1);
138138
var match$1 = CamlinternalLazy.force(l2);
139139
var ll2 = match$1[1];
@@ -193,7 +193,7 @@ var ham5 = { };
193193

194194
Caml_obj.caml_update_dummy(hamming, {
195195
tag: 246,
196-
_0: (function (param) {
196+
value: (function (param) {
197197
return /* Cons */[
198198
nn1,
199199
merge(cmp, ham2, merge(cmp, ham3, ham5))
@@ -203,21 +203,21 @@ Caml_obj.caml_update_dummy(hamming, {
203203

204204
Caml_obj.caml_update_dummy(ham2, {
205205
tag: 246,
206-
_0: (function (param) {
206+
value: (function (param) {
207207
return CamlinternalLazy.force(map(x2, hamming));
208208
})
209209
});
210210

211211
Caml_obj.caml_update_dummy(ham3, {
212212
tag: 246,
213-
_0: (function (param) {
213+
value: (function (param) {
214214
return CamlinternalLazy.force(map(x3, hamming));
215215
})
216216
});
217217

218218
Caml_obj.caml_update_dummy(ham5, {
219219
tag: 246,
220-
_0: (function (param) {
220+
value: (function (param) {
221221
return CamlinternalLazy.force(map(x5, hamming));
222222
})
223223
});

‎jscomp/test/lazy_test.js

+64-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var u = {
1313

1414
var v = {
1515
tag: 246,
16-
_0: (function (param) {
16+
value: (function (param) {
1717
u.contents = 32;
1818

1919
})
@@ -56,15 +56,15 @@ var s = {
5656

5757
var set_true = {
5858
tag: 246,
59-
_0: (function (param) {
59+
value: (function (param) {
6060
s.contents = 1;
6161

6262
})
6363
};
6464

6565
var set_false = {
6666
tag: 246,
67-
_0: (function (param) {
67+
value: (function (param) {
6868
s.contents = undefined;
6969

7070
})
@@ -94,7 +94,7 @@ var u_v = {
9494

9595
var u$1 = {
9696
tag: 246,
97-
_0: (function (param) {
97+
value: (function (param) {
9898
u_v.contents = 2;
9999

100100
})
@@ -110,7 +110,7 @@ var l_from_fun = Lazy.from_fun((function (param) {
110110

111111
var forward_test = {
112112
tag: 246,
113-
_0: (function (param) {
113+
value: (function (param) {
114114
var u = 3;
115115
u = u + 1 | 0;
116116
return u;
@@ -119,14 +119,14 @@ var forward_test = {
119119

120120
var f005 = {
121121
tag: 246,
122-
_0: (function (param) {
122+
value: (function (param) {
123123
return 6;
124124
})
125125
};
126126

127127
var f006 = {
128128
tag: 246,
129-
_0: (function (param) {
129+
value: (function (param) {
130130
return (function (param) {
131131
return 3;
132132
});
@@ -135,19 +135,27 @@ var f006 = {
135135

136136
var f007 = {
137137
tag: 246,
138-
_0: (function (param) {
138+
value: (function (param) {
139139
throw Caml_builtin_exceptions.not_found;
140140
})
141141
};
142142

143143
var f008 = {
144144
tag: 246,
145-
_0: (function (param) {
145+
value: (function (param) {
146146
console.log("hi");
147147
throw Caml_builtin_exceptions.not_found;
148148
})
149149
};
150150

151+
var a2 = CamlinternalLazy.from_val;
152+
153+
var a4 = CamlinternalLazy.from_val(3);
154+
155+
var a7 = CamlinternalLazy.force(undefined);
156+
157+
var a8 = CamlinternalLazy.force(undefined);
158+
151159
Mt.from_pair_suites("Lazy_test", /* :: */[
152160
/* tuple */[
153161
"simple",
@@ -222,7 +230,40 @@ Mt.from_pair_suites("Lazy_test", /* :: */[
222230
]);
223231
})
224232
],
225-
/* [] */0
233+
/* :: */[
234+
/* tuple */[
235+
"lazy_test.ml",
236+
(function (param) {
237+
return /* Eq */Block.__(0, [
238+
3,
239+
a4
240+
]);
241+
})
242+
],
243+
/* :: */[
244+
/* tuple */[
245+
"lazy_test.ml",
246+
(function (param) {
247+
return /* Eq */Block.__(0, [
248+
a7,
249+
undefined
250+
]);
251+
})
252+
],
253+
/* :: */[
254+
/* tuple */[
255+
"lazy_test.ml",
256+
(function (param) {
257+
return /* Eq */Block.__(0, [
258+
a8,
259+
undefined
260+
]);
261+
})
262+
],
263+
/* [] */0
264+
]
265+
]
266+
]
226267
]
227268
]
228269
]
@@ -231,6 +272,12 @@ Mt.from_pair_suites("Lazy_test", /* :: */[
231272
]
232273
]);
233274

275+
var a3 = 3;
276+
277+
var a5;
278+
279+
var a6;
280+
234281
exports.v = v;
235282
exports.lazy_test = lazy_test;
236283
exports.f = f;
@@ -247,4 +294,11 @@ exports.f005 = f005;
247294
exports.f006 = f006;
248295
exports.f007 = f007;
249296
exports.f008 = f008;
297+
exports.a2 = a2;
298+
exports.a3 = a3;
299+
exports.a4 = a4;
300+
exports.a5 = a5;
301+
exports.a6 = a6;
302+
exports.a7 = a7;
303+
exports.a8 = a8;
250304
/* h Not a pure module */

‎jscomp/test/lazy_test.ml

+17-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ let f006 = lazy (let x=3 in fun _ -> x)
5050
let f007 = lazy (raise Not_found)
5151
let f008 = lazy(print_endline "hi"; raise Not_found)
5252

53+
let a2 x = lazy x
54+
55+
let a3 = lazy 3
56+
let a4 = a2 3
57+
let a5 = lazy None
58+
let a6 = lazy ()
59+
60+
let lazy a7 = a5
61+
let lazy a8 = a6
5362

5463
;; Mt.from_pair_suites __MODULE__ Mt.[
5564
"simple", (fun _ ->
@@ -61,6 +70,13 @@ let f008 = lazy(print_endline "hi"; raise Not_found)
6170
"lazy_from_val", (fun _ -> Eq(Lazy.force (Lazy.from_val 3) , 3));
6271
"lazy_from_val2", (fun _ -> Eq((Lazy.force @@ Lazy.force (Lazy.from_val (lazy 3))), 3));
6372
"lazy_from_val3",
64-
(fun _ -> Eq(( [%bs.debugger]; Lazy.force @@ Lazy.force (Lazy.from_val forward_test)), 4))
73+
(fun _ -> Eq(( [%bs.debugger]; Lazy.force @@ Lazy.force (Lazy.from_val forward_test)), 4));
74+
75+
__FILE__,
76+
(fun _ -> Eq(a3,a4));
77+
__FILE__,
78+
(fun _ -> Eq(a7,None));
79+
__FILE__,
80+
(fun _ -> Eq (a8,()))
6581
]
6682

‎jscomp/test/ocaml_parsetree_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@ function symbol_docs_lazy(param) {
23702370
var p2 = Parsing.symbol_end_pos(undefined);
23712371
return {
23722372
tag: 246,
2373-
_0: (function (param) {
2373+
value: (function (param) {
23742374
return {
23752375
docs_pre: get_pre_docs(p1),
23762376
docs_post: get_post_docs(p2)
@@ -2393,7 +2393,7 @@ function symbol_text_lazy(param) {
23932393
var pos = Parsing.symbol_start_pos(undefined);
23942394
return {
23952395
tag: 246,
2396-
_0: (function (param) {
2396+
value: (function (param) {
23972397
return get_text(pos);
23982398
})
23992399
};

0 commit comments

Comments
 (0)