snapshot

bobzhang · bobzhang · commit c7dbf6ccb0e1 · 2020-05-16T15:53:55.000+08:00
diff --git a/jscomp/test/bs_node_string_buffer_test.js b/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");
diff --git a/jscomp/test/gpr_1891_test.js b/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;
diff --git a/jscomp/test/gpr_3875_test.js b/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 = {
diff --git a/jscomp/test/inline_record_test.js b/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, [
diff --git a/jscomp/test/mario_game.js b/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) {
diff --git a/jscomp/test/mt.js b/jscomp/test/mt.js
@@ -213,11 +213,10 @@ function from_promise_suites(name, suites) {
                             
                           }), suites);
             }));
-      return ;
     } else {
       console.log("promise suites");
-      return ;
     }
+    return ;
   }
   
 }
diff --git a/jscomp/test/ocaml_parsetree_test.js b/jscomp/test/ocaml_parsetree_test.js
@@ -2248,11 +2248,10 @@ function associate_docstrings(dsl) {
                 var match = ds.ds_associated;
                 if (match !== 0) {
                   ds.ds_associated = /* Many */2;
-                  return ;
                 } else {
                   ds.ds_associated = /* One */1;
-                  return ;
                 }
+                
               }), dsl);
 }
 
diff --git a/jscomp/test/ocaml_typedtree_test.js b/jscomp/test/ocaml_typedtree_test.js
@@ -6488,11 +6488,10 @@ function associate_docstrings(dsl) {
                 var match = ds.ds_associated;
                 if (match !== 0) {
                   ds.ds_associated = /* Many */2;
-                  return ;
                 } else {
                   ds.ds_associated = /* One */1;
-                  return ;
                 }
+                
               }), dsl);
 }
 
@@ -40595,14 +40594,13 @@ function set_printing_env(env) {
                     /* [] */0
                   ]
                 ]]);
-            return ;
           } else {
             r.contents = /* Paths */Block.__(0, [/* :: */[
                   p,
                   l[0]
                 ]]);
-            return ;
           }
+          return ;
         }
         catch (raw_exn){
           var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -63405,15 +63403,14 @@ function type_let(checkOpt, check_strictOpt, env, rec_flag, spat_sexp_list, scop
                         slot$1.contents
                       ];
                       rec_needed.contents = true;
-                      return ;
                     } else {
                       List.iter((function (param) {
                               return mark_value_used(env, param[0], param[1]);
                             }), get_ref(slot));
                       used.contents = true;
                       some_used.contents = true;
-                      return ;
                     }
+                    
                   };
                   var key_001 = vd.val_loc;
                   var key = /* tuple */[
diff --git a/jscomp/test/parser_api.js b/jscomp/test/parser_api.js
@@ -4269,11 +4269,10 @@ function associate_docstrings(dsl) {
                 var match = ds.ds_associated;
                 if (match !== 0) {
                   ds.ds_associated = /* Many */2;
-                  return ;
                 } else {
                   ds.ds_associated = /* One */1;
-                  return ;
                 }
+                
               }), dsl);
 }
 
diff --git a/jscomp/test/qcc.js b/jscomp/test/qcc.js
@@ -462,11 +462,10 @@ function patchlval(param) {
   var n = lval.contents[0];
   if (n.tag) {
     opos.contents = opos.contents - n[0] | 0;
-    return ;
   } else {
     obuf[opos.contents - n[0] | 0] = /* "\141" */141;
-    return ;
   }
+  
 }
 
 function read(param) {
@@ -477,16 +476,15 @@ function read(param) {
       /* Del */Block.__(1, [4]),
       /* Chr */1
     ];
-    return ;
   } else {
     out(18571);
     le(8, 0);
     lval.contents = /* tuple */[
       /* Del */Block.__(1, [3]),
       /* Int */0
     ];
-    return ;
   }
+  
 }
 
 var globs = Caml_array.caml_make_vect(100, {
diff --git a/jscomp/test/reactDOMRe.js b/jscomp/test/reactDOMRe.js
@@ -8,22 +8,20 @@ function renderToElementWithClassName(reactElement, className) {
   var elements = document.getElementsByClassName(className);
   if (elements.length !== 0) {
     ReactDom.render(reactElement, elements[0]);
-    return ;
   } else {
     console.error("ReactDOMRe.renderToElementWithClassName: no element of class " + (className + " found in the HTML."));
-    return ;
   }
+  
 }
 
 function renderToElementWithId(reactElement, id) {
   var element = document.getElementById(id);
   if (element == null) {
     console.error("ReactDOMRe.renderToElementWithId : no element of id " + (id + " found in the HTML."));
-    return ;
   } else {
     ReactDom.render(reactElement, element);
-    return ;
   }
+  
 }
 
 function createRootWithClassName(className) {
@@ -53,11 +51,10 @@ function hydrateToElementWithClassName(reactElement, className) {
   var elements = document.getElementsByClassName(className);
   if (elements.length !== 0) {
     ReactDom.hydrate(reactElement, elements[0]);
-    return ;
   } else {
     console.error("ReactDOMRe.hydrateToElementWithClassName: no element of class " + (className + " found in the HTML."));
-    return ;
   }
+  
 }
 
 function hydrateToElementWithId(reactElement, id) {
diff --git a/jscomp/test/reasonReact.js b/jscomp/test/reasonReact.js
@@ -223,11 +223,10 @@ function createClass(debugName) {
                   var subs = $$this.subscriptions;
                   if (subs !== null) {
                     subs.push(subscription);
-                    return ;
                   } else {
                     $$this.subscriptions = [subscription];
-                    return ;
                   }
+                  
                 }),
               handleMethod: (function (callback) {
                   var $$this = this ;
diff --git a/jscomp/test/testing.js b/jscomp/test/testing.js
@@ -17,11 +17,10 @@ function finish(param) {
   var match = all_tests_ok.contents;
   if (match) {
     console.log("\nAll tests succeeded.");
-    return ;
   } else {
     console.log("\n\n********* Test suite failed. ***********\n");
-    return ;
   }
+  
 }
 
 Pervasives.at_exit(finish);
diff --git a/jscomp/test/undef_regression2_test.js b/jscomp/test/undef_regression2_test.js
@@ -51,22 +51,20 @@ function test(param) {
   var match = typeof __DEV__ === "undefined" ? undefined : __DEV__;
   if (match !== undefined) {
     console.log("dev mode");
-    return ;
   } else {
     console.log("producton mode");
-    return ;
   }
+  
 }
 
 function test2(param) {
   var f = typeof __filename === "undefined" ? undefined : __filename;
   if (f !== undefined) {
     console.log(f);
-    return ;
   } else {
     console.log("non node environment");
-    return ;
   }
+  
 }
 
 function test3(param) {
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -87025,6 +87025,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
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
@@ -379469,6 +379469,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
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -380236,6 +380236,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
diff --git a/lib/es6/belt_MutableQueue.js b/lib/es6/belt_MutableQueue.js
@@ -28,13 +28,12 @@ function add(q, x) {
     q.length = q.length + 1 | 0;
     last.next = cell;
     q.last = cell;
-    return ;
   } else {
     q.length = 1;
     q.first = cell;
     q.last = cell;
-    return ;
   }
+  
 }
 
 function peek(q) {
diff --git a/lib/es6/belt_internalBuckets.js b/lib/es6/belt_internalBuckets.js
@@ -176,11 +176,10 @@ function filterMapInplaceBucket(f, h, i, _prec, _cell) {
     if (n === undefined) {
       if (prec !== undefined) {
         prec.next = n;
-        return ;
       } else {
         h.buckets[i] = prec;
-        return ;
       }
+      return ;
     }
     _cell = n;
     continue ;
diff --git a/lib/es6/caml_hash.js b/lib/es6/caml_hash.js
@@ -12,13 +12,12 @@ function push_back(q, v) {
     q.length = q.length + 1 | 0;
     last.next = cell;
     q.last = cell;
-    return ;
   } else {
     q.length = 1;
     q.first = cell;
     q.last = cell;
-    return ;
   }
+  
 }
 
 function unsafe_pop(q) {
diff --git a/lib/es6/caml_io.js b/lib/es6/caml_io.js
diff --git a/lib/es6/format.js b/lib/es6/format.js
diff --git a/lib/es6/queue.js b/lib/es6/queue.js
diff --git a/lib/js/belt_MutableQueue.js b/lib/js/belt_MutableQueue.js
diff --git a/lib/js/belt_internalBuckets.js b/lib/js/belt_internalBuckets.js
diff --git a/lib/js/caml_hash.js b/lib/js/caml_hash.js
diff --git a/lib/js/caml_io.js b/lib/js/caml_io.js
diff --git a/lib/js/format.js b/lib/js/format.js
diff --git a/lib/js/queue.js b/lib/js/queue.js

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,10 @@ var Curry = require("../../lib/js/curry.js");`
`5`	`5`	`function foo(x) {`
`6`	`6`	`if (typeof x === "number" \|\| x[0] !== 3505894 \|\| x[1] !== 3) {`
`7`	`7`	`console.log("2");`
`8`		`- return ;`
`9`	`8`	`} else {`
`10`	`9`	`console.log("1");`
`11`		`- return ;`
`12`	`10`	`}`
	`11`	`+`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`function foo2(x) {`
`@@ -39,11 +38,10 @@ function foo4(x, h) {`
`39`	`38`	`function foo5(x) {`
`40`	`39`	`if (typeof x === "number" \|\| x[0] !== 3505894 \|\| x[1] !== 3) {`
`41`	`40`	`console.log("x");`
`42`		`- return ;`
`43`	`41`	`} else {`
`44`	`42`	`console.log("hi");`
`45`		`- return ;`
`46`	`43`	`}`
	`44`	`+`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`exports.foo = foo;`
Original file line number	Diff line number	Diff line change
`@@ -25,30 +25,27 @@ function compilerBug(a, b, c, f) {`
`25`	`25`	`if (b === undefined) {`
`26`	`26`	`if (c) {`
`27`	`27`	`result.contents = "No x, c is true";`
`28`		`- return ;`
`29`	`28`	`} else {`
`30`	`29`	`result.contents = "No x, c is false";`
`31`		`- return ;`
`32`	`30`	`}`
	`31`	`+ return ;`
`33`	`32`	`}`
`34`	`33`	`if (b !== "x") {`
`35`	`34`	`if (c) {`
`36`	`35`	`result.contents = "No x, c is true";`
`37`		`- return ;`
`38`	`36`	`} else {`
`39`	`37`	`result.contents = "No x, c is false";`
`40`		`- return ;`
`41`	`38`	`}`
	`39`	`+ return ;`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`}`
`45`	`43`	`if (Curry._1(f, undefined)) {`
`46`	`44`	`result.contents = "Some x, f returns true";`
`47`		`- return ;`
`48`	`45`	`} else {`
`49`	`46`	`result.contents = "Some x, f returns false";`
`50`		`- return ;`
`51`	`47`	`}`
	`48`	`+`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`var suites = {`
Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,10 @@ eq("File \"inline_record_test.ml\", line 51, characters 6-13", tmp, 3);`
`79`	`79`	`function ff(x) {`
`80`	`80`	`if (x.tag) {`
`81`	`81`	`x[/* z /0] = x[/ z */0] + 2 \| 0;`
`82`		`- return ;`
`83`	`82`	`} else {`
`84`	`83`	`x[/* x /0] = x[/ x */0] + 1 \| 0;`
`85`		`- return ;`
`86`	`84`	`}`
	`85`	`+`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`var v4 = /* A0 */Block.__(0, [`
Original file line number	Diff line number	Diff line change
`@@ -808,11 +808,10 @@ function set_vel_to_speed(obj) {`
`808`	`808`	`var match = obj.dir;`
`809`	`809`	`if (match) {`
`810`	`810`	`obj.vel.x = speed;`
`811`		`- return ;`
`812`	`811`	`} else {`
`813`	`812`	`obj.vel.x = -speed;`
`814`		`- return ;`
`815`	`813`	`}`
	`814`	`+`
`816`	`815`	`}`
`817`	`816`
`818`	`817`	`function make_type$2(t) {`
Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,10 @@ function from_promise_suites(name, suites) {`
`213`	`213`
`214`	`214`	`}), suites);`
`215`	`215`	`}));`
`216`		`- return ;`
`217`	`216`	`} else {`
`218`	`217`	`console.log("promise suites");`
`219`		`- return ;`
`220`	`218`	`}`
	`219`	`+ return ;`
`221`	`220`	`}`
`222`	`221`
`223`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2248,11 +2248,10 @@ function associate_docstrings(dsl) {`
`2248`	`2248`	`var match = ds.ds_associated;`
`2249`	`2249`	`if (match !== 0) {`
`2250`	`2250`	`ds.ds_associated = /* Many */2;`
`2251`		`- return ;`
`2252`	`2251`	`} else {`
`2253`	`2252`	`ds.ds_associated = /* One */1;`
`2254`		`- return ;`
`2255`	`2253`	`}`
	`2254`	`+`
`2256`	`2255`	`}), dsl);`
`2257`	`2256`	`}`
`2258`	`2257`
Original file line number	Diff line number	Diff line change
`@@ -4269,11 +4269,10 @@ function associate_docstrings(dsl) {`
`4269`	`4269`	`var match = ds.ds_associated;`
`4270`	`4270`	`if (match !== 0) {`
`4271`	`4271`	`ds.ds_associated = /* Many */2;`
`4272`		`- return ;`
`4273`	`4272`	`} else {`
`4274`	`4273`	`ds.ds_associated = /* One */1;`
`4275`		`- return ;`
`4276`	`4274`	`}`
	`4275`	`+`
`4277`	`4276`	`}), dsl);`
`4278`	`4277`	`}`
`4279`	`4278`