clean up unused code

Author: Hongbo Zhang

jscomp/syntax/ast_util.ml

@@ -59,21 +59,6 @@ let down_with_name ~loc obj name =
     ~pval_type:(downgrade ~loc ())
     ~local_fun_name:"cast" 
     (fun down -> Exp.send ~loc (Exp.apply ~loc down ["", obj]) name  )
-       
-let destruct_tuple_exp (exp : Parsetree.expression) : Parsetree.expression list = 
-  match exp with 
-  | {pexp_desc = 
-       Pexp_tuple [arg ; {pexp_desc = Pexp_ident{txt = Lident "__"; _}} ]
-    ; _} -> 
-    [arg]
-  | {pexp_desc = Pexp_tuple args; _} -> args
-  | {pexp_desc = Pexp_construct ({txt = Lident "()"}, None); _} -> []
-  | v -> [v]
-
-
-
-
-
 
 let gen_fn_run loc arity fn args  : Parsetree.expression_desc = 
   let pval_prim = ["js_fn_run" ; string_of_int arity]  in

jscomp/syntax/ast_util.mli

@@ -83,8 +83,6 @@ val destruct_arrow_as_meth :
   Parsetree.core_type -> Ast_mapper.mapper -> Parsetree.core_type
 
 
-val destruct_tuple_exp : 
-  Parsetree.expression -> Parsetree.expression list
 
 val lift_js_type : 
   loc:Ast_helper.loc -> Parsetree.core_type -> Parsetree.core_type

jscomp/syntax/ppx_entry.ml

@@ -230,53 +230,42 @@ let handle_class_obj_typ
 
 
 
-
-
-
-
-let handle_obj_method loc (obj : Parsetree.expression) 
-    name (value : Parsetree.expression) e 
+let handle_obj_fns loc (obj : Parsetree.expression) 
+    name (args : (string * Parsetree.expression) list ) e 
     (mapper : Ast_mapper.mapper) : Parsetree.expression = 
-  let value = mapper.expr mapper value in 
-  let obj = mapper.expr mapper obj in 
-  let args = Ast_util.destruct_tuple_exp value in 
-  let len = List.length args in 
-  {e with pexp_desc =
-            Ast_util.gen_method_run loc len 
-              (Exp.mk ~loc (Ast_util.down_with_name ~loc obj name )) (obj::args)
-  }
-
-let handle_obj_fn loc (obj : Parsetree.expression) 
-    name (value : Parsetree.expression) e 
-    (mapper : Ast_mapper.mapper) : Parsetree.expression = 
-  let obj = mapper.expr mapper obj in 
-  let value = mapper.expr mapper value in 
+  let obj = mapper.expr mapper obj in
+  let args =
+    List.map (fun (label,e) ->
+        if label <> "" then
+          Location.raise_errorf ~loc "label is not allowed here"        ;
+        mapper.expr mapper e
+      ) args in
+  let len = List.length args in
   let method_kind = 
     if name = Literals.case_set then Case_setter
     else if Ext_string.ends_with name Literals.setter_suffix then Setter
     else Normal name in 
-  let len, args = 
-    match method_kind with 
-    | Setter -> 
-      1, [value]
-    | (Case_setter | Normal _) -> 
-      let args = Ast_util.destruct_tuple_exp value in 
-      let arity = List.length args in  
-      if method_kind = Case_setter && arity <> 2 then 
-        Location.raise_errorf ~loc "case_set would expect arity of 2 "
-      else  arity, args 
+  let () = 
+     if method_kind = Setter && len <> 1 then 
+        Location.raise_errorf ~loc "setter expect single argument"
+     else if method_kind = Case_setter && len <> 2 then 
+       Location.raise_errorf ~loc "case_set would expect arity of 2 "
   in
-  {e with pexp_desc = 
-            Ast_util.gen_fn_run loc len 
-              (Exp.mk ~loc @@ Ast_util.down_with_name ~loc obj name)
-              args
-  }
-        (** TODO: 
-            More syntax sanity check for [case_set] 
-            case_set: arity 2
-            _set : arity 1            
-            case:
-        *)
+  match args with 
+  | [ {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)}]
+    -> 
+    {e with pexp_desc = 
+              Ast_util.gen_fn_run loc 0
+                (Exp.mk ~loc @@ Ast_util.down_with_name ~loc obj name)
+                []
+    }
+  | _ -> 
+    {e with pexp_desc = 
+              Ast_util.gen_fn_run loc len 
+                (Exp.mk ~loc @@ Ast_util.down_with_name ~loc obj name)
+                args
+    }
+
 
 
 (* ./dumpast -e ' (Js.Unsafe.(!) obj) # property ' *)
@@ -371,33 +360,24 @@ let rec unsafe_mapper : Ast_mapper.mapper =
             | {pexp_desc = 
                  Pexp_apply (
                    {pexp_desc = 
-                      Pexp_ident  {txt = Lident ("##" | "#." as n) ; loc} ; _},
+                      Pexp_ident  {txt = Lident "##"  ; loc} ; _},
                    [("", obj) ;
                     ("", {pexp_desc = Pexp_ident {txt = Lident name;_ } ; _} )
                    ]);
                _
               } -> 
-              begin match args with 
-                | [ "", value] -> 
-                  if n = "##" then 
-                    handle_obj_fn loc obj name value e mapper
-                  else 
-                    handle_obj_method loc obj name value e mapper
-                | _ -> 
-                  Location.raise_errorf ~loc
-                    "Js object %s expect only one argument when it is a method " n 
-              end
+              handle_obj_fns loc obj name args e mapper
             | {pexp_desc = 
                  Pexp_ident  {txt = Lident "##" ; loc} ; _} 
               -> 
               begin match args with 
                 | [("", obj) ;
                    ("", {pexp_desc = Pexp_apply(
                         {pexp_desc = Pexp_ident {txt = Lident name;_ } ; _},
-                        ["", value]
+                        args
                       ) })
                   ] -> (* f##(paint (1,2)) *)
-                  handle_obj_fn loc obj name value e mapper
+                  handle_obj_fns loc obj name args e mapper
                 | [("", obj) ;
                    ("", 
                     {pexp_desc = Pexp_ident {txt = Lident name;_ } ; _}
@@ -407,21 +387,6 @@ let rec unsafe_mapper : Ast_mapper.mapper =
                   Location.raise_errorf ~loc
                     "Js object ## expect syntax like obj##(paint (a,b)) "
               end
-            | {pexp_desc =
-                 Pexp_ident  {txt = Lident "#." ; loc} ; _}
-              -> 
-              begin match args with
-                | [("", obj) ; (* f#.(paint (1,2)) *)
-                   ("", {pexp_desc = Pexp_apply(
-                        {pexp_desc = Pexp_ident {txt = Lident name;_ } ; _},
-                        ["", value]
-                      ) })
-                  ] ->
-                  handle_obj_method loc obj name value e mapper
-                | _ ->
-                  Location.raise_errorf ~loc
-                    "Js object #. expect syntax like obj#.(paint (a,b)) "
-              end
             | _ -> 
               begin match Ext_list.exclude_with_fact (function 
                   | {Location.txt = "uncurry"; _}, _ -> true 

jscomp/test/chain_code_test.ml

@@ -13,10 +13,10 @@ let f2 h =
   h##x##y##z
 
 let f3 h x y = 
-  (h##paint(x,y))##draw(x,y)
+  (h##paint x y)##draw x y
 
 let f4 h x y = 
-  (h##paint_set(x,y))##draw_set(x,y)
+  (h##paint_set (x,y))##draw_set (x,y)
 
 
 (* let g h =  *)

jscomp/test/config2_test.ml

@@ -30,7 +30,7 @@ let hh2 ( x : vv) : vv2 = x
 
 
 let test_v (x : v Js.t) = 
-  x##hey(1,2)
+  x##hey 1 2
 
 let test_vv (h : vv) =
-  h##hey(1,2)
+  h##hey 1 2

jscomp/test/demo.ml

@@ -201,11 +201,12 @@ let ui_layout
 
     button##text_set "update formula";
     button##minHeight_set 20;
-    button##on ("click", (fun [@uncurry] _event -> (* FIXME both [_] and () should work*)
+    button##on "click" begin fun [@uncurry] _event -> (* FIXME both [_] and () should work*)
       try 
         let hot_function = compile inputCode##text in
         computeFunction := fun env ->  hot_function (fun key -> lookup env key) 
-      with  e -> ()));
+      with  e -> ()
+    end;
     let fmt v = to_fixed v 2 in
     set_interval (fun [@uncurry] () -> 
 

jscomp/test/js_date_test.ml

@@ -6,11 +6,11 @@ let d3 = d2 ~year:2016. ~day:1. ()
 
 
 let suites = Mt.[
-    "getMonth", (fun _ -> Eq(2., d ## getMonth () ));
+    "getMonth", (fun _ -> Eq(2., d##getMonth () ));
     "getYear", (fun _ -> Eq((2016.,2.,1.), 
-                            (d3 ## getFullYear() , 
-                             d3 ## getMonth(), 
-                             d3 ## getDate()
+                            (d3##getFullYear() , 
+                             d3##getMonth(), 
+                             d3##getDate()
                             )))
 ]
 

jscomp/test/method_chain.ml

@@ -1,6 +1,6 @@
 
 let f obj x y= 
   obj
-  ##(paint (x,y))
-  ##(draw (x,y))
-  ##(bark (x,y))
+  ##(paint x y)
+  ##(draw x y )
+  ##(bark x y)

jscomp/test/method_name_test.ml

@@ -8,7 +8,7 @@ let eq loc x y =
 
 let f x i file v = 
   x##case i ;
-  x##case_set (i,v);
+  x##case_set i v;
   x##_open file;
   x##open_ file ;
   x##_MAX_LENGTH_

jscomp/test/obj_literal_ppx.ml

@@ -8,7 +8,7 @@ let b =
 let f obj = 
   obj ## x + Array.length (obj ## y)
 
-let h obj = obj##u (1,2)
+let h obj = obj##u 1 2
 
 let u = f  a
 

jscomp/test/test_http_server.ml

@@ -4,15 +4,16 @@
 let port = 3000
 let hostname = "127.0.0.1"
 let create_server  http = 
-  let server = http##createServer (fun [@uncurry] req  resp  -> 
+  let server = http##createServer begin fun [@uncurry] req  resp  -> 
       resp##statusCode_set 200;
-      resp##setHeader("Content-Type", "text/plain");
-      resp##end_("Hello world\n")
-    )
+      resp##setHeader "Content-Type" "text/plain";
+      resp##end_ "Hello world\n"
+    end
   in
-  server##listen(port, hostname,  fun [@uncurry] () -> 
-      Js.log ("Server running at http://"^ hostname ^ ":" ^ string_of_int port ^ "/")
-    ) 
+  server##listen port hostname  begin fun [@uncurry] () -> 
+    Js.log ("Server running at http://"^ hostname ^ ":" ^ string_of_int port ^ "/")
+  end
+     
 let () = 
   create_server Http_types.http
 

jscomp/test/test_index.ml

@@ -8,7 +8,7 @@ let f (x : [%bs.obj: < case : int ->  'a ;
             case_set : int ->  int -> unit ;
             .. > [@uncurry] ] )
  = 
-  x ## case_set (3, 2) ;
+  x ## case_set 3 2 ;
   x ## case 3 
 
 class type ['a] case = object [@uncurry]
@@ -18,7 +18,7 @@ end
 
 let ff (x : int case  Js.t)
  = 
-  x##case_set (3, 2) ;
+  x##case_set 3 2 ;
   x##case 3 
 
 
@@ -38,7 +38,7 @@ type x_obj =
 let f_ext 
     (x : x_obj)
  = 
-  x ## case_set (3, 2) ;
+  x ## case_set 3 2 ;
   x ## case 3 
 
 

jscomp/test/test_obj_simple_ffi.ml

@@ -24,8 +24,8 @@ type hh = < bark :( 'self -> int -> int [@meth_callback]) > Js.t as 'self
 
 let ff (x  : h) : hh = x 
 
-let f (u : x Js.t) = 
-  u#.tet (1,2)
+(* let f (u : x Js.t) =  *)
+(*   u#.tet (1,2) *)
 
 
 type 'a return = int -> 'a [@fn]

jscomp/test/test_unsafe_obj_ffi_ppx.ml

@@ -21,7 +21,7 @@ let chain x =
 
 let g x  = 
   let () = x ## method1 3  in 
-  x ## method2 (3,  3 )
+  x ## method2 3  3 
 
 
 

jscomp/test/unsafe_this.ml

@@ -18,7 +18,7 @@ let u : 'self =
       length : int >       )
   ]
 
-let v = u##bark (u,1,2)
+let v = u##bark u 1 2
 
 
 (* let bark2  = fun [@bs.this] (this, x, y) -> Js.log (this##x,x+y)  *)
@@ -88,10 +88,10 @@ let js_obj : 'self =
         length = 32
       }
   ]
-let h = js_obj#.bark(1,2)
+(* let h = js_obj#.bark(1,2) *)
 
 (* let h = run_method2  uuu##bark uuu 1 2 *)
-let hh = js_obj#.(bark (1,2))
+(* let hh = js_obj#.(bark (1,2)) *)
 
 
 (*

lib/js/test/unsafe_this.js

@@ -35,9 +35,5 @@ var js_obj = {
   length: 32
 };
 
-js_obj.bark(1, 2);
-
-js_obj.bark(1, 2);
-
 exports.js_obj = js_obj;
 /* u Not a pure module */