Fix build and snapshot

Author: bobzhang

jscomp/stdlib-402/obj.ml

@@ -20,7 +20,7 @@ external obj : t -> 'a = "%identity"
 external magic : 'a -> 'b = "%identity"
 
 external is_int : t -> bool = "%obj_is_int"
-let [@inline always] is_block a = not (is_int a)
+let is_block a = not (is_int a)
 external tag : t -> int = "caml_obj_tag"
 external set_tag : t -> int -> unit = "caml_obj_set_tag"
 external size : t -> int = "%obj_size"

jscomp/test/.depend

@@ -223,6 +223,7 @@ for_side_effect_test.cmj : mt.cmj
 format_regression.cmj :
 format_test.cmj : mt.cmj
 fs_test.cmj : ../others/node.cmj mt.cmj ../runtime/js.cmj
+fun_pattern_match.cmj : ../runtime/js.cmj
 functor_app_test.cmj : mt.cmj functor_inst.cmj functor_def.cmj
 functor_def.cmj : ../runtime/js.cmj
 functor_ffi.cmj : ../runtime/js.cmj

jscomp/test/Makefile

@@ -266,6 +266,7 @@ OTHERS := test_literals a test_ari test_export2 test_internalOO test_obj_simple_
 	large_record_duplication_test\
 	unboxed_attribute_test\
 	406_primitive_test\
+	fun_pattern_match\
 	ocaml_typedtree_test
 # ocaml_typedtree_test is not cross version due to camlinternalFormat
 # bs_uncurry_test

jscomp/test/fun_pattern_match.js

@@ -0,0 +1,88 @@
+'use strict';
+
+var Curry = require("../../lib/js/curry.js");
+var Caml_primitive = require("../../lib/js/caml_primitive.js");
+var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
+
+function f(param, v) {
+  return ((((param[/* x0 */0] + param[/* x1 */1] | 0) + param[/* x2 */2] | 0) + param[/* x3 */3] | 0) + param[/* x4 */4] | 0) + v | 0;
+}
+
+function f2(param, param$1) {
+  return (((((param[/* x0 */0] + param[/* x1 */1] | 0) + param[/* x2 */2] | 0) + param[/* x3 */3] | 0) + param[/* x4 */4] | 0) + param$1[/* a */0] | 0) + param$1[/* b */1] | 0;
+}
+
+function f3(param, param$1) {
+  var lhs = param[/* rank */0];
+  var rhs = param$1[/* rank */0];
+  if (typeof lhs === "number") {
+    throw [
+          Caml_builtin_exceptions.assert_failure,
+          /* tuple */[
+            "fun_pattern_match.ml",
+            43,
+            9
+          ]
+        ];
+  } else if (typeof rhs === "number") {
+    throw [
+          Caml_builtin_exceptions.assert_failure,
+          /* tuple */[
+            "fun_pattern_match.ml",
+            43,
+            9
+          ]
+        ];
+  } else {
+    return Caml_primitive.caml_int_compare(lhs[0], rhs[0]);
+  }
+}
+
+function f4(param, param$1) {
+  var lhs = param[/* rank */0];
+  var rhs = param$1[/* rank */0];
+  if (typeof lhs === "number") {
+    throw [
+          Caml_builtin_exceptions.assert_failure,
+          /* tuple */[
+            "fun_pattern_match.ml",
+            51,
+            9
+          ]
+        ];
+  } else if (typeof rhs === "number") {
+    throw [
+          Caml_builtin_exceptions.assert_failure,
+          /* tuple */[
+            "fun_pattern_match.ml",
+            51,
+            9
+          ]
+        ];
+  } else {
+    return Caml_primitive.caml_int_compare(lhs[0], rhs[0]);
+  }
+}
+
+var x = /* `A */[
+  65,
+  r
+];
+
+function r(param) {
+  return x;
+}
+
+var match = r(/* () */0);
+
+var v = Curry._1(match[1], /* () */0);
+
+console.log(v);
+
+exports.f = f;
+exports.f2 = f2;
+exports.f3 = f3;
+exports.f4 = f4;
+exports.r = r;
+exports.v = v;
+/* match Not a pure module */

jscomp/test/fun_pattern_match.ml

@@ -0,0 +1,59 @@
+
+
+
+type u  = {x0 : int ; x1 : int ; x2 : int; x3 : int ; x4: int}
+
+
+let f {x0;x1;x2;x3;x4} v = 
+    x0 + x1 + x2 + x3 + x4 + v 
+
+
+type b = {a : int; b: int }
+let f2 {x0;x1;x2;x3;x4}  {a; b}= 
+    x0 + x1 + x2 + x3 + x4 + a + b  
+
+type binary_op = 
+  | PLUS 
+  | MINUS 
+
+type rank = 
+  | Uninitialized 
+  | Visited 
+  | Ranked of int 
+
+
+type binary_op_ticker = {
+  op : binary_op; 
+  rhs: ticker; 
+  lhs: ticker; 
+}
+
+and ticker_type = 
+  | Market 
+  | Binary_op of binary_op_ticker
+
+and ticker = {
+   mutable rank: rank;  
+}
+
+let f3  =     
+  (fun {rank = lhs; _} {rank = rhs} -> 
+  match lhs, rhs with
+  | Ranked x , Ranked y -> Pervasives.compare x y 
+  | _ -> assert false
+  ) 
+
+
+let f4  
+  {rank = lhs; _} {rank = rhs}  = 
+  match lhs, rhs with
+  | Ranked x , Ranked y -> Pervasives.compare x y 
+  | _ -> assert false
+     
+(* #995 test case *)
+let rec r = (let rec x = `A r and y = fun () -> x in y);;  
+
+let v = let (`A x) = r () in x ();;
+
+Js.log v 
+

jscomp/test/obj_magic_test.js

@@ -7,15 +7,15 @@ var Block = require("../../lib/js/block.js");
 var empty_backtrace = Block.__(Obj.abstract_tag, []);
 
 function is_block(x) {
-  return x.length !== undefined;
+  return typeof x !== "number";
 }
 
 var suites_000 = /* tuple */[
   "is_block_test1",
   (function (param) {
       return /* Eq */Block.__(0, [
                 false,
-                (3).length !== undefined
+                false
               ]);
     })
 ];
@@ -26,10 +26,10 @@ var suites_001 = /* :: */[
     (function (param) {
         return /* Eq */Block.__(0, [
                   true,
-                  /* :: */[
+                  typeof /* :: */[
                     3,
                     /* [] */0
-                  ].length !== undefined
+                  ] !== "number"
                 ]);
       })
   ],
@@ -39,7 +39,7 @@ var suites_001 = /* :: */[
       (function (param) {
           return /* Eq */Block.__(0, [
                     true,
-                    "x".length !== undefined
+                    true
                   ]);
         })
     ],
@@ -49,7 +49,7 @@ var suites_001 = /* :: */[
         (function (param) {
             return /* Eq */Block.__(0, [
                       false,
-                      (3.0).length !== undefined
+                      false
                     ]);
           })
       ],