feat: changing runtime representation of extension and exceptions

Author: diogomqbm

jscomp/runtime/caml_exceptions.res

@@ -22,6 +22,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+module Map = {
+  type t<'k, 'v>
+  
+  @new external make: unit => t<'k, 'v> = "Map"
+
+  @send external set: (t<'k, 'v>, 'k, 'v) => unit = "set"
+
+  @send external get: (t<'k, 'v>, 'k) => option<'v> = "get"
+}
+
 type t = {@as("RE_EXN_ID") id: string}
 
 /**
@@ -31,11 +41,23 @@ type t = {@as("RE_EXN_ID") id: string}
    This can be inlined as 
    {[ a = caml_set_oo_id([248,"string", caml_oo_last_id++]) ]}
 */
-let id = ref(0)
+let idMap: Map.t<string, int> = Map.make()
 
 let create = (str: string): string => {
-  id.contents = id.contents + 1
-  str ++ ("/" ++ (Obj.magic((id.contents: int)): string))
+  let id = switch idMap->Map.get(str) {
+    | Some(v) => {
+      let id = v + 1
+      idMap->Map.set(str, id)
+      id
+    }
+    | None => {
+      let id = 1
+      idMap->Map.set(str, id)
+      id
+    }
+  }
+
+  str ++ ("/" ++ (Obj.magic((id: int)): string))
 }
 
 /**

lib/es6/caml_exceptions.js

@@ -1,13 +1,22 @@
 
 
 
-var id = {
-  contents: 0
-};
+var $$Map = {};
+
+var idMap = new Map();
 
 function create(str) {
-  id.contents = id.contents + 1 | 0;
-  return str + ("/" + id.contents);
+  var v = idMap.get(str);
+  var id;
+  if (v !== undefined) {
+    var id$1 = v + 1 | 0;
+    idMap.set(str, id$1);
+    id = id$1;
+  } else {
+    idMap.set(str, 1);
+    id = 1;
+  }
+  return str + ("/" + id);
 }
 
 function is_extension(e) {
@@ -23,9 +32,10 @@ function exn_slot_name(x) {
 }
 
 export {
-  id ,
+  $$Map ,
+  idMap ,
   create ,
   is_extension ,
   exn_slot_name ,
 }
-/* No side effect */
+/* idMap Not a pure module */

lib/es6/caml_js_exceptions.js

@@ -28,4 +28,4 @@ export {
   internalToOCamlException ,
   as_js_exn ,
 }
-/* No side effect */
+/* Caml_exceptions Not a pure module */

lib/js/caml_exceptions.js

@@ -1,13 +1,22 @@
 'use strict';
 
 
-var id = {
-  contents: 0
-};
+var $$Map = {};
+
+var idMap = new Map();
 
 function create(str) {
-  id.contents = id.contents + 1 | 0;
-  return str + ("/" + id.contents);
+  var v = idMap.get(str);
+  var id;
+  if (v !== undefined) {
+    var id$1 = v + 1 | 0;
+    idMap.set(str, id$1);
+    id = id$1;
+  } else {
+    idMap.set(str, 1);
+    id = 1;
+  }
+  return str + ("/" + id);
 }
 
 function is_extension(e) {
@@ -22,8 +31,9 @@ function exn_slot_name(x) {
   return x.RE_EXN_ID;
 }
 
-exports.id = id;
+exports.$$Map = $$Map;
+exports.idMap = idMap;
 exports.create = create;
 exports.is_extension = is_extension;
 exports.exn_slot_name = exn_slot_name;
-/* No side effect */
+/* idMap Not a pure module */

lib/js/caml_js_exceptions.js

@@ -26,4 +26,4 @@ function as_js_exn(exn) {
 exports.$$Error = $$Error;
 exports.internalToOCamlException = internalToOCamlException;
 exports.as_js_exn = as_js_exn;
-/* No side effect */
+/* Caml_exceptions Not a pure module */