Skip to content

Continue enhancing meta data from upstream #3986

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2019
Merged

Continue enhancing meta data from upstream #3986

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions jscomp/core/js_of_lam_block.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,14 @@ let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args =
let field (field_info : Lam_compat.field_dbg_info) e i =
match field_info with
| Fld_na
| Fld_tuple ->
(* let comment = "NA" in *)
E.array_index_by_int (* ~comment *) e i
#if OCAML_VERSION =~ ">4.03.0" then
| Fld_record_inline comment
| Fld_record_extension comment
| Fld_tuple
| Fld_poly_var_tag
| Fld_poly_var_content
| Fld_record_inline _
| Fld_record_extension _
->
E.array_index_by_int ~comment e i
#end
E.array_index_by_int
?comment:(Lam_compat.str_of_field_info field_info) e i
| Fld_record {name}
-> E.record_access e name i
| Fld_module name
Expand Down
8 changes: 7 additions & 1 deletion jscomp/core/lam_compat.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,16 @@ type field_dbg_info = Lambda.field_dbg_info =
| Fld_record_extension of string
#end
| Fld_tuple
| Fld_poly_var_tag
| Fld_poly_var_content


let str_of_field_info (x : field_dbg_info) : string option =
match x with
| Fld_na
| Fld_tuple -> None
| Fld_poly_var_tag
| Fld_poly_var_content
| Fld_tuple -> None
| Fld_record {name = s}
| Fld_module s
| Fld_record_inline s
Expand Down
3 changes: 3 additions & 0 deletions jscomp/core/lam_compat.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ type field_dbg_info = Lambda.field_dbg_info =
| Fld_record_extension of string
#end
| Fld_tuple
| Fld_poly_var_tag
| Fld_poly_var_content


val str_of_field_info :
field_dbg_info ->
Expand Down
4 changes: 3 additions & 1 deletion jscomp/core/lam_compile_util.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,11 @@ let comment_of_tag_info (x : Lam_tag_info.t) =
| Blk_extension (* TODO: enhance it later *)
| Blk_extension_slot -> None
| Blk_na s -> if s = "" then None else Some s

let module_alias = Some "alias"
let comment_of_pointer_info (x : Lam_pointer_info.t)=
match x with
| Pt_constructor {name}
| Pt_variant {name} -> Some name
| Pt_module_alias -> None (* FIXME *)
| Pt_module_alias -> module_alias
| Pt_na -> None
2 changes: 1 addition & 1 deletion jscomp/test/array_data_util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function randomRange(i, j) {
return v;
}

var A = 0;
var A = /* alias */0;

exports.A = A;
exports.range = range;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bigarray_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function init3(v) {
return /* () */0;
}

var BA1 = 0;
var BA1 = /* alias */0;

exports.BA1 = BA1;
exports.sum = sum;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bs_MapInt_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function test(param) {

test(/* () */0);

var M = 0;
var M = /* alias */0;

exports.should = should;
exports.M = M;
Expand Down
4 changes: 2 additions & 2 deletions jscomp/test/bs_array_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,9 +1586,9 @@ eq("File \"bs_array_test.ml\", line 339, characters 5-12", Belt_Array.getIndexBy

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

var A = 0;
var A = /* alias */0;

var L = 0;
var L = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bs_float_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ eq("File \"bs_float_test.ml\", line 44, characters 5-12", 3.0 / 2.0, 1.5);

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

var F = 0;
var F = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
10 changes: 5 additions & 5 deletions jscomp/test/bs_hashmap_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,17 @@ b("File \"bs_hashmap_test.ml\", line 57, characters 4-11", Belt_Array.every(Arra

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

var N = 0;
var N = /* alias */0;

var S = 0;
var S = /* alias */0;

var I = 0;
var I = /* alias */0;

var $plus$plus = Belt_Array.concat;

var A = 0;
var A = /* alias */0;

var So = 0;
var So = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
10 changes: 5 additions & 5 deletions jscomp/test/bs_hashset_int_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ b("File \"bs_hashset_int_test.ml\", line 62, characters 4-11", histo.length <= 1

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

var N = 0;
var N = /* alias */0;

var S = 0;
var S = /* alias */0;

var I = 0;
var I = /* alias */0;

var $plus$plus = Belt_Array.concat;

var A = 0;
var A = /* alias */0;

var SI = 0;
var SI = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
16 changes: 8 additions & 8 deletions jscomp/test/bs_hashtbl_string_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,25 +297,25 @@ bench7(/* () */0);

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

var N = 0;
var N = /* alias */0;

var count = 1000000;

var initial_size = 1000000;

var M = 0;
var M = /* alias */0;

var Md = 0;
var Md = /* alias */0;

var Md0 = 0;
var Md0 = /* alias */0;

var H = 0;
var H = /* alias */0;

var H0 = 0;
var H0 = /* alias */0;

var HI = 0;
var HI = /* alias */0;

var S = 0;
var S = /* alias */0;

exports.hash_string = hash_string;
exports.hashString = hashString;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bs_int_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ eq("File \"bs_int_test.ml\", line 43, characters 5-12", 0, 0);

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

var I = 0;
var I = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
6 changes: 3 additions & 3 deletions jscomp/test/bs_list_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,11 +2517,11 @@ b("File \"bs_list_test.ml\", line 349, characters 4-11", Belt_List.keepMap(/* ::

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

var N = 0;
var N = /* alias */0;

var A = 0;
var A = /* alias */0;

var J = 0;
var J = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
16 changes: 8 additions & 8 deletions jscomp/test/bs_map_set_dict_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,25 +155,25 @@ eq("File \"bs_map_set_dict_test.ml\", line 94, characters 4-11", Belt_Array.make

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

var M = 0;
var M = /* alias */0;

var MI = 0;
var MI = /* alias */0;

var I = 0;
var I = /* alias */0;

var A = 0;
var A = /* alias */0;

var L = 0;
var L = /* alias */0;

var vv = Belt_MapInt.empty;

var vv2 = Belt_MapInt.empty;

var Md0 = 0;
var Md0 = /* alias */0;

var ISet = 0;
var ISet = /* alias */0;

var S0 = 0;
var S0 = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
6 changes: 3 additions & 3 deletions jscomp/test/bs_map_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ Belt_MapInt.checkInvariantInternal(xx);

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

var M = 0;
var M = /* alias */0;

var N = 0;
var N = /* alias */0;

var A = 0;
var A = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
10 changes: 5 additions & 5 deletions jscomp/test/bs_mutable_set_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,15 +822,15 @@ b("File \"bs_mutable_set_test.ml\", line 317, characters 4-11", Belt_MutableSetI

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

var N = 0;
var N = /* alias */0;

var I = 0;
var I = /* alias */0;

var R = 0;
var R = /* alias */0;

var A = 0;
var A = /* alias */0;

var L = 0;
var L = /* alias */0;

var empty = Belt_MutableSetInt.make;

Expand Down
8 changes: 4 additions & 4 deletions jscomp/test/bs_poly_map_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,13 @@ b("File \"bs_poly_map_test.ml\", line 139, characters 4-11", Belt_Array.eq(Belt_

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

var M = 0;
var M = /* alias */0;

var N = 0;
var N = /* alias */0;

var A = 0;
var A = /* alias */0;

var I = 0;
var I = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
8 changes: 4 additions & 4 deletions jscomp/test/bs_poly_mutable_map_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ b("File \"bs_poly_mutable_map_test.ml\", line 31, characters 6-13", Belt_Mutable

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

var M = 0;
var M = /* alias */0;

var N = 0;
var N = /* alias */0;

var A = 0;
var A = /* alias */0;

var I = 0;
var I = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
8 changes: 4 additions & 4 deletions jscomp/test/bs_poly_mutable_set_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,13 +327,13 @@ Belt_List.forEach(/* :: */[

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

var N = 0;
var N = /* alias */0;

var I = 0;
var I = /* alias */0;

var A = 0;
var A = /* alias */0;

var L = 0;
var L = /* alias */0;

var $plus$plus = Belt_MutableSet.union;

Expand Down
12 changes: 6 additions & 6 deletions jscomp/test/bs_poly_set_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,17 +416,17 @@ b("File \"bs_poly_set_test.ml\", line 159, characters 4-11", !match$5[1]);

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

var N = 0;
var N = /* alias */0;

var D = 0;
var D = /* alias */0;

var I = 0;
var I = /* alias */0;

var A = 0;
var A = /* alias */0;

var S = 0;
var S = /* alias */0;

var L = 0;
var L = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bs_queue_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ b("File \"bs_queue_test.ml\", line 156, characters 4-11", q$8.length === 0);

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

var Q = 0;
var Q = /* alias */0;

exports.suites = suites;
exports.test_id = test_id;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bs_rbset_int_bench.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ console.timeEnd("test/bs_rbset_int_bench.ml 21");

var count = 1000000;

var V = 0;
var V = /* alias */0;

exports.count = count;
exports.V = V;
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/bs_set_bench.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ console.timeEnd("test/bs_set_bench.ml 21");

var count = 1000000;

var N = 0;
var N = /* alias */0;

exports.count = count;
exports.N = N;
Expand Down
Loading