simplify the method call

Author: bobzhang

jscomp/.merlin

@@ -15,6 +15,9 @@ B ounit
 S ounit_tests
 B ounit_tests
 
+S main
+B main
+
 S depends
 B depends
 

jscomp/core/lam_convert.ml

@@ -816,22 +816,32 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
       Lam.for_ id (convert_aux from_) (convert_aux to_) dir (convert_aux loop)
     | Lassign (id, body) ->
       Lam.assign id (convert_aux body)
-    | Lsend (Public(Some name), _, obj, _, _loc) ->
+    | Lsend (Public(Some name), _, obj, _, send_loc) ->
       (* Format.fprintf Format.err_formatter "%a@." Printlambda.lambda b ; *)
         (match convert_aux obj with
-        | Lprim {primitive =  Pjs_unsafe_downgrade _;  args;loc}
+        (* | Lprim {primitive =  Pjs_unsafe_downgrade _;  args;loc}
           ->
-              let setter = Ext_string.ends_with name Literals.setter_suffix in 
-              let property = 
-                if setter then   
-                  Lam_methname.translate 
-                    (String.sub name 0
-                       (String.length name - Literals.setter_suffix_len))
-                else Lam_methname.translate  name in 
-              prim ~primitive:(Pjs_unsafe_downgrade {name = property; setter})
-                ~args loc                
-        | _ ->
-          assert false)
+          let setter = Ext_string.ends_with name Literals.setter_suffix in 
+          let property = 
+            if setter then   
+              Lam_methname.translate 
+                (String.sub name 0
+                   (String.length name - Literals.setter_suffix_len))
+            else Lam_methname.translate  name in 
+          prim ~primitive:(Pjs_unsafe_downgrade {name = property; setter})
+            ~args loc                 *)
+        | obj ->
+          let args = [obj] in 
+          let setter = Ext_string.ends_with name Literals.setter_suffix in 
+          let property = 
+            if setter then   
+              Lam_methname.translate 
+                (String.sub name 0
+                   (String.length name - Literals.setter_suffix_len))
+            else Lam_methname.translate  name in 
+          prim ~primitive:(Pjs_unsafe_downgrade {name = property; setter})
+            ~args send_loc                
+        )
     | Lsend _ -> assert false  
     | Levent _ ->
       (* disabled by upstream*)

jscomp/frontend/bs_ast_invariant.ml

@@ -142,12 +142,6 @@ let emit_external_warnings : iterator=
         | Pexp_new _  -> 
           Location.raise_errorf ~loc:a.pexp_loc
             "OCaml style objects are not supported"
-        | Pexp_send (obj, _) ->
-          begin match obj with 
-            | {pexp_desc = Pexp_apply ({pexp_desc = Pexp_ident ({txt = Ldot(_,"unsafe_downgrade")})},_)} -> ()
-            | _ -> Location.raise_errorf ~loc:a.pexp_loc
-                     "OCaml style objects are not supported"
-          end
         | _ -> super.expr self a         
       );
     label_declaration = (fun self lbl ->     

jscomp/main/builtin_cmi_datasets.ml

@@ -24,8 +24,8 @@
 
 [@@@bs.config {flags = [|"-unboxed-types"|]}]
 (**/**)
-external unsafe_downgrade : 'a  -> 'a = "#unsafe_downgrade"
-external unsafe_to_method : 'a -> 'a = "#fn_method"
+external unsafe_downgrade : 'a  -> 'a = "%identity"
+external unsafe_to_method : 'a -> 'a =  "#fn_method"
 (**/**)
 module Callback = struct
   type 'a arity1 = {

jscomp/others/js_OO.ml

@@ -335,6 +335,8 @@ o test/gray_code_test.cmi test/gray_code_test.cmj : cc test/gray_code_test.ml |
 o test/guide_for_ext.cmi test/guide_for_ext.cmj : cc test/guide_for_ext.ml | $stdlib
 o test/hamming_test.cmi test/hamming_test.cmj : cc test/hamming_test.ml | test/mt.cmj $stdlib
 o test/hash_collision_test.cmi test/hash_collision_test.cmj : cc test/hash_collision_test.ml | test/mt.cmj $stdlib
+o test/hash_sugar_desugar.cmj : cc_cmi test/hash_sugar_desugar.ml | test/hash_sugar_desugar.cmi $stdlib
+o test/hash_sugar_desugar.cmi : cc test/hash_sugar_desugar.mli | $stdlib
 o test/hash_test.cmi test/hash_test.cmj : cc test/hash_test.ml | test/mt.cmj test/mt_global.cmj $stdlib
 o test/hashtbl_test.cmi test/hashtbl_test.cmj : cc test/hashtbl_test.ml | test/mt.cmj $stdlib
 o test/hello.foo.cmi test/hello.foo.cmj : cc test/hello.foo.ml | $stdlib