Merge pull request #654 from bloomberg/eager_evaluate_lazy

Eager evaluate lazy

Author: bobzhang

jscomp/js_dump.ml

@@ -307,9 +307,9 @@ let rec pp_function method_
   | [ {statement_desc =
          Return {return_value = 
                    {expression_desc = 
-                      Call({expression_desc = Var v ; _}, 
+                      Call(({expression_desc = Var v ; _} as function_), 
                            ls , 
-                           {arity = ( Full (* | NA  *) (* see #234*)); 
+                           {arity = ( Full | NA as arity(* see #234*)); 
                             (* TODO: need a case to justify it*)
                             call_info = 
                               (Call_builtin_runtime | Call_ml )})}}}],
@@ -320,6 +320,19 @@ let rec pp_function method_
           match b.J.expression_desc with 
           | Var (Id i) -> Ident.same a i 
           | _ -> false) l ls ->
+    let optimize  len p cxt f v =
+      if p then
+        begin           
+          P.string f Js_config.curry;
+          P.string f L.dot;
+          P.string f "__";
+          P.string f (Printf.sprintf "%d" len);
+          P.paren_group f 1 (fun _ -> arguments cxt f [function_])            
+        end              
+      else
+        vident cxt f v
+    in
+    let len = List.length l in (* length *)           
     begin match name with 
       | Some i -> 
         P.string f L.var; 
@@ -328,14 +341,15 @@ let rec pp_function method_
         P.space f ;
         P.string f L.eq;
         P.space f ;
-        vident cxt f v
+
+        optimize len (arity = NA && len <= 8) cxt f v 
       | None ->
         if return then 
           begin 
             P.string f L.return ;
             P.space f;
           end;
-        vident cxt f v 
+        optimize len (arity = NA && len <=8) cxt f v 
     end
   | _, _  -> 
 

jscomp/runtime/curry.ml

@@ -78,6 +78,11 @@ let _1 o a0 =
 let js1 label cacheid a0 =
   _1 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0
 
+let __1 o =
+  let arity = function_length o in
+  if arity = 1 then o
+  else fun a0 -> _1 o a0
+
 
 let curry_2 o a0 a1 arity =
   match arity with
@@ -99,6 +104,11 @@ let _2 o a0 a1 =
 let js2 label cacheid a0 a1 =
   _2 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1
 
+let __2 o =
+  let arity = function_length o in
+  if arity = 2 then o
+  else fun a0 a1 -> _2 o a0 a1
+
 
 let curry_3 o a0 a1 a2 arity =
   match arity with
@@ -120,6 +130,11 @@ let _3 o a0 a1 a2 =
 let js3 label cacheid a0 a1 a2 =
   _3 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1 a2
 
+let __3 o =
+  let arity = function_length o in
+  if arity = 3 then o
+  else fun a0 a1 a2 -> _3 o a0 a1 a2
+
 
 let curry_4 o a0 a1 a2 a3 arity =
   match arity with
@@ -141,6 +156,11 @@ let _4 o a0 a1 a2 a3 =
 let js4 label cacheid a0 a1 a2 a3 =
   _4 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1 a2 a3
 
+let __4 o =
+  let arity = function_length o in
+  if arity = 4 then o
+  else fun a0 a1 a2 a3 -> _4 o a0 a1 a2 a3
+
 
 let curry_5 o a0 a1 a2 a3 a4 arity =
   match arity with
@@ -162,6 +182,11 @@ let _5 o a0 a1 a2 a3 a4 =
 let js5 label cacheid a0 a1 a2 a3 a4 =
   _5 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1 a2 a3 a4
 
+let __5 o =
+  let arity = function_length o in
+  if arity = 5 then o
+  else fun a0 a1 a2 a3 a4 -> _5 o a0 a1 a2 a3 a4
+
 
 let curry_6 o a0 a1 a2 a3 a4 a5 arity =
   match arity with
@@ -183,6 +208,11 @@ let _6 o a0 a1 a2 a3 a4 a5 =
 let js6 label cacheid a0 a1 a2 a3 a4 a5 =
   _6 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1 a2 a3 a4 a5
 
+let __6 o =
+  let arity = function_length o in
+  if arity = 6 then o
+  else fun a0 a1 a2 a3 a4 a5 -> _6 o a0 a1 a2 a3 a4 a5
+
 
 let curry_7 o a0 a1 a2 a3 a4 a5 a6 arity =
   match arity with
@@ -204,6 +234,11 @@ let _7 o a0 a1 a2 a3 a4 a5 a6 =
 let js7 label cacheid a0 a1 a2 a3 a4 a5 a6 =
   _7 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1 a2 a3 a4 a5 a6
 
+let __7 o =
+  let arity = function_length o in
+  if arity = 7 then o
+  else fun a0 a1 a2 a3 a4 a5 a6 -> _7 o a0 a1 a2 a3 a4 a5 a6
+
 
 let curry_8 o a0 a1 a2 a3 a4 a5 a6 a7 arity =
   match arity with
@@ -225,3 +260,8 @@ let _8 o a0 a1 a2 a3 a4 a5 a6 a7 =
 let js8 label cacheid a0 a1 a2 a3 a4 a5 a6 a7 =
   _8 (Obj.magic Caml_oo.caml_get_public_method a0 label cacheid) a0 a1 a2 a3 a4 a5 a6 a7
 
+let __8 o =
+  let arity = function_length o in
+  if arity = 8 then o
+  else fun a0 a1 a2 a3 a4 a5 a6 a7 -> _8 o a0 a1 a2 a3 a4 a5 a6 a7
+

jscomp/test/.depend

@@ -75,6 +75,8 @@ basic_module_test.cmx : ../stdlib/set.cmx pr6726.cmx offset.cmx \
     mt_global.cmx mt.cmx basic_module_test.cmi
 bdd.cmj : ../stdlib/array.cmi
 bdd.cmx : ../stdlib/array.cmx
+bench.cmj : ../stdlib/array.cmi
+bench.cmx : ../stdlib/array.cmx
 bigarray_test.cmj : ../stdlib/int32.cmi ../stdlib/complex.cmi \
     ../stdlib/bigarray.cmi
 bigarray_test.cmx : ../stdlib/int32.cmx ../stdlib/complex.cmx \
@@ -163,6 +165,8 @@ digest_test.cmx : ../stdlib/string.cmx ../stdlib/printf.cmx mt.cmx \
     ext_array.cmx ../stdlib/digest.cmx ../stdlib/array.cmx
 div_by_zero_test.cmj : mt.cmi ../stdlib/int64.cmi ../stdlib/int32.cmi
 div_by_zero_test.cmx : mt.cmx ../stdlib/int64.cmx ../stdlib/int32.cmx
+earger_curry_test.cmj : ../stdlib/array.cmi
+earger_curry_test.cmx : ../stdlib/array.cmx
 empty_obj.cmj :
 empty_obj.cmx :
 epsilon_test.cmj : mt.cmi
@@ -439,6 +443,8 @@ offset.cmj : ../stdlib/string.cmi ../stdlib/set.cmi
 offset.cmx : ../stdlib/string.cmx ../stdlib/set.cmx
 optional_ffi_test.cmj : mt.cmi
 optional_ffi_test.cmx : mt.cmx
+poly_type.cmj : ../runtime/js.cmj
+poly_type.cmx : ../runtime/js.cmx
 poly_variant_test.cmj : ../runtime/js.cmj poly_variant_test.cmi
 poly_variant_test.cmx : ../runtime/js.cmx poly_variant_test.cmi
 polymorphism_test.cmj : polymorphism_test.cmi
@@ -839,6 +845,8 @@ basic_module_test.cmj : ../stdlib/set.cmj pr6726.cmj offset.cmj \
     mt_global.cmj mt.cmj basic_module_test.cmi
 bdd.cmo : ../stdlib/array.cmi
 bdd.cmj : ../stdlib/array.cmj
+bench.cmo : ../stdlib/array.cmi
+bench.cmj : ../stdlib/array.cmj
 bigarray_test.cmo : ../stdlib/int32.cmi ../stdlib/complex.cmi \
     ../stdlib/bigarray.cmi
 bigarray_test.cmj : ../stdlib/int32.cmj ../stdlib/complex.cmj \
@@ -927,6 +935,8 @@ digest_test.cmj : ../stdlib/string.cmj ../stdlib/printf.cmj mt.cmj \
     ext_array.cmj ../stdlib/digest.cmj ../stdlib/array.cmj
 div_by_zero_test.cmo : mt.cmi ../stdlib/int64.cmi ../stdlib/int32.cmi
 div_by_zero_test.cmj : mt.cmj ../stdlib/int64.cmj ../stdlib/int32.cmj
+earger_curry_test.cmo : ../stdlib/array.cmi
+earger_curry_test.cmj : ../stdlib/array.cmj
 empty_obj.cmo :
 empty_obj.cmj :
 epsilon_test.cmo : mt.cmi
@@ -1203,6 +1213,8 @@ offset.cmo : ../stdlib/string.cmi ../stdlib/set.cmi
 offset.cmj : ../stdlib/string.cmj ../stdlib/set.cmj
 optional_ffi_test.cmo : mt.cmi
 optional_ffi_test.cmj : mt.cmj
+poly_type.cmo : ../runtime/js.cmo
+poly_type.cmj : ../runtime/js.cmj
 poly_variant_test.cmo : ../runtime/js.cmo poly_variant_test.cmi
 poly_variant_test.cmj : ../runtime/js.cmj poly_variant_test.cmi
 polymorphism_test.cmo : polymorphism_test.cmi

jscomp/test/Makefile

@@ -60,7 +60,8 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	bs_rest_test infer_type_test fs_test module_as_function\
 	test_case_set test_mutliple string_bound_get_test inline_string_test\
 	ppx_this_obj_test unsafe_obj_external gpr_627_test jsoo_485_test jsoo_400_test	\
-	test_require more_uncurry	
+	test_require more_uncurry earger_curry_test poly_type bench
+
 
 
 SOURCE_LIST := js_dyn $(OTHERS)