Merge pull request #4418 from BuckleScript/bump

clean up, add more test cases

Author: bobzhang

.npmignore

@@ -36,4 +36,5 @@ vendor/rollup.js
 package/
 *.tgz
 .nyc_output/
-themes
+themes
+vendor/js_of_ocaml.bc

jscomp/artifacts.json

@@ -107,8 +107,6 @@
     "belt_SortArrayInt.js",
     "belt_SortArrayString.js",
     "belt.js",
-    "bigarray.js",
-    "block.js",
     "buffer.js",
     "bytes.js",
     "bytesLabels.js",
@@ -118,7 +116,6 @@
     "caml_bytes_extern.js",
     "caml_bytes.js",
     "caml_char.js",
-    "caml_chrome_debugger.js",
     "caml_exceptions.js",
     "caml_external_polyfill.js",
     "caml_float_extern.js",
@@ -137,7 +134,6 @@
     "caml_md5.js",
     "caml_module.js",
     "caml_nativeint_extern.js",
-    "caml_obj_extern.js",
     "caml_obj.js",
     "caml_oo_curry.js",
     "caml_oo.js",
@@ -149,7 +145,6 @@
     "caml_string.js",
     "caml_sys.js",
     "caml_undefined_extern.js",
-    "caml_weak.js",
     "camlinternalBigarray.js",
     "camlinternalFormat.js",
     "camlinternalFormatBasics.js",
@@ -163,7 +158,6 @@
     "dom_storage.js",
     "dom_storage2.js",
     "dom.js",
-    "ephemeron.js",
     "filename.js",
     "format.js",
     "gc.js",
@@ -217,7 +211,6 @@
     "node_process.js",
     "node.js",
     "obj.js",
-    "oo.js",
     "parsing.js",
     "pervasives.js",
     "printexc.js",
@@ -237,8 +230,7 @@
     "sys.js",
     "uchar.js",
     "unix.js",
-    "unixLabels.js",
-    "weak.js"
+    "unixLabels.js"
   ],
   "lib/js": [
     "arg.js",
@@ -287,8 +279,6 @@
     "belt_SortArrayInt.js",
     "belt_SortArrayString.js",
     "belt.js",
-    "bigarray.js",
-    "block.js",
     "buffer.js",
     "bytes.js",
     "bytesLabels.js",
@@ -298,7 +288,6 @@
     "caml_bytes_extern.js",
     "caml_bytes.js",
     "caml_char.js",
-    "caml_chrome_debugger.js",
     "caml_exceptions.js",
     "caml_external_polyfill.js",
     "caml_float_extern.js",
@@ -317,7 +306,6 @@
     "caml_md5.js",
     "caml_module.js",
     "caml_nativeint_extern.js",
-    "caml_obj_extern.js",
     "caml_obj.js",
     "caml_oo_curry.js",
     "caml_oo.js",
@@ -329,7 +317,6 @@
     "caml_string.js",
     "caml_sys.js",
     "caml_undefined_extern.js",
-    "caml_weak.js",
     "camlinternalBigarray.js",
     "camlinternalFormat.js",
     "camlinternalFormatBasics.js",
@@ -343,7 +330,6 @@
     "dom_storage.js",
     "dom_storage2.js",
     "dom.js",
-    "ephemeron.js",
     "filename.js",
     "format.js",
     "gc.js",
@@ -397,7 +383,6 @@
     "node_process.js",
     "node.js",
     "obj.js",
-    "oo.js",
     "parsing.js",
     "pervasives.js",
     "printexc.js",
@@ -417,8 +402,6 @@
     "sys.js",
     "uchar.js",
     "unix.js",
-    "unixLabels.js",
-    "weak.js"
   ],
   "lib/ocaml": [
     "arg.cmi",

jscomp/runtime/release.ninja

@@ -29,19 +29,19 @@ build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml |
 build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.ml | runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
 build runtime/caml_int32.cmi : cc runtime/caml_int32.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_primitive.cmj runtime/caml_string_extern.cmj runtime/js.cmj
+build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj runtime/js.cmj
 build runtime/caml_int64.cmi : cc runtime/caml_int64.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/curry.cmj runtime/js.cmj
+build runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_io.cmi : cc runtime/caml_io.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_lexer.cmj : cc_cmi runtime/caml_lexer.ml | runtime/caml_lexer.cmi
 build runtime/caml_lexer.cmi : cc runtime/caml_lexer.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_md5.cmj : cc_cmi runtime/caml_md5.ml | runtime/caml_array_extern.cmj runtime/caml_char.cmj runtime/caml_int32_extern.cmj runtime/caml_md5.cmi runtime/caml_string_extern.cmj
 build runtime/caml_md5.cmi : cc runtime/caml_md5.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_module.cmj : cc_cmi runtime/caml_module.ml | runtime/caml_array_extern.cmj runtime/caml_module.cmi runtime/caml_obj.cmj
 build runtime/caml_module.cmi : cc runtime/caml_module.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_primitive.cmj runtime/js.cmj
+build runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/js.cmj
 build runtime/caml_obj.cmi : cc runtime/caml_obj.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_oo.cmj : cc_cmi runtime/caml_oo.ml | runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/caml_exceptions.cmj runtime/caml_oo.cmi
+build runtime/caml_oo.cmj : cc_cmi runtime/caml_oo.ml | runtime/caml_array_extern.cmj runtime/caml_exceptions.cmj runtime/caml_oo.cmi
 build runtime/caml_oo.cmi : cc runtime/caml_oo.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_option.cmj : cc_cmi runtime/caml_option.ml | runtime/caml_option.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_option.cmi : cc runtime/caml_option.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -63,10 +63,10 @@ build runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc
 build runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj : cc runtime/caml_int32_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj : cc runtime/caml_int64_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/caml_option.cmj runtime/js.cmi runtime/js.cmj
+build runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runtime/caml_nativeint_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj : cc runtime/caml_oo_curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_oo.cmj runtime/curry.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
+build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
 build runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_gc.cmi runtime/caml_gc.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_oo.cmi runtime/caml_oo.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_primitive.cmi runtime/caml_primitive.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bytes_extern.cmi runtime/caml_bytes_extern.cmj runtime/caml_char.cmi runtime/caml_char.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj

jscomp/test/build.ninja

@@ -704,6 +704,7 @@ build test/tfloat_record_test.cmi test/tfloat_record_test.cmj : cc test/tfloat_r
 build test/ticker.cmi test/ticker.cmj : cc test/ticker.ml | $stdlib
 build test/to_string_test.cmi test/to_string_test.cmj : cc test/to_string_test.ml | test/mt.cmj $stdlib
 build test/topsort_test.cmi test/topsort_test.cmj : cc test/topsort_test.ml | $stdlib
+build test/tramp_fib.cmi test/tramp_fib.cmj : cc test/tramp_fib.ml | test/mt.cmj $stdlib
 build test/tscanf_test.cmi test/tscanf_test.cmj : cc test/tscanf_test.ml | test/mt.cmj test/mt_global.cmj test/testing.cmj $stdlib
 build test/tuple_alloc.cmi test/tuple_alloc.cmj : cc test/tuple_alloc.ml | $stdlib
 build test/typeof_test.cmi test/typeof_test.cmj : cc test/typeof_test.ml | test/mt.cmj $stdlib

jscomp/test/tramp_fib.js

@@ -0,0 +1,107 @@
+'use strict';
+
+var Mt = require("./mt.js");
+
+var suites = {
+  contents: /* [] */0
+};
+
+var test_id = {
+  contents: 0
+};
+
+function eq(loc, x, y) {
+  return Mt.eq_suites(test_id, suites, loc, x, y);
+}
+
+function fib(n, k) {
+  if (n === 0 || n === 1) {
+    return k(1);
+  } else {
+    return {
+            TAG: /* Suspend */1,
+            _0: (function () {
+                return fib(n - 1 | 0, (function (v0) {
+                              return fib(n - 2 | 0, (function (v1) {
+                                            return k(v0 + v1 | 0);
+                                          }));
+                            }));
+              })
+          };
+  }
+}
+
+var u = fib(10, (function (x) {
+        return {
+                TAG: /* Continue */0,
+                _0: x
+              };
+      }));
+
+function iter(_bounce) {
+  while(true) {
+    var bounce = _bounce;
+    if (!bounce.TAG) {
+      return bounce._0;
+    }
+    _bounce = bounce._0();
+    continue ;
+  };
+}
+
+function isEven(n) {
+  if (n !== 0) {
+    if (n !== 1) {
+      return {
+              TAG: /* Suspend */1,
+              _0: (function () {
+                  return isOdd(n - 1 | 0);
+                })
+            };
+    } else {
+      return {
+              TAG: /* Continue */0,
+              _0: false
+            };
+    }
+  } else {
+    return {
+            TAG: /* Continue */0,
+            _0: true
+          };
+  }
+}
+
+function isOdd(n) {
+  if (n !== 0) {
+    if (n !== 1) {
+      return isEven(n - 1 | 0);
+    } else {
+      return {
+              TAG: /* Continue */0,
+              _0: true
+            };
+    }
+  } else {
+    return {
+            TAG: /* Continue */0,
+            _0: false
+          };
+  }
+}
+
+eq("File \"tramp_fib.ml\", line 56, characters 6-13", iter(u), 89);
+
+eq("File \"tramp_fib.ml\", line 58, characters 6-13", iter(isEven(20000)), true);
+
+Mt.from_pair_suites("File \"tramp_fib.ml\", line 60, characters 23-30", suites.contents);
+
+exports.suites = suites;
+exports.test_id = test_id;
+exports.eq = eq;
+exports.fib = fib;
+exports.u = u;
+exports.iter = iter;
+exports.isEven = isEven;
+exports.isOdd = isOdd;
+/* u Not a pure module */

jscomp/test/tramp_fib.ml

@@ -0,0 +1,60 @@
+[@@@bs.config {flags = [|"-w";"a";"-bs-noassertfalse"|]}]
+
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc x y = Mt.eq_suites ~test_id ~suites loc x y 
+
+
+type 'a bounce = Continue of 'a | Suspend of (unit -> 'a bounce [@bs])
+(* https://eli.thegreenplace.net/2017/on-recursion-continuations-and-trampolines/ *)
+(* http://gallium.inria.fr/seminaires/transparents/20141027.Frederic.Bour.pdf *)
+(* http://www.usrsb.in/blog/blog/2012/08/12/bouncing-pythons-generators-with-a-trampoline/ *)
+(* http://glat.info/jscheck/tomrec.html *)
+let rec fib n k = 
+  match n with 
+  | 0 | 1 -> 
+    (* k (Continue 1) [@bs] *)
+    (* Suspend (fun [@bs]() -> k (Continue 1 ) [@bs]) *)
+    k 1 [@bs]
+  | _ ->
+    Suspend (fun [@bs] () ->
+      fib (n-1) (fun [@bs] v0 ->
+        fib (n-2) (fun [@bs] v1 ->
+          k (v0 + v1) [@bs] 
+        (* match v0,v1 with
+        | Continue v0, Continue v1 ->  *)
+          (* k (Continue (v0 + v1)) [@bs] *)
+          (* Suspend (fun [@bs]() -> k (Continue (v0 + v1)) [@bs]) *)
+        (* | _ -> assert false   *)
+          (* FIXME: this branch completly gone*)
+        )
+      )
+    ) 
+
+let u = fib 10 (fun [@bs] x -> Continue x)    
+
+
+let rec iter (bounce : 'a bounce) : 'a = 
+  match bounce with 
+  | Continue v -> v 
+  | Suspend f -> iter (f () [@bs])
+
+
+(* first it needs to be tailcall *)
+let rec isEven n = 
+  match n with 
+  | 0 -> Continue true
+  | 1 -> Continue false  
+  | _ -> Suspend (fun [@bs] () -> isOdd (n - 1))
+and isOdd n = 
+  match n with 
+  | 0 -> Continue false
+  | 1 -> Continue true
+  | _ -> 
+    isEven (n - 1)
+    (* Suspend (fun [@bs] () -> isEven (n - 1))       *)
+;; eq __LOC__ (iter u) 89  
+
+;; eq __LOC__  (isEven 20_000 |. iter )  true
+
+;; Mt.from_pair_suites __LOC__ !suites