Merge pull request #3881 from BuckleScript/gpr_3877

fix #3877

Author: bobzhang

jscomp/core/js_exp_make.ml

@@ -990,11 +990,11 @@ let rec is_out ?comment (e : t) (range : t) : t  =
       not (or_ (triple_equal e zero_int_literal) (triple_equal e one_int_literal))                  
     | Number (Int {i = 1l}), 
       (
-        Bin (Plus , {expression_desc = Number (Int {i ; _}) }, {expression_desc = Var _; _})
-      | Bin (Plus, {expression_desc = Var _; _}, {expression_desc = Number (Int {i ; _}) }))
+        Bin (Plus , {expression_desc = Number (Int {i ; _}) }, ({expression_desc = Var _; _} as x ))
+      | Bin (Plus, ({expression_desc = Var _; _} as x), {expression_desc = Number (Int {i ; _}) }))
 
       ->
-      not (or_ (triple_equal e (int (Int32.neg i ))) (triple_equal e (int (Int32.sub Int32.one  i))))        
+      not (or_ (triple_equal x (int (Int32.neg i ))) (triple_equal x (int (Int32.sub Int32.one  i))))        
     | Number (Int {i = 1l}), 
       Bin (Minus ,  ({expression_desc = Var _; _} as x), {expression_desc = Number (Int {i ; _}) })        
       ->           

jscomp/test/build.ninja

@@ -305,6 +305,7 @@ build test/gpr_3865.cmi test/gpr_3865.cmj : cc test/gpr_3865.re | test/gpr_3865_
 build test/gpr_3865_bar.cmi test/gpr_3865_bar.cmj : cc test/gpr_3865_bar.re | $stdlib
 build test/gpr_3865_foo.cmi test/gpr_3865_foo.cmj : cc test/gpr_3865_foo.re | $stdlib
 build test/gpr_3875_test.cmi test/gpr_3875_test.cmj : cc test/gpr_3875_test.ml | test/mt.cmj $stdlib
+build test/gpr_3877_test.cmi test/gpr_3877_test.cmj : cc test/gpr_3877_test.ml | $stdlib
 build test/gpr_405_test.cmj : cc_cmi test/gpr_405_test.ml | test/gpr_405_test.cmi $stdlib
 build test/gpr_405_test.cmi : cc test/gpr_405_test.mli | $stdlib
 build test/gpr_441.cmi test/gpr_441.cmj : cc test/gpr_441.ml | $stdlib

jscomp/test/gpr_3877_test.js

@@ -0,0 +1,21 @@
+'use strict';
+
+
+var switcher = -299;
+
+if (switcher > 99 || switcher < 0) {
+  if (switcher === -300 || switcher === -299) {
+    console.log("good response");
+  } else {
+    console.log("the catch all");
+  }
+} else if (switcher > 97 || switcher < 12) {
+  console.log("bad response");
+} else {
+  console.log("the catch all");
+}
+
+var httpResponseCode = 201;
+
+exports.httpResponseCode = httpResponseCode;
+/*  Not a pure module */

jscomp/test/gpr_3877_test.ml

@@ -0,0 +1,8 @@
+let httpResponseCode = 201
+let _ =
+  match httpResponseCode with
+  | 201|200 ->
+      Js.log (("good response"))
+  | 500|503|506|509|598|501|504|507|510|599|502|505|508|511 ->
+      Js.log (("bad response"))
+  | _ -> Js.log (("the catch all"))

lib/4.02.3/unstable/js_compiler.ml

@@ -83178,11 +83178,11 @@ let rec is_out ?comment (e : t) (range : t) : t  =
       not (or_ (triple_equal e zero_int_literal) (triple_equal e one_int_literal))                  
     | Number (Int {i = 1l}), 
       (
-        Bin (Plus , {expression_desc = Number (Int {i ; _}) }, {expression_desc = Var _; _})
-      | Bin (Plus, {expression_desc = Var _; _}, {expression_desc = Number (Int {i ; _}) }))
+        Bin (Plus , {expression_desc = Number (Int {i ; _}) }, ({expression_desc = Var _; _} as x ))
+      | Bin (Plus, ({expression_desc = Var _; _} as x), {expression_desc = Number (Int {i ; _}) }))
 
       ->
-      not (or_ (triple_equal e (int (Int32.neg i ))) (triple_equal e (int (Int32.sub Int32.one  i))))        
+      not (or_ (triple_equal x (int (Int32.neg i ))) (triple_equal x (int (Int32.sub Int32.one  i))))        
     | Number (Int {i = 1l}), 
       Bin (Minus ,  ({expression_desc = Var _; _} as x), {expression_desc = Number (Int {i ; _}) })        
       ->           

lib/4.02.3/whole_compiler.ml

@@ -73370,11 +73370,11 @@ let rec is_out ?comment (e : t) (range : t) : t  =
       not (or_ (triple_equal e zero_int_literal) (triple_equal e one_int_literal))                  
     | Number (Int {i = 1l}), 
       (
-        Bin (Plus , {expression_desc = Number (Int {i ; _}) }, {expression_desc = Var _; _})
-      | Bin (Plus, {expression_desc = Var _; _}, {expression_desc = Number (Int {i ; _}) }))
+        Bin (Plus , {expression_desc = Number (Int {i ; _}) }, ({expression_desc = Var _; _} as x ))
+      | Bin (Plus, ({expression_desc = Var _; _} as x), {expression_desc = Number (Int {i ; _}) }))
 
       ->
-      not (or_ (triple_equal e (int (Int32.neg i ))) (triple_equal e (int (Int32.sub Int32.one  i))))        
+      not (or_ (triple_equal x (int (Int32.neg i ))) (triple_equal x (int (Int32.sub Int32.one  i))))        
     | Number (Int {i = 1l}), 
       Bin (Minus ,  ({expression_desc = Var _; _} as x), {expression_desc = Number (Int {i ; _}) })        
       ->