Skip to content

Commit 669d304

Browse files
bobzhangbobzhang
committed
upgrade refined meta data info from upsteram
1 parent 547df72 commit 669d304

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+298
-256
lines changed

Diff for: ‎jscomp/core/js_of_lam_block.ml

+7-8
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,14 @@ let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args =
5151
let field (field_info : Lam_compat.field_dbg_info) e i =
5252
match field_info with
5353
| Fld_na
54-
| Fld_tuple ->
55-
(* let comment = "NA" in *)
56-
E.array_index_by_int (* ~comment *) e i
57-
#if OCAML_VERSION =~ ">4.03.0" then
58-
| Fld_record_inline comment
59-
| Fld_record_extension comment
54+
| Fld_tuple
55+
| Fld_poly_var_tag
56+
| Fld_poly_var_content
57+
| Fld_record_inline _
58+
| Fld_record_extension _
6059
->
61-
E.array_index_by_int ~comment e i
62-
#end
60+
E.array_index_by_int
61+
?comment:(Lam_compat.str_of_field_info field_info) e i
6362
| Fld_record {name}
6463
-> E.record_access e name i
6564
| Fld_module name

Diff for: ‎jscomp/core/lam_compat.ml

+7-1
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,16 @@ type field_dbg_info = Lambda.field_dbg_info =
191191
| Fld_record_extension of string
192192
#end
193193
| Fld_tuple
194+
| Fld_poly_var_tag
195+
| Fld_poly_var_content
196+
197+
194198
let str_of_field_info (x : field_dbg_info) : string option =
195199
match x with
196200
| Fld_na
197-
| Fld_tuple -> None
201+
| Fld_poly_var_tag
202+
| Fld_poly_var_content
203+
| Fld_tuple -> None
198204
| Fld_record {name = s}
199205
| Fld_module s
200206
| Fld_record_inline s

Diff for: ‎jscomp/core/lam_compat.mli

+3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ type field_dbg_info = Lambda.field_dbg_info =
9292
| Fld_record_extension of string
9393
#end
9494
| Fld_tuple
95+
| Fld_poly_var_tag
96+
| Fld_poly_var_content
97+
9598

9699
val str_of_field_info :
97100
field_dbg_info ->

Diff for: ‎jscomp/core/lam_compile_util.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ let comment_of_tag_info (x : Lam_tag_info.t) =
5959
| Blk_extension (* TODO: enhance it later *)
6060
| Blk_extension_slot -> None
6161
| Blk_na s -> if s = "" then None else Some s
62+
63+
let module_alias = Some "alias"
6264
let comment_of_pointer_info (x : Lam_pointer_info.t)=
6365
match x with
6466
| Pt_constructor {name}
6567
| Pt_variant {name} -> Some name
66-
| Pt_module_alias -> None (* FIXME *)
68+
| Pt_module_alias -> module_alias
6769
| Pt_na -> None

Diff for: ‎jscomp/test/array_data_util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function randomRange(i, j) {
1616
return v;
1717
}
1818

19-
var A = 0;
19+
var A = /* alias */0;
2020

2121
exports.A = A;
2222
exports.range = range;

Diff for: ‎jscomp/test/bigarray_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function init3(v) {
3535
return /* () */0;
3636
}
3737

38-
var BA1 = 0;
38+
var BA1 = /* alias */0;
3939

4040
exports.BA1 = BA1;
4141
exports.sum = sum;

Diff for: ‎jscomp/test/bs_MapInt_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function test(param) {
2626

2727
test(/* () */0);
2828

29-
var M = 0;
29+
var M = /* alias */0;
3030

3131
exports.should = should;
3232
exports.M = M;

Diff for: ‎jscomp/test/bs_array_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1586,9 +1586,9 @@ eq("File \"bs_array_test.ml\", line 339, characters 5-12", Belt_Array.getIndexBy
15861586

15871587
Mt.from_pair_suites("File \"bs_array_test.ml\", line 341, characters 23-30", suites.contents);
15881588

1589-
var A = 0;
1589+
var A = /* alias */0;
15901590

1591-
var L = 0;
1591+
var L = /* alias */0;
15921592

15931593
exports.suites = suites;
15941594
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_float_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ eq("File \"bs_float_test.ml\", line 44, characters 5-12", 3.0 / 2.0, 1.5);
8787

8888
Mt.from_pair_suites("File \"bs_float_test.ml\", line 46, characters 23-30", suites.contents);
8989

90-
var F = 0;
90+
var F = /* alias */0;
9191

9292
exports.suites = suites;
9393
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_hashmap_test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,17 @@ b("File \"bs_hashmap_test.ml\", line 57, characters 4-11", Belt_Array.every(Arra
101101

102102
Mt.from_pair_suites("Bs_hashmap_test", suites.contents);
103103

104-
var N = 0;
104+
var N = /* alias */0;
105105

106-
var S = 0;
106+
var S = /* alias */0;
107107

108-
var I = 0;
108+
var I = /* alias */0;
109109

110110
var $plus$plus = Belt_Array.concat;
111111

112-
var A = 0;
112+
var A = /* alias */0;
113113

114-
var So = 0;
114+
var So = /* alias */0;
115115

116116
exports.suites = suites;
117117
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_hashset_int_test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ b("File \"bs_hashset_int_test.ml\", line 62, characters 4-11", histo.length <= 1
105105

106106
Mt.from_pair_suites("Bs_hashset_int_test", suites.contents);
107107

108-
var N = 0;
108+
var N = /* alias */0;
109109

110-
var S = 0;
110+
var S = /* alias */0;
111111

112-
var I = 0;
112+
var I = /* alias */0;
113113

114114
var $plus$plus = Belt_Array.concat;
115115

116-
var A = 0;
116+
var A = /* alias */0;
117117

118-
var SI = 0;
118+
var SI = /* alias */0;
119119

120120
exports.suites = suites;
121121
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_hashtbl_string_test.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -297,25 +297,25 @@ bench7(/* () */0);
297297

298298
console.timeEnd("test/bs_hashtbl_string_test.ml 203");
299299

300-
var N = 0;
300+
var N = /* alias */0;
301301

302302
var count = 1000000;
303303

304304
var initial_size = 1000000;
305305

306-
var M = 0;
306+
var M = /* alias */0;
307307

308-
var Md = 0;
308+
var Md = /* alias */0;
309309

310-
var Md0 = 0;
310+
var Md0 = /* alias */0;
311311

312-
var H = 0;
312+
var H = /* alias */0;
313313

314-
var H0 = 0;
314+
var H0 = /* alias */0;
315315

316-
var HI = 0;
316+
var HI = /* alias */0;
317317

318-
var S = 0;
318+
var S = /* alias */0;
319319

320320
exports.hash_string = hash_string;
321321
exports.hashString = hashString;

Diff for: ‎jscomp/test/bs_int_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ eq("File \"bs_int_test.ml\", line 43, characters 5-12", 0, 0);
8585

8686
Mt.from_pair_suites("File \"bs_int_test.ml\", line 45, characters 23-30", suites.contents);
8787

88-
var I = 0;
88+
var I = /* alias */0;
8989

9090
exports.suites = suites;
9191
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_list_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2517,11 +2517,11 @@ b("File \"bs_list_test.ml\", line 349, characters 4-11", Belt_List.keepMap(/* ::
25172517

25182518
Mt.from_pair_suites("Bs_list_test", suites.contents);
25192519

2520-
var N = 0;
2520+
var N = /* alias */0;
25212521

2522-
var A = 0;
2522+
var A = /* alias */0;
25232523

2524-
var J = 0;
2524+
var J = /* alias */0;
25252525

25262526
exports.suites = suites;
25272527
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_map_set_dict_test.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,25 @@ eq("File \"bs_map_set_dict_test.ml\", line 94, characters 4-11", Belt_Array.make
155155

156156
Mt.from_pair_suites("Bs_map_set_dict_test", suites.contents);
157157

158-
var M = 0;
158+
var M = /* alias */0;
159159

160-
var MI = 0;
160+
var MI = /* alias */0;
161161

162-
var I = 0;
162+
var I = /* alias */0;
163163

164-
var A = 0;
164+
var A = /* alias */0;
165165

166-
var L = 0;
166+
var L = /* alias */0;
167167

168168
var vv = Belt_MapInt.empty;
169169

170170
var vv2 = Belt_MapInt.empty;
171171

172-
var Md0 = 0;
172+
var Md0 = /* alias */0;
173173

174-
var ISet = 0;
174+
var ISet = /* alias */0;
175175

176-
var S0 = 0;
176+
var S0 = /* alias */0;
177177

178178
exports.suites = suites;
179179
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_map_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ Belt_MapInt.checkInvariantInternal(xx);
7676

7777
Mt.from_pair_suites("Bs_map_test", suites.contents);
7878

79-
var M = 0;
79+
var M = /* alias */0;
8080

81-
var N = 0;
81+
var N = /* alias */0;
8282

83-
var A = 0;
83+
var A = /* alias */0;
8484

8585
exports.suites = suites;
8686
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_mutable_set_test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -822,15 +822,15 @@ b("File \"bs_mutable_set_test.ml\", line 317, characters 4-11", Belt_MutableSetI
822822

823823
Mt.from_pair_suites("Bs_mutable_set_test", suites.contents);
824824

825-
var N = 0;
825+
var N = /* alias */0;
826826

827-
var I = 0;
827+
var I = /* alias */0;
828828

829-
var R = 0;
829+
var R = /* alias */0;
830830

831-
var A = 0;
831+
var A = /* alias */0;
832832

833-
var L = 0;
833+
var L = /* alias */0;
834834

835835
var empty = Belt_MutableSetInt.make;
836836

Diff for: ‎jscomp/test/bs_poly_map_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,13 @@ b("File \"bs_poly_map_test.ml\", line 139, characters 4-11", Belt_Array.eq(Belt_
321321

322322
Mt.from_pair_suites("Bs_poly_map_test", suites.contents);
323323

324-
var M = 0;
324+
var M = /* alias */0;
325325

326-
var N = 0;
326+
var N = /* alias */0;
327327

328-
var A = 0;
328+
var A = /* alias */0;
329329

330-
var I = 0;
330+
var I = /* alias */0;
331331

332332
exports.suites = suites;
333333
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_poly_mutable_map_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ b("File \"bs_poly_mutable_map_test.ml\", line 31, characters 6-13", Belt_Mutable
7777

7878
Mt.from_pair_suites("Bs_poly_mutable_map_test", suites.contents);
7979

80-
var M = 0;
80+
var M = /* alias */0;
8181

82-
var N = 0;
82+
var N = /* alias */0;
8383

84-
var A = 0;
84+
var A = /* alias */0;
8585

86-
var I = 0;
86+
var I = /* alias */0;
8787

8888
exports.suites = suites;
8989
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_poly_mutable_set_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,13 @@ Belt_List.forEach(/* :: */[
327327

328328
Mt.from_pair_suites("Bs_poly_mutable_set_test", suites.contents);
329329

330-
var N = 0;
330+
var N = /* alias */0;
331331

332-
var I = 0;
332+
var I = /* alias */0;
333333

334-
var A = 0;
334+
var A = /* alias */0;
335335

336-
var L = 0;
336+
var L = /* alias */0;
337337

338338
var $plus$plus = Belt_MutableSet.union;
339339

Diff for: ‎jscomp/test/bs_poly_set_test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -416,17 +416,17 @@ b("File \"bs_poly_set_test.ml\", line 159, characters 4-11", !match$5[1]);
416416

417417
Mt.from_pair_suites("Bs_poly_set_test", suites.contents);
418418

419-
var N = 0;
419+
var N = /* alias */0;
420420

421-
var D = 0;
421+
var D = /* alias */0;
422422

423-
var I = 0;
423+
var I = /* alias */0;
424424

425-
var A = 0;
425+
var A = /* alias */0;
426426

427-
var S = 0;
427+
var S = /* alias */0;
428428

429-
var L = 0;
429+
var L = /* alias */0;
430430

431431
exports.suites = suites;
432432
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_queue_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ b("File \"bs_queue_test.ml\", line 156, characters 4-11", q$8.length === 0);
11381138

11391139
Mt.from_pair_suites("Bs_queue_test", suites.contents);
11401140

1141-
var Q = 0;
1141+
var Q = /* alias */0;
11421142

11431143
exports.suites = suites;
11441144
exports.test_id = test_id;

Diff for: ‎jscomp/test/bs_rbset_int_bench.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ console.timeEnd("test/bs_rbset_int_bench.ml 21");
5252

5353
var count = 1000000;
5454

55-
var V = 0;
55+
var V = /* alias */0;
5656

5757
exports.count = count;
5858
exports.V = V;

Diff for: ‎jscomp/test/bs_set_bench.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ console.timeEnd("test/bs_set_bench.ml 21");
5252

5353
var count = 1000000;
5454

55-
var N = 0;
55+
var N = /* alias */0;
5656

5757
exports.count = count;
5858
exports.N = N;

0 commit comments

Comments
 (0)