remove pos variance ( Bs_Map.empty has to be monomorphic), prepare mu…

…tation
rescript-lang · Jan 13, 2018 · 390ce36 · 390ce36
1 parent 927d480
commit 390ce36
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 18 deletions.
diff --git a/jscomp/others/bs_Map.ml b/jscomp/others/bs_Map.ml
@@ -14,7 +14,7 @@
 
 module N = Bs_internalAVLtree
 module B = Bs_Bag 
-type ('key, + 'a, 'id) t0 = ('key,'a) N.t0 
+type ('key,  'a, 'id) t0 = ('key,'a) N.t0 
 
 type ('k,'v,'id) t = 
   (('k,'id) Bs_Cmp.t,

diff --git a/jscomp/others/bs_Map.mli b/jscomp/others/bs_Map.mli
@@ -12,7 +12,7 @@
 (***********************************************************************)
 (** Adapted by authors of BuckleScript without using functors          *)
 (** The type of the map keys. *)
-type ('k, + 'a, 'id) t0 
+type ('k,  'a, 'id) t0 
 (** [('k, 'a, id) t] 
     ['k] the key type 
     ['a] the value type

diff --git a/jscomp/others/bs_MapInt.ml b/jscomp/others/bs_MapInt.ml
@@ -6,7 +6,7 @@ module N = Bs_internalAVLtree
 
 type ('key, 'a, 'id) t0 = ('key,'a) N.t0 
 
-type + 'a t = (key,'a) N.t0 
+type  'a t = (key,'a) N.t0 
 
 
 

diff --git a/jscomp/others/bs_MapInt.mli b/jscomp/others/bs_MapInt.mli
@@ -1,7 +1,7 @@
 # 4 "map.cppo.mli"
 type key = int
 # 8
-type (+'a) t
+type 'a t
 (** The type of maps from type [key] to type ['a]. *)
 
 val empty: 'a t

diff --git a/jscomp/others/bs_MapString.ml b/jscomp/others/bs_MapString.ml
@@ -6,7 +6,7 @@ module N = Bs_internalAVLtree
 
 type ('key, 'a, 'id) t0 = ('key,'a) N.t0 
 
-type + 'a t = (key,'a) N.t0 
+type  'a t = (key,'a) N.t0 
 
 
 

diff --git a/jscomp/others/bs_MapString.mli b/jscomp/others/bs_MapString.mli
@@ -1,7 +1,7 @@
 # 2 "map.cppo.mli"
 type key = string
 # 8
-type (+'a) t
+type 'a t
 (** The type of maps from type [key] to type ['a]. *)
 
 val empty: 'a t

diff --git a/jscomp/others/bs_internalAVLtree.ml b/jscomp/others/bs_internalAVLtree.ml
@@ -13,12 +13,12 @@
 (** Almost rewritten  by authors of BuckleScript                       *)
 
 
-type ('k, + 'v) node  = {
-  left : ('k,'v) node Js.null;
-  key : 'k; 
-  value : 'v; 
-  right : ('k,'v) node Js.null;
-  h : int 
+type ('k, 'v) node  = {
+  mutable left : ('k,'v) node Js.null;
+  mutable key : 'k; 
+  mutable value : 'v; 
+  mutable right : ('k,'v) node Js.null;
+  mutable h : int 
 } [@@bs.deriving abstract]
 
 external toOpt : 'a Js.null -> 'a option = "#null_to_opt"

diff --git a/jscomp/others/bs_internalAVLtree.mli b/jscomp/others/bs_internalAVLtree.mli
@@ -26,7 +26,7 @@
 
 type ('key, 'a) t0 = ('key, 'a) node Js.null
 
-and ('k, + 'v) node  = {
+and ('k,  'v) node  = {
   left : ('k,'v) t0;
   key : 'k; 
   value : 'v; 

diff --git a/jscomp/others/map.cppo.ml b/jscomp/others/map.cppo.ml
@@ -10,7 +10,7 @@ module N = Bs_internalAVLtree
 
 type ('key, 'a, 'id) t0 = ('key,'a) N.t0 
 
-type + 'a t = (key,'a) N.t0 
+type  'a t = (key,'a) N.t0 
 
 
 

diff --git a/jscomp/others/map.cppo.mli b/jscomp/others/map.cppo.mli
@@ -5,7 +5,7 @@ type key = int
 #else
 [%error "unknown type"]
 #endif  
-type (+'a) t
+type 'a t
 (** The type of maps from type [key] to type ['a]. *)
 
 val empty: 'a t

diff --git a/jscomp/test/bs_map_test.js b/jscomp/test/bs_map_test.js
@@ -2,6 +2,7 @@
 
 var Bs_Map = require("../../lib/js/bs_Map.js");
 var Bs_Set = require("../../lib/js/bs_Set.js");
+var Bs_MapInt = require("../../lib/js/bs_MapInt.js");
 var Caml_primitive = require("../../lib/js/caml_primitive.js");
 var Bs_internalAVLset = require("../../lib/js/bs_internalAVLset.js");
 var Bs_internalAVLtree = require("../../lib/js/bs_internalAVLtree.js");
@@ -71,16 +72,28 @@ for(var i$1 = 0; i$1 <= 100000; ++i$1){
 
 console.log(data$1);
 
+var M = 0;
+
+var MI = 0;
+
+var vv = Bs_MapInt.empty;
+
+var vv2 = Bs_MapInt.empty;
+
 var B = 0;
 
 var ISet = 0;
 
 exports.N = N;
+exports.M = M;
+exports.MI = MI;
 exports.m0 = m0;
 exports.I = I;
 exports.I2 = I2;
 exports.m = m;
 exports.m2 = m2;
+exports.vv = vv;
+exports.vv2 = vv2;
 exports.B = B;
 exports.ISet = ISet;
 /* data Not a pure module */
diff --git a/jscomp/test/bs_map_test.ml b/jscomp/test/bs_map_test.ml
@@ -5,8 +5,9 @@ module N =
       compare x y
      )
   )
-
-let m0 = Bs.Map.empty (module N)   
+module M = Bs.Map
+module MI = Bs.MapInt
+let m0 : (_,string,_) M.t = M.empty (module N)   
 
 module I = Bs.Cmp.Make(
   struct 
@@ -26,8 +27,10 @@ module I2 = Bs.Cmp.Make(
 
 let m = Bs.Map.empty (module I)
 
-let m2 = Bs.Map.empty (module I2)
+let m2 : (int, string, _) M.t = M.empty (module I2)
 
+let vv = MI.empty 
+let vv2 = MI.empty
 module B = Bs.Bag
 (* let () = 
   Js.log (m = m2) *)