more tests

Author: hhugo

compiler/tests-jsoo/test_weak.ml

@@ -59,4 +59,96 @@ let%expect_test _ =
   [%expect {|
     found
     found
-    |}]
+  |}]
+
+let copy_eq a b =
+  if a == b
+  then false
+  else
+    let a = Obj.repr a in
+    let b = Obj.repr b in
+    if Obj.size a <> Obj.size b || Obj.tag a <> Obj.tag b
+    then false
+    else
+      let exception False in
+      try
+        for i = 0 to Obj.size a - 1 do
+          if Obj.field a i != Obj.field b i then raise False
+        done;
+        true
+      with False -> false
+
+let bool x = Printf.printf "%b" x
+
+let%expect_test _ =
+  let module E = Obj.Ephemeron in
+  let ki = Obj.repr None in
+  let k1 = Obj.repr (Some 2) in
+  let k2 = Obj.repr (Some 43) in
+  let e = E.create 10 in
+  let e2 = E.create 3 in
+  Printf.printf "%d\n" (E.length e);
+  [%expect {| 10 |}];
+  E.set_key e 1 ki;
+  E.set_key e 2 k1;
+  E.set_key e 3 k2;
+  bool (Option.get (E.get_key e 2) == k1);
+  [%expect {| true |}];
+  bool (Option.get (E.get_key_copy e 2) == k1);
+  [%expect {| false |}];
+  bool (copy_eq (Option.get (E.get_key_copy e 2)) k1);
+  [%expect {| true |}];
+  bool (Option.get (E.get_key e 1) == ki);
+  [%expect {| true |}];
+  bool (Option.get (E.get_key_copy e 1) == ki);
+  [%expect {| true |}];
+  bool (copy_eq (Option.get (E.get_key_copy e 1)) ki);
+  [%expect {| false |}];
+  bool (E.check_key e 0);
+  [%expect {| false |}];
+  bool (E.check_key e 2);
+  [%expect {| true |}];
+  bool (E.check_key e 3);
+  [%expect {| true |}];
+  E.unset_key e 3;
+  bool (E.check_key e 3);
+  [%expect {| false |}];
+
+  bool (E.check_data e);
+  [%expect {| false |}];
+  E.set_data e k1;
+  bool (E.check_data e);
+  [%expect {| true |}];
+
+  bool (Option.get (E.get_data e) == k1);
+  [%expect {| true |}];
+  bool (Option.get (E.get_data_copy e) == k1);
+  [%expect {| false |}];
+  bool (copy_eq (Option.get (E.get_data_copy e)) k1);
+  [%expect {| true |}];
+
+  E.set_data e ki;
+  bool (Option.get (E.get_data e) == ki);
+  [%expect {| true |}];
+  bool (Option.get (E.get_data_copy e) == ki);
+  [%expect {| true |}];
+  bool (copy_eq (Option.get (E.get_data_copy e)) ki);
+  [%expect {| false |}];
+
+  bool (E.check_data e2);
+  [%expect {| false |}];
+  E.blit_data e e2;
+  bool (E.check_data e2);
+  [%expect {| true |}];
+
+  E.blit_key e 1 e2 0 3;
+  bool (E.check_key e2 0);
+  [%expect {| true |}];
+  bool (E.check_key e2 1);
+  [%expect {| true |}];
+  bool (E.check_key e2 2);
+  [%expect {| false |}];
+
+  E.unset_data e;
+  bool (E.check_data e);
+  [%expect {| false |}]

runtime/weak.js

@@ -190,7 +190,7 @@ function caml_ephe_get_data_copy(x) {
   if (r === 0) return 0;
   var z = r[1];
   if (Array.isArray(z)) return [0, caml_obj_dup(z)];
-  return z;
+  return r;
 }
 
 //Provides: caml_ephe_set_data
@@ -206,7 +206,7 @@ function caml_ephe_set_data(x, data) {
         continue;
       }
       if (globalThis.WeakMap) {
-        data = new globalThis.WeakMap().set(k,data);
+        data = new globalThis.WeakMap().set(k, data);
       }
     }
   }