remove lazy keyword

Author: namenu

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

jscomp/syntax/src/res_grammar.ml

@@ -129,7 +129,7 @@ let isSignatureItemStart = function
 
 let isAtomicPatternStart = function
   | Token.Int _ | String _ | Codepoint _ | Backtick | Lparen | Lbracket | Lbrace
-  | Underscore | Lident _ | Uident _ | List | Exception | Lazy | Percent ->
+  | Underscore | Lident _ | Uident _ | List | Exception | Percent ->
     true
   | _ -> false
 
@@ -148,9 +148,9 @@ let isAtomicTypExprStart = function
 
 let isExprStart = function
   | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | False | Float _
-  | For | Hash | If | Int _ | Lazy | Lbrace | Lbracket | LessThan | Lident _
-  | List | Lparen | Minus | MinusDot | Module | Percent | Plus | PlusDot
-  | String _ | Switch | True | Try | Uident _ | Underscore (* _ => doThings() *)
+  | For | Hash | If | Int _ | Lbrace | Lbracket | LessThan | Lident _ | List
+  | Lparen | Minus | MinusDot | Module | Percent | Plus | PlusDot | String _
+  | Switch | True | Try | Uident _ | Underscore (* _ => doThings() *)
   | While ->
     true
   | _ -> false
@@ -169,7 +169,7 @@ let isStructureItemStart = function
 let isPatternStart = function
   | Token.Int _ | Float _ | String _ | Codepoint _ | Backtick | True | False
   | Minus | Plus | Lparen | Lbracket | Lbrace | List | Underscore | Lident _
-  | Uident _ | Hash | Exception | Lazy | Percent | Module | At ->
+  | Uident _ | Hash | Exception | Percent | Module | At ->
     true
   | _ -> false
 
@@ -257,10 +257,10 @@ let isJsxChildStart = isAtomicExprStart
 
 let isBlockExprStart = function
   | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | Exception
-  | False | Float _ | For | Forwardslash | Hash | If | Int _ | Lazy | Lbrace
-  | Lbracket | LessThan | Let | Lident _ | List | Lparen | Minus | MinusDot
-  | Module | Open | Percent | Plus | PlusDot | String _ | Switch | True | Try
-  | Uident _ | Underscore | While ->
+  | False | Float _ | For | Forwardslash | Hash | If | Int _ | Lbrace | Lbracket
+  | LessThan | Let | Lident _ | List | Lparen | Minus | MinusDot | Module | Open
+  | Percent | Plus | PlusDot | String _ | Switch | True | Try | Uident _
+  | Underscore | While ->
     true
   | _ -> false
 

jscomp/syntax/src/res_token.ml

@@ -55,7 +55,6 @@ type t =
   | Hash
   | HashEqual
   | Assert
-  | Lazy
   | Tilde
   | Question
   | If
@@ -166,7 +165,6 @@ let toString = function
   | AsteriskDot -> "*."
   | Exponentiation -> "**"
   | Assert -> "assert"
-  | Lazy -> "lazy"
   | Tilde -> "tilde"
   | Question -> "?"
   | If -> "if"
@@ -222,7 +220,6 @@ let keywordTable = function
   | "if" -> If
   | "in" -> In
   | "include" -> Include
-  | "lazy" -> Lazy
   | "let" -> Let
   | "list{" -> List
   | "module" -> Module
@@ -242,8 +239,8 @@ let keywordTable = function
 
 let isKeyword = function
   | Await | And | As | Assert | Constraint | Else | Exception | External | False
-  | For | If | In | Include | Land | Lazy | Let | List | Lor | Module | Mutable
-  | Of | Open | Private | Rec | Switch | True | Try | Typ | When | While ->
+  | For | If | In | Include | Land | Let | List | Lor | Module | Mutable | Of
+  | Open | Private | Rec | Switch | True | Try | Typ | When | While ->
     true
   | _ -> false