Drop %lazy_force primitive

Author: cometkim

jscomp/ext/js_runtime_modules.ml

@@ -38,6 +38,8 @@ let promise = "Primitive_promise"
 
 let module_ = "Primitive_module"
 
+let lazy_ = "Primitive_lazy"
+
 let deriving = "Runtime_deriving"
 
 let astExtensions = "Runtime_ast_extensions"

jscomp/ml/matching.ml

@@ -1498,7 +1498,7 @@ let get_mod_field modname field =
 
 
 let code_force =
-    get_mod_field "CamlinternalLazy" "force"
+    get_mod_field Js_runtime_modules.lazy_ "force"
 ;;
 
 (* inline_lazy_force inlines the beginning of the code of Lazy.force. When

jscomp/ml/translcore.ml

@@ -356,7 +356,6 @@ let primitives_table =
       ("%await", Pawait);
 
       (* etc, depreacted *)
-      ("%lazy_force", Plazyforce);
       ("%intoffloat", Pintoffloat);
       ("%floatofint", Pfloatofint);
     |]

jscomp/runtime/lazy.res

@@ -0,0 +1,13 @@
+type t<'a> = lazy_t<'a>
+
+exception Undefined = Primitive_lazy.Undefined
+
+let force = Primitive_lazy.force
+
+let force_val = Primitive_lazy.force_val
+
+let from_fun = Primitive_lazy.from_fun
+
+let from_val = Primitive_lazy.from_val
+
+let is_val = Primitive_lazy.is_val

jscomp/runtime/lazy.resi

@@ -0,0 +1,41 @@
+type t<'a> = lazy_t<'a>
+
+exception Undefined
+
+/** [force x] forces the suspension [x] and returns its result.
+   If [x] has already been forced, [Lazy.force x] returns the
+   same value again without recomputing it.  If it raised an exception,
+   the same exception is raised again.
+   Raise {!Undefined} if the forcing of [x] tries to force [x] itself
+   recursively.
+*/
+let force: t<'a> => 'a
+
+/** [force_val x] forces the suspension [x] and returns its
+    result.  If [x] has already been forced, [force_val x]
+    returns the same value again without recomputing it.
+    Raise {!Undefined} if the forcing of [x] tries to force [x] itself
+    recursively.
+    If the computation of [x] raises an exception, it is unspecified
+    whether [force_val x] raises the same exception or {!Undefined}.
+*/
+let force_val: t<'a> => 'a
+
+/** [from_fun f] is the same as [lazy (f ())] but slightly more efficient.
+
+    [from_fun] should only be used if the function [f] is already defined.
+    In particular it is always less efficient to write
+    [from_fun (fun () => expr)] than [lazy expr].
+*/
+let from_fun: (unit => 'a) => t<'a>
+
+/** [from_val v] returns an already-forced suspension of [v].
+    This is for special purposes only and should not be confused with
+    [lazy (v)].
+*/
+let from_val: 'a => t<'a>
+
+/** [is_val x] returns [true] if [x] has already been forced and
+    did not raise an exception.
+*/
+let is_val: t<'a> => bool

jscomp/stdlib-406/camlinternalLazy.res renamed to jscomp/runtime/primitive_lazy.res

@@ -32,8 +32,8 @@ type t<'a> = {
   /* its type is ['a] or [unit -> 'a ] */
 }
 
-%%private(external fnToVal: ((. unit) => 'a) => 'a = "%identity")
-%%private(external valToFn: 'a => (. unit) => 'a = "%identity")
+%%private(external fnToVal: (unit => 'a) => 'a = "%identity")
+%%private(external valToFn: 'a => unit => 'a = "%identity")
 %%private(external castToConcrete: lazy_t<'a> => t<'a> = "%identity")
 %%private(external castFromConcrete: t<'a> => lazy_t<'a> = "%identity")
 
@@ -42,15 +42,15 @@ let is_val = (type a, l: lazy_t<a>): bool => castToConcrete(l).tag
 exception Undefined
 
 %%private(
-  let forward_with_closure = (type a, blk: t<a>, closure: (. unit) => a): a => {
-    let result = closure(.)
+  let forward_with_closure = (type a, blk: t<a>, closure: unit => a): a => {
+    let result = closure()
     blk.value = result
     blk.tag = true
     result
   }
 )
 
-%%private(let raise_undefined = (. ()) => raise(Undefined))
+%%private(let raise_undefined = () => raise(Undefined))
 
 /* Assume [blk] is a block with tag lazy */
 %%private(
@@ -59,7 +59,7 @@ exception Undefined
     blk.value = fnToVal(raise_undefined)
     try forward_with_closure(blk, closure) catch {
     | e =>
-      blk.value = fnToVal((. ()) => raise(e))
+      blk.value = fnToVal(() => raise(e))
       raise(e)
     }
   }
@@ -92,7 +92,7 @@ let force_val = (type a, lzv: lazy_t<a>): a => {
   }
 }
 
-let from_fun = (type a, closure: (. unit) => a): lazy_t<a> => {
+let from_fun = (type a, closure: unit => a): lazy_t<a> => {
   let blk = {
     tag: false,
     value: fnToVal(closure),
@@ -103,7 +103,7 @@ let from_fun = (type a, closure: (. unit) => a): lazy_t<a> => {
 let from_val = (type a, value: a): lazy_t<a> => {
   let blk = {
     tag: true,
-    value: value,
+    value,
   }
   castFromConcrete(blk)
 }

jscomp/runtime/primitive_lazy.resi

@@ -0,0 +1,39 @@
+exception Undefined
+
+/** [force x] forces the suspension [x] and returns its result.
+   If [x] has already been forced, [Lazy.force x] returns the
+   same value again without recomputing it.  If it raised an exception,
+   the same exception is raised again.
+   Raise {!Undefined} if the forcing of [x] tries to force [x] itself
+   recursively.
+*/
+let force: lazy_t<'a> => 'a
+
+/** [force_val x] forces the suspension [x] and returns its
+    result.  If [x] has already been forced, [force_val x]
+    returns the same value again without recomputing it.
+    Raise {!Undefined} if the forcing of [x] tries to force [x] itself
+    recursively.
+    If the computation of [x] raises an exception, it is unspecified
+    whether [force_val x] raises the same exception or {!Undefined}.
+*/
+let force_val: lazy_t<'a> => 'a
+
+/** [from_fun f] is the same as [lazy (f ())] but slightly more efficient.
+
+    [from_fun] should only be used if the function [f] is already defined.
+    In particular it is always less efficient to write
+    [from_fun (fun () => expr)] than [lazy expr].
+*/
+let from_fun: (unit => 'a) => lazy_t<'a>
+
+/** [from_val v] returns an already-forced suspension of [v].
+    This is for special purposes only and should not be confused with
+    [lazy (v)].
+*/
+let from_val: 'a => lazy_t<'a>
+
+/** [is_val x] returns [true] if [x] has already been forced and
+    did not raise an exception.
+*/
+let is_val: lazy_t<'a> => bool

jscomp/runtime/release.ninja

@@ -25,7 +25,11 @@ o runtime/caml_option.cmj : cc_cmi runtime/caml_option.res | runtime/caml_option
 o runtime/caml_option.cmi : cc runtime/caml_option.resi | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
 o runtime/caml_splice_call.cmj : cc_cmi runtime/caml_splice_call.res | runtime/caml_splice_call.cmi
 o runtime/caml_splice_call.cmi : cc runtime/caml_splice_call.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/primitive_module.cmj : cc_cmi runtime/primitive_module.res | runtime/caml_obj.cmj runtime/primitive_module.cmi
+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_lazy.cmj : cc_cmi runtime/primitive_lazy.res | runtime/caml_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/caml_obj.cmj runtime/lazy.cmj runtime/primitive_module.cmi
 o runtime/primitive_module.cmi : cc runtime/primitive_module.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.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/caml_option.cmj runtime/js.cmi runtime/js.cmj
 o runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
@@ -39,4 +43,4 @@ o runtime/primitive_int.cmi runtime/primitive_int.cmj : cc runtime/primitive_int
 o runtime/primitive_promise.cmi runtime/primitive_promise.cmj : cc runtime/primitive_promise.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 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 : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/primitive_module.cmi runtime/primitive_module.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.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_float.cmi runtime/primitive_float.cmj runtime/primitive_float_extern.cmi runtime/primitive_float_extern.cmj runtime/primitive_int.cmi runtime/primitive_int.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
+o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/lazy.cmi runtime/lazy.cmj runtime/primitive_lazy.cmi runtime/primitive_lazy.cmj runtime/primitive_module.cmi runtime/primitive_module.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.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_float.cmi runtime/primitive_float.cmj runtime/primitive_float_extern.cmi runtime/primitive_float_extern.cmj runtime/primitive_int.cmi runtime/primitive_int.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