fix build, {j|..|j} implies deps on Js module which may not apply in our repo

Author: bobzhang

Diff for: jscomp/Makefile

@@ -10,7 +10,7 @@ BYTE=ocamlc.opt$(EXE)
 OCAMLLEX=ocamllex.opt$(EXE)
 CAMLP4OF=camlp4of
 CAMLDEP=ocamldep.opt$(EXE)
-COMPFLAGS=-g -w +6-40-30-23 -warn-error +a-40-30-23
+COMPFLAGS=-g -w +6-40-30-23 -warn-error +a-40-30-23 -absname
 # COMPFLAGS+= -S
 
 

Diff for: jscomp/others/Makefile

@@ -13,7 +13,7 @@ $(addsuffix .cmj, $(SOURCE_LIST)): $(addsuffix .cmj, $(MAP_FILES))
 
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) $(addsuffix .cmi, $(SOURCE_LIST))
 
-BS_COMMON_FLAGS= -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform
+BS_COMMON_FLAGS= -no-alias-deps -bs-no-version-header -absname -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name bs-platform
 
 
 BS_FLAGS=  $(BS_COMMON_FLAGS) $(BS_PKG_FLAGS)

Diff for: jscomp/others/bs_array.ml

@@ -62,3 +62,24 @@ let iterX f  xs =
     f (Array.unsafe_get xs i) 
   done 
 *)
+
+external createUnsafe : int -> 'a t = "Array" [@@bs.new]
+
+let ofList xs = 
+  match xs with 
+  | [] -> [||]
+  | l ->
+    let a = createUnsafe (List.length l) in 
+    let rec fill i = function
+        | [] -> a
+        | hd::tl -> Array.unsafe_set a i hd; fill (i+1) tl in
+    fill 0 l
+
+let map f a =
+  let l = Array.length a in
+  let r = createUnsafe l in
+  for i = 0 to l - 1 do
+      Array.unsafe_set r i (f(Array.unsafe_get a i) [@bs])
+  done;
+  r
+  

Diff for: jscomp/others/bs_array.mli

@@ -33,3 +33,7 @@ val pushBack : 'a -> 'a t -> unit
 val memByRef : 'a -> 'a t -> bool
 
 val iter : ('a -> unit [@bs]) -> 'a array -> unit
+
+val ofList : 'a list -> 'a t 
+
+val map : ('a -> 'b [@bs]) -> 'a t -> 'b t 

Diff for: jscomp/others/bs_option.ml

@@ -36,7 +36,7 @@ let isNone = function
 
 let getExn x =
   match x with 
-  | None -> Js_exn.raiseError {j| $__LOC__: Bs.Option.unsafeGet|j}
+  | None -> Js_exn.raiseError "Bs_option.getExn"
   | Some x -> x 
 
 let equal eq a b =

Diff for: jscomp/others/node_process.ml

@@ -38,7 +38,7 @@ type t =
 external process : t = "" [@@bs.module]
 
 external exit : int -> unit = "" [@@bs.module "process"]
-
+external cwd : unit -> string = "" [@@bs.module "process"]
 (** The process.uptime() method returns the number of seconds 
    the current Node.js process has been running.) *)
 external uptime : t -> unit -> float = "" [@@bs.send]

Diff for: jscomp/others/node_process.mli

@@ -36,7 +36,7 @@ type t =
 external process : t = "" [@@bs.module]
 
 external exit : int -> unit = "" [@@bs.module "process"]
-
+external cwd : unit -> string = "" [@@bs.module "process"]
 (** The process.uptime() method returns the number of seconds 
    the current Node.js process has been running.) *)
 external uptime : t -> unit -> float = "" [@@bs.send]

Diff for: jscomp/test/.depend

@@ -74,7 +74,7 @@ bench.cmj : ../stdlib/array.cmj
 bigarray_test.cmj : ../stdlib/int32.cmj ../stdlib/complex.cmj \
     ../stdlib/bigarray.cmj
 boolean_test.cmj : test_bool_equal.cmj mt.cmj
-bs_array_test.cmj : ../runtime/js.cmj
+bs_array_test.cmj : mt.cmj ../runtime/js.cmj ../others/bs.cmj
 bs_auto_uncurry.cmj : ../runtime/js.cmj
 bs_auto_uncurry_test.cmj : mt.cmj ../others/js_array.cmj ../runtime/js.cmj
 bs_ignore_effect.cmj : mt.cmj

Diff for: jscomp/test/Makefile

@@ -172,7 +172,7 @@ $(addsuffix .cmj, $(OTHERS)): ../runtime/js.cmj
 
 # It is okay to test deprecated API
 COMPFLAGS+=  $(MODULE_FLAGS) -w -40 -warn-error A+8-3-30-26
-COMPFLAGS+=  -bs-no-version-header -bs-no-error-unused-attribute -bs-diagnose -bs-cross-module-opt -bs-package-name  bs-platform
+COMPFLAGS+=  -bs-no-version-header -absname -bs-no-error-unused-attribute -bs-diagnose -bs-cross-module-opt -bs-package-name  bs-platform
 
 
 $(TESTS): $(CAMLC)

Diff for: jscomp/test/bs_array_test.js

@@ -1,5 +1,29 @@
 'use strict';
 
+var Mt       = require("./mt.js");
+var Block    = require("../../lib/js/block.js");
+var Bs_array = require("../../lib/js/bs_array.js");
+
+var suites = [/* [] */0];
+
+var test_id = [0];
+
+function eq(loc, x, y) {
+  test_id[0] = test_id[0] + 1 | 0;
+  suites[0] = /* :: */[
+    /* tuple */[
+      loc + (" id " + test_id[0]),
+      function () {
+        return /* Eq */Block.__(0, [
+                  x,
+                  y
+                ]);
+      }
+    ],
+    suites[0]
+  ];
+  return /* () */0;
+}
 
 console.log(/* int array */[
             1,
@@ -14,4 +38,36 @@ console.log(/* int array */[
           return x + y | 0;
         }, 0));
 
+eq("File \"bs_array_test.ml\", line 22, characters 5-12", Bs_array.ofList(/* :: */[
+          1,
+          /* :: */[
+            2,
+            /* :: */[
+              3,
+              /* [] */0
+            ]
+          ]
+        ]), /* int array */[
+      1,
+      2,
+      3
+    ]);
+
+eq("File \"bs_array_test.ml\", line 23, characters 6-13", Bs_array.map(function (x) {
+          return x + 1 | 0;
+        }, /* int array */[
+          1,
+          2,
+          3
+        ]), /* int array */[
+      2,
+      3,
+      4
+    ]);
+
+Mt.from_pair_suites("File \"bs_array_test.ml\", line 27, characters 23-30", suites[0]);
+
+exports.suites  = suites;
+exports.test_id = test_id;
+exports.eq      = eq;
 /*  Not a pure module */

Diff for: jscomp/test/bs_array_test.ml

@@ -1,8 +1,27 @@
 
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc x y = 
+  incr test_id ; 
+  suites := 
+    (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
+
+
 type 'a t = 'a Js.Array.t
 let () =
   [| 1; 2; 3; 4 |]
   |> Js.Array.filter (fun  x -> x > 2)
   |> Js.Array.mapi (fun  x i -> x + i)
   |> Js.Array.reduce (fun  x y -> x + y) 0 
   |> Js.log
+
+
+
+
+let () =
+  eq __LOC__ (Bs.Array.ofList [1;2;3]) [|1;2;3|];
+  eq  __LOC__ 
+  ( Bs.Array.map (fun [@bs] x -> x + 1) [|1;2;3|] )
+  [|2;3;4|]
+
+;; Mt.from_pair_suites __LOC__ !suites  

Diff for: jscomp/watch-build.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+export OCAMLPARAM='_,bin-annot=1,annot=1' 
+export OCAMLRUNPARAM=b
+export BS_DEBUG=true
+export npm_package_name=bs-platform
+
+echo "Checking"
+make -r -j5  check 
+echo "Linking"
+make -r -j2 bin/bsc.exe bin/bsb.exe 
+echo "Making libs"
+make libs 
+echo "Making test"
+make -C test -j30 all
+
+echo "Update depend, snapshot"
+make -j7 depend snapshotml
+make -C test depend 
+make -C runtime depend
+make -C others depend
+echo "Done"

Diff for: jscomp/xwatcher/xwatcher_current.js

@@ -26,7 +26,7 @@ var lock = Xwatcher_util.makeLock(/* () */0);
 var events = Xwatcher_util.makeEventObj(/* () */0);
 
 function exec() {
-  return Xwatcher_util.buildWithShell("make -r -j5   check", events, lock, function () {
+  return Xwatcher_util.buildWithShell("./watch-build.sh", events, lock, function () {
               return /* () */0;
             });
 }
@@ -50,7 +50,11 @@ Bs_array.iter(function (x) {
       "core",
       "syntax",
       "ext",
-      "depends"
+      "depends",
+      "others",
+      "ounit",
+      "ounit_tests",
+      "test"
     ]);
 
 exec(/* () */0);

Diff for: jscomp/xwatcher/xwatcher_current.ml

@@ -26,7 +26,7 @@ let jscomp =
 
 let lock = Xwatcher_util.makeLock ()
 let events = Xwatcher_util.makeEventObj ()
-let command = "make -r -j5   check"
+let command = "./watch-build.sh"
 let exec () = 
   buildWithShell command events lock (fun [@bs] () -> ())
 let watch dir   = 
@@ -43,7 +43,7 @@ let () =
   Node.Process.putEnvVar "BS_VSCODE" "1";
   Bs.Array.iter (fun [@bs] x -> 
       ignore @@ watch (Node.Path.join [|jscomp; x|])
-    ) [| "core"; "syntax"; "ext"; "depends"; "others"|];
+    ) [| "core"; "syntax"; "ext"; "depends"; "others"; "ounit"; "ounit_tests"; "test"|];
   (* watch jscomp_core ; *)
   exec ()
 

Diff for: lib/js/bs_array.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var List = require("./list.js");
 
 function filterInPlace(p, a) {
   var i = 0;
@@ -37,9 +38,43 @@ function iter(f, xs) {
   return /* () */0;
 }
 
+function ofList(xs) {
+  if (xs) {
+    var a = new Array(List.length(xs));
+    var _i = 0;
+    var _param = xs;
+    while(true) {
+      var param = _param;
+      var i = _i;
+      if (param) {
+        a[i] = param[0];
+        _param = param[1];
+        _i = i + 1 | 0;
+        continue ;
+        
+      } else {
+        return a;
+      }
+    };
+  } else {
+    return /* array */[];
+  }
+}
+
+function map(f, a) {
+  var l = a.length;
+  var r = new Array(l);
+  for(var i = 0 ,i_finish = l - 1 | 0; i <= i_finish; ++i){
+    r[i] = f(a[i]);
+  }
+  return r;
+}
+
 exports.filterInPlace = filterInPlace;
 exports.empty         = empty;
 exports.pushBack      = pushBack;
 exports.memByRef      = memByRef;
 exports.iter          = iter;
+exports.ofList        = ofList;
+exports.map           = map;
 /* No side effect */

Diff for: lib/js/bs_option.js

@@ -25,8 +25,7 @@ function getExn(x) {
   if (x) {
     return x[0];
   } else {
-    var str = " " + (String("File \"bs_option.ml\", line 39, characters 34-42") + ": Bs.Option.unsafeGet");
-    throw new Error(str);
+    throw new Error("Bs_option.getExn");
   }
 }