Merge pull request #4390 from BuckleScript/tweak_lazy_encoding

paren-less for `bs.as json literal`

Author: bobzhang

jscomp/core/js_dump.ml

@@ -680,7 +680,9 @@ and expression_desc cxt ~(level:int) f x : cxt  =
     (match info with
      | Exp exp_info ->
        let raw_paren =
-          not (match exp_info with  Js_literal _ -> true | _ -> false || raw_snippet_exp_simple_enough s) in 
+          not (match exp_info with  
+            | Js_literal _ | Js_raw_json -> true 
+            | Js_function _ | Js_exp_unknown -> false || raw_snippet_exp_simple_enough s) in 
        if raw_paren then P.string f L.lparen;
        P.string f s ;       
        if raw_paren then  P.string f L.rparen;

jscomp/core/js_exp_make.ml

@@ -775,6 +775,8 @@ let rec econd ?comment (pred : t) (ifso : t) (ifnot : t) : t =
   | Js_not e, _, _  when not_empty_branch ifnot
     ->
     econd ?comment e ifnot ifso  
+  | _, Seq (a,{expression_desc = Undefined}), Seq(b,{expression_desc = Undefined})
+    -> seq (econd ?comment pred a b ) undefined
   | _ -> 
     if Js_analyzer.eq_expression ifso ifnot then
       if no_side_effect pred then ifso else seq  ?comment pred ifso

jscomp/core/js_raw_info.ml

@@ -40,6 +40,7 @@ type exp =
     | RegExp of RegExp.t
   ]}
   *)
+  | Js_raw_json
   | Js_exp_unknown
 
 

jscomp/core/lam_compile_const.ml

@@ -129,7 +129,7 @@ let translate_arg_cst (cst : External_arg_spec.cst) =
      E.str i
    | Arg_js_null  -> E.nil
    | Arg_js_json s 
-     -> E.raw_js_code (Exp Js_exp_unknown) s
+     -> E.raw_js_code (Exp Js_raw_json) s
 
    | Arg_js_true  -> E.bool true
    | Arg_js_false -> E.bool false 

jscomp/test/bs_node_string_buffer_test.js

@@ -9,14 +9,13 @@ function f(str) {
           "buffer",
           Buffer.isBuffer(match[1])
         ]);
-    return ;
   } else {
     console.log(/* tuple */[
           "string",
           match[1]
         ]);
-    return ;
   }
+  
 }
 
 f("xx");

jscomp/test/gpr_1891_test.js

@@ -5,11 +5,10 @@ var Curry = require("../../lib/js/curry.js");
 function foo(x) {
   if (typeof x === "number" || x[0] !== 3505894 || x[1] !== 3) {
     console.log("2");
-    return ;
   } else {
     console.log("1");
-    return ;
   }
+  
 }
 
 function foo2(x) {
@@ -39,11 +38,10 @@ function foo4(x, h) {
 function foo5(x) {
   if (typeof x === "number" || x[0] !== 3505894 || x[1] !== 3) {
     console.log("x");
-    return ;
   } else {
     console.log("hi");
-    return ;
   }
+  
 }
 
 exports.foo = foo;

jscomp/test/gpr_3875_test.js

@@ -25,30 +25,27 @@ function compilerBug(a, b, c, f) {
     if (b === undefined) {
       if (c) {
         result.contents = "No x, c is true";
-        return ;
       } else {
         result.contents = "No x, c is false";
-        return ;
       }
+      return ;
     }
     if (b !== "x") {
       if (c) {
         result.contents = "No x, c is true";
-        return ;
       } else {
         result.contents = "No x, c is false";
-        return ;
       }
+      return ;
     }
 
   }
   if (Curry._1(f, undefined)) {
     result.contents = "Some x, f returns true";
-    return ;
   } else {
     result.contents = "Some x, f returns false";
-    return ;
   }
+  
 }
 
 var suites = {

jscomp/test/inline_record_test.js

@@ -79,11 +79,10 @@ eq("File \"inline_record_test.ml\", line 51, characters 6-13", tmp, 3);
 function ff(x) {
   if (x.tag) {
     x[/* z */0] = x[/* z */0] + 2 | 0;
-    return ;
   } else {
     x[/* x */0] = x[/* x */0] + 1 | 0;
-    return ;
   }
+  
 }
 
 var v4 = /* A0 */Block.__(0, [

jscomp/test/mario_game.js

@@ -808,11 +808,10 @@ function set_vel_to_speed(obj) {
   var match = obj.dir;
   if (match) {
     obj.vel.x = speed;
-    return ;
   } else {
     obj.vel.x = -speed;
-    return ;
   }
+  
 }
 
 function make_type$2(t) {

jscomp/test/mt.js

@@ -213,11 +213,10 @@ function from_promise_suites(name, suites) {
 
                           }), suites);
             }));
-      return ;
     } else {
       console.log("promise suites");
-      return ;
     }
+    return ;
   }
 
 }