remove the cycle between stdlib and runtime

Now: runtime -> others -> stdlib

Author: bobzhang

Makefile

@@ -19,7 +19,6 @@ world:
 
 libs:
 	@echo "Making compiler finished"
-	$(MAKE) -C jscomp/stdlib -j $(NPROCS) allcmis
 	$(MAKE) -C jscomp/runtime -j $(NPROCS) all
 	$(MAKE) -C jscomp/others -j $(NPROCS) all
 	$(MAKE) -C jscomp/stdlib -j $(NPROCS) all

jscomp/Makefile

@@ -623,10 +623,6 @@ bootbspack:
 	@echo "Rebuilding bspack.exe finsihed"
 
 libs:
-	@echo "Making stdlib cmis"
-	cd stdlib && $(MAKE) allcmis
-	@echo "Making stdlib finished"
-
 	@echo "Making runtime"
 	cd runtime && $(MAKE) all
 	@echo "Making runtime finished"

jscomp/others/Makefile

@@ -58,9 +58,6 @@ SOURCE_LIST= node_path node_fs node_process dict node_module js_array js_string
 	belt_HashMapString\
 	belt_Debug\
 
-# belt_Bag\
-# belt_BagM\
-# belt_dyn belt_dyn_lib\
 
 $(addsuffix .cmj, $(SOURCE_LIST)): $(addsuffix .cmj, $(MAP_FILES))
 
@@ -71,7 +68,7 @@ BS_COMMON_FLAGS= -no-alias-deps -bs-no-version-header -absname -bs-diagnose -bs-
 
 BS_FLAGS=  $(BS_COMMON_FLAGS) $(BS_PKG_FLAGS)
 
-COMPFLAGS += $(BS_FLAGS)  -I ../runtime -I ../stdlib -w +3-40-49 -warn-error A -bin-annot
+COMPFLAGS +=  -I ../runtime -nostdlib -nopervasives -open Bs_stdlib_mini $(BS_FLAGS)  -w +3-40-49 -warn-error A -bin-annot
 
 
 node.cmi : $(COMPILER)

jscomp/others/belt_Array.ml

@@ -183,10 +183,10 @@ let slice a ~offset ~len =
     let lena = length a in
     let ofs =
       if offset < 0 then
-        max (lena + offset) 0
+        Pervasives.max (lena + offset) 0
       else offset in
     let hasLen = lena - ofs in
-    let copyLength = min hasLen len in
+    let copyLength = Pervasives.min hasLen len in
     if copyLength <= 0 then [||]
     else
       let result = makeUninitializedUnsafe copyLength  in
@@ -197,7 +197,7 @@ let slice a ~offset ~len =
 
 let sliceToEnd a offset =
   let lena = length a in
-  let ofs = if offset < 0 then max (lena + offset) 0 else offset in
+  let ofs = if offset < 0 then Pervasives.max (lena + offset) 0 else offset in
   let len = lena - ofs in
   let result = makeUninitializedUnsafe len in
   for i = 0 to len - 1 do
@@ -210,10 +210,10 @@ let fill a ~offset ~len v =
     let lena = length a in
     let ofs =
       if offset < 0 then
-        max (lena + offset ) 0
+        Pervasives.max (lena + offset ) 0
       else offset in
     let hasLen = lena - ofs in
-    let fillLength = min hasLen len in
+    let fillLength = Pervasives.min hasLen len in
     if fillLength > 0 then
       for i = ofs to  ofs + fillLength - 1 do
         setUnsafe a i v
@@ -236,10 +236,10 @@ let blitUnsafe ~src:a1  ~srcOffset:srcofs1 ~dst:a2 ~dstOffset:srcofs2 ~len:blitL
 let blit ~src:a1 ~srcOffset:ofs1 ~dst:a2 ~dstOffset:ofs2 ~len =
     let lena1 = length a1 in
     let lena2 = length a2 in
-    let srcofs1 = if ofs1 < 0 then max (lena1 + ofs1) 0 else ofs1 in
-    let srcofs2 = if ofs2 < 0 then max (lena2 + ofs2) 0 else ofs2 in
+    let srcofs1 = if ofs1 < 0 then Pervasives.max (lena1 + ofs1) 0 else ofs1 in
+    let srcofs2 = if ofs2 < 0 then Pervasives.max (lena2 + ofs2) 0 else ofs2 in
     let blitLength =
-      min len (min (lena1 - srcofs1) (lena2 - srcofs2)) in
+      Pervasives.min len (Pervasives.min (lena1 - srcofs1) (lena2 - srcofs2)) in
     (* blitUnsafe a1 srcofs1 a2 srcofs2 blitLength *)
     (if srcofs2 <= srcofs1 then
       for j = 0 to blitLength - 1 do
@@ -353,7 +353,7 @@ let reduceReverse a x f = reduceReverseU a x (fun[@bs] a b -> f a b)
 
 let reduceReverse2U a b x f =
   let r = ref x in
-  let len = min (length a) (length b) in
+  let len = Pervasives.min (length a) (length b) in
   for i = len - 1 downto  0 do
     r := f !r (getUnsafe a i) (getUnsafe b i) [@bs]
   done;
@@ -409,12 +409,12 @@ let rec someAux2 arr1 arr2 i b len =
 
 
 let every2U  a b p =
-  everyAux2  a b 0 p (min (length a) (length b))
+  everyAux2  a b 0 p (Pervasives.min (length a) (length b))
 
 let every2 a b p = every2U  a b (fun[@bs] a b -> p a b)
 
 let some2U a b p =
-  someAux2 a b 0 p (min (length a) (length b))
+  someAux2 a b 0 p (Pervasives.min (length a) (length b))
 
 let some2 a b p = some2U a b (fun [@bs] a b -> p a b)
 

jscomp/others/belt_MutableSet.ml

@@ -311,7 +311,7 @@ let intersect a b  : _ t =
        )
     then S.t ~cmp ~data:N.empty
     else 
-      let tmp2 = A.makeUninitializedUnsafe (min sizea sizeb) in 
+      let tmp2 = A.makeUninitializedUnsafe (Pervasives.min sizea sizeb) in 
       let k = Sort.intersectU tmp 0 sizea tmp sizea sizeb tmp2 0 p in 
       S.t ~data:(N.fromSortedArrayAux tmp2 0 k)
         ~cmp

jscomp/others/belt_MutableSetInt.ml

@@ -290,7 +290,7 @@ let intersect dataa datab  =
       )
        then make ()
     else 
-    let tmp2 = A.makeUninitializedUnsafe (min sizea sizeb) in 
+    let tmp2 = A.makeUninitializedUnsafe (Pervasives.min sizea sizeb) in 
     let k = S.intersect tmp 0 sizea tmp sizea sizeb tmp2 0  in 
     t ~data:(N.fromSortedArrayAux tmp2 0 k)
 

jscomp/others/belt_MutableSetString.ml

@@ -290,7 +290,7 @@ let intersect dataa datab  =
       )
        then make ()
     else 
-    let tmp2 = A.makeUninitializedUnsafe (min sizea sizeb) in 
+    let tmp2 = A.makeUninitializedUnsafe (Pervasives.min sizea sizeb) in 
     let k = S.intersect tmp 0 sizea tmp sizea sizeb tmp2 0  in 
     t ~data:(N.fromSortedArrayAux tmp2 0 k)
 

jscomp/others/belt_internalAVLset.ml

@@ -613,7 +613,7 @@ let balMutate nt  =
     )
   else
     begin
-      heightSet nt (max hl hr + 1);
+      heightSet nt (Pervasives.max hl hr + 1);
       nt
     end
 

jscomp/others/belt_internalAVLtree.ml

@@ -710,7 +710,7 @@ let balMutate nt  =
     )
   else
     begin
-      heightSet nt (max hl hr + 1);
+      heightSet nt (Pervasives.max hl hr + 1);
       nt
     end
 

jscomp/others/js_math.ml

@@ -83,8 +83,8 @@ let unsafe_ceil = unsafe_ceil_int
 [@@ocaml.deprecated "Please use `unsafe_ceil_int` instead"]
 (** smallest int greater than or equal to the argument *)
 let ceil_int f =
-  if f > Pervasives.float Js_int.max then Js_int.max
-  else if f < Pervasives.float Js_int.min then Js_int.min
+  if f > float Js_int.max then Js_int.max
+  else if f < float Js_int.min then Js_int.min
   else unsafe_ceil_int f
 let ceil = ceil_int
 [@@ocaml.deprecated "Please use `ceil_int` instead"]

jscomp/others/setm.cppo.ml

@@ -294,7 +294,7 @@ let intersect dataa datab  =
       )
        then make ()
     else 
-    let tmp2 = A.makeUninitializedUnsafe (min sizea sizeb) in 
+    let tmp2 = A.makeUninitializedUnsafe (Pervasives.min sizea sizeb) in 
     let k = S.intersect tmp 0 sizea tmp sizea sizeb tmp2 0  in 
     t ~data:(N.fromSortedArrayAux tmp2 0 k)
 

jscomp/runtime/bs_stdlib_mini.mli

@@ -31,7 +31,7 @@ external ( && ) : bool -> bool -> bool = "%sequand"
 external not : bool -> bool = "%boolnot"
 
 external raise : exn -> 'a = "%raise"
-
+external ignore : 'a -> unit = "%ignore"
 external fst : 'a * 'b -> 'a = "%field0"
 external snd : 'a * 'b -> 'b = "%field1"
 external ( |> ) : 'a -> ('a -> 'b) -> 'b = "%revapply"

jscomp/stdlib/Makefile.shared

@@ -60,7 +60,7 @@ OTHERS=array.cmo list.cmo char.cmo bytes.cmo string.cmo sys.cmo \
   unix.cmo unixLabels.cmo \
   bigarray.cmo
 
-allcmis:$(OBJS:.cmo=.cmi) std_exit.cmi $(COMPILER)
+# allcmis:$(OBJS:.cmo=.cmi) std_exit.cmi $(COMPILER)
 
 all: $(OBJS:.cmo=.cmj) std_exit.cmj $(COMPILER)
 # all: stdlib.cma std_exit.cmo