merge exn primitive modules

Author: cometkim

jscomp/core/lam_compile_primitive.ml

@@ -78,8 +78,8 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
   | Pis_not_none -> Js_of_lam_option.is_not_none (Ext_list.singleton_exn args)
   | Pcreate_extension s -> E.make_exception s
   | Pwrap_exn ->
-      E.runtime_call Js_runtime_modules.caml_js_exceptions
-        "internalToOCamlException" args
+      E.runtime_call Js_runtime_modules.exceptions
+        "internalToException" args
   | Praw_js_code { code; code_info } -> E.raw_js_code code_info code
   (* FIXME: save one allocation
      trim can not be done before syntax checking

jscomp/ext/js_runtime_modules.ml

@@ -48,10 +48,8 @@ let option = "Primitive_option"
 
 let hash = "Primitive_hash"
 
-let deriving = "Runtime_deriving"
+let exceptions = "Primitive_exceptions"
 
-let exceptions = "Caml_exceptions"
+let deriving = "Runtime_deriving"
 
 let curry = "Curry"
-
-let caml_js_exceptions = "Caml_js_exceptions"

jscomp/runtime/caml_exceptions.resi

@@ -1,4 +1,4 @@
-/* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+/* 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
@@ -26,39 +26,8 @@ module Obj = Primitive_object_extern
 
 type t = {@as("RE_EXN_ID") id: string}
 
-module Dict = {
-  @obj
-  external empty: unit => dict<'a> = ""
-
-  @set_index
-  external set: (dict<'a>, string, 'a) => unit = ""
-
-  @get_index
-  /**
-    It's the same as `Js.Dict.get` but it doesn't have runtime overhead to check if the key exists.
-   */
-  external dangerouslyGetNonOption: (dict<'a>, string) => option<'a> = ""
-}
-
-/**
-  Needs to have unique extension ids when used with functors.
-  See discussion in https://github.com/rescript-lang/rescript-compiler/pull/6570
-*/
-let idMap = Dict.empty()
-
-let create = (str: string): string => {
-  switch idMap->Dict.dangerouslyGetNonOption(str) {
-  | Some(v) => {
-      let id = v + 1
-      idMap->Dict.set(str, id)
-      str ++ ("/" ++ (Obj.magic((id: int)): string))
-    }
-  | None => {
-      idMap->Dict.set(str, 1)
-      str
-    }
-  }
-}
+exception Error = JsError
+type js_error = {cause: exn}
 
 /**
    This function should never throw
@@ -91,12 +60,54 @@ let create = (str: string): string => {
 
    This is not a problem in `try .. with` since the logic above is not expressible, see more design in [destruct_exn.md]
 */
-let is_extension = (type a, e: a): bool =>
+let isExtension = (type a, e: a): bool =>
   if Js.testAny(e) {
     false
   } else {
     Js.typeof((Obj.magic(e): t).id) == "string"
   }
 
-/** FIXME: remove the trailing `/` */
-let exn_slot_name = (x: t): string => x.id
+/**   
+   This function has to be in this module Since 
+   [Error] is defined here 
+*/
+let internalToException = (e: unknown) =>
+  if isExtension(e) {
+    (Obj.magic(e): exn)
+  } else {
+    JsError(e)
+  }
+
+module Dict = {
+  @obj
+  external empty: unit => dict<'a> = ""
+
+  @set_index
+  external set: (dict<'a>, string, 'a) => unit = ""
+
+  @get_index
+  /**
+    It's the same as `Js.Dict.get` but it doesn't have runtime overhead to check if the key exists.
+   */
+  external dangerouslyGetNonOption: (dict<'a>, string) => option<'a> = ""
+}
+
+/**
+  Needs to have unique extension ids when used with functors.
+  See discussion in https://github.com/rescript-lang/rescript-compiler/pull/6570
+*/
+let idMap = Dict.empty()
+
+let create = (str: string): string => {
+  switch idMap->Dict.dangerouslyGetNonOption(str) {
+  | Some(v) => {
+      let id = v + 1
+      idMap->Dict.set(str, id)
+      str ++ ("/" ++ (Obj.magic((id: int)): string))
+    }
+  | None => {
+      idMap->Dict.set(str, 1)
+      str
+    }
+  }
+}

jscomp/runtime/caml_js_exceptions.res

@@ -0,0 +1,7 @@
+exception Error = JsError
+type js_error = {cause: exn}
+
+// TODO: remove legacy exn representation
+type t = {@as("RE_EXN_ID") id: string}
+let create: string => string
+let internalToException: unknown => exn

jscomp/runtime/caml_exceptions.res renamed to jscomp/runtime/primitive_exceptions.res

@@ -13,21 +13,20 @@ o runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.resi
     bsc_flags = -nostdlib -nopervasives
 o runtime/js.cmj runtime/js.cmi : cc runtime/js.res
     bsc_flags = $bsc_no_open_flags
-o runtime/caml_exceptions.cmj : cc_cmi runtime/caml_exceptions.res | runtime/caml_exceptions.cmi runtime/obj.cmj runtime/primitive_object_extern.cmj
-o runtime/caml_exceptions.cmi : cc runtime/caml_exceptions.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/lazy.cmj : cc_cmi runtime/lazy.res | runtime/lazy.cmi runtime/primitive_lazy.cmj
 o runtime/lazy.cmi : cc runtime/lazy.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
+o runtime/primitive_exceptions.cmj : cc_cmi runtime/primitive_exceptions.res | runtime/obj.cmj runtime/primitive_exceptions.cmi runtime/primitive_object_extern.cmj
+o runtime/primitive_exceptions.cmi : cc runtime/primitive_exceptions.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/primitive_hash.cmj : cc_cmi runtime/primitive_hash.res | runtime/obj.cmj runtime/primitive_hash.cmi runtime/primitive_object_extern.cmj
 o runtime/primitive_hash.cmi : cc runtime/primitive_hash.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_object.cmi
-o runtime/primitive_lazy.cmj : cc_cmi runtime/primitive_lazy.res | runtime/caml_exceptions.cmj runtime/primitive_lazy.cmi
+o runtime/primitive_lazy.cmj : cc_cmi runtime/primitive_lazy.res | runtime/primitive_exceptions.cmj runtime/primitive_lazy.cmi
 o runtime/primitive_lazy.cmi : cc runtime/primitive_lazy.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/primitive_module.cmj : cc_cmi runtime/primitive_module.res | runtime/lazy.cmj runtime/obj.cmj runtime/primitive_module.cmi runtime/primitive_object_extern.cmj
 o runtime/primitive_module.cmi : cc runtime/primitive_module.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_object.cmi
 o runtime/primitive_object.cmj : cc_cmi runtime/primitive_object.res | runtime/primitive_bool.cmj runtime/primitive_float.cmj runtime/primitive_int.cmj runtime/primitive_object.cmi runtime/primitive_object_extern.cmj runtime/primitive_option.cmj runtime/primitive_string.cmj
 o runtime/primitive_object.cmi : cc runtime/primitive_object.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_object_extern.cmj
 o runtime/primitive_option.cmj : cc_cmi runtime/primitive_option.res | runtime/primitive_object_extern.cmj runtime/primitive_option.cmi
 o runtime/primitive_option.cmi : cc runtime/primitive_option.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_object_extern.cmj
-o runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.res | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/js.cmi runtime/js.cmj runtime/primitive_object_extern.cmj
 o runtime/char.cmi runtime/char.cmj : cc runtime/char.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/obj.cmj runtime/primitive_object_extern.cmj
 o runtime/obj.cmi runtime/obj.cmj : cc runtime/obj.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_object_extern.cmj
@@ -43,4 +42,4 @@ o runtime/primitive_promise.cmi runtime/primitive_promise.cmj : cc runtime/primi
 o runtime/primitive_string.cmi runtime/primitive_string.cmj : cc runtime/primitive_string.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_string_extern.cmj
 o runtime/primitive_string_extern.cmi runtime/primitive_string_extern.cmj : cc runtime/primitive_string_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 o runtime/string.cmi runtime/string.cmj : cc runtime/string.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj runtime/primitive_string.cmj runtime/primitive_string_extern.cmj
-o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/lazy.cmi runtime/lazy.cmj runtime/primitive_hash.cmi runtime/primitive_hash.cmj runtime/primitive_lazy.cmi runtime/primitive_lazy.cmj runtime/primitive_module.cmi runtime/primitive_module.cmj runtime/primitive_object.cmi runtime/primitive_object.cmj runtime/primitive_option.cmi runtime/primitive_option.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/char.cmi runtime/char.cmj runtime/curry.cmi runtime/curry.cmj runtime/obj.cmi runtime/obj.cmj runtime/primitive_array.cmi runtime/primitive_array.cmj runtime/primitive_bigint.cmi runtime/primitive_bigint.cmj runtime/primitive_bool.cmi runtime/primitive_bool.cmj runtime/primitive_char_extern.cmi runtime/primitive_char_extern.cmj runtime/primitive_dict.cmi runtime/primitive_dict.cmj runtime/primitive_float.cmi runtime/primitive_float.cmj runtime/primitive_int.cmi runtime/primitive_int.cmj runtime/primitive_object_extern.cmi runtime/primitive_object_extern.cmj runtime/primitive_promise.cmi runtime/primitive_promise.cmj runtime/primitive_string.cmi runtime/primitive_string.cmj runtime/primitive_string_extern.cmi runtime/primitive_string_extern.cmj runtime/string.cmi runtime/string.cmj
+o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/lazy.cmi runtime/lazy.cmj runtime/primitive_exceptions.cmi runtime/primitive_exceptions.cmj runtime/primitive_hash.cmi runtime/primitive_hash.cmj runtime/primitive_lazy.cmi runtime/primitive_lazy.cmj runtime/primitive_module.cmi runtime/primitive_module.cmj runtime/primitive_object.cmi runtime/primitive_object.cmj runtime/primitive_option.cmi runtime/primitive_option.cmj runtime/char.cmi runtime/char.cmj runtime/curry.cmi runtime/curry.cmj runtime/obj.cmi runtime/obj.cmj runtime/primitive_array.cmi runtime/primitive_array.cmj runtime/primitive_bigint.cmi runtime/primitive_bigint.cmj runtime/primitive_bool.cmi runtime/primitive_bool.cmj runtime/primitive_char_extern.cmi runtime/primitive_char_extern.cmj runtime/primitive_dict.cmi runtime/primitive_dict.cmj runtime/primitive_float.cmi runtime/primitive_float.cmj runtime/primitive_int.cmi runtime/primitive_int.cmj runtime/primitive_object_extern.cmi runtime/primitive_object_extern.cmj runtime/primitive_promise.cmi runtime/primitive_promise.cmj runtime/primitive_string.cmi runtime/primitive_string.cmj runtime/primitive_string_extern.cmi runtime/primitive_string_extern.cmj runtime/string.cmi runtime/string.cmj