Add comparison for undefined, and tests.

Author: Cristiano Calcagno

jscomp/runtime/caml_obj.ml

@@ -167,8 +167,10 @@ let unsafe_js_compare x y =
 let rec caml_compare (a : Obj.t) (b : Obj.t) : int =
   if a == b then 0 else
   (*front and formoest, we do not compare function values*)
-  if a == (Obj.repr Js_null.empty) then -1 else
-  if b == (Obj.repr Js_null.empty) then 1 else
+  if a == (Obj.repr Js.null) then -1 else
+  if b == (Obj.repr Js.null) then 1 else
+  if a == (Obj.repr Js.undefined) then -1 else
+  if b == (Obj.repr Js.undefined) then 1 else
   let a_type = Js.typeof a in 
   let b_type = Js.typeof b in 
   if a_type = "string" then

jscomp/test/caml_compare_test.js

@@ -909,7 +909,51 @@ var suites_001 = /* :: */[
                                                                                                       ]);
                                                                                             })
                                                                                         ],
-                                                                                        /* [] */0
+                                                                                        /* :: */[
+                                                                                          /* tuple */[
+                                                                                            "File \"caml_compare_test.ml\", line 87, characters 4-11",
+                                                                                            (function () {
+                                                                                                return /* Eq */Block.__(0, [
+                                                                                                          Caml_obj.caml_compare(null, 0),
+                                                                                                          -1
+                                                                                                        ]);
+                                                                                              })
+                                                                                          ],
+                                                                                          /* :: */[
+                                                                                            /* tuple */[
+                                                                                              "File \"caml_compare_test.ml\", line 90, characters 4-11",
+                                                                                              (function () {
+                                                                                                  return /* Eq */Block.__(0, [
+                                                                                                            Caml_obj.caml_compare(0, null),
+                                                                                                            1
+                                                                                                          ]);
+                                                                                                })
+                                                                                            ],
+                                                                                            /* :: */[
+                                                                                              /* tuple */[
+                                                                                                "File \"caml_compare_test.ml\", line 93, characters 4-11",
+                                                                                                (function () {
+                                                                                                    return /* Eq */Block.__(0, [
+                                                                                                              Caml_obj.caml_compare(undefined, 0),
+                                                                                                              -1
+                                                                                                            ]);
+                                                                                                  })
+                                                                                              ],
+                                                                                              /* :: */[
+                                                                                                /* tuple */[
+                                                                                                  "File \"caml_compare_test.ml\", line 96, characters 4-11",
+                                                                                                  (function () {
+                                                                                                      return /* Eq */Block.__(0, [
+                                                                                                                Caml_obj.caml_compare(0, undefined),
+                                                                                                                1
+                                                                                                              ]);
+                                                                                                    })
+                                                                                                ],
+                                                                                                /* [] */0
+                                                                                              ]
+                                                                                            ]
+                                                                                          ]
+                                                                                        ]
                                                                                       ]
                                                                                     ]
                                                                                   ]

jscomp/test/caml_compare_test.ml

@@ -84,7 +84,18 @@ let suites = Mt.[
     __LOC__ , begin fun _ ->
         Eq(compare (Js.Null.return [3]) Js.null, 1)
     end;
-
+    __LOC__ , begin fun _ ->
+        Eq(compare Js.null (Js.Null.return 0), -1)
+    end;
+    __LOC__ , begin fun _ ->
+        Eq(compare (Js.Null.return 0) Js.null, 1)
+    end;
+    __LOC__ , begin fun _ ->
+        Eq(compare Js.Nullable.undefined (Js.Nullable.return 0), -1)
+    end;
+    __LOC__ , begin fun _ ->
+        Eq(compare (Js.Nullable.return 0) Js.Nullable.undefined, 1)
+    end;
 ]
 ;;
 

lib/js/caml_obj.js

@@ -70,6 +70,10 @@ function caml_compare(_a, _b) {
       return -1;
     } else if (b === null) {
       return 1;
+    } else if (a === undefined) {
+      return -1;
+    } else if (b === undefined) {
+      return 1;
     } else {
       var a_type = typeof a;
       var b_type = typeof b;