Fix Obj.magic, Obj.repr etc. appearing in JS output

rescript-lang · Oct 5, 2024 · 39f5505 · 39f5505
1 parent 2be44d5
commit 39f5505
Show file tree

Hide file tree

Showing 20 changed files with 99 additions and 194 deletions.
diff --git a/lib/es6/js_exn.js b/lib/es6/js_exn.js
@@ -5,9 +5,8 @@ import * as Primitive_option from "./primitive_option.js";
 let $$Error = "JsError";
 
 function asJsExn(exn) {
-  let t = exn;
-  if (t.RE_EXN_ID === $$Error) {
-    return Primitive_option.some(t._1);
+  if (exn.RE_EXN_ID === $$Error) {
+    return Primitive_option.some(exn._1);
   }
 
 }

diff --git a/lib/es6/obj.js b/lib/es6/obj.js
@@ -1,51 +1 @@
-
-
-
-function magic(prim) {
-  return prim;
-}
-
-function repr(prim) {
-  return prim;
-}
-
-function obj(prim) {
-  return prim;
-}
-
-function tag(prim) {
-  return prim.TAG;
-}
-
-function size(prim) {
-  return prim.length | 0;
-}
-
-function field(prim0, prim1) {
-  return prim0[prim1];
-}
-
-function set_field(prim0, prim1, prim2) {
-  prim0[prim1] = prim2;
-}
-
-function dup(prim) {
-  return {...prim};
-}
-
-function update_dummy(prim0, prim1) {
-  Object.assign(prim0, prim1);
-}
-
-export {
-  magic,
-  repr,
-  obj,
-  tag,
-  size,
-  field,
-  set_field,
-  dup,
-  update_dummy,
-}
-/* No side effect */
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/lib/js/js_exn.js b/lib/js/js_exn.js
@@ -5,9 +5,8 @@ let Primitive_option = require("./primitive_option.js");
 let $$Error = "JsError";
 
 function asJsExn(exn) {
-  let t = exn;
-  if (t.RE_EXN_ID === $$Error) {
-    return Primitive_option.some(t._1);
+  if (exn.RE_EXN_ID === $$Error) {
+    return Primitive_option.some(exn._1);
   }
 
 }

diff --git a/lib/js/obj.js b/lib/js/obj.js
@@ -1,49 +1 @@
-'use strict';
-
-
-function magic(prim) {
-  return prim;
-}
-
-function repr(prim) {
-  return prim;
-}
-
-function obj(prim) {
-  return prim;
-}
-
-function tag(prim) {
-  return prim.TAG;
-}
-
-function size(prim) {
-  return prim.length | 0;
-}
-
-function field(prim0, prim1) {
-  return prim0[prim1];
-}
-
-function set_field(prim0, prim1, prim2) {
-  prim0[prim1] = prim2;
-}
-
-function dup(prim) {
-  return {...prim};
-}
-
-function update_dummy(prim0, prim1) {
-  Object.assign(prim0, prim1);
-}
-
-exports.magic = magic;
-exports.repr = repr;
-exports.obj = obj;
-exports.tag = tag;
-exports.size = size;
-exports.field = field;
-exports.set_field = set_field;
-exports.dup = dup;
-exports.update_dummy = update_dummy;
-/* No side effect */
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/runtime/obj.res b/runtime/obj.res
@@ -4,28 +4,28 @@
 
 type t = Primitive_object_extern.t
 
-let magic = Primitive_object_extern.magic
+external magic: 'a => 'b = "%identity"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let repr = Primitive_object_extern.repr
+external repr: 'a => t = "%identity"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let obj = Primitive_object_extern.obj
+external obj: t => 'a = "%identity"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let tag = Primitive_object_extern.tag
+external tag: t => int = "%obj_tag"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let size = Primitive_object_extern.size
+external size: t => int = "%obj_size"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let field = Primitive_object_extern.getField
+external getField: (t, 'a) => t = "%obj_get_field"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let set_field = Primitive_object_extern.setField
+external setField: (t, 'a, t) => unit = "%obj_set_field"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let dup = Primitive_object_extern.dup
+external dup: t => t = "%obj_dup"
 
-@deprecated("Do not use directly. This will be removed in v13")
-let update_dummy = Primitive_object_extern.updateDummy
+@deprecated("Do not use directly. This will be removed in v13") @scope("Object")
+external updateDummy: (t, t) => unit = "assign"
diff --git a/tests/tests/src/UntaggedVariants.js b/tests/tests/src/UntaggedVariants.js
diff --git a/tests/tests/src/exception_raise_test.js b/tests/tests/src/exception_raise_test.js
diff --git a/tests/tests/src/gpr_1946_test.js b/tests/tests/src/gpr_1946_test.js
diff --git a/tests/tests/src/gpr_4069_test.js b/tests/tests/src/gpr_4069_test.js
diff --git a/tests/tests/src/int_poly_var.js b/tests/tests/src/int_poly_var.js