Merge pull request #3986 from BuckleScript/precise_pointer_info

Continue enhancing meta data from upstream

Author: bobzhang

jscomp/core/js_of_lam_block.ml

@@ -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

jscomp/core/lam_compat.ml

@@ -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 

jscomp/core/lam_compat.mli

@@ -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 -> 

jscomp/core/lam_compile_util.ml

@@ -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

jscomp/test/array_data_util.js

@@ -16,7 +16,7 @@ function randomRange(i, j) {
   return v;
 }
 
-var A = 0;
+var A = /* alias */0;
 
 exports.A = A;
 exports.range = range;

jscomp/test/bigarray_test.js

@@ -35,7 +35,7 @@ function init3(v) {
   return /* () */0;
 }
 
-var BA1 = 0;
+var BA1 = /* alias */0;
 
 exports.BA1 = BA1;
 exports.sum = sum;

jscomp/test/bs_MapInt_test.js

@@ -26,7 +26,7 @@ function test(param) {
 
 test(/* () */0);
 
-var M = 0;
+var M = /* alias */0;
 
 exports.should = should;
 exports.M = M;

jscomp/test/bs_array_test.js

@@ -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;

jscomp/test/bs_float_test.js

@@ -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;

jscomp/test/bs_hashmap_test.js

@@ -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;