[code gen] continue refinement

Author: bobzhang

jscomp/bin/whole_compiler.ml

@@ -70962,6 +70962,23 @@ let rec eq_expression
           p0 = p1 && b0 =  b1 && eq_expression e0 e1
         |  _ -> false 
       end
+    | Dump (l0,es0) -> 
+      begin match y0 with 
+        | Dump(l1,es1) -> 
+          l0 = l1 && eq_expression_list es0 es1
+        | _ -> false     
+      end
+    | Seq (a0,b0) -> 
+      begin match y0 with       
+        | Seq(a1,b1) -> 
+          eq_expression a0 a1 && eq_expression b0 b1
+        | _ -> false 
+      end
+    | Bool a0 -> 
+      begin match y0 with 
+        | Bool b0 -> a0 = b0
+        | _ -> false 
+      end
     | Length _ 
     | Char_of_int _
     | Char_to_int _ 
@@ -70972,15 +70989,15 @@ let rec eq_expression
     | String_append _ 
     | Int_of_boolean _ 
     | Anything_to_number _ 
-    | Bool _ 
+
     | Typeof _ 
     | Caml_not _
     | Js_not _ 
     | String_of_small_int_array _ 
     | Json_stringify _ 
     | Anything_to_string _ 
-    | Dump _ 
-    | Seq _ 
+
+
     | Cond _ 
     | FlatCall  _
     | Bind _ 
@@ -71010,13 +71027,49 @@ and eq_expression_list xs ys =
     | x::xs, y::ys -> eq_expression x y && aux xs ys 
   in
   aux xs ys
-
-and eq_statement (x : J.statement) (y : J.statement) = 
-  match x.statement_desc, y.statement_desc with 
-  | Exp a, Exp b 
-  | Return { return_value = a ; _} , Return { return_value = b; _} ->
-    eq_expression a b
-  | _, _ ->
+and eq_statement_list xs ys =
+  let rec aux xs ys =
+    match xs,ys with
+    | [], [] -> true
+    | [], _  -> false 
+    | _ , [] -> false
+    | x::xs, y::ys -> eq_statement x y && aux xs ys 
+  in
+  aux xs ys
+and eq_statement 
+    ({statement_desc = x0} : J.statement)
+    ({statement_desc = y0} : J.statement) = 
+  match x0  with 
+  | Exp a -> 
+    begin match y0 with 
+      | Exp b -> eq_expression a b 
+      | _ -> false
+    end
+  | Return { return_value = a ; _} -> 
+    begin match y0 with 
+      | Return { return_value = b; _} ->
+        eq_expression a b
+      | _ -> false 
+    end
+  | Debugger -> y0 = Debugger  
+  | Break -> y0 = Break 
+  | Block xs0 -> 
+    begin match y0 with 
+    | Block ys0 -> 
+      eq_statement_list xs0 ys0
+    | _ -> false 
+  end
+  | Variable _ 
+  | If _ 
+  | While _ 
+  | ForRange _ 
+  | Continue _ 
+  
+  | Int_switch _ 
+  | String_switch _ 
+  | Throw _ 
+  | Try _ 
+    -> 
     false 
 
 let rev_flatten_seq (x : J.expression) = 

jscomp/core/js_analyzer.ml

@@ -246,6 +246,23 @@ let rec eq_expression
           p0 = p1 && b0 =  b1 && eq_expression e0 e1
         |  _ -> false 
       end
+    | Dump (l0,es0) -> 
+      begin match y0 with 
+        | Dump(l1,es1) -> 
+          l0 = l1 && eq_expression_list es0 es1
+        | _ -> false     
+      end
+    | Seq (a0,b0) -> 
+      begin match y0 with       
+        | Seq(a1,b1) -> 
+          eq_expression a0 a1 && eq_expression b0 b1
+        | _ -> false 
+      end
+    | Bool a0 -> 
+      begin match y0 with 
+        | Bool b0 -> a0 = b0
+        | _ -> false 
+      end
     | Length _ 
     | Char_of_int _
     | Char_to_int _ 
@@ -256,15 +273,15 @@ let rec eq_expression
     | String_append _ 
     | Int_of_boolean _ 
     | Anything_to_number _ 
-    | Bool _ 
+
     | Typeof _ 
     | Caml_not _
     | Js_not _ 
     | String_of_small_int_array _ 
     | Json_stringify _ 
     | Anything_to_string _ 
-    | Dump _ 
-    | Seq _ 
+
+
     | Cond _ 
     | FlatCall  _
     | Bind _ 
@@ -294,13 +311,49 @@ and eq_expression_list xs ys =
     | x::xs, y::ys -> eq_expression x y && aux xs ys 
   in
   aux xs ys
-
-and eq_statement (x : J.statement) (y : J.statement) = 
-  match x.statement_desc, y.statement_desc with 
-  | Exp a, Exp b 
-  | Return { return_value = a ; _} , Return { return_value = b; _} ->
-    eq_expression a b
-  | _, _ ->
+and eq_statement_list xs ys =
+  let rec aux xs ys =
+    match xs,ys with
+    | [], [] -> true
+    | [], _  -> false 
+    | _ , [] -> false
+    | x::xs, y::ys -> eq_statement x y && aux xs ys 
+  in
+  aux xs ys
+and eq_statement 
+    ({statement_desc = x0} : J.statement)
+    ({statement_desc = y0} : J.statement) = 
+  match x0  with 
+  | Exp a -> 
+    begin match y0 with 
+      | Exp b -> eq_expression a b 
+      | _ -> false
+    end
+  | Return { return_value = a ; _} -> 
+    begin match y0 with 
+      | Return { return_value = b; _} ->
+        eq_expression a b
+      | _ -> false 
+    end
+  | Debugger -> y0 = Debugger  
+  | Break -> y0 = Break 
+  | Block xs0 -> 
+    begin match y0 with 
+    | Block ys0 -> 
+      eq_statement_list xs0 ys0
+    | _ -> false 
+  end
+  | Variable _ 
+  | If _ 
+  | While _ 
+  | ForRange _ 
+  | Continue _ 
+  
+  | Int_switch _ 
+  | String_switch _ 
+  | Throw _ 
+  | Try _ 
+    -> 
     false 
 
 let rev_flatten_seq (x : J.expression) = 

jscomp/test/.depend

@@ -244,7 +244,7 @@ gpr_1760_test.cmj : mt.cmj ../stdlib/int64.cmj ../stdlib/int32.cmj
 gpr_1762_test.cmj : mt.cmj
 gpr_1817_test.cmj : mt.cmj ../runtime/js.cmj
 gpr_1822_test.cmj : mt.cmj
-gpr_1891_test.cmj :
+gpr_1891_test.cmj : ../runtime/js.cmj
 gpr_405_test.cmj : ../stdlib/hashtbl.cmj gpr_405_test.cmi
 gpr_441.cmj :
 gpr_459_test.cmj : mt.cmj

jscomp/test/gpr_1891_test.js

@@ -1,14 +1,9 @@
 'use strict';
 
+var Curry = require("../../lib/js/curry.js");
 
 function foo(x) {
-  if (typeof x === "number") {
-    console.log("2");
-    return /* () */0;
-  } else if (x[0] !== 3505894) {
-    console.log("2");
-    return /* () */0;
-  } else if (x[1] !== 3) {
+  if (typeof x === "number" || x[0] !== 3505894 || x[1] !== 3) {
     console.log("2");
     return /* () */0;
   } else {
@@ -33,7 +28,27 @@ function foo3(x) {
   }
 }
 
+function foo4(x, h) {
+  if (typeof x === "number" || x[0] !== 3505894 || x[1] !== 3) {
+    return /* () */0;
+  } else {
+    return Curry._1(h, /* () */0);
+  }
+}
+
+function foo5(x) {
+  if (typeof x === "number" || x[0] !== 3505894 || x[1] !== 3) {
+    console.log("x");
+    return /* () */0;
+  } else {
+    console.log("hi");
+    return /* () */0;
+  }
+}
+
 exports.foo  = foo;
 exports.foo2 = foo2;
 exports.foo3 = foo3;
+exports.foo4 = foo4;
+exports.foo5 = foo5;
 /* No side effect */

jscomp/test/gpr_1891_test.ml

@@ -20,4 +20,12 @@ let foo3  x =
 
 
 
-  
+let foo4 x h = 
+  match x with 
+  | `Foo 3 ->  h ()
+  | _ -> ()
+
+let foo5 x = 
+  match x with
+  | `Foo 3 -> Js.log "hi"
+  | _ -> Js.log "x"

jscomp/test/ocaml_typedtree_test.js

@@ -12024,10 +12024,7 @@ function components_of_module_maker(param) {
                             pos[0]
                           ], c[/* comp_values */0]);
                       var match = decl[/* val_kind */1];
-                      if (typeof match === "number") {
-                        pos[0] = pos[0] + 1 | 0;
-                        return /* () */0;
-                      } else if (match.tag) {
+                      if (typeof match === "number" || match.tag) {
                         pos[0] = pos[0] + 1 | 0;
                         return /* () */0;
                       } else {

jscomp/test/test_ramification.js

@@ -48,11 +48,7 @@ function f3(x) {
   var v = 0;
   var y;
   v = 1;
-  if (x.tag) {
-    y = 4;
-  } else {
-    y = 3;
-  }
+  y = x.tag ? 4 : 3;
   return y + 32 | 0;
 }
 

jscomp/test/test_require.js

@@ -8,12 +8,8 @@ if (match !== undefined) {
   var match$1 = typeof (module) === "undefined" ? undefined : (module);
   var match$2 = match.main;
   if (match$1 !== undefined) {
-    if (match$2 !== undefined) {
-      if (match$1 === match$2) {
-        console.log("is main");
-      } else {
-        console.log("not main");
-      }
+    if (match$2 !== undefined && match$1 === match$2) {
+      console.log("is main");
     } else {
       console.log("not main");
     }

lib/js/genlex.js

@@ -484,14 +484,8 @@ function make_lexer(keywords) {
     var match = Stream.peek(strm__);
     if (match) {
       var c = match[0];
-      if (c !== 43) {
-        if (c !== 45) {
-          return end_exponent_part(strm__);
-        } else {
-          Stream.junk(strm__);
-          store(c);
-          return end_exponent_part(strm__);
-        }
+      if (c !== 43 && c !== 45) {
+        return end_exponent_part(strm__);
       } else {
         Stream.junk(strm__);
         store(c);