Skip to content

Commit bc1a24d

Browse files
bobzhangbobzhang
committed
snapshot js changes
1 parent 3be6867 commit bc1a24d

23 files changed

+429
-636
lines changed

‎jscomp/test/ext_filename_test.js

+7-13
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ var node_parent = "..";
2424

2525
var node_current = ".";
2626

27-
var cwd = {
28-
tag: 246,
29-
value: (function () {
30-
return Caml_sys.caml_sys_getcwd(undefined);
31-
})
32-
};
27+
var cwd = CamlinternalLazy.from_fun((function () {
28+
return Caml_sys.caml_sys_getcwd(undefined);
29+
}));
3330

3431
function path_as_directory(x) {
3532
if (x === "" || Ext_string_test.ends_with(x, Filename.dir_sep)) {
@@ -216,13 +213,10 @@ function find_package_json_dir(cwd) {
216213
return find_root_filename(cwd, Test_literals.bsconfig_json);
217214
}
218215

219-
var package_dir = {
220-
tag: 246,
221-
value: (function () {
222-
var cwd$1 = CamlinternalLazy.force(cwd);
223-
return find_root_filename(cwd$1, Test_literals.bsconfig_json);
224-
})
225-
};
216+
var package_dir = CamlinternalLazy.from_fun((function () {
217+
var cwd$1 = CamlinternalLazy.force(cwd);
218+
return find_root_filename(cwd$1, Test_literals.bsconfig_json);
219+
}));
226220

227221
function module_name_of_file(file) {
228222
var s = Filename.chop_extension(Curry._1(Filename.basename, file));

‎jscomp/test/gpr_3697_test.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
44

55
function fix(param) {
6-
return /* Fix */[{
7-
tag: 246,
8-
value: (function () {
9-
return fix(undefined);
10-
})
11-
}];
6+
return /* Fix */[CamlinternalLazy.from_fun((function () {
7+
return fix(undefined);
8+
}))];
129
}
1310

1411
function unfixLeak(_f) {

‎jscomp/test/hamming_test.js

+47-73
Original file line numberDiff line numberDiff line change
@@ -118,47 +118,41 @@ function pr(param) {
118118
}
119119

120120
function map(f, l) {
121-
return {
122-
tag: 246,
123-
value: (function () {
124-
var match = CamlinternalLazy.force(l);
125-
return /* Cons */[
126-
Curry._1(f, match[0]),
127-
map(f, match[1])
128-
];
129-
})
130-
};
121+
return CamlinternalLazy.from_fun((function () {
122+
var match = CamlinternalLazy.force(l);
123+
return /* Cons */[
124+
Curry._1(f, match[0]),
125+
map(f, match[1])
126+
];
127+
}));
131128
}
132129

133130
function merge(cmp, l1, l2) {
134-
return {
135-
tag: 246,
136-
value: (function () {
137-
var match = CamlinternalLazy.force(l1);
138-
var match$1 = CamlinternalLazy.force(l2);
139-
var ll2 = match$1[1];
140-
var x2 = match$1[0];
141-
var ll1 = match[1];
142-
var x1 = match[0];
143-
var c = Curry._2(cmp, x1, x2);
144-
if (c === 0) {
145-
return /* Cons */[
146-
x1,
147-
merge(cmp, ll1, ll2)
148-
];
149-
} else if (c < 0) {
150-
return /* Cons */[
151-
x1,
152-
merge(cmp, ll1, l2)
153-
];
154-
} else {
155-
return /* Cons */[
156-
x2,
157-
merge(cmp, l1, ll2)
158-
];
159-
}
160-
})
161-
};
131+
return CamlinternalLazy.from_fun((function () {
132+
var match = CamlinternalLazy.force(l1);
133+
var match$1 = CamlinternalLazy.force(l2);
134+
var ll2 = match$1[1];
135+
var x2 = match$1[0];
136+
var ll1 = match[1];
137+
var x1 = match[0];
138+
var c = Curry._2(cmp, x1, x2);
139+
if (c === 0) {
140+
return /* Cons */[
141+
x1,
142+
merge(cmp, ll1, ll2)
143+
];
144+
} else if (c < 0) {
145+
return /* Cons */[
146+
x1,
147+
merge(cmp, ll1, l2)
148+
];
149+
} else {
150+
return /* Cons */[
151+
x2,
152+
merge(cmp, l1, ll2)
153+
];
154+
}
155+
}));
162156
}
163157

164158
function iter_interval(f, _l, _param) {
@@ -183,44 +177,24 @@ function iter_interval(f, _l, _param) {
183177
};
184178
}
185179

186-
var hamming = { };
187-
188-
var ham2 = { };
189-
190-
var ham3 = { };
191-
192-
var ham5 = { };
193-
194-
Caml_obj.caml_update_dummy(hamming, {
195-
tag: 246,
196-
value: (function () {
197-
return /* Cons */[
198-
nn1,
199-
merge(cmp, ham2, merge(cmp, ham3, ham5))
200-
];
201-
})
202-
});
180+
var hamming = CamlinternalLazy.from_fun((function () {
181+
return /* Cons */[
182+
nn1,
183+
merge(cmp, ham2, merge(cmp, ham3, ham5))
184+
];
185+
}));
203186

204-
Caml_obj.caml_update_dummy(ham2, {
205-
tag: 246,
206-
value: (function () {
207-
return CamlinternalLazy.force(map(x2, hamming));
208-
})
209-
});
187+
var ham2 = CamlinternalLazy.from_fun((function () {
188+
return CamlinternalLazy.force(map(x2, hamming));
189+
}));
210190

211-
Caml_obj.caml_update_dummy(ham3, {
212-
tag: 246,
213-
value: (function () {
214-
return CamlinternalLazy.force(map(x3, hamming));
215-
})
216-
});
191+
var ham3 = CamlinternalLazy.from_fun((function () {
192+
return CamlinternalLazy.force(map(x3, hamming));
193+
}));
217194

218-
Caml_obj.caml_update_dummy(ham5, {
219-
tag: 246,
220-
value: (function () {
221-
return CamlinternalLazy.force(map(x5, hamming));
222-
})
223-
});
195+
var ham5 = CamlinternalLazy.from_fun((function () {
196+
return CamlinternalLazy.force(map(x5, hamming));
197+
}));
224198

225199
iter_interval(pr, hamming, /* tuple */[
226200
88000,

‎jscomp/test/lazy_test.js

+45-75
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@ var u = {
1010
contents: 3
1111
};
1212

13-
var v = {
14-
tag: 246,
15-
value: (function () {
16-
u.contents = 32;
17-
18-
})
19-
};
13+
var v = CamlinternalLazy.from_fun((function () {
14+
u.contents = 32;
15+
16+
}));
2017

2118
function lazy_test(param) {
2219
var h = u.contents;
@@ -54,21 +51,15 @@ var s = {
5451
contents: undefined
5552
};
5653

57-
var set_true = {
58-
tag: 246,
59-
value: (function () {
60-
s.contents = 1;
61-
62-
})
63-
};
54+
var set_true = CamlinternalLazy.from_fun((function () {
55+
s.contents = 1;
56+
57+
}));
6458

65-
var set_false = {
66-
tag: 246,
67-
value: (function () {
68-
s.contents = undefined;
69-
70-
})
71-
};
59+
var set_false = CamlinternalLazy.from_fun((function () {
60+
s.contents = undefined;
61+
62+
}));
7263

7364
var h;
7465

@@ -92,70 +83,49 @@ var u_v = {
9283
contents: 0
9384
};
9485

95-
var u$1 = {
96-
tag: 246,
97-
value: (function () {
98-
u_v.contents = 2;
99-
100-
})
101-
};
86+
var u$1 = CamlinternalLazy.from_fun((function () {
87+
u_v.contents = 2;
88+
89+
}));
10290

10391
CamlinternalLazy.force(u$1);
10492

10593
var exotic = CamlinternalLazy.force;
10694

107-
var l_from_fun = {
108-
tag: 246,
109-
value: (function () {
110-
return 3;
111-
})
112-
};
95+
var l_from_fun = CamlinternalLazy.from_fun((function () {
96+
return 3;
97+
}));
11398

114-
var forward_test = {
115-
tag: 246,
116-
value: (function () {
117-
var u = 3;
118-
u = u + 1 | 0;
119-
return u;
120-
})
121-
};
99+
var forward_test = CamlinternalLazy.from_fun((function () {
100+
var u = 3;
101+
u = u + 1 | 0;
102+
return u;
103+
}));
122104

123-
var f005 = {
124-
tag: 246,
125-
value: (function () {
126-
return 6;
127-
})
128-
};
105+
var f005 = CamlinternalLazy.from_fun((function () {
106+
return 6;
107+
}));
129108

130-
var f006 = {
131-
tag: 246,
132-
value: (function () {
133-
return (function (param) {
134-
return 3;
135-
});
136-
})
137-
};
109+
var f006 = CamlinternalLazy.from_fun((function () {
110+
return (function (param) {
111+
return 3;
112+
});
113+
}));
138114

139-
var f007 = {
140-
tag: 246,
141-
value: (function () {
142-
throw {
143-
RE_EXN_ID: "Not_found",
144-
Error: new Error()
145-
};
146-
})
147-
};
115+
var f007 = CamlinternalLazy.from_fun((function () {
116+
throw {
117+
RE_EXN_ID: "Not_found",
118+
Error: new Error()
119+
};
120+
}));
148121

149-
var f008 = {
150-
tag: 246,
151-
value: (function () {
152-
console.log("hi");
153-
throw {
154-
RE_EXN_ID: "Not_found",
155-
Error: new Error()
156-
};
157-
})
158-
};
122+
var f008 = CamlinternalLazy.from_fun((function () {
123+
console.log("hi");
124+
throw {
125+
RE_EXN_ID: "Not_found",
126+
Error: new Error()
127+
};
128+
}));
159129

160130
var a2 = CamlinternalLazy.from_val;
161131

‎jscomp/test/ocaml_parsetree_test.js

+9-15
Original file line numberDiff line numberDiff line change
@@ -2421,15 +2421,12 @@ function symbol_docs(param) {
24212421
function symbol_docs_lazy(param) {
24222422
var p1 = Parsing.symbol_start_pos(undefined);
24232423
var p2 = Parsing.symbol_end_pos(undefined);
2424-
return {
2425-
tag: 246,
2426-
value: (function () {
2427-
return {
2428-
docs_pre: get_pre_docs(p1),
2429-
docs_post: get_post_docs(p2)
2430-
};
2431-
})
2432-
};
2424+
return CamlinternalLazy.from_fun((function () {
2425+
return {
2426+
docs_pre: get_pre_docs(p1),
2427+
docs_post: get_post_docs(p2)
2428+
};
2429+
}));
24332430
}
24342431

24352432
function mark_symbol_docs(param) {
@@ -2444,12 +2441,9 @@ function mark_rhs_docs(pos1, pos2) {
24442441

24452442
function symbol_text_lazy(param) {
24462443
var pos = Parsing.symbol_start_pos(undefined);
2447-
return {
2448-
tag: 246,
2449-
value: (function () {
2450-
return get_text(pos);
2451-
})
2452-
};
2444+
return CamlinternalLazy.from_fun((function () {
2445+
return get_text(pos);
2446+
}));
24532447
}
24542448

24552449
function init(param) {

0 commit comments

Comments
 (0)