avoid late bindings in callback

the object already had a late binding for methods
TODO: we may do eta-expansion here to avoid the cost of currying

Author: bobzhang

jscomp/core/js_iter.ml

@@ -8,13 +8,13 @@
     class iter =
       object ((_self : 'self_type))
         method list :
-          'a. ('self_type -> 'a -> unit) -> 'a list -> unit =
+          'a. ('a -> unit) -> 'a list -> unit =
           fun _f_a ->
             function
             | [] -> ()
-            | _x :: _x_i1 -> _f_a _self _x ;  _self#list _f_a _x_i1 
+            | _x :: _x_i1 -> _f_a  _x ;  _self#list _f_a _x_i1 
     method label : label -> unit = ignore  
-method required_modules : required_modules -> unit = _self#list (fun _self -> _self#module_id)  
+method required_modules : required_modules -> unit = _self#list _self#module_id  
 method ident : ident -> unit = ignore  
 method module_id : module_id -> unit = fun { id = _x0;kind = _x1} -> begin _self#ident _x0 end  
 method vident : vident -> unit = function 
@@ -25,7 +25,7 @@ method vident : vident -> unit = function
 method exception_ident : exception_ident -> unit = _self#ident  
 method for_ident : for_ident -> unit = _self#ident  
 method for_direction : for_direction -> unit = ignore  
-method property_map : property_map -> unit = _self#list (fun _self -> fun ( _x0,_x1) -> begin _self#expression _x1 end)  
+method property_map : property_map -> unit = _self#list (fun ( _x0,_x1) -> begin _self#expression _x1 end)  
 method length_object : length_object -> unit = ignore  
 method expression_desc : expression_desc -> unit = function 
 | Length ( _x0,_x1)  -> 
@@ -52,28 +52,28 @@ method expression_desc : expression_desc -> unit = function
 |FlatCall ( _x0,_x1)  -> 
  begin _self#expression _x0;_self#expression _x1 end
 |Call ( _x0,_x1,_x2)  -> 
- begin _self#expression _x0;_self#list (fun _self -> _self#expression) _x1 end
+ begin _self#expression _x0;_self#list _self#expression _x1 end
 |String_index ( _x0,_x1)  -> 
  begin _self#expression _x0;_self#expression _x1 end
 |Array_index ( _x0,_x1)  -> 
  begin _self#expression _x0;_self#expression _x1 end
 |Static_index ( _x0,_x1,_x2)  -> 
  begin _self#expression _x0 end
 |New ( _x0,_x1)  -> 
- begin _self#expression _x0;option (_self#list (fun _self -> _self#expression)) _x1 end
+ begin _self#expression _x0;option (_self#list _self#expression) _x1 end
 |Var ( _x0)  -> 
  begin _self#vident _x0 end
 |Fun ( _x0,_x1,_x2,_x3)  -> 
- begin _self#list (fun _self -> _self#ident) _x1;_self#block _x2 end
+ begin _self#list _self#ident _x1;_self#block _x2 end
 |Str _ -> ()
 |Unicode _ -> ()
 |Raw_js_code _ -> ()
 |Array ( _x0,_x1)  -> 
- begin _self#list (fun _self -> _self#expression) _x0 end
+ begin _self#list _self#expression _x0 end
 |Optional_block ( _x0,_x1)  -> 
  begin _self#expression _x0 end
 |Caml_block ( _x0,_x1,_x2,_x3)  -> 
- begin _self#list (fun _self -> _self#expression) _x0;_self#expression _x2 end
+ begin _self#list _self#expression _x0;_self#expression _x2 end
 |Caml_block_tag ( _x0)  -> 
  begin _self#expression _x0 end
 |Number _ -> ()
@@ -102,21 +102,21 @@ method statement_desc : statement_desc -> unit = function
 |Return ( _x0)  -> 
  begin _self#expression _x0 end
 |Int_switch ( _x0,_x1,_x2)  -> 
- begin _self#expression _x0;_self#list (fun _self -> _self#int_clause) _x1;option (_self#block) _x2 end
+ begin _self#expression _x0;_self#list _self#int_clause _x1;option (_self#block) _x2 end
 |String_switch ( _x0,_x1,_x2)  -> 
- begin _self#expression _x0;_self#list (fun _self -> _self#string_clause) _x1;option (_self#block) _x2 end
+ begin _self#expression _x0;_self#list _self#string_clause _x1;option (_self#block) _x2 end
 |Throw ( _x0)  -> 
  begin _self#expression _x0 end
 |Try ( _x0,_x1,_x2)  -> 
- begin _self#block _x0;option (fun ( _x0,_x1) -> begin _self#exception_ident _x0;_self#block _x1 end) _x1;option (_self#block) _x2 end
+ begin _self#block _x0;option ((fun ( _x0,_x1) -> begin _self#exception_ident _x0;_self#block _x1 end)) _x1;option (_self#block) _x2 end
 |Debugger -> ()  
 method expression : expression -> unit = fun { expression_desc = _x0;comment = _x1} -> begin _self#expression_desc _x0 end  
 method statement : statement -> unit = fun { statement_desc = _x0;comment = _x1} -> begin _self#statement_desc _x0 end  
 method variable_declaration : variable_declaration -> unit = fun { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> begin _self#ident _x0;option (_self#expression) _x1 end  
-method string_clause : string_clause -> unit = fun ( _x0,_x1) -> begin _self#case_clause _x1 end  
-method int_clause : int_clause -> unit = fun ( _x0,_x1) -> begin _self#case_clause _x1 end  
+method string_clause : string_clause -> unit = (fun ( _x0,_x1) -> begin _self#case_clause _x1 end)  
+method int_clause : int_clause -> unit = (fun ( _x0,_x1) -> begin _self#case_clause _x1 end)  
 method case_clause : case_clause -> unit = fun { switch_body = _x0;should_break = _x1;comment = _x2} -> begin _self#block _x0 end  
-method block : block -> unit = _self#list (fun _self -> _self#statement)  
+method block : block -> unit = _self#list _self#statement  
 method program : program -> unit = fun { block = _x0;exports = _x1;export_set = _x2} -> begin _self#block _x0 end  
 method deps_program : deps_program -> unit = fun { program = _x0;modules = _x1;side_effect = _x2} -> begin _self#program _x0;_self#required_modules _x1 end      
     end

ocaml-tree/iter_maker.js

@@ -46,10 +46,7 @@ function mkBody(def, allNames) {
           return `option (${inner})`;
         case "list":
           // there are list and other
-          return `${mkBody(list, allNames)} (fun _self -> ${mkBody(
-            base,
-            allNames
-          )})`;
+          return `${mkBody(list, allNames)} ${mkBody(base, allNames)}`;
         default:
           throw new Error(`not supported high order types ${list.text}`);
       }
@@ -81,7 +78,7 @@ function mkBody(def, allNames) {
       var body = args
         .map((x, i) => mkBodyApply(def.children[i], allNames, x))
         .filter(Boolean);
-      return `fun ( ${args.join(",")}) -> begin ${body.join(";")} end`;
+      return `(fun ( ${args.join(",")}) -> begin ${body.join(";")} end)`;
     default:
       throw new Error(`unkonwn ${def.type}`);
   }
@@ -149,11 +146,11 @@ function make(typedefs) {
     class iter =
       object ((_self : 'self_type))
         method list :
-          'a. ('self_type -> 'a -> unit) -> 'a list -> unit =
+          'a. ('a -> unit) -> 'a list -> unit =
           fun _f_a ->
             function
             | [] -> ()
-            | _x :: _x_i1 -> _f_a _self _x ;  _self#list _f_a _x_i1 
+            | _x :: _x_i1 -> _f_a  _x ;  _self#list _f_a _x_i1 
     ${output.join("\n")}    
     end
     `;