snapshot

Author: bobzhang

lib/4.06.1/unstable/js_compiler.ml

@@ -109470,7 +109470,7 @@ val get_default_undefined_from_optional:
 
 (** Given [Some (`a x)] or [None], 
     return [x] *)  
-val get_default_undefined : 
+val option_unwrap : 
   J.expression ->
   J.expression
 
@@ -109598,7 +109598,7 @@ let get_default_undefined_from_optional
     else
       (E.runtime_call Js_runtime_modules.option "option_get" [arg])
 
-let get_default_undefined (arg : J.expression) : J.expression =
+let option_unwrap (arg : J.expression) : J.expression =
   let desc = arg.expression_desc in
   if is_none_static desc then E.undefined else
   match desc with
@@ -109607,12 +109607,7 @@ let get_default_undefined (arg : J.expression) : J.expression =
     Js_of_lam_polyvar.get_field x 
     (* invariant: option encoding *)
   | _ ->
-    (* FIXME: no need do such inlining*)
-    if Js_analyzer.is_okay_to_duplicate arg then
-      E.econd (is_not_none arg) 
-        (Js_of_lam_polyvar.get_field (val_from_option arg)) E.undefined
-    else
-      E.runtime_call Js_runtime_modules.option "option_get_unwrap" [arg]
+    E.runtime_call Js_runtime_modules.option "option_unwrap" [arg]
 
 let destruct_optional
   ~for_sure_none
@@ -110069,8 +110064,10 @@ let ocaml_to_js_eff
            - if ocaml arg is `None`, let js arg be `undefined` (no unwrapping)
            - if ocaml arg is `Some x`, unwrap the arg to get the `x`, then
              unwrap the `x` itself
+           - Here `Some x` is `x` due to the current encoding
+           Lets inline here since it depends on the runtime encoding
         *)
-        Js_of_lam_option.get_default_undefined raw_arg
+        Js_of_lam_option.option_unwrap raw_arg
       | _ ->
         Js_of_lam_variant.eval_as_unwrap raw_arg
     in
@@ -406086,7 +406083,8 @@ let spec_of_ptyp
     begin match ptyp_desc with
       | Ptyp_variant (row_fields, Closed, _)
         when variant_unwrap row_fields ->
-        Unwrap
+        Unwrap 
+        (* Unwrap attribute can only be attached to things like `[a of a0 | b of b0]` *)
       | _ ->
         Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_unwrap_type
     end

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -109470,7 +109470,7 @@ val get_default_undefined_from_optional:
 
 (** Given [Some (`a x)] or [None], 
     return [x] *)  
-val get_default_undefined : 
+val option_unwrap : 
   J.expression ->
   J.expression
 
@@ -109598,7 +109598,7 @@ let get_default_undefined_from_optional
     else
       (E.runtime_call Js_runtime_modules.option "option_get" [arg])
 
-let get_default_undefined (arg : J.expression) : J.expression =
+let option_unwrap (arg : J.expression) : J.expression =
   let desc = arg.expression_desc in
   if is_none_static desc then E.undefined else
   match desc with
@@ -109607,12 +109607,7 @@ let get_default_undefined (arg : J.expression) : J.expression =
     Js_of_lam_polyvar.get_field x 
     (* invariant: option encoding *)
   | _ ->
-    (* FIXME: no need do such inlining*)
-    if Js_analyzer.is_okay_to_duplicate arg then
-      E.econd (is_not_none arg) 
-        (Js_of_lam_polyvar.get_field (val_from_option arg)) E.undefined
-    else
-      E.runtime_call Js_runtime_modules.option "option_get_unwrap" [arg]
+    E.runtime_call Js_runtime_modules.option "option_unwrap" [arg]
 
 let destruct_optional
   ~for_sure_none
@@ -110069,8 +110064,10 @@ let ocaml_to_js_eff
            - if ocaml arg is `None`, let js arg be `undefined` (no unwrapping)
            - if ocaml arg is `Some x`, unwrap the arg to get the `x`, then
              unwrap the `x` itself
+           - Here `Some x` is `x` due to the current encoding
+           Lets inline here since it depends on the runtime encoding
         *)
-        Js_of_lam_option.get_default_undefined raw_arg
+        Js_of_lam_option.option_unwrap raw_arg
       | _ ->
         Js_of_lam_variant.eval_as_unwrap raw_arg
     in
@@ -406086,7 +406083,8 @@ let spec_of_ptyp
     begin match ptyp_desc with
       | Ptyp_variant (row_fields, Closed, _)
         when variant_unwrap row_fields ->
-        Unwrap
+        Unwrap 
+        (* Unwrap attribute can only be attached to things like `[a of a0 | b of b0]` *)
       | _ ->
         Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_unwrap_type
     end

lib/4.06.1/unstable/native_ppx.ml

@@ -19196,7 +19196,8 @@ let spec_of_ptyp
     begin match ptyp_desc with
       | Ptyp_variant (row_fields, Closed, _)
         when variant_unwrap row_fields ->
-        Unwrap
+        Unwrap 
+        (* Unwrap attribute can only be attached to things like `[a of a0 | b of b0]` *)
       | _ ->
         Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_unwrap_type
     end

lib/4.06.1/whole_compiler.ml

@@ -392165,7 +392165,7 @@ val get_default_undefined_from_optional:
 
 (** Given [Some (`a x)] or [None], 
     return [x] *)  
-val get_default_undefined : 
+val option_unwrap : 
   J.expression ->
   J.expression
 
@@ -392293,7 +392293,7 @@ let get_default_undefined_from_optional
     else
       (E.runtime_call Js_runtime_modules.option "option_get" [arg])
 
-let get_default_undefined (arg : J.expression) : J.expression =
+let option_unwrap (arg : J.expression) : J.expression =
   let desc = arg.expression_desc in
   if is_none_static desc then E.undefined else
   match desc with
@@ -392302,12 +392302,7 @@ let get_default_undefined (arg : J.expression) : J.expression =
     Js_of_lam_polyvar.get_field x 
     (* invariant: option encoding *)
   | _ ->
-    (* FIXME: no need do such inlining*)
-    if Js_analyzer.is_okay_to_duplicate arg then
-      E.econd (is_not_none arg) 
-        (Js_of_lam_polyvar.get_field (val_from_option arg)) E.undefined
-    else
-      E.runtime_call Js_runtime_modules.option "option_get_unwrap" [arg]
+    E.runtime_call Js_runtime_modules.option "option_unwrap" [arg]
 
 let destruct_optional
   ~for_sure_none
@@ -392764,8 +392759,10 @@ let ocaml_to_js_eff
            - if ocaml arg is `None`, let js arg be `undefined` (no unwrapping)
            - if ocaml arg is `Some x`, unwrap the arg to get the `x`, then
              unwrap the `x` itself
+           - Here `Some x` is `x` due to the current encoding
+           Lets inline here since it depends on the runtime encoding
         *)
-        Js_of_lam_option.get_default_undefined raw_arg
+        Js_of_lam_option.option_unwrap raw_arg
       | _ ->
         Js_of_lam_variant.eval_as_unwrap raw_arg
     in
@@ -409825,7 +409822,8 @@ let spec_of_ptyp
     begin match ptyp_desc with
       | Ptyp_variant (row_fields, Closed, _)
         when variant_unwrap row_fields ->
-        Unwrap
+        Unwrap 
+        (* Unwrap attribute can only be attached to things like `[a of a0 | b of b0]` *)
       | _ ->
         Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_unwrap_type
     end