Remove lazy keyword (rescript-lang#6342)

* remove lazy keyword * fix contributing doc stating old ocaml ver * sync test output * change CHANGELOG

Author: namenu

CHANGELOG.md

@@ -16,6 +16,10 @@
 
 - Build with OCaml 5.1.1. https://github.com/rescript-lang/rescript-compiler/pull/6641
 
+#### :boom: Breaking Change
+
+- `lazy` syntax is no longer supported. If you're using it, use `Lazy` module or `React.lazy_` instead. https://github.com/rescript-lang/rescript-compiler/pull/6342
+
 # 11.1.0-rc.2
 
 #### :rocket: New Feature

CONTRIBUTING.md

@@ -41,7 +41,7 @@ Make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed on
 opam init
 
 # Any recent OCaml version works as a development compiler
-opam switch create 4.14.1 # can also create local switch with opam switch create . 4.14.1
+opam switch create 5.1.1 # can also create local switch with opam switch create
 
 # Install dev dependencies from OPAM
 opam install . --deps-only

jscomp/dune

@@ -1,5 +1,5 @@
 (dirs bsb bsb_exe bsb_helper bsb_helper_exe bsc cmij common core depends ext
- frontend gentype jsoo js_parser ml napkin ounit_tests syntax)
+ frontend gentype jsoo js_parser ml ounit_tests syntax)
 
 (env
  (dev

jscomp/runtime/caml_module.res

@@ -53,7 +53,7 @@ let init_mod = (loc: (string, int, int), shape: shape) => {
  let rec loop = (shape: shape, struct_: Obj.t, idx) =>
  switch shape {
  | Function => set_field(struct_, idx, Obj.magic(undef_module))
- | Lazy => set_field(struct_, idx, Obj.magic(lazy undef_module))
+ | Lazy => set_field(struct_, idx, Obj.magic(undef_module))
  | Class =>
  set_field(
  struct_,

jscomp/stdlib-406/camlinternalLazy.res

@@ -35,6 +35,7 @@ type t<'a> = {
 %%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")
 
 let is_val = (type a, l: lazy_t<a>): bool => castToConcrete(l).tag
 
@@ -90,3 +91,19 @@ let force_val = (type a, lzv: lazy_t<a>): a => {
  force_val_lazy_block(lzv)
  }
 }
+
+let from_fun = (type a, closure: (. unit) => a): lazy_t<a> => {
+ let blk = {
+ tag: false,
+ value: fnToVal(closure),
+ }
+ castFromConcrete(blk)
+}
+
+let from_val = (type a, value: a): lazy_t<a> => {
+ let blk = {
+ tag: true,
+ value: value,
+ }
+ castFromConcrete(blk)
+}

jscomp/stdlib-406/camlinternalLazy.resi

@@ -25,3 +25,7 @@ let force: lazy_t<'a> => 'a
 let force_val: lazy_t<'a> => 'a
 
 let is_val: lazy_t<'a> => bool
+
+let from_fun: ((. unit) => 'a) => lazy_t<'a>
+
+let from_val: 'a => lazy_t<'a>

jscomp/stdlib-406/hashtbl.res

@@ -56,7 +56,7 @@ let randomized = ref(randomized_default)
 let randomize = () => randomized := true
 let is_randomized = () => randomized.contents
 
-let prng = lazy Random.State.make_self_init()
+let prng = Lazy.from_fun(() => Random.State.make_self_init())
 
 /* Creating a fresh, empty table */
 

jscomp/stdlib-406/lazy.res

@@ -55,9 +55,9 @@ external force: t<'a> => 'a = "%lazy_force"
 
 let force_val = CamlinternalLazy.force_val
 
-let from_fun = f => lazy f()
+let from_fun = f => CamlinternalLazy.from_fun((. ) => f())
 
-let from_val = v => lazy v
+let from_val = v => CamlinternalLazy.from_val(v)
 
 let is_val = CamlinternalLazy.is_val
 

jscomp/stdlib-406/stream.res

@@ -218,13 +218,13 @@ let iapp = (i, s) => Some({count: 0, data: Sapp(data(i), data(s))})
 let icons = (i, s) => Some({count: 0, data: Scons(i, data(s))})
 let ising = i => Some({count: 0, data: Scons(i, Sempty)})
 
-let lapp = (f, s) => Some({count: 0, data: Slazy(lazy Sapp(data(f()), data(s)))})
+let lapp = (f, s) => Some({count: 0, data: Slazy(Lazy.from_fun(() => Sapp(data(f()), data(s))))})
 
-let lcons = (f, s) => Some({count: 0, data: Slazy(lazy Scons(f(), data(s)))})
-let lsing = f => Some({count: 0, data: Slazy(lazy Scons(f(), Sempty))})
+let lcons = (f, s) => Some({count: 0, data: Slazy(Lazy.from_fun(() => Scons(f(), data(s))))})
+let lsing = f => Some({count: 0, data: Slazy(Lazy.from_fun(() => Scons(f(), Sempty)))})
 
 let sempty = None
-let slazy = f => Some({count: 0, data: Slazy(lazy data(f()))})
+let slazy = f => Some({count: 0, data: Slazy(Lazy.from_fun(() => data(f())))})
 
 /* For debugging use */
 

jscomp/syntax/src/res_core.ml

@@ -1108,11 +1108,6 @@ let rec parsePattern ?(alias = true) ?(or_ = true) p =
  let pat = parsePattern ~alias:false ~or_:false p in
  let loc = mkLoc startPos p.prevEndPos in
  Ast_helper.Pat.exception_ ~loc ~attrs pat
- | Lazy ->
- Parser.next p;
- let pat = parsePattern ~alias:false ~or_:false p in
- let loc = mkLoc startPos p.prevEndPos in
- Ast_helper.Pat.lazy_ ~loc ~attrs pat
  | List ->
  Parser.next p;
  parseListPattern ~startPos ~attrs p
@@ -2128,11 +2123,6 @@ and parseOperandExpr ~context p =
  let () = attrs := [] in
  parseAsyncArrowExpression ~arrowAttrs p
  | Await -> parseAwaitExpression p
- | Lazy ->
- Parser.next p;
- let expr = parseUnaryExpr p in
- let loc = mkLoc startPos p.prevEndPos in
- Ast_helper.Exp.lazy_ ~loc expr
  | Try -> parseTryExpression p
  | If -> parseIfOrIfLetExpression p
  | For -> parseForExpression p