snapshot changes

Author: bobzhang

lib/4.06.1/unstable/js_compiler.ml

@@ -110723,8 +110723,6 @@ module Js_of_lam_exception : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val caml_set_oo_id : 
-  J.expression list -> J.expression
 
 
 val make : J.expression  -> J.expression
@@ -110778,10 +110776,6 @@ let make exception_str  : J.expression =
 
 
 
-(* TODO: only used in camlinternalOO, split it off as a separate module? *)
-let caml_set_oo_id args = 
-   E.runtime_call Js_runtime_modules.exceptions "caml_set_oo_id" args 
-    
 
 end
 module Lam_dispatch_primitive : sig 
@@ -111417,7 +111411,7 @@ let translate loc (prim_name : string)
       call Js_runtime_modules.caml_js_exceptions  
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
-      Js_of_lam_exception.caml_set_oo_id args 
+      call Js_runtime_modules.oo
 
     | "caml_sys_get_argv" 
     (** TODO: refine

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -110723,8 +110723,6 @@ module Js_of_lam_exception : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val caml_set_oo_id : 
-  J.expression list -> J.expression
 
 
 val make : J.expression  -> J.expression
@@ -110778,10 +110776,6 @@ let make exception_str  : J.expression =
 
 
 
-(* TODO: only used in camlinternalOO, split it off as a separate module? *)
-let caml_set_oo_id args = 
-   E.runtime_call Js_runtime_modules.exceptions "caml_set_oo_id" args 
-    
 
 end
 module Lam_dispatch_primitive : sig 
@@ -111417,7 +111411,7 @@ let translate loc (prim_name : string)
       call Js_runtime_modules.caml_js_exceptions  
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
-      Js_of_lam_exception.caml_set_oo_id args 
+      call Js_runtime_modules.oo
 
     | "caml_sys_get_argv" 
     (** TODO: refine

lib/4.06.1/whole_compiler.ml

@@ -393312,8 +393312,6 @@ module Js_of_lam_exception : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val caml_set_oo_id : 
-  J.expression list -> J.expression
 
 
 val make : J.expression  -> J.expression
@@ -393367,10 +393365,6 @@ let make exception_str  : J.expression =
 
 
 
-(* TODO: only used in camlinternalOO, split it off as a separate module? *)
-let caml_set_oo_id args = 
-   E.runtime_call Js_runtime_modules.exceptions "caml_set_oo_id" args 
-    
 
 end
 module Lam_dispatch_primitive : sig 
@@ -394006,7 +394000,7 @@ let translate loc (prim_name : string)
       call Js_runtime_modules.caml_js_exceptions  
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
-      Js_of_lam_exception.caml_set_oo_id args 
+      call Js_runtime_modules.oo
 
     | "caml_sys_get_argv" 
     (** TODO: refine

lib/es6/caml_exceptions.js

@@ -5,12 +5,6 @@ var id = {
   contents: 0
 };
 
-function caml_set_oo_id(b) {
-  b[1] = id.contents;
-  id.contents = id.contents + 1 | 0;
-  return b;
-}
-
 function create(str) {
   id.contents = id.contents + 1 | 0;
   return str + ("/" + id.contents);
@@ -29,7 +23,7 @@ function caml_exn_slot_name(x) {
 }
 
 export {
-  caml_set_oo_id ,
+  id ,
   create ,
   caml_is_extension ,
   caml_exn_slot_name ,

lib/es6/caml_hash.js

@@ -62,35 +62,21 @@ function caml_hash(count, _limit, seed, obj) {
     } else if (typeof obj$1 === "string") {
       hash = Caml_hash_primitive.caml_hash_mix_string(hash, obj$1);
       num = num - 1 | 0;
-    } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined") {
-      if (typeof obj$1 === "symbol") {
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: /* tuple */[
-                "caml_hash.ml",
-                128,
-                8
-              ],
-              Error: new Error()
-            };
-      }
-      if (typeof obj$1 !== "function") {
-        var size = obj$1.length;
-        if (size !== undefined) {
-          var obj_tag = obj$1.tag | 0;
-          var tag = (size << 10) | obj_tag;
-          if (tag === 248) {
-            hash = Caml_hash_primitive.caml_hash_mix_int(hash, obj$1[1]);
-          } else {
-            hash = Caml_hash_primitive.caml_hash_mix_int(hash, tag);
-            var v = size - 1 | 0;
-            var block = v < num ? v : num;
-            for(var i = 0; i <= block; ++i){
-              push_back(queue, obj$1[i]);
-            }
+    } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined" && typeof obj$1 !== "symbol" && typeof obj$1 !== "function") {
+      var size = obj$1.length;
+      if (size !== undefined) {
+        var obj_tag = obj$1.tag | 0;
+        var tag = (size << 10) | obj_tag;
+        if (tag === 248) {
+          hash = Caml_hash_primitive.caml_hash_mix_int(hash, obj$1[1]);
+        } else {
+          hash = Caml_hash_primitive.caml_hash_mix_int(hash, tag);
+          var v = size - 1 | 0;
+          var block = v < num ? v : num;
+          for(var i = 0; i <= block; ++i){
+            push_back(queue, obj$1[i]);
           }
         }
-        
       }
 
     }

lib/es6/caml_oo.js

@@ -1,9 +1,16 @@
 
 
 import * as Caml_array from "./caml_array.js";
+import * as Caml_exceptions from "./caml_exceptions.js";
 
 var caml_methods_cache = Caml_array.caml_make_vect(1000, 0);
 
+function caml_set_oo_id(b) {
+  b[1] = Caml_exceptions.id.contents;
+  Caml_exceptions.id.contents = Caml_exceptions.id.contents + 1 | 0;
+  return b;
+}
+
 function caml_get_public_method(obj, tag, cacheid) {
   var meths = obj[0];
   var offs = caml_methods_cache[cacheid];
@@ -18,7 +25,7 @@ function caml_get_public_method(obj, tag, cacheid) {
               RE_EXN_ID: "Assert_failure",
               _1: /* tuple */[
                 "caml_oo.ml",
-                62,
+                80,
                 20
               ],
               Error: new Error()
@@ -37,6 +44,7 @@ function caml_get_public_method(obj, tag, cacheid) {
 
 export {
   caml_get_public_method ,
+  caml_set_oo_id ,
 
 }
 /* No side effect */

lib/es6/camlinternalOO.js

@@ -9,11 +9,10 @@ import * as Caml_array from "./caml_array.js";
 import * as Belt_MapInt from "./belt_MapInt.js";
 import * as Caml_string from "./caml_string.js";
 import * as Belt_MapString from "./belt_MapString.js";
-import * as Caml_exceptions from "./caml_exceptions.js";
 import * as Caml_js_exceptions from "./caml_js_exceptions.js";
 
 function copy(o) {
-  return Caml_exceptions.caml_set_oo_id(Caml_obj.caml_obj_dup(o));
+  return Caml_oo.caml_set_oo_id(Caml_obj.caml_obj_dup(o));
 }
 
 var params = {
@@ -366,7 +365,7 @@ function make_class_store(pub_meths, class_init, init_table) {
 function create_object(table) {
   var obj = Caml_obj.caml_obj_block(248, table.size);
   obj[0] = table.methods;
-  return Caml_exceptions.caml_set_oo_id(obj);
+  return Caml_oo.caml_set_oo_id(obj);
 }
 
 function create_object_opt(obj_0, table) {
@@ -375,7 +374,7 @@ function create_object_opt(obj_0, table) {
   }
   var obj = Caml_obj.caml_obj_block(248, table.size);
   obj[0] = table.methods;
-  return Caml_exceptions.caml_set_oo_id(obj);
+  return Caml_oo.caml_set_oo_id(obj);
 }
 
 function iter_f(obj, _param) {

lib/js/caml_exceptions.js

@@ -5,12 +5,6 @@ var id = {
   contents: 0
 };
 
-function caml_set_oo_id(b) {
-  b[1] = id.contents;
-  id.contents = id.contents + 1 | 0;
-  return b;
-}
-
 function create(str) {
   id.contents = id.contents + 1 | 0;
   return str + ("/" + id.contents);
@@ -28,7 +22,7 @@ function caml_exn_slot_name(x) {
   return x.RE_EXN_ID;
 }
 
-exports.caml_set_oo_id = caml_set_oo_id;
+exports.id = id;
 exports.create = create;
 exports.caml_is_extension = caml_is_extension;
 exports.caml_exn_slot_name = caml_exn_slot_name;

lib/js/caml_hash.js

@@ -62,35 +62,21 @@ function caml_hash(count, _limit, seed, obj) {
     } else if (typeof obj$1 === "string") {
       hash = Caml_hash_primitive.caml_hash_mix_string(hash, obj$1);
       num = num - 1 | 0;
-    } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined") {
-      if (typeof obj$1 === "symbol") {
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: /* tuple */[
-                "caml_hash.ml",
-                128,
-                8
-              ],
-              Error: new Error()
-            };
-      }
-      if (typeof obj$1 !== "function") {
-        var size = obj$1.length;
-        if (size !== undefined) {
-          var obj_tag = obj$1.tag | 0;
-          var tag = (size << 10) | obj_tag;
-          if (tag === 248) {
-            hash = Caml_hash_primitive.caml_hash_mix_int(hash, obj$1[1]);
-          } else {
-            hash = Caml_hash_primitive.caml_hash_mix_int(hash, tag);
-            var v = size - 1 | 0;
-            var block = v < num ? v : num;
-            for(var i = 0; i <= block; ++i){
-              push_back(queue, obj$1[i]);
-            }
+    } else if (typeof obj$1 !== "boolean" && typeof obj$1 !== "undefined" && typeof obj$1 !== "symbol" && typeof obj$1 !== "function") {
+      var size = obj$1.length;
+      if (size !== undefined) {
+        var obj_tag = obj$1.tag | 0;
+        var tag = (size << 10) | obj_tag;
+        if (tag === 248) {
+          hash = Caml_hash_primitive.caml_hash_mix_int(hash, obj$1[1]);
+        } else {
+          hash = Caml_hash_primitive.caml_hash_mix_int(hash, tag);
+          var v = size - 1 | 0;
+          var block = v < num ? v : num;
+          for(var i = 0; i <= block; ++i){
+            push_back(queue, obj$1[i]);
           }
         }
-        
       }
 
     }

lib/js/caml_oo.js

@@ -1,9 +1,16 @@
 'use strict';
 
 var Caml_array = require("./caml_array.js");
+var Caml_exceptions = require("./caml_exceptions.js");
 
 var caml_methods_cache = Caml_array.caml_make_vect(1000, 0);
 
+function caml_set_oo_id(b) {
+  b[1] = Caml_exceptions.id.contents;
+  Caml_exceptions.id.contents = Caml_exceptions.id.contents + 1 | 0;
+  return b;
+}
+
 function caml_get_public_method(obj, tag, cacheid) {
   var meths = obj[0];
   var offs = caml_methods_cache[cacheid];
@@ -18,7 +25,7 @@ function caml_get_public_method(obj, tag, cacheid) {
               RE_EXN_ID: "Assert_failure",
               _1: /* tuple */[
                 "caml_oo.ml",
-                62,
+                80,
                 20
               ],
               Error: new Error()
@@ -36,4 +43,5 @@ function caml_get_public_method(obj, tag, cacheid) {
 }
 
 exports.caml_get_public_method = caml_get_public_method;
+exports.caml_set_oo_id = caml_set_oo_id;
 /* No side effect */

lib/js/camlinternalOO.js

@@ -9,11 +9,10 @@ var Caml_array = require("./caml_array.js");
 var Belt_MapInt = require("./belt_MapInt.js");
 var Caml_string = require("./caml_string.js");
 var Belt_MapString = require("./belt_MapString.js");
-var Caml_exceptions = require("./caml_exceptions.js");
 var Caml_js_exceptions = require("./caml_js_exceptions.js");
 
 function copy(o) {
-  return Caml_exceptions.caml_set_oo_id(Caml_obj.caml_obj_dup(o));
+  return Caml_oo.caml_set_oo_id(Caml_obj.caml_obj_dup(o));
 }
 
 var params = {
@@ -366,7 +365,7 @@ function make_class_store(pub_meths, class_init, init_table) {
 function create_object(table) {
   var obj = Caml_obj.caml_obj_block(248, table.size);
   obj[0] = table.methods;
-  return Caml_exceptions.caml_set_oo_id(obj);
+  return Caml_oo.caml_set_oo_id(obj);
 }
 
 function create_object_opt(obj_0, table) {
@@ -375,7 +374,7 @@ function create_object_opt(obj_0, table) {
   }
   var obj = Caml_obj.caml_obj_block(248, table.size);
   obj[0] = table.methods;
-  return Caml_exceptions.caml_set_oo_id(obj);
+  return Caml_oo.caml_set_oo_id(obj);
 }
 
 function iter_f(obj, _param) {