Merge pull request #1176 from dorafmon/Issue#1167

Issue #1167: a simple fix for case two

Author: bobzhang

jscomp/runtime/caml_obj.ml

@@ -152,6 +152,7 @@ let unsafe_js_compare x y =
     as well as the [List.sort] and [Array.sort] functions.
 *)
 let rec caml_compare (a : Obj.t) (b : Obj.t) : int =
+  (*front and formoest, we do not compare function values*)
   if Js.typeof a = "string" then
     caml_string_compare (Obj.magic a) (Obj.magic b )
   else if Js.typeof a = "number" then
@@ -161,6 +162,8 @@ let rec caml_compare (a : Obj.t) (b : Obj.t) : int =
           || Js.typeof a = "undefined"
   then
     unsafe_js_compare a b
+  else if Js.typeof a = "function" || Js.typeof b = "function"
+  then raise (Invalid_argument "compare: functional value")
   else
   (* if js_is_instance_array a then  *)
   (*   0 *)
@@ -212,14 +215,17 @@ and aux_length_b_short (a : Obj.t) (b : Obj.t) i short_length =
 type eq = Obj.t -> Obj.t -> bool
 
 let rec caml_equal (a : Obj.t) (b : Obj.t) : bool =
-  (* first, check using reference equality *)
+  (*front and formoest, we do not compare function values*)
   if a == b then true
   else if Js.typeof a = "string"
   || Js.typeof a = "number"
   || Js.typeof a = "boolean"
   || Js.typeof a = "undefined"
   || Js.typeof a = "null"
   then false
+  else if Js.typeof a = "function" || Js.typeof b = "function"
+  then raise (Invalid_argument "equal: functional value")
+  (* first, check using reference equality *)
   else
     let tag_a = Bs_obj.tag a in
     let tag_b = Bs_obj.tag b in

jscomp/test/caml_compare_test.js

@@ -1,6 +1,10 @@
 
 type  u  = A of int | B of int * bool | C of int 
 
+let function_equal_test = try ((fun x -> x + 1) = (fun x -> x + 2)) with
+                         | Invalid_argument "equal: functional value" -> true
+                         | _ -> false
+
 let suites = Mt.[
     "option", (fun _ -> Eq(true, None < Some 1));
     "option2", (fun _ -> Eq(true, Some 1 < Some 2));
@@ -9,8 +13,10 @@ let suites = Mt.[
     "listneq", (fun _ -> Eq(true, [1;2;3] > [1;2;2]));
     "custom_u", (fun _ -> Eq(true, ( A 3  ,  B (2,false) , C 1)  > ( A 3, B (2,false) , C 0 )));
     "custom_u2", (fun _ -> Eq(true, ( A 3  ,  B (2,false) , C 1)  = ( A 3, B (2,false) , C 1 )));
+    "function", (fun _ -> Eq(true, function_equal_test))
 ]
 ;;
 
 
+
 Mt.from_pair_suites __FILE__ suites

jscomp/test/caml_compare_test.ml

@@ -97,6 +97,12 @@ function caml_compare(_a, _b) {
         return 1;
       }
     }
+    else if (typeof a === "function" || typeof b === "function") {
+      throw [
+            Caml_builtin_exceptions.invalid_argument,
+            "compare: functional value"
+          ];
+    }
     else {
       var tag_a = a.tag | 0;
       var tag_b = b.tag | 0;
@@ -214,6 +220,12 @@ function caml_equal(_a, _b) {
     else if (typeof a === "string" || typeof a === "number" || typeof a === "boolean" || typeof a === "undefined" || typeof a === "null") {
       return /* false */0;
     }
+    else if (typeof a === "function" || typeof b === "function") {
+      throw [
+            Caml_builtin_exceptions.invalid_argument,
+            "equal: functional value"
+          ];
+    }
     else {
       var tag_a = a.tag | 0;
       var tag_b = b.tag | 0;

lib/es6/caml_obj.js

@@ -97,6 +97,12 @@ function caml_compare(_a, _b) {
         return 1;
       }
     }
+    else if (typeof a === "function" || typeof b === "function") {
+      throw [
+            Caml_builtin_exceptions.invalid_argument,
+            "compare: functional value"
+          ];
+    }
     else {
       var tag_a = a.tag | 0;
       var tag_b = b.tag | 0;
@@ -214,6 +220,12 @@ function caml_equal(_a, _b) {
     else if (typeof a === "string" || typeof a === "number" || typeof a === "boolean" || typeof a === "undefined" || typeof a === "null") {
       return /* false */0;
     }
+    else if (typeof a === "function" || typeof b === "function") {
+      throw [
+            Caml_builtin_exceptions.invalid_argument,
+            "equal: functional value"
+          ];
+    }
     else {
       var tag_a = a.tag | 0;
       var tag_b = b.tag | 0;