remove staled js files, fix camlinternalOO

Author: bobzhang

jscomp/bsb/bsb_templates.ml

@@ -59,8 +59,10 @@ let root = OCamlRes.Res.([
       \  ],\n\
       \  \"warnings\": {\n\
       \    \"error\" : \"+101\"\n\
-      \  }\n\
-       }") ;
+      \  },\n\
+      \  \"refmt\": 3\n\
+       }\n\
+       ") ;
     Dir (".vscode", [
       File ("tasks.json",
         "{\n\

jscomp/others/intro.txt

@@ -19,7 +19,7 @@ For example
 
 {!Belt}
 
-This BuckleScript stdandard library.
+This BuckleScript standard library ({b beta}).
 
 BuckleScript also shipped the vanilla OCaml standard library.
 @see <https://caml.inria.fr/pub/docs/manual-ocaml-4.02/stdlib.html> OCaml standard library

jscomp/release.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+rm ../lib/js/*.js 
 git clean -dfx . ../lib
 make clean
 make themes

jscomp/stdlib/camlinternalOO.ml

@@ -87,22 +87,22 @@ let public_method_label s : tag =
 
 module Vars =
 #if BS then
-  Bs.Map.String
+  Belt.Map.String
 #else
   Map.Make(struct type t = string let compare (x:t) y = compare x y end)
 #end  
 type vars = int Vars.t
 
 module Meths =
 #if BS then
-    Bs.Map.String
+    Belt.Map.String
 #else      
   Map.Make(struct type t = string let compare (x:t) y = compare x y end)
 #end    
 type meths = label Meths.t
 module Labs =
 #if BS then
-    Bs.Map.Int
+    Belt.Map.Int
 #else      
   Map.Make(struct type t = label let compare (x:t) y = compare x y end)
 #end  

jscomp/test/.depend

@@ -61,7 +61,7 @@ arith_parser.cmj : ../stdlib/parsing.cmj ../stdlib/obj.cmj \
     ../stdlib/lexing.cmj arith_syntax.cmj
 arith_syntax.cmj :
 arity_deopt.cmj : mt.cmj
-array_data_util.cmj : ../others/bs_Array.cmj
+array_data_util.cmj : ../others/belt.cmj
 array_safe_get.cmj : ../stdlib/array.cmj
 array_subtle_test.cmj : mt.cmj ../runtime/js.cmj ../stdlib/array.cmj
 array_test.cmj : ../stdlib/pervasives.cmj mt.cmj ../stdlib/list.cmj \
@@ -93,23 +93,21 @@ bs_auto_uncurry.cmj : ../runtime/js.cmj
 bs_auto_uncurry_test.cmj : mt.cmj ../others/js_array.cmj ../runtime/js.cmj
 bs_hashmap_test.cmj : mt.cmj ../stdlib/hashtbl.cmj ../others/belt.cmj \
     array_data_util.cmj
-bs_hashset_int_test.cmj : mt.cmj ../others/bs_Array.cmj ../others/belt.cmj \
-    array_data_util.cmj
+bs_hashset_int_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
 bs_hashtbl_string_test.cmj : ../stdlib/hashtbl.cmj ../others/belt.cmj
 bs_ignore_effect.cmj : mt.cmj
 bs_ignore_test.cmj : ../runtime/js.cmj
 bs_list_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj
-bs_map_set_dict_test.cmj : mt.cmj ../runtime/js.cmj ../others/bs_Array.cmj \
-    ../others/belt.cmj array_data_util.cmj
+bs_map_set_dict_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
+    array_data_util.cmj
 bs_map_test.cmj : mt.cmj ../others/belt.cmj
 bs_min_max_test.cmj : ../stdlib/pervasives.cmj mt.cmj
 bs_mutable_set_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
     array_data_util.cmj ../stdlib/array.cmj
 bs_node_string_buffer_test.cmj : ../others/node.cmj ../runtime/js.cmj
-bs_poly_map_test.cmj : mt.cmj ../runtime/js.cmj ../others/bs_Array.cmj \
-    ../others/belt.cmj array_data_util.cmj
-bs_poly_mutable_map_test.cmj : mt.cmj ../others/bs_Array.cmj \
-    ../others/belt.cmj array_data_util.cmj
+bs_poly_map_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
+    array_data_util.cmj
+bs_poly_mutable_map_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
 bs_poly_mutable_set_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
     array_data_util.cmj
 bs_poly_set_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
@@ -120,10 +118,8 @@ bs_rbset_int_bench.cmj : rbset.cmj
 bs_rest_test.cmj :
 bs_set_bench.cmj : ../others/belt.cmj
 bs_set_int_test.cmj : mt.cmj ../stdlib/list.cmj ../runtime/js.cmj \
-    ../others/bs_Array.cmj ../others/belt.cmj array_data_util.cmj \
-    ../stdlib/array.cmj
-bs_sort_test.cmj : mt.cmj ../others/bs_Range.cmj ../others/bs_Array.cmj \
-    ../others/belt.cmj array_data_util.cmj
+    ../others/belt.cmj array_data_util.cmj ../stdlib/array.cmj
+bs_sort_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
 bs_splice_partial.cmj : ../runtime/js.cmj
 bs_stack_test.cmj : ../runtime/js.cmj ../others/belt.cmj
 bs_string_test.cmj : mt.cmj ../runtime/js.cmj
@@ -329,8 +325,7 @@ hashtbl_test.cmj : mt.cmj ../stdlib/moreLabels.cmj ../stdlib/list.cmj \
 hello.foo.cmj : ../runtime/js.cmj
 http_types.cmj : ../runtime/js.cmj
 ignore_test.cmj : mt.cmj ../runtime/js.cmj
-imm_map_bench.cmj : ../runtime/js.cmj ../others/bs_Array.cmj \
-    ../others/belt.cmj
+imm_map_bench.cmj : ../runtime/js.cmj ../others/belt.cmj
 include_side_effect.cmj : side_effect.cmj
 include_side_effect_free.cmj : side_effect_free.cmj
 infer_type_test.cmj : ../runtime/js.cmj infer_type_test.cmi

jscomp/test/array_data_util.js

@@ -1,18 +1,18 @@
 'use strict';
 
-var Bs_Array = require("../../lib/js/bs_Array.js");
+var Belt_Array = require("../../lib/js/belt_Array.js");
 
 function range(i, j) {
-  return Bs_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
+  return Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
                 return k + i | 0;
               }));
 }
 
 function randomRange(i, j) {
-  var v = Bs_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
+  var v = Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
           return k + i | 0;
         }));
-  Bs_Array.shuffleInPlace(v);
+  Belt_Array.shuffleInPlace(v);
   return v;
 }
 

jscomp/test/array_data_util.ml

@@ -1,5 +1,5 @@
 
-module A = Bs_Array 
+module A = Belt.Array
 
 (* []*)
 let range i j = 

jscomp/test/bs_MapInt_test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Bs_MapInt = require("../../lib/js/bs_MapInt.js");
+var Belt_MapInt = require("../../lib/js/belt_MapInt.js");
 
 function should(b) {
   if (b) {
@@ -11,17 +11,17 @@ function should(b) {
 }
 
 function test() {
-  var m = Bs_MapInt.empty;
+  var m = Belt_MapInt.empty;
   for(var i = 0; i <= 999999; ++i){
-    m = Bs_MapInt.set(m, i, i);
+    m = Belt_MapInt.set(m, i, i);
   }
   for(var i$1 = 0; i$1 <= 999999; ++i$1){
-    should(+(Bs_MapInt.get(m, i$1) !== /* None */0));
+    should(+(Belt_MapInt.get(m, i$1) !== /* None */0));
   }
   for(var i$2 = 0; i$2 <= 999999; ++i$2){
-    m = Bs_MapInt.remove(m, i$2);
+    m = Belt_MapInt.remove(m, i$2);
   }
-  return should(Bs_MapInt.isEmpty(m));
+  return should(Belt_MapInt.isEmpty(m));
 }
 
 test(/* () */0);