add remaining part of melange-re/melange#732

Author: tsnobip

jscomp/core/bs_conditional_initial.ml

@@ -46,8 +46,13 @@ let setup_env () =
     Record_attributes_check.check_duplicated_labels;
   Lambda.fld_record := Record_attributes_check.fld_record;
   Lambda.fld_record_set := Record_attributes_check.fld_record_set;
+  Lambda.fld_record_inline := Record_attributes_check.fld_record_inline;
+  Lambda.fld_record_inline_set := Record_attributes_check.fld_record_inline_set;
+  Lambda.fld_record_extension := Record_attributes_check.fld_record_extension;
+  Lambda.fld_record_extension_set := Record_attributes_check.fld_record_extension_set;
   Lambda.blk_record := Record_attributes_check.blk_record;
   Lambda.blk_record_inlined := Record_attributes_check.blk_record_inlined;
+  Lambda.blk_record_ext := Record_attributes_check.blk_record_ext;
   Matching.names_from_construct_pattern := 
     Matching_polyfill.names_from_construct_pattern;
 

jscomp/core/record_attributes_check.ml

@@ -51,6 +51,22 @@ let fld_record_set (lbl : label) =
   Lambda.Fld_record_set
     (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
 
+let fld_record_inline (lbl : label) =
+  Lambda.Fld_record_inline
+    { name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name }
+
+let fld_record_inline_set (lbl : label) =
+  Lambda.Fld_record_inline_set
+    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+
+let fld_record_extension (lbl : label) =
+  Lambda.Fld_record_extension
+    { name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name }
+
+let fld_record_extension_set (lbl : label) =
+  Lambda.Fld_record_extension_set
+    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+
 let blk_record (fields : (label * _) array) mut record_repr =
   let all_labels_info =
     Ext_array.map fields (fun (lbl, _) ->
@@ -59,6 +75,15 @@ let blk_record (fields : (label * _) array) mut record_repr =
   Lambda.Blk_record
     { fields = all_labels_info; mutable_flag = mut; record_repr }
 
+let blk_record_ext fields mutable_flag =
+  let all_labels_info =
+    Array.map
+      (fun ((lbl : label), _) ->
+        Ext_list.find_def lbl.Types.lbl_attributes find_name lbl.lbl_name)
+      fields
+  in
+  Lambda.Blk_record_ext {fields = all_labels_info; mutable_flag }
+
 let blk_record_inlined fields name num_nonconst optional_labels ~tag ~attrs mutable_flag =
   let fields =
     Array.map

jscomp/ml/lambda.ml

@@ -121,6 +121,12 @@ type field_dbg_info =
 let fld_record = ref (fun (lbl : Types.label_description) ->
   Fld_record {name = lbl.lbl_name; mutable_flag = Mutable})
 
+let fld_record_inline = ref (fun (lbl : Types.label_description) ->
+  Fld_record_inline {name = lbl.lbl_name})
+
+let fld_record_extension = ref (fun (lbl : Types.label_description) ->
+  Fld_record_extension {name = lbl.lbl_name})
+
 let ref_field_info : field_dbg_info = 
   Fld_record { name = "contents"; mutable_flag = Mutable}
 
@@ -134,6 +140,12 @@ let ref_field_set_info : set_field_dbg_info = Fld_record_set "contents"
 let fld_record_set = ref ( fun (lbl : Types.label_description) ->
   Fld_record_set lbl.lbl_name  )
 
+let fld_record_inline_set = ref ( fun (lbl : Types.label_description) ->
+  Fld_record_inline_set lbl.lbl_name )
+
+let fld_record_extension_set = ref ( fun (lbl : Types.label_description) ->
+  Fld_record_extension_set lbl.lbl_name )
+
 type immediate_or_pointer =
   | Immediate
   | Pointer

jscomp/ml/lambda.mli

@@ -113,6 +113,14 @@ val fld_record :
   (Types.label_description -> 
   field_dbg_info) ref
 
+val fld_record_inline :
+  (Types.label_description -> 
+  field_dbg_info) ref
+
+val fld_record_extension :
+  (Types.label_description -> 
+  field_dbg_info) ref
+
 val ref_field_info : field_dbg_info   
 
 
@@ -128,6 +136,14 @@ val fld_record_set :
   (Types.label_description ->
   set_field_dbg_info) ref
 
+val fld_record_inline_set : 
+  (Types.label_description ->
+  set_field_dbg_info) ref
+
+val fld_record_extension_set :
+  (Types.label_description -> 
+  set_field_dbg_info) ref
+
 type immediate_or_pointer =
   | Immediate
   | Pointer

jscomp/test/as_inline_record_test.js

@@ -12,7 +12,17 @@ let getName = t =>
   | User({name}) => name
   }
 
+let getName' = t =>
+  switch t {
+  | User(u) => u.name
+  }
+
 let getAge = t => 
   switch t {
   | User({age}) => age
   }
+
+let getAge' = t => 
+  switch t {
+  | User(u) => u.age
+  }