Merge pull request #3985 from BuckleScript/precise_pointer_info

prepare for singleton variant -> undefined

Author: bobzhang

jscomp/core/lam.ml

@@ -410,7 +410,7 @@ let false_ : t =
   Lconst (Const_js_false)
 
 let unit : t =
-  Lconst (Const_pointer( 0, Pt_constructor "()"))
+  Lconst (Const_pointer( 0, Pt_constructor {name = "()"; cstrs = 1,0}))
 
 
 

jscomp/core/lam_compile_util.ml

@@ -61,7 +61,7 @@ let comment_of_tag_info  (x : Lam_tag_info.t) =
   | Blk_na s -> if s = "" then None else Some s
 let comment_of_pointer_info (x :  Lam_pointer_info.t)= 
   match x with 
-  | Pt_constructor x -> Some x 
-  | Pt_variant x -> Some x 
+  | Pt_constructor {name}
+  | Pt_variant {name} -> Some name
   | Pt_module_alias -> None (* FIXME *)
   | Pt_na -> None

jscomp/core/lam_constant_convert.ml

@@ -40,8 +40,8 @@ let rec convert_constant ( const : Lambda.structured_constant) : Lam_constant.t
   | Const_base (Const_nativeint i) -> (Const_nativeint i)
   | Const_pointer(i,p) ->
     begin match p with 
-    | Pt_constructor p -> Const_pointer(i, Pt_constructor p)
-    | Pt_variant p -> Const_pointer(i,Pt_variant p)
+    | Pt_constructor {name;cstrs} -> Const_pointer(i, Pt_constructor {name; cstrs})
+    | Pt_variant {name} -> Const_pointer(i,Pt_variant {name})
     | Pt_module_alias -> Const_pointer(i, Pt_module_alias)
     | Pt_builtin_boolean -> if i = 0 then Const_js_false else Const_js_true
     | Pt_shape_none ->

jscomp/core/lam_pointer_info.ml

@@ -24,7 +24,7 @@
 
 
 type t = 
-  | Pt_constructor of string 
-  | Pt_variant of string 
+  | Pt_constructor of {name : string ; cstrs : int * int}
+  | Pt_variant of {name : string }
   | Pt_module_alias
   | Pt_na 

jscomp/core/lam_pointer_info.mli

@@ -24,7 +24,7 @@
 
 
 type t = 
-  | Pt_constructor of string 
-  | Pt_variant of string 
+  | Pt_constructor of {name : string ; cstrs : int * int}
+  | Pt_variant of { name : string}
   | Pt_module_alias
   | Pt_na 

jscomp/runtime/release.ninja

@@ -32,7 +32,7 @@ build runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml_bui
 build runtime/caml_format.cmi : cc runtime/caml_format.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_gc.cmj : cc_cmi runtime/caml_gc.ml | runtime/caml_gc.cmi
 build runtime/caml_gc.cmi : cc runtime/caml_gc.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/caml_obj_extern.cmj runtime/caml_undefined_extern.cmj runtime/js.cmj
+build runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/caml_obj_extern.cmj runtime/js.cmj
 build runtime/caml_hash.cmi : cc runtime/caml_hash.mli | runtime/bs_stdlib_mini.cmi runtime/caml_obj_extern.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml | runtime/caml_char.cmj runtime/caml_hash_primitive.cmi runtime/caml_int32.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
 build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj

jscomp/test/build.ninja

@@ -526,6 +526,7 @@ build test/simple_derive_use.cmi : cc test/simple_derive_use.mli | $stdlib
 build test/simple_lexer_test.cmi test/simple_lexer_test.cmj : cc test/simple_lexer_test.ml | test/mt.cmj $stdlib
 build test/simplify_lambda_632o.cmi test/simplify_lambda_632o.cmj : cc test/simplify_lambda_632o.ml | $stdlib
 build test/single_module_alias.cmi test/single_module_alias.cmj : cc test/single_module_alias.ml | $stdlib
+build test/singular_unit_test.cmi test/singular_unit_test.cmj : cc test/singular_unit_test.ml | $stdlib
 build test/small_inline_test.cmi test/small_inline_test.cmj : cc test/small_inline_test.ml | $stdlib
 build test/splice_test.cmi test/splice_test.cmj : cc test/splice_test.ml | test/mt.cmj $stdlib
 build test/sprintf_reg_test.cmi test/sprintf_reg_test.cmj : cc test/sprintf_reg_test.ml | test/mt.cmj test/mt_global.cmj $stdlib

jscomp/test/class3_test.js

@@ -349,7 +349,7 @@ function vpoint_init($$class) {
   var move = ids[0];
   var get_x = ids[1];
   var x = ids[2];
-  var inh = CamlinternalOO.inherits($$class, 0, shared$5, /* array */["get_offset"], abstract_point, 1);
+  var inh = CamlinternalOO.inherits($$class, 0, shared$5, /* array */["get_offset"], abstract_point, true);
   var obj_init = inh[0];
   CamlinternalOO.set_methods($$class, /* array */[
         get_x,
@@ -404,7 +404,7 @@ var abstract_point2 = /* class */[
 function point2_init($$class) {
   var x_init = CamlinternalOO.new_variable($$class, "");
   var get_offset = CamlinternalOO.get_method_label($$class, "get_offset");
-  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$8, abstract_point2, 1);
+  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$8, abstract_point2, true);
   var obj_init = inh[0];
   var x = inh[1];
   CamlinternalOO.set_method($$class, get_offset, (function (self$10) {
@@ -482,7 +482,7 @@ eq("File \"class3_test.ml\", line 144, characters 12-19", h$2, 1);
 function point_again_init($$class) {
   var x = CamlinternalOO.new_variable($$class, "");
   CamlinternalOO.get_method_label($$class, "move");
-  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, 1);
+  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, true);
   var obj_init = inh[0];
   return (function (env, self, x$1) {
       var self$1 = CamlinternalOO.create_object_opt(self, $$class);
@@ -508,7 +508,7 @@ eq("File \"class3_test.ml\", line 161, characters 12-19", hh, 8);
 
 function point_again2_init($$class) {
   var x = CamlinternalOO.new_variable($$class, "");
-  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, 1);
+  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, true);
   var obj_init = inh[0];
   return (function (env, self, x$1) {
       var self$1 = CamlinternalOO.create_object_opt(self, $$class);
@@ -535,7 +535,7 @@ eq("File \"class3_test.ml\", line 177, characters 12-19", hhh, 35);
 function point_again3_init($$class) {
   var x = CamlinternalOO.new_variable($$class, "");
   var move = CamlinternalOO.get_method_label($$class, "move");
-  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, 1);
+  var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, true);
   var obj_init = inh[0];
   var move$1 = inh[4];
   CamlinternalOO.set_method($$class, move, Curry.__1(move$1));

jscomp/test/class4_test.js

@@ -80,7 +80,7 @@ function restricted_point_init($$class) {
 var restricted_point = CamlinternalOO.make_class(shared$2, restricted_point_init);
 
 function restricted_point$prime_init($$class) {
-  var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, 1);
+  var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, true);
   var obj_init = inh[0];
   return (function (env, self, x) {
       return Curry._2(obj_init, self, x);
@@ -90,7 +90,7 @@ function restricted_point$prime_init($$class) {
 var restricted_point$prime = CamlinternalOO.make_class(shared$2, restricted_point$prime_init);
 
 function restricted_point2$prime_init($$class) {
-  var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, 1);
+  var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, true);
   var obj_init = inh[0];
   return (function (env, self, x) {
       return Curry._2(obj_init, self, x);
@@ -135,7 +135,7 @@ function point_init($$class) {
   var move = ids[0];
   var get_x = ids[1];
   var x = ids[2];
-  var inh = CamlinternalOO.inherits($$class, 0, shared$1, /* array */["get_offset"], abstract_point, 1);
+  var inh = CamlinternalOO.inherits($$class, 0, shared$1, /* array */["get_offset"], abstract_point, true);
   var obj_init = inh[0];
   CamlinternalOO.set_methods($$class, /* array */[
         get_x,
@@ -173,7 +173,7 @@ function colored_point_init($$class) {
         "get_offset",
         "get_x",
         "move"
-      ], point, 1);
+      ], point, true);
   var obj_init = inh[0];
   CamlinternalOO.set_method($$class, color, (function (self$7) {
           return self$7[c$1];

jscomp/test/class5_test.js

@@ -102,7 +102,7 @@ function printable_colored_point_init($$class) {
         "get_x",
         "move",
         "print"
-      ], printable_point, 1);
+      ], printable_point, true);
   var obj_init = inh[0];
   var print$1 = inh[4];
   CamlinternalOO.set_method($$class, print, (function (self$2) {
@@ -289,7 +289,7 @@ function distance_point_init($$class) {
   var inh = CamlinternalOO.inherits($$class, shared$1, 0, /* array */[
         "get_x",
         "move"
-      ], point, 1);
+      ], point, true);
   var obj_init = inh[0];
   var x$1 = inh[1];
   CamlinternalOO.set_method($$class, distance, (function (self$7, other) {