Quick no-wrapped-options PR for testing.

See #7430

Author: cristianoc

compiler/core/j.ml

@@ -147,8 +147,6 @@ and expression_desc =
   (* literally raw JS code 
   *)
   | Array of expression list * mutable_flag
-  | Optional_block of expression * bool
-  (* [true] means [identity] *)
   | Caml_block of expression list * mutable_flag * expression * tag_info
   (* The third argument is [tag] , forth is [tag_info] *)
   (* | Caml_uninitialized_obj of expression * expression *)

compiler/core/js_analyzer.ml

@@ -101,7 +101,6 @@ let rec no_side_effect_expression_desc (x : J.expression_desc) =
         the block is mutable does not mean this operation is non-pure
     *)
     Ext_list.for_all xs no_side_effect
-  | Optional_block (x, _) -> no_side_effect x
   | Object (_, kvs) -> Ext_list.for_all_snd kvs no_side_effect
   | String_append (a, b) | Seq (a, b) -> no_side_effect a && no_side_effect b
   | Length (e, _) | Caml_block_tag (e, _) | Typeof e -> no_side_effect e
@@ -218,10 +217,6 @@ let rec eq_expression ({expression_desc = x0} : J.expression)
     match y0 with
     | Bool b0 -> a0 = b0
     | _ -> false)
-  | Optional_block (a0, b0) -> (
-    match y0 with
-    | Optional_block (a1, b1) -> b0 = b1 && eq_expression a0 a1
-    | _ -> false)
   | Caml_block (ls0, flag0, tag0, _) -> (
     match y0 with
     | Caml_block (ls1, flag1, tag1, _) ->

compiler/core/js_block_runtime.ml

@@ -22,12 +22,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-let option_id = Ident.create_persistent Primitive_modules.option
-
 let curry_id = Ident.create_persistent Primitive_modules.curry
 
 let check_additional_id (x : J.expression) : Ident.t option =
   match x.expression_desc with
-  | Optional_block (_, false) -> Some option_id
   | Call (_, _, {arity = NA}) -> Some curry_id
   | _ -> None

compiler/core/js_dump.ml

@@ -148,7 +148,7 @@ let raw_snippet_exp_simple_enough (s : string) =
 
 (* e = function(x){...}(x);  is good
 *)
-let rec exp_need_paren ?(arrow = false) (e : J.expression) =
+let exp_need_paren ?(arrow = false) (e : J.expression) =
   match e.expression_desc with
   (* | Caml_uninitialized_obj _  *)
   | Call ({expression_desc = Raw_js_code _}, _, _) -> true
@@ -172,8 +172,6 @@ let rec exp_need_paren ?(arrow = false) (e : J.expression) =
   | Await _ -> false
   | Spread _ -> false
   | Tagged_template _ -> false
-  | Optional_block (e, true) when arrow -> exp_need_paren ~arrow e
-  | Optional_block _ -> false
 
 (** Print as underscore for unused vars, may not be 
     needed in the future *)
@@ -867,10 +865,6 @@ and expression_desc cxt ~(level : int) f x : cxt =
     match el with
     | [] | [_] -> P.bracket_group f 1 (fun _ -> array_element_list cxt f el)
     | _ -> P.bracket_vgroup f 1 (fun _ -> array_element_list cxt f el))
-  | Optional_block (e, identity) ->
-    expression ~level cxt f
-      (if identity then e
-       else E.runtime_call Primitive_modules.option "some" [e])
   | Caml_block (el, _, _, Blk_module fields) ->
     expression_desc cxt ~level f
       (Object
@@ -1118,9 +1112,7 @@ and print_jsx cxt ?(spread_props : J.expression option)
         if n = "children" then
           if fnName = "jsxs" then
             match e.J.expression_desc with
-            | J.Array (xs, _)
-            | J.Optional_block ({expression_desc = J.Array (xs, _)}, _) ->
-              Some xs
+            | J.Array (xs, _) -> Some xs
             | _ -> Some [e]
           else Some [e]
         else None)

compiler/core/js_exp_make.ml

@@ -166,13 +166,9 @@ let raw_js_code ?comment info s : t =
   }
 
 let array ?comment mt es : t = {expression_desc = Array (es, mt); comment}
-let some_comment = None
+let optional_block e : J.expression = e
 
-let optional_block e : J.expression =
-  {expression_desc = Optional_block (e, false); comment = some_comment}
-
-let optional_not_nest_block e : J.expression =
-  {expression_desc = Optional_block (e, true); comment = None}
+let optional_not_nest_block e : J.expression = e
 
 (** used in normal property
     like [e.length], no dependency introduced
@@ -599,7 +595,7 @@ let str_equal (txt0 : string) (delim0 : External_arg_spec.delim) txt1 delim1 =
     else None
   else None
 
-let rec triple_equal ?comment (e0 : t) (e1 : t) : t =
+let triple_equal ?comment (e0 : t) (e1 : t) : t =
   match (e0.expression_desc, e1.expression_desc) with
   | ( (Null | Undefined _),
       (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _) )
@@ -610,11 +606,7 @@ let rec triple_equal ?comment (e0 : t) (e1 : t) : t =
     when no_side_effect e0 ->
     false_
   | Number (Int {i = i0; _}), Number (Int {i = i1; _}) -> bool (i0 = i1)
-  | Optional_block (a, _), Optional_block (b, _) -> triple_equal ?comment a b
-  | Undefined _, Optional_block _
-  | Optional_block _, Undefined _
-  | Null, Undefined _
-  | Undefined _, Null
+  | (Null, Undefined _ | Undefined _, Null)
     when no_side_effect e0 && no_side_effect e1 ->
     false_
   | Null, Null | Undefined _, Undefined _ -> true_
@@ -1388,14 +1380,8 @@ let rec int_comp (cmp : Lam_compat.comparison) ?comment (e0 : t) (e1 : t) =
           _ ),
       Number (Int {i = 0l}) ) ->
     int_comp cmp l r (* = 0 > 0 < 0 *)
-  | (Ceq, Optional_block _, Undefined _ | Ceq, Undefined _, Optional_block _)
-    when no_side_effect e0 && no_side_effect e1 ->
-    false_
   | Ceq, _, _ -> int_equal e0 e1
-  | Cneq, Optional_block _, Undefined _
-  | Cneq, Undefined _, Optional_block _
-  | Cneq, Caml_block _, Number _
-  | Cneq, Number _, Caml_block _
+  | (Cneq, Caml_block _, Number _ | Cneq, Number _, Caml_block _)
     when no_side_effect e0 && no_side_effect e1 ->
     true_
   | _ -> bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1

compiler/core/js_fold.ml

@@ -167,9 +167,6 @@ class fold =
       | Array (_x0, _x1) ->
         let _self = list (fun _self -> _self#expression) _self _x0 in
         _self
-      | Optional_block (_x0, _x1) ->
-        let _self = _self#expression _x0 in
-        _self
       | Caml_block (_x0, _x1, _x2, _x3) ->
         let _self = list (fun _self -> _self#expression) _self _x0 in
         let _self = _self#expression _x2 in

compiler/core/js_of_lam_option.ml

@@ -46,7 +46,6 @@ let is_not_none (e : J.expression) : J.expression =
   if is_none_static desc then E.false_
   else
     match desc with
-    | Optional_block _ -> E.true_
     | _ -> E.not (E.triple_equal e none)
 
 (**
@@ -64,39 +63,27 @@ let is_not_none (e : J.expression) : J.expression =
      {!Js_ast_util.named_expression} does not help 
      since we need an expression here, it might be a statement
 *)
-let val_from_option (arg : J.expression) =
-  match arg.expression_desc with
-  | Optional_block (x, _) -> x
-  | _ -> E.runtime_call Primitive_modules.option "valFromOption" [arg]
+let val_from_option (arg : J.expression) = arg
 
 let get_default_undefined_from_optional (arg : J.expression) : J.expression =
   let desc = arg.expression_desc in
   if is_none_static desc then E.undefined
   else
     match desc with
-    | Optional_block (x, _) -> x (* invariant: option encoding *)
     | _ ->
       if Js_analyzer.is_okay_to_duplicate arg then
         (* FIXME: no need do such inlining*)
         E.econd (is_not_none arg) (val_from_option arg) E.undefined
-      else E.runtime_call Primitive_modules.option "toUndefined" [arg]
+      else arg
 
-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
-    | Optional_block (x, _) -> E.poly_var_value_access x
-    (* invariant: option encoding *)
-    | _ -> E.runtime_call Primitive_modules.option "unwrapPolyVar" [arg]
+let option_unwrap (arg : J.expression) : J.expression = arg
 
 let destruct_optional ~for_sure_none ~for_sure_some ~not_sure
     (arg : J.expression) =
   let desc = arg.expression_desc in
   if is_none_static desc then for_sure_none
   else
     match desc with
-    | Optional_block (x, _) -> for_sure_some x
     | _ -> not_sure ()
 
 let some = E.optional_block

compiler/core/js_record_fold.ml

@@ -173,9 +173,6 @@ let expression_desc : 'a. ('a, expression_desc) fn =
   | Array (_x0, _x1) ->
     let st = list _self.expression _self st _x0 in
     st
-  | Optional_block (_x0, _x1) ->
-    let st = _self.expression _self st _x0 in
-    st
   | Caml_block (_x0, _x1, _x2, _x3) ->
     let st = list _self.expression _self st _x0 in
     let st = _self.expression _self st _x2 in

compiler/core/js_record_iter.ml

@@ -132,7 +132,6 @@ let expression_desc : expression_desc fn =
   | Str _ -> ()
   | Raw_js_code _ -> ()
   | Array (_x0, _x1) -> list _self.expression _self _x0
-  | Optional_block (_x0, _x1) -> _self.expression _self _x0
   | Caml_block (_x0, _x1, _x2, _x3) ->
     list _self.expression _self _x0;
     _self.expression _self _x2

compiler/core/js_record_map.ml

@@ -171,9 +171,6 @@ let expression_desc : expression_desc fn =
   | Array (_x0, _x1) ->
     let _x0 = list _self.expression _self _x0 in
     Array (_x0, _x1)
-  | Optional_block (_x0, _x1) ->
-    let _x0 = _self.expression _self _x0 in
-    Optional_block (_x0, _x1)
   | Caml_block (_x0, _x1, _x2, _x3) ->
     let _x0 = list _self.expression _self _x0 in
     let _x2 = _self.expression _self _x2 in

compiler/core/lam_compile_primitive.ml

@@ -93,21 +93,21 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
     | [e] -> (
       match e.expression_desc with
       | Var _ | Undefined _ | Null -> Js_of_lam_option.null_to_opt e
-      | _ -> E.runtime_call Primitive_modules.option "fromNull" args)
+      | _ -> e)
     | _ -> assert false)
   | Pundefined_to_opt -> (
     match args with
     | [e] -> (
       match e.expression_desc with
       | Var _ | Undefined _ | Null -> Js_of_lam_option.undef_to_opt e
-      | _ -> E.runtime_call Primitive_modules.option "fromUndefined" args)
+      | _ -> e)
     | _ -> assert false)
   | Pnull_undefined_to_opt -> (
     match args with
     | [e] -> (
       match e.expression_desc with
       | Var _ | Undefined _ | Null -> Js_of_lam_option.null_undef_to_opt e
-      | _ -> E.runtime_call Primitive_modules.option "fromNullable" args)
+      | _ -> e)
     | _ -> assert false)
   (* Compile %import: The module argument for dynamic import is represented as a path,
      and the module value is expressed through wrapping it with promise.then *)

compiler/ext/primitive_modules.ml

@@ -44,8 +44,6 @@ let module_ = "Primitive_module"
 
 let lazy_ = "Primitive_lazy"
 
-let option = "Primitive_option"
-
 let hash = "Primitive_hash"
 
 let exceptions = "Primitive_exceptions"

lib/es6/Belt_Array.js

@@ -1,11 +1,10 @@
 
 
 import * as Primitive_int from "./Primitive_int.js";
-import * as Primitive_option from "./Primitive_option.js";
 
 function get(arr, i) {
   if (i >= 0 && i < arr.length) {
-    return Primitive_option.some(arr[i]);
+    return arr[i];
   }
 
 }
@@ -297,7 +296,7 @@ function getBy(a, p) {
   while (r === undefined && i < l) {
     let v = a[i];
     if (p(v)) {
-      r = Primitive_option.some(v);
+      r = v;
     }
     i = i + 1 | 0;
   };
@@ -358,7 +357,7 @@ function keepMap(a, f) {
     let v = a[i];
     let v$1 = f(v);
     if (v$1 !== undefined) {
-      r[j] = Primitive_option.valFromOption(v$1);
+      r[j] = v$1;
       j = j + 1 | 0;
     }
 

lib/es6/Belt_HashMap.js

@@ -1,6 +1,5 @@
 
 
-import * as Primitive_option from "./Primitive_option.js";
 import * as Belt_internalBuckets from "./Belt_internalBuckets.js";
 import * as Belt_internalBucketsType from "./Belt_internalBucketsType.js";
 
@@ -138,19 +137,19 @@ function get(h, key) {
   }
   let eq = h.eq;
   if (eq(key, cell1.key)) {
-    return Primitive_option.some(cell1.value);
+    return cell1.value;
   }
   let cell2 = cell1.next;
   if (cell2 === undefined) {
     return;
   }
   if (eq(key, cell2.key)) {
-    return Primitive_option.some(cell2.value);
+    return cell2.value;
   }
   let cell3 = cell2.next;
   if (cell3 !== undefined) {
     if (eq(key, cell3.key)) {
-      return Primitive_option.some(cell3.value);
+      return cell3.value;
     } else {
       let _buckets = cell3.next;
       while (true) {
@@ -159,7 +158,7 @@ function get(h, key) {
           return;
         }
         if (eq(key, buckets.key)) {
-          return Primitive_option.some(buckets.value);
+          return buckets.value;
         }
         _buckets = buckets.next;
         continue;

lib/es6/Belt_HashMapInt.js

@@ -1,7 +1,6 @@
 
 
 import * as Primitive_hash from "./Primitive_hash.js";
-import * as Primitive_option from "./Primitive_option.js";
 import * as Belt_internalBuckets from "./Belt_internalBuckets.js";
 import * as Belt_internalBucketsType from "./Belt_internalBucketsType.js";
 
@@ -129,19 +128,19 @@ function get(h, key) {
     return;
   }
   if (key === cell1.key) {
-    return Primitive_option.some(cell1.value);
+    return cell1.value;
   }
   let cell2 = cell1.next;
   if (cell2 === undefined) {
     return;
   }
   if (key === cell2.key) {
-    return Primitive_option.some(cell2.value);
+    return cell2.value;
   }
   let cell3 = cell2.next;
   if (cell3 !== undefined) {
     if (key === cell3.key) {
-      return Primitive_option.some(cell3.value);
+      return cell3.value;
     } else {
       let _buckets = cell3.next;
       while (true) {
@@ -150,7 +149,7 @@ function get(h, key) {
           return;
         }
         if (key === buckets.key) {
-          return Primitive_option.some(buckets.value);
+          return buckets.value;
         }
         _buckets = buckets.next;
         continue;