clean up object handling

Author: bobzhang

jscomp/core/lam_convert.ml

@@ -816,13 +816,11 @@ 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 (kind, _,b,ls, _loc) ->
+    | Lsend (Public(Some name), _, obj, _, _loc) ->
       (* Format.fprintf Format.err_formatter "%a@." Printlambda.lambda b ; *)
-        (match convert_aux b with
+        (match convert_aux obj with
         | Lprim {primitive =  Pjs_unsafe_downgrade _;  args;loc}
           ->
-          begin match kind, ls with
-            | Public (Some name), [] ->
               let setter = Ext_string.ends_with name Literals.setter_suffix in 
               let property = 
                 if setter then   
@@ -831,12 +829,10 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
                        (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
-          end
+                ~args loc                
         | _ ->
           assert false)
-      
+    | Lsend _ -> assert false  
     | Levent _ ->
       (* disabled by upstream*)
       assert false

lib/4.06.1/unstable/js_compiler.ml

@@ -395140,13 +395140,11 @@ 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 (kind, _,b,ls, _loc) ->
+    | Lsend (Public(Some name), _, obj, _, _loc) ->
       (* Format.fprintf Format.err_formatter "%a@." Printlambda.lambda b ; *)
-        (match convert_aux b with
+        (match convert_aux obj with
         | Lprim {primitive =  Pjs_unsafe_downgrade _;  args;loc}
           ->
-          begin match kind, ls with
-            | Public (Some name), [] ->
               let setter = Ext_string.ends_with name Literals.setter_suffix in 
               let property = 
                 if setter then   
@@ -395155,12 +395153,10 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
                        (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
-          end
+                ~args loc                
         | _ ->
           assert false)
-      
+    | Lsend _ -> assert false  
     | Levent _ ->
       (* disabled by upstream*)
       assert false

lib/4.06.1/whole_compiler.ml

@@ -398210,13 +398210,11 @@ 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 (kind, _,b,ls, _loc) ->
+    | Lsend (Public(Some name), _, obj, _, _loc) ->
       (* Format.fprintf Format.err_formatter "%a@." Printlambda.lambda b ; *)
-        (match convert_aux b with
+        (match convert_aux obj with
         | Lprim {primitive =  Pjs_unsafe_downgrade _;  args;loc}
           ->
-          begin match kind, ls with
-            | Public (Some name), [] ->
               let setter = Ext_string.ends_with name Literals.setter_suffix in 
               let property = 
                 if setter then   
@@ -398225,12 +398223,10 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
                        (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
-          end
+                ~args loc                
         | _ ->
           assert false)
-      
+    | Lsend _ -> assert false  
     | Levent _ ->
       (* disabled by upstream*)
       assert false