hide caml_exceptions from user completely

bobzhang · bobzhang · commit 97d40c71c15c · 2018-11-23T19:52:57.000+08:00
diff --git a/jscomp/core/lam_dispatch_primitive.ml b/jscomp/core/lam_dispatch_primitive.ml
@@ -594,6 +594,8 @@ let translate loc (prim_name : string)
       ->
       Js_of_lam_exception.caml_fresh_oo_id args   
 #end
+    | "caml_is_extension" ->
+      call Js_runtime_modules.exceptions
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
       Js_of_lam_exception.caml_set_oo_id args 
diff --git a/jscomp/runtime/caml_exceptions.ml b/jscomp/runtime/caml_exceptions.ml
@@ -101,7 +101,7 @@ let create (str : string) : Caml_builtin_exceptions.exception_block =
 
    This is not a problem in `try .. with` since the logic above is not expressible, see more design in [destruct_exn.md]
 *)
-let isCamlExceptionOrOpenVariant e = 
+let caml_is_extension e = 
   if  Obj.magic e = Js.undefined then false 
   else 
     Obj.tag (Obj.repr e) = object_tag  (* nullary exception *)
diff --git a/jscomp/runtime/caml_exceptions.mli b/jscomp/runtime/caml_exceptions.mli
@@ -36,4 +36,4 @@ val caml_fresh_oo_id :
 
 val create : string -> Caml_builtin_exceptions.exception_block
 (* val makeExtension : string -> Caml_builtin_exceptions.exception_block *)
-val isCamlExceptionOrOpenVariant : 'a -> bool
+val caml_is_extension : 'a -> bool
diff --git a/jscomp/runtime/caml_js_exceptions.ml b/jscomp/runtime/caml_js_exceptions.ml
@@ -14,6 +14,6 @@ exception Error of t
    ]}
 *)
 let internalToOCamlException (e : Obj.t) =
-  if Caml_exceptions.isCamlExceptionOrOpenVariant e  then
+  if Caml_exceptions.caml_is_extension e  then
     (Obj.magic e  : exn)
   else Error (Obj.magic (e : Obj.t) : t) 
diff --git a/jscomp/runtime/js_exn.ml b/jscomp/runtime/js_exn.ml
@@ -37,7 +37,9 @@ external fileName : t -> string option = ""
 
 type error
 external makeError : string -> error = "Error" [@@bs.new]
-
+external isCamlExceptionOrOpenVariant : 
+  'a -> bool = "caml_is_extension"
+  
 let raiseError str = 
   raise (Obj.magic (makeError str : error) : exn)
 
diff --git a/jscomp/runtime/js_exn.mli b/jscomp/runtime/js_exn.mli
@@ -38,6 +38,11 @@ external fileName : t -> string option = ""
   [@@bs.get] [@@bs.return undefined_to_opt] 
 
 
+external isCamlExceptionOrOpenVariant:
+  'a -> bool = "caml_is_extension"
+(** internal use only *)
+
+
 (** Raise Js exception Error object with stacktrace *)
 val raiseError : string -> 'a
 val raiseEvalError : string -> 'a
diff --git a/jscomp/syntax/ast_util.ml b/jscomp/syntax/ast_util.ml
@@ -646,7 +646,8 @@ let record_as_js_object
 
 
 let isCamlExceptionOrOpenVariant : Longident.t = 
-  Ldot (Lident "Caml_exceptions","isCamlExceptionOrOpenVariant")
+  Ldot (Ldot (Lident "Js","Exn"), "isCamlExceptionOrOpenVariant")
+
   
 let obj_magic : Longident.t = 
   Ldot (Lident "Obj", "magic")
diff --git a/jscomp/test/.depend b/jscomp/test/.depend
@@ -190,7 +190,7 @@ exception_rebind_test.cmj : exception_def.cmj
 exception_rebound_err_test.cmj : mt.cmj ../runtime/js.cmj
 exception_repr_test.cmj : mt.cmj exception_def.cmj
 exception_value_test.cmj : ../runtime/js.cmj
-exn_error_pattern.cmj :
+exn_error_pattern.cmj : mt.cmj ../runtime/js.cmj
 export_keyword.cmj :
 ext_array_test.cmj :
 ext_bytes_test.cmj :
diff --git a/jscomp/test/exn_error_pattern.js b/jscomp/test/exn_error_pattern.js
@@ -1,10 +1,12 @@
 'use strict';
 
+var Mt = require("./mt.js");
 var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
+var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
 
 function f(match) {
-  if (Caml_exceptions.isCamlExceptionOrOpenVariant(match)) {
+  if (Caml_exceptions.caml_is_extension(match)) {
     if (match === Caml_builtin_exceptions.not_found) {
       return 0;
     } else if (match[0] === Caml_builtin_exceptions.invalid_argument || match === Caml_builtin_exceptions.stack_overflow) {
@@ -23,7 +25,7 @@ var A = Caml_exceptions.create("Exn_error_pattern.A");
 var B = Caml_exceptions.create("Exn_error_pattern.B");
 
 function g(match) {
-  if (Caml_exceptions.isCamlExceptionOrOpenVariant(match)) {
+  if (Caml_exceptions.caml_is_extension(match)) {
     if (match === Caml_builtin_exceptions.not_found || match[0] === Caml_builtin_exceptions.invalid_argument) {
       return 0;
     } else if (match[0] === Caml_builtin_exceptions.sys_error) {
@@ -37,8 +39,46 @@ function g(match) {
   
 }
 
+var suites = /* record */[/* contents : [] */0];
+
+var test_id = /* record */[/* contents */0];
+
+function eq(loc, x, y) {
+  return Mt.eq_suites(test_id, suites, loc, x, y);
+}
+
+eq("File \"exn_error_pattern.ml\", line 34, characters 5-12", f(Caml_builtin_exceptions.not_found), 0);
+
+eq("File \"exn_error_pattern.ml\", line 35, characters 5-12", f([
+          Caml_builtin_exceptions.invalid_argument,
+          ""
+        ]), 1);
+
+eq("File \"exn_error_pattern.ml\", line 36, characters 5-12", f(Caml_builtin_exceptions.stack_overflow), 1);
+
+eq("File \"exn_error_pattern.ml\", line 37, characters 5-12", f([
+          Caml_builtin_exceptions.sys_error,
+          ""
+        ]), 2);
+
+var tmp;
+
+try {
+  throw new Error("x");
+}
+catch (raw_e){
+  tmp = Caml_js_exceptions.internalToOCamlException(raw_e);
+}
+
+eq("File \"exn_error_pattern.ml\", line 38, characters 5-12", f(tmp), undefined);
+
+Mt.from_pair_suites("exn_error_pattern.ml", suites[0]);
+
 exports.f = f;
 exports.A = A;
 exports.B = B;
 exports.g = g;
-/* No side effect */
+exports.suites = suites;
+exports.test_id = test_id;
+exports.eq = eq;
+/*  Not a pure module */
diff --git a/jscomp/test/exn_error_pattern.ml b/jscomp/test/exn_error_pattern.ml
@@ -26,7 +26,19 @@ let g = function [@bs.open]
   | Sys_error _ -> 2
   | (A i | B i) -> i 
 
-
+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 
+
+let () = 
+  eq __LOC__ (f Not_found) (Some 0);
+  eq __LOC__ (f (Invalid_argument "")) (Some 1);
+  eq __LOC__ (f Stack_overflow) (Some 1);
+  eq __LOC__ (f (Sys_error "")) (Some 2);
+  eq __LOC__ (f (try Js.Exn.raiseError "x" with e -> e)) None
+
+let () = 
+  Mt.from_pair_suites __FILE__ !suites
 (* type v = A  *)
 (* let f = function [@bs.open] *)
 (*   | A -> 1  *)
diff --git a/jscomp/test/js_promise_basic_test.js b/jscomp/test/js_promise_basic_test.js
@@ -70,7 +70,7 @@ function andThenTest(param) {
 var h = Promise.resolve(/* () */0);
 
 function assertIsNotFound(x) {
-  var match = Caml_exceptions.isCamlExceptionOrOpenVariant(x) && x === Caml_builtin_exceptions.not_found ? 0 : undefined;
+  var match = Caml_exceptions.caml_is_extension(x) && x === Caml_builtin_exceptions.not_found ? 0 : undefined;
   if (match !== undefined) {
     return h;
   } else {
@@ -131,7 +131,7 @@ function orElseRejectedRejectTest(param) {
   return p.catch((function (param) {
                     return Promise.reject(Caml_builtin_exceptions.stack_overflow);
                   })).then(fail).catch((function (error) {
-                var match = Caml_exceptions.isCamlExceptionOrOpenVariant(error) && error === Caml_builtin_exceptions.stack_overflow ? 0 : undefined;
+                var match = Caml_exceptions.caml_is_extension(error) && error === Caml_builtin_exceptions.stack_overflow ? 0 : undefined;
                 if (match !== undefined) {
                   return h;
                 } else {
diff --git a/jscomp/test/promise_catch_test.js b/jscomp/test/promise_catch_test.js
@@ -49,7 +49,7 @@ function handler(e) {
 }
 
 function myHandler(match) {
-  if (Caml_exceptions.isCamlExceptionOrOpenVariant(match)) {
+  if (Caml_exceptions.caml_is_extension(match)) {
     if (match === Caml_builtin_exceptions.not_found) {
       return 1;
     } else if (match[0] === Js_exn.$$Error) {
diff --git a/lib/bsdep.ml b/lib/bsdep.ml
@@ -36098,7 +36098,8 @@ let record_as_js_object
 
 
 let isCamlExceptionOrOpenVariant : Longident.t = 
-  Ldot (Lident "Caml_exceptions","isCamlExceptionOrOpenVariant")
+  Ldot (Ldot (Lident "Js","Exn"), "isCamlExceptionOrOpenVariant")
+
   
 let obj_magic : Longident.t = 
   Ldot (Lident "Obj", "magic")
diff --git a/lib/bsppx.ml b/lib/bsppx.ml
@@ -18099,7 +18099,8 @@ let record_as_js_object
 
 
 let isCamlExceptionOrOpenVariant : Longident.t = 
-  Ldot (Lident "Caml_exceptions","isCamlExceptionOrOpenVariant")
+  Ldot (Ldot (Lident "Js","Exn"), "isCamlExceptionOrOpenVariant")
+
   
 let obj_magic : Longident.t = 
   Ldot (Lident "Obj", "magic")
diff --git a/lib/js/caml_exceptions.js b/lib/js/caml_exceptions.js
@@ -24,7 +24,7 @@ function create(str) {
   return v;
 }
 
-function isCamlExceptionOrOpenVariant(e) {
+function caml_is_extension(e) {
   if (e === undefined) {
     return false;
   } else if (e.tag === 248) {
@@ -42,5 +42,5 @@ function isCamlExceptionOrOpenVariant(e) {
 exports.caml_set_oo_id = caml_set_oo_id;
 exports.caml_fresh_oo_id = caml_fresh_oo_id;
 exports.create = create;
-exports.isCamlExceptionOrOpenVariant = isCamlExceptionOrOpenVariant;
+exports.caml_is_extension = caml_is_extension;
 /* No side effect */
diff --git a/lib/js/caml_js_exceptions.js b/lib/js/caml_js_exceptions.js
@@ -5,7 +5,7 @@ var Caml_exceptions = require("./caml_exceptions.js");
 var $$Error = Caml_exceptions.create("Caml_js_exceptions.Error");
 
 function internalToOCamlException(e) {
-  if (Caml_exceptions.isCamlExceptionOrOpenVariant(e)) {
+  if (Caml_exceptions.caml_is_extension(e)) {
     return e;
   } else {
     return [
diff --git a/lib/whole_compiler.ml b/lib/whole_compiler.ml
@@ -95300,6 +95300,8 @@ let translate loc (prim_name : string)
         like normal one to set the identifier *)
 
 
+    | "caml_is_extension" ->
+      call Js_runtime_modules.exceptions
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
       Js_of_lam_exception.caml_set_oo_id args 
@@ -107129,7 +107131,8 @@ let record_as_js_object
 
 
 let isCamlExceptionOrOpenVariant : Longident.t = 
-  Ldot (Lident "Caml_exceptions","isCamlExceptionOrOpenVariant")
+  Ldot (Ldot (Lident "Js","Exn"), "isCamlExceptionOrOpenVariant")
+
   
 let obj_magic : Longident.t = 
   Ldot (Lident "Obj", "magic")

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function handler(e) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`function myHandler(match) {`
`52`		`- if (Caml_exceptions.isCamlExceptionOrOpenVariant(match)) {`
	`52`	`+ if (Caml_exceptions.caml_is_extension(match)) {`
`53`	`53`	`if (match === Caml_builtin_exceptions.not_found) {`
`54`	`54`	`return 1;`
`55`	`55`	`} else if (match[0] === Js_exn.$$Error) {`