Merge pull request #4545 from BuckleScript/disable_record_punning

fix #4535 disable record punning temporarily

Author: bobzhang

jscomp/core/js_dump.ml

@@ -940,49 +940,43 @@ and expression_desc cxt ~(level:int) f x : cxt  =
       let cxt = P.group f 1 (fun _ -> expression ~level:3 cxt f e1) in
 
       P.space f;
-      P.string f L.colon;
-      P.space f ;
+      P.string f L.colon_space;
       (* idem *)
       P.group f 1 (fun _ -> expression ~level:3 cxt f e2)
     in
     if level > 2 then P.paren_vgroup f 1 action else action ()
 
-  | Object lst ->    
-    let action () =
-      if lst = [] then begin P.string f "{}" ; cxt end else      
-        P.brace_vgroup f 1 (fun _ ->
-            property_name_and_value_list cxt f lst) in
-    if level > 1 then
+  | Object lst ->        
       (* #1946 object literal is easy to be
          interpreted as block statement
          here we avoid parens in such case
          {[
            var f = { x : 2 , y : 2}
          ]}
       *)
-      P.paren_group f 1 action
-    else action ()
+    P.cond_paren_group f (level > 1 ) 1 (fun _ -> 
+        if lst = [] then begin P.string f "{}" ; cxt end else      
+          P.brace_vgroup f 1 (fun _ ->
+              property_name_and_value_list cxt f lst) 
+      )
+
 
 and property_name_and_value_list cxt f (l : J.property_map) =     
   iter_lst cxt f l (fun cxt f (pn,e) -> 
       match e.expression_desc with  
       | Var (Id v | Qualified (v,_,None)) -> 
         let key = Js_dump_property.property_key pn in 
         let str, cxt = Ext_pp_scope.str_of_ident cxt v in 
-        if key = str then 
-          P.string f key
-        else begin 
-          P.string f key;
-          P.string f L.colon;
-          P.space f;
-          P.string f str ;
-        end;
+        let content = 
+          (* if key = str then key 
+          else   *)
+          key ^ L.colon_space ^ str  in 
+        P.string f content ; 
         cxt 
       | _ -> 
         let key = Js_dump_property.property_key pn in 
         P.string f key;
-        P.string f L.colon;
-        P.space f;
+        P.string f L.colon_space;
         expression ~level:1 cxt f e
     ) comma_nl      
 

jscomp/core/js_dump_lit.ml

@@ -38,6 +38,7 @@ let exports = "exports"
 let dot = "."
 let comma = ","
 let colon = Ext_string.single_colon
+let colon_space = ": "
 let throw = "throw"
 let default = "default"
 let length = "length"

jscomp/test/block_alias_test.js

@@ -38,7 +38,7 @@ var v1 = {
 
 var N = {
   Block: Block$1,
-  v1
+  v1: v1
 };
 
 var Caml_obj$1 = {};

jscomp/test/caml_format_test.js

@@ -1850,13 +1850,13 @@ var string_of_lambda = Curry._1(Format.asprintf(/* Format */{
         }), pr_lambda);
 
 var Lambda_suites = {
-  ident,
-  kwd,
-  pr_exp0,
-  pr_app,
-  pr_other_applications,
-  pr_lambda,
-  string_of_lambda
+  ident: ident,
+  kwd: kwd,
+  pr_exp0: pr_exp0,
+  pr_app: pr_app,
+  pr_other_applications: pr_other_applications,
+  pr_lambda: pr_lambda,
+  string_of_lambda: string_of_lambda
 };
 
 var lambda_suites = [

jscomp/test/defunctor_make_test.js

@@ -11,8 +11,8 @@ function Make(M) {
 }
 
 var Comparable = {
-  getcompare,
-  Make
+  getcompare: getcompare,
+  Make: Make
 };
 
 function height(param) {
@@ -143,7 +143,7 @@ function empty(v) {
 var compare = Caml_primitive.caml_int_compare;
 
 var V0 = {
-  compare
+  compare: compare
 };
 
 var compare$1 = Caml_primitive.caml_int_compare;

jscomp/test/demo.js

@@ -49,7 +49,7 @@ function ui_layout(compile, lookup, appContext) {
   var mk_titleRow = function (text) {
     return {
             label: {
-              text
+              text: text
             }
           };
   };
@@ -109,8 +109,8 @@ function ui_layout(compile, lookup, appContext) {
                   var bid = price + 20 * Math.random();
                   var ask = price + 20 * Math.random();
                   var result = Curry._1(computeFunction.contents, {
-                        bid,
-                        ask
+                        bid: bid,
+                        ask: ask
                       });
                   return [
                           mk_titleRow(param.ticker),

jscomp/test/demo_int_map.js

@@ -13,10 +13,10 @@ function create(l, x, d, r) {
   var hl = height(l);
   var hr = height(r);
   return /* Node */{
-          l,
+          l: l,
           v: x,
-          d,
-          r,
+          d: d,
+          r: r,
           h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
         };
 }
@@ -50,10 +50,10 @@ function bal(l, x, d, r) {
   }
   if (hr <= (hl + 2 | 0)) {
     return /* Node */{
-            l,
+            l: l,
             v: x,
-            d,
-            r,
+            d: d,
+            r: r,
             h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
           };
   }
@@ -101,10 +101,10 @@ function add(x, data, m) {
       return m;
     } else {
       return /* Node */{
-              l,
+              l: l,
               v: x,
               d: data,
-              r,
+              r: r,
               h: m.h
             };
     }

jscomp/test/exception_alias.js

@@ -66,7 +66,7 @@ var List$1 = {
   fast_sort: List.fast_sort,
   sort_uniq: List.sort_uniq,
   merge: List.merge,
-  b,
+  b: b,
   length: 3
 };
 

jscomp/test/exception_rebind_test.js

@@ -6,7 +6,7 @@ var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
 var E = Caml_exceptions.create("Exception_rebind_test.A.E");
 
 var A = {
-  E
+  E: E
 };
 
 var B = {

jscomp/test/extensible_variant_test.js

@@ -8,7 +8,7 @@ var Str = Caml_exceptions.create("Extensible_variant_test.Str");
 var Int = Caml_exceptions.create("Extensible_variant_test.N.Int");
 
 var N = {
-  Int
+  Int: Int
 };
 
 var Int$1 = Caml_exceptions.create("Extensible_variant_test.Int");