remove high order types in visitor, ensure the evaluation order

Author: bobzhang

jscomp/core/js_fold.ml

@@ -4,7 +4,13 @@
     let [@inline] option sub  self = fun v -> 
       match v with 
       | None -> self 
-      | Some x -> sub  x 
+      | Some x -> sub self x 
+    let rec list (sub : 'self_type -> 'a -> 'self_type) self = fun v ->
+      match  v with 
+      | [] -> self 
+      | x::xs -> 
+        let self = sub self x in 
+        list sub self xs 
     class  fold =
       object ((_self : 'self_type))
         method list :
@@ -14,7 +20,7 @@
             | [] -> _self
             | _x :: _x_i1 -> let _self = _f_a _self _x in let _self = _self#list _f_a _x_i1 in _self
     method label : label -> 'self_type = unknown _self  
-method required_modules : required_modules -> 'self_type = _self#list (fun _self -> _self#module_id)  
+method required_modules : required_modules -> 'self_type = list (fun _self -> _self#module_id) _self  
 method ident : ident -> 'self_type = unknown _self  
 method module_id : module_id -> 'self_type = fun { id = _x0;kind = _x1} -> let _self = _self#ident _x0 in _self  
 method vident : vident -> 'self_type = function 
@@ -27,7 +33,7 @@ let _self = _self#module_id _x0 in
 method exception_ident : exception_ident -> 'self_type = _self#ident  
 method for_ident : for_ident -> 'self_type = _self#ident  
 method for_direction : for_direction -> 'self_type = unknown _self  
-method property_map : property_map -> 'self_type = _self#list (fun _self -> fun ( _x0,_x1) -> let _self = _self#expression _x1 in _self)  
+method property_map : property_map -> 'self_type = list (fun _self -> fun ( _x0,_x1) -> let _self = _self#expression _x1 in _self) _self  
 method length_object : length_object -> 'self_type = unknown _self  
 method expression_desc : expression_desc -> 'self_type = function 
 | Length ( _x0,_x1)  -> 
@@ -73,7 +79,7 @@ let _self = _self#expression _x1 in
  _self
 |Call ( _x0,_x1,_x2)  -> 
 let _self = _self#expression _x0 in
-let _self = _self#list (fun _self -> _self#expression) _x1 in
+let _self = list (fun _self -> _self#expression) _self _x1 in
  _self
 |String_index ( _x0,_x1)  -> 
 let _self = _self#expression _x0 in
@@ -88,26 +94,26 @@ let _self = _self#expression _x0 in
  _self
 |New ( _x0,_x1)  -> 
 let _self = _self#expression _x0 in
-let _self = option (_self#list (fun _self -> _self#expression)) _self _x1 in
+let _self = option (fun _self -> list (fun _self -> _self#expression) _self) _self _x1 in
  _self
 |Var ( _x0)  -> 
 let _self = _self#vident _x0 in
  _self
 |Fun ( _x0,_x1,_x2,_x3)  -> 
-let _self = _self#list (fun _self -> _self#ident) _x1 in
+let _self = list (fun _self -> _self#ident) _self _x1 in
 let _self = _self#block _x2 in
  _self
 |Str _ -> _self
 |Unicode _ -> _self
 |Raw_js_code _ -> _self
 |Array ( _x0,_x1)  -> 
-let _self = _self#list (fun _self -> _self#expression) _x0 in
+let _self = list (fun _self -> _self#expression) _self _x0 in
  _self
 |Optional_block ( _x0,_x1)  -> 
 let _self = _self#expression _x0 in
  _self
 |Caml_block ( _x0,_x1,_x2,_x3)  -> 
-let _self = _self#list (fun _self -> _self#expression) _x0 in
+let _self = list (fun _self -> _self#expression) _self _x0 in
 let _self = _self#expression _x2 in
  _self
 |Caml_block_tag ( _x0)  -> 
@@ -137,12 +143,12 @@ let _self = _self#block _x1 in
 let _self = _self#block _x2 in
  _self
 |While ( _x0,_x1,_x2,_x3)  -> 
-let _self = option (_self#label) _self _x0 in
+let _self = option (fun _self -> _self#label) _self _x0 in
 let _self = _self#expression _x1 in
 let _self = _self#block _x2 in
  _self
 |ForRange ( _x0,_x1,_x2,_x3,_x4,_x5)  -> 
-let _self = option (_self#for_ident_expression) _self _x0 in
+let _self = option (fun _self -> _self#for_ident_expression) _self _x0 in
 let _self = _self#finish_ident_expression _x1 in
 let _self = _self#for_ident _x2 in
 let _self = _self#for_direction _x3 in
@@ -157,31 +163,31 @@ let _self = _self#expression _x0 in
  _self
 |Int_switch ( _x0,_x1,_x2)  -> 
 let _self = _self#expression _x0 in
-let _self = _self#list (fun _self -> _self#int_clause) _x1 in
-let _self = option (_self#block) _self _x2 in
+let _self = list (fun _self -> _self#int_clause) _self _x1 in
+let _self = option (fun _self -> _self#block) _self _x2 in
  _self
 |String_switch ( _x0,_x1,_x2)  -> 
 let _self = _self#expression _x0 in
-let _self = _self#list (fun _self -> _self#string_clause) _x1 in
-let _self = option (_self#block) _self _x2 in
+let _self = list (fun _self -> _self#string_clause) _self _x1 in
+let _self = option (fun _self -> _self#block) _self _x2 in
  _self
 |Throw ( _x0)  -> 
 let _self = _self#expression _x0 in
  _self
 |Try ( _x0,_x1,_x2)  -> 
 let _self = _self#block _x0 in
-let _self = option (fun ( _x0,_x1) -> let _self = _self#exception_ident _x0 in let _self = _self#block _x1 in _self) _self _x1 in
-let _self = option (_self#block) _self _x2 in
+let _self = option (fun _self -> fun ( _x0,_x1) -> let _self = _self#exception_ident _x0 in let _self = _self#block _x1 in _self) _self _x1 in
+let _self = option (fun _self -> _self#block) _self _x2 in
  _self
 |Debugger -> _self   
 method expression : expression -> 'self_type = fun { expression_desc = _x0;comment = _x1} -> let _self = _self#expression_desc _x0 in _self  
 method statement : statement -> 'self_type = fun { statement_desc = _x0;comment = _x1} -> let _self = _self#statement_desc _x0 in _self  
 method variable_declaration : variable_declaration -> 'self_type = fun { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> let _self = _self#ident _x0 in
-let _self = option (_self#expression) _self _x1 in _self  
+let _self = option (fun _self -> _self#expression) _self _x1 in _self  
 method string_clause : string_clause -> 'self_type = fun ( _x0,_x1) -> let _self = _self#case_clause _x1 in _self  
 method int_clause : int_clause -> 'self_type = fun ( _x0,_x1) -> let _self = _self#case_clause _x1 in _self  
 method case_clause : case_clause -> 'self_type = fun { switch_body = _x0;should_break = _x1;comment = _x2} -> let _self = _self#block _x0 in _self  
-method block : block -> 'self_type = _self#list (fun _self -> _self#statement)  
+method block : block -> 'self_type = list (fun _self -> _self#statement) _self  
 method program : program -> 'self_type = fun { block = _x0;exports = _x1;export_set = _x2} -> let _self = _self#block _x0 in _self  
 method deps_program : deps_program -> 'self_type = fun { program = _x0;modules = _x1;side_effect = _x2} -> let _self = _self#program _x0 in
 let _self = _self#required_modules _x1 in _self      

jscomp/core/js_map.ml

@@ -1,22 +1,23 @@
 
 open J
-let unknown : 'a. 'a -> 'a = fun x -> x 
-let option sub = fun v -> 
+let [@inline] unknown : 'a. 'a -> 'a = fun x -> x 
+let [@inline] option sub = fun v -> 
   match v with 
   | None -> None
   | Some v -> Some (sub v)
+let rec list sub = fun v ->
+  match v with 
+  | [] -> []
+  | x::xs -> 
+    let v = sub x in 
+    v :: list sub xs 
+    (* Note we need add [v] to enforce the evaluation order
+      it indeed cause different semantis here  
+    *) 
 class map = object
 ((_self : 'self_type))
-method list :
-  'a 'a_out. ('self_type -> 'a -> 'a_out) -> 'a list -> 'a_out list =
-  fun _f_a ->
-    function
-    | [] -> []
-    | _x :: _x_i1 ->
-        let _x = _f_a _self _x in
-        let _x_i1 = _self#list _f_a _x_i1 in _x :: _x_i1
 method label : label -> label = unknown  
-method required_modules : required_modules -> required_modules = _self#list (fun _self -> _self#module_id)  
+method required_modules : required_modules -> required_modules = list (_self#module_id)  
 method ident : ident -> ident = unknown  
 method module_id : module_id -> module_id = fun { id = _x0;kind = _x1} -> let _x0 = _self#ident _x0 in  {id = _x0;kind = _x1}  
 method vident : vident -> vident = function 
@@ -29,7 +30,7 @@ Qualified ( _x0,_x1)
 method exception_ident : exception_ident -> exception_ident = _self#ident  
 method for_ident : for_ident -> for_ident = _self#ident  
 method for_direction : for_direction -> for_direction = unknown  
-method property_map : property_map -> property_map = _self#list (fun _self -> fun ( _x0,_x1) -> let _x1 = _self#expression _x1 in  _x0,_x1)  
+method property_map : property_map -> property_map = list (fun ( _x0,_x1) -> let _x1 = _self#expression _x1 in  _x0,_x1)  
 method length_object : length_object -> length_object = unknown  
 method expression_desc : expression_desc -> expression_desc = function 
 | Length ( _x0,_x1)  -> 
@@ -75,7 +76,7 @@ let _x1 = _self#expression _x1 in
 FlatCall ( _x0,_x1) 
 |Call ( _x0,_x1,_x2)  -> 
 let _x0 = _self#expression _x0 in 
-let _x1 = _self#list (fun _self -> _self#expression) _x1 in 
+let _x1 = list (_self#expression) _x1 in 
 Call ( _x0,_x1,_x2) 
 |String_index ( _x0,_x1)  -> 
 let _x0 = _self#expression _x0 in 
@@ -90,26 +91,26 @@ let _x0 = _self#expression _x0 in
 Static_index ( _x0,_x1,_x2) 
 |New ( _x0,_x1)  -> 
 let _x0 = _self#expression _x0 in 
-let _x1 = option (_self#list (fun _self -> _self#expression)) _x1 in 
+let _x1 = option (list (_self#expression)) _x1 in 
 New ( _x0,_x1) 
 |Var ( _x0)  -> 
 let _x0 = _self#vident _x0 in 
 Var ( _x0) 
 |Fun ( _x0,_x1,_x2,_x3)  -> 
-let _x1 = _self#list (fun _self -> _self#ident) _x1 in 
+let _x1 = list (_self#ident) _x1 in 
 let _x2 = _self#block _x2 in 
 Fun ( _x0,_x1,_x2,_x3) 
 |Str _ as v -> v 
 |Unicode _ as v -> v 
 |Raw_js_code _ as v -> v 
 |Array ( _x0,_x1)  -> 
-let _x0 = _self#list (fun _self -> _self#expression) _x0 in 
+let _x0 = list (_self#expression) _x0 in 
 Array ( _x0,_x1) 
 |Optional_block ( _x0,_x1)  -> 
 let _x0 = _self#expression _x0 in 
 Optional_block ( _x0,_x1) 
 |Caml_block ( _x0,_x1,_x2,_x3)  -> 
-let _x0 = _self#list (fun _self -> _self#expression) _x0 in 
+let _x0 = list (_self#expression) _x0 in 
 let _x2 = _self#expression _x2 in 
 Caml_block ( _x0,_x1,_x2,_x3) 
 |Caml_block_tag ( _x0)  -> 
@@ -159,12 +160,12 @@ let _x0 = _self#expression _x0 in
 Return ( _x0) 
 |Int_switch ( _x0,_x1,_x2)  -> 
 let _x0 = _self#expression _x0 in 
-let _x1 = _self#list (fun _self -> _self#int_clause) _x1 in 
+let _x1 = list (_self#int_clause) _x1 in 
 let _x2 = option (_self#block) _x2 in 
 Int_switch ( _x0,_x1,_x2) 
 |String_switch ( _x0,_x1,_x2)  -> 
 let _x0 = _self#expression _x0 in 
-let _x1 = _self#list (fun _self -> _self#string_clause) _x1 in 
+let _x1 = list (_self#string_clause) _x1 in 
 let _x2 = option (_self#block) _x2 in 
 String_switch ( _x0,_x1,_x2) 
 |Throw ( _x0)  -> 
@@ -183,7 +184,7 @@ let _x1 = option (_self#expression) _x1 in  {ident = _x0;value = _x1;property =
 method string_clause : string_clause -> string_clause = fun ( _x0,_x1) -> let _x1 = _self#case_clause _x1 in  _x0,_x1  
 method int_clause : int_clause -> int_clause = fun ( _x0,_x1) -> let _x1 = _self#case_clause _x1 in  _x0,_x1  
 method case_clause : case_clause -> case_clause = fun { switch_body = _x0;should_break = _x1;comment = _x2} -> let _x0 = _self#block _x0 in  {switch_body = _x0;should_break = _x1;comment = _x2}  
-method block : block -> block = _self#list (fun _self -> _self#statement)  
+method block : block -> block = list (_self#statement)  
 method program : program -> program = fun { block = _x0;exports = _x1;export_set = _x2} -> let _x0 = _self#block _x0 in  {block = _x0;exports = _x1;export_set = _x2}  
 method deps_program : deps_program -> deps_program = fun { program = _x0;modules = _x1;side_effect = _x2} -> let _x0 = _self#program _x0 in 
 let _x1 = _self#required_modules _x1 in  {program = _x0;modules = _x1;side_effect = _x2}