small simplification: null or undefined

Author: cristianoc

compiler/core/js_dump.ml

@@ -700,6 +700,16 @@ and expression_desc cxt ~(level : int) f x : cxt =
           | Float _ -> "- "
           | _ -> "-");
         expression ~level:13 cxt f e)
+  | Bin
+      ( Or,
+        {expression_desc = Bin (EqEqEq, e1, {expression_desc = Null})},
+        {expression_desc = Bin (EqEqEq, e2, {expression_desc = Undefined _})} )
+  | Bin
+      ( Or,
+        {expression_desc = Bin (EqEqEq, e1, {expression_desc = Undefined _})},
+        {expression_desc = Bin (EqEqEq, e2, {expression_desc = Null})} )
+    when e1 = e2 ->
+    expression_desc cxt ~level:(level : int) f (Is_null_or_undefined e1)
   | Bin (op, e1, e2) ->
     let out, lft, rght = Js_op_util.op_prec op in
     let need_paren =

tests/tests/src/UntaggedVariants.mjs

@@ -80,7 +80,7 @@ let Truthy = {
 };
 
 function classify$1(x) {
-  if (x === null || x === undefined) {
+  if (x == null) {
     if (x === null) {
       return "null";
     } else {

tests/tests/src/core/Core_NullableTests.mjs

@@ -7,7 +7,7 @@ function shouldHandleNullableValues() {
   let tUndefined = undefined;
   let tValue = "hello";
   let tmp;
-  tmp = tNull === null || tNull === undefined ? tNull === null : false;
+  tmp = (tNull == null) ? tNull === null : false;
   Test.run([
     [
       "Core_NullableTests.res",
@@ -18,7 +18,7 @@ function shouldHandleNullableValues() {
     "Should handle null"
   ], tmp, (prim0, prim1) => prim0 === prim1, true);
   let tmp$1;
-  tmp$1 = (tUndefined === null || tUndefined === undefined) && tUndefined !== null;
+  tmp$1 = (tUndefined == null) && tUndefined !== null;
   Test.run([
     [
       "Core_NullableTests.res",
@@ -29,7 +29,7 @@ function shouldHandleNullableValues() {
     "Should handle undefined"
   ], tmp$1, (prim0, prim1) => prim0 === prim1, true);
   let tmp$2;
-  tmp$2 = tValue === null || tValue === undefined ? false : tValue === "hello";
+  tmp$2 = (tValue == null) ? false : tValue === "hello";
   Test.run([
     [
       "Core_NullableTests.res",

tests/tests/src/variantsMatching.mjs

@@ -216,17 +216,17 @@ function isUndefined$1(x) {
 }
 
 function plus$2(x, y) {
-  if (x === null || x === undefined) {
+  if (x == null) {
     return y;
-  } else if (y === null || y === undefined) {
+  } else if (y == null) {
     return x;
   } else {
     return x + y | 0;
   }
 }
 
 function kind(x) {
-  if (x === null || x === undefined) {
+  if (x == null) {
     if (x === null) {
       return "null";
     } else {