rename Record_float into object

Author: bobzhang

jscomp/core/lam_convert.ml

@@ -194,7 +194,7 @@ let convert_record_repr ( x : Types.record_representation)
   : Lam_primitive.record_representation = 
   match x with 
   | Record_regular 
-  | Record_float ->  Record_regular
+  | Record_object ->  Record_regular (* FIX later*)
   | Record_extension -> Record_extension 
   | Record_unboxed _ -> assert false 
   (* see patches in {!Typedecl.get_unboxed_from_attributes}*)

jscomp/ml/includecore.ml

@@ -170,7 +170,7 @@ let report_type_mismatch0 first second decl ppf err =
   | Record_representation b ->
       pr "Their internal representations differ:@ %s %s %s"
         (if b then second else first) decl
-        "uses unboxed float representation"
+        "uses @@obj representation"
   | Unboxed_representation b ->
       pr "Their internal representations differ:@ %s %s %s"
          (if b then second else first) decl
@@ -320,7 +320,7 @@ let type_declarations ?(equality = false) ~loc env name decl1 id decl2 =
         let err = compare_records ~loc env decl1.type_params decl2.type_params
             1 labels1 labels2 in
         if err <> [] || rep1 = rep2 then err else
-        [Record_representation (rep2 = Record_float)]
+        [Record_representation (rep2 = Record_object)]
     | (Type_open, Type_open) -> []
     | (_, _) -> [Kind]
   in

jscomp/ml/matching.ml

@@ -1593,7 +1593,7 @@ let make_record_matching loc all_labels def = function
           let lbl = all_labels.(pos) in
           let access =
             match lbl.lbl_repres with
-            | Record_regular | Record_float -> 
+            | Record_regular | Record_object -> 
               Lprim (Pfield (lbl.lbl_pos, !Lambda.fld_record lbl), [arg], loc) 
             | Record_inlined _ ->
               Lprim (Pfield (lbl.lbl_pos, Fld_record_inline {name = lbl.lbl_name}), [arg], loc)

jscomp/ml/printlambda.ml

@@ -77,7 +77,7 @@ let record_rep ppf r =
   | Record_inlined {tag = i} -> fprintf ppf "inlined(%i)" i
   | Record_unboxed false -> fprintf ppf "unboxed"
   | Record_unboxed true -> fprintf ppf "inlined(unboxed)"
-  | Record_float -> fprintf ppf "float"
+  | Record_object -> fprintf ppf "object"
   | Record_extension -> fprintf ppf "ext"
 ;;
 

jscomp/ml/printtyped.ml

@@ -151,7 +151,7 @@ let arg_label i ppf = function
 
 let record_representation i ppf = let open Types in function
   | Record_regular -> line i ppf "Record_regular\n"
-  | Record_float -> line i ppf "Record_float\n"
+  | Record_object -> line i ppf "Record_object\n"
   | Record_unboxed b -> line i ppf "Record_unboxed %b\n" b
   | Record_inlined {tag = i} -> line i ppf "Record_inlined %d\n" i
   | Record_extension -> line i ppf "Record_extension\n"

jscomp/ml/translcore.ml

@@ -748,7 +748,7 @@ and transl_exp0 e =
   | Texp_field(arg, _, lbl) ->
       let targ = transl_exp arg in
       begin match lbl.lbl_repres with
-          Record_regular | Record_float  -> 
+          Record_regular | Record_object  -> 
           Lprim (Pfield (lbl.lbl_pos, !Lambda.fld_record lbl), [targ], e.exp_loc) 
         | Record_inlined _ ->
           Lprim (Pfield (lbl.lbl_pos, Fld_record_inline {name = lbl.lbl_name}), [targ], e.exp_loc)
@@ -759,12 +759,11 @@ and transl_exp0 e =
   | Texp_setfield(arg, _, lbl, newval) ->
       let access =
         match lbl.lbl_repres with
-          Record_regular -> 
+          Record_regular | Record_object -> 
           Psetfield(lbl.lbl_pos,  !Lambda.fld_record_set lbl)
         | Record_inlined _ -> 
           Psetfield(lbl.lbl_pos,  Fld_record_inline_set lbl.lbl_name)
         | Record_unboxed _ -> assert false
-        | Record_float -> Psetfield (lbl.lbl_pos,  !Lambda.fld_record_set lbl)
         | Record_extension -> 
           Psetfield (lbl.lbl_pos + 1,  Fld_record_extension_set lbl.lbl_name)
       in
@@ -1011,7 +1010,7 @@ and transl_record loc env fields repres opt_init_expr =
            | Kept _ ->
                let access =
                  match repres with
-                   Record_regular | Record_float ->   Pfield (i, !Lambda.fld_record lbl) 
+                   Record_regular | Record_object ->   Pfield (i, !Lambda.fld_record lbl) 
                  | Record_inlined _ -> Pfield (i, Fld_record_inline {name = lbl.lbl_name}) 
                  | Record_unboxed _ -> assert false
                  | Record_extension -> Pfield (i + 1, Fld_record_extension {name = lbl.lbl_name})in 
@@ -1071,12 +1070,12 @@ and transl_record loc env fields repres opt_init_expr =
       | Overridden (_lid, expr) ->
           let upd =
             match repres with
-              Record_regular -> 
+            | Record_object
+            | Record_regular -> 
               Psetfield(lbl.lbl_pos,  !Lambda.fld_record_set lbl)
             | Record_inlined _ -> 
                 Psetfield(lbl.lbl_pos,  Fld_record_inline_set lbl.lbl_name)
             | Record_unboxed _ -> assert false
-            | Record_float -> Psetfield (lbl.lbl_pos,  !Lambda.fld_record_set lbl)
             | Record_extension -> 
                 Psetfield(lbl.lbl_pos + 1,  Fld_record_extension_set lbl.lbl_name)
           in

jscomp/ml/typecore.ml

@@ -783,7 +783,7 @@ module Label = NameChoice (struct
   let unbound_name_error = Typetexp.unbound_label_error
   let in_env lbl =
     match lbl.lbl_repres with
-    | Record_regular | Record_float | Record_unboxed false -> true
+    | Record_regular | Record_object | Record_unboxed false -> true
     | Record_unboxed true | Record_inlined _ | Record_extension -> false
 end)
 

jscomp/ml/types.ml

@@ -151,7 +151,7 @@ and type_kind =
 
 and record_representation =
     Record_regular                      (* All fields are boxed / tagged *)
-  | Record_float                        (* All fields are floats *)
+  | Record_object                       (* None fileds can be omitted *)
   | Record_unboxed of bool    (* Unboxed single-field record, inlined or not *)
   | Record_inlined of {tag : int; name : string; num_nonconsts : int}               (* Inlined record *)
   | Record_extension                    (* Inlined record under extension *)

jscomp/ml/types.mli

@@ -298,7 +298,7 @@ and type_kind =
 
 and record_representation =
     Record_regular                      (* All fields are boxed / tagged *)
-  | Record_float                        (* All fields are floats *)
+  | Record_object                        (* All fields are floats *)
   | Record_unboxed of bool    (* Unboxed single-field record, inlined or not *)
   | Record_inlined of { tag : int ; name : string; num_nonconsts : int}              (* Inlined record *)
   | Record_extension                    (* Inlined record under extension *)