use JsError to encode Js.Exn

Author: bobzhang

jscomp/others/js_exn.ml

@@ -23,10 +23,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type t = Caml_js_exceptions.t 
+type t = unknown 
 
 [@@@warning "-38"] (* unused extension constructor*)
-exception Error = Caml_js_exceptions.Error
+exception Error = JsError
 
 external asJsExn : exn -> t option = 
   "?as_js_exn"
@@ -45,8 +45,7 @@ external makeError : string -> error = "Error" [@@bs.new]
 external isCamlExceptionOrOpenVariant : 
   'a -> bool = "?is_extension"
 
-let anyToExnInternal x = 
-    Caml_js_exceptions.internalToOCamlException (Obj.repr x)
+external anyToExnInternal : 'a -> exn = "#wrap_exn"
 
 
 let raiseError str = 

jscomp/others/js_exn.mli

@@ -43,7 +43,7 @@ external isCamlExceptionOrOpenVariant:
   'a -> bool = "?is_extension"
 (** internal use only *)
 
-val anyToExnInternal: 'a -> exn
+external anyToExnInternal : 'a -> exn = "#wrap_exn"
 (**
   `anyToExnInternal obj` will take any value `obj` and wrap it
   in a Js.Exn.Error if given value is not an exn already. If

jscomp/runtime/caml_js_exceptions.ml

@@ -1,19 +1,40 @@
+(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type  t = 
-  | Any : 'a ->  t [@@unboxed]
 
-exception Error of  t 
+exception Error = JsError
 
 
 (**   
    This function has to be in this module Since 
    [Error] is defined here 
 *)
-let internalToOCamlException (e : Obj.t) =
+let internalToOCamlException (e : unknown) =
   if Caml_exceptions.is_extension e  then
     (Obj.magic e  : exn)
-  else Error (Any e)
+  else JsError ( e)
 
 let as_js_exn exn =   
   match exn with