Finish the optimization around visitor pattern using objects

Author: bobzhang

jscomp/core/js_fold.ml

@@ -1,11 +1,12 @@
 
     open J  
     let [@inline] unknown _self _ = _self
+    let [@inline] option sub  self = fun v -> 
+      match v with 
+      | None -> self 
+      | Some x -> sub  x 
     class  fold =
       object ((_self : 'self_type))
-        method option :
-          'a. ('self_type -> 'a -> 'self_type) -> 'a option -> 'self_type =
-          fun _f_a -> function | None -> _self | Some _x -> let _self = _f_a _self _x in _self
         method list :
           'a. ('self_type -> 'a -> 'self_type) -> 'a list -> 'self_type =
           fun _f_a ->
@@ -22,7 +23,6 @@ let _self = _self#ident _x0 in
  _self
 |Qualified ( _x0,_x1)  -> 
 let _self = _self#module_id _x0 in
-let _self = _self#option (fun _self -> unknown _self) _x1 in
  _self  
 method exception_ident : exception_ident -> 'self_type = _self#ident  
 method for_ident : for_ident -> 'self_type = _self#ident  
@@ -85,11 +85,10 @@ let _self = _self#expression _x1 in
  _self
 |Static_index ( _x0,_x1,_x2)  -> 
 let _self = _self#expression _x0 in
-let _self = _self#option (fun _self -> unknown _self) _x2 in
  _self
 |New ( _x0,_x1)  -> 
 let _self = _self#expression _x0 in
-let _self = _self#option (fun _self -> _self#list (fun _self -> _self#expression)) _x1 in
+let _self = option (_self#list (fun _self -> _self#expression)) _self _x1 in
  _self
 |Var ( _x0)  -> 
 let _self = _self#vident _x0 in
@@ -138,12 +137,12 @@ let _self = _self#block _x1 in
 let _self = _self#block _x2 in
  _self
 |While ( _x0,_x1,_x2,_x3)  -> 
-let _self = _self#option (fun _self -> _self#label) _x0 in
+let _self = option (_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 = _self#option (fun _self -> _self#for_ident_expression) _x0 in
+let _self = option (_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
@@ -159,36 +158,32 @@ let _self = _self#expression _x0 in
 |Int_switch ( _x0,_x1,_x2)  -> 
 let _self = _self#expression _x0 in
 let _self = _self#list (fun _self -> _self#int_clause) _x1 in
-let _self = _self#option (fun _self -> _self#block) _x2 in
+let _self = option (_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 = _self#option (fun _self -> _self#block) _x2 in
+let _self = option (_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 = _self#option (fun _self -> fun ( _x0,_x1) -> let _self = _self#exception_ident _x0 in let _self = _self#block _x1 in _self) _x1 in
-let _self = _self#option (fun _self -> _self#block) _x2 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
  _self
 |Debugger -> _self   
-method expression : expression -> 'self_type = fun { expression_desc = _x0;comment = _x1} -> let _self = _self#expression_desc _x0 in
-let _self = _self#option (fun _self -> unknown _self) _x1 in _self  
-method statement : statement -> 'self_type = fun { statement_desc = _x0;comment = _x1} -> let _self = _self#statement_desc _x0 in
-let _self = _self#option (fun _self -> unknown _self) _x1 in _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 = _self#option (fun _self -> _self#expression) _x1 in _self  
+let _self = option (_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
-let _self = _self#option (fun _self -> unknown _self) _x2 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 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
-let _self = _self#option (fun _self -> unknown _self) _x2 in _self      
+let _self = _self#required_modules _x1 in _self      
     end
 

jscomp/core/js_iter.ml

@@ -1,31 +1,32 @@
 
     open J  
-    let unknown _self _ = ()
+
+    let option sub  = fun  v ->
+      match v with 
+      | None -> ()
+      | Some v -> sub  v
     class iter =
       object ((_self : 'self_type))
-        method option :
-          'a. ('self_type -> 'a -> unit) -> 'a option -> unit =
-          fun _f_a -> function | None -> () | Some _x ->  _f_a _self _x 
         method list :
           'a. ('self_type -> 'a -> unit) -> 'a list -> unit =
           fun _f_a ->
             function
             | [] -> ()
             | _x :: _x_i1 -> _f_a _self _x ;  _self#list _f_a _x_i1 
-    method label : label -> unit = unknown _self  
+    method label : label -> unit = ignore  
 method required_modules : required_modules -> unit = _self#list (fun _self -> _self#module_id)  
-method ident : ident -> unit = unknown _self  
+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 
 | Id ( _x0)  -> 
  begin _self#ident _x0 end
 |Qualified ( _x0,_x1)  -> 
- begin _self#module_id _x0;_self#option (fun _self -> unknown _self) _x1 end  
+ begin _self#module_id _x0 end  
 method exception_ident : exception_ident -> unit = _self#ident  
 method for_ident : for_ident -> unit = _self#ident  
-method for_direction : for_direction -> unit = unknown _self  
+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 length_object : length_object -> unit = unknown _self  
+method length_object : length_object -> unit = ignore  
 method expression_desc : expression_desc -> unit = function 
 | Length ( _x0,_x1)  -> 
  begin _self#expression _x0;_self#length_object _x1 end
@@ -57,9 +58,9 @@ method expression_desc : expression_desc -> unit = function
 |Array_index ( _x0,_x1)  -> 
  begin _self#expression _x0;_self#expression _x1 end
 |Static_index ( _x0,_x1,_x2)  -> 
- begin _self#expression _x0;_self#option (fun _self -> unknown _self) _x2 end
+ begin _self#expression _x0 end
 |New ( _x0,_x1)  -> 
- begin _self#expression _x0;_self#option (fun _self -> _self#list (fun _self -> _self#expression)) _x1 end
+ begin _self#expression _x0;option (_self#list (fun _self -> _self#expression)) _x1 end
 |Var ( _x0)  -> 
  begin _self#vident _x0 end
 |Fun ( _x0,_x1,_x2,_x3)  -> 
@@ -92,31 +93,31 @@ method statement_desc : statement_desc -> unit = function
 |If ( _x0,_x1,_x2)  -> 
  begin _self#expression _x0;_self#block _x1;_self#block _x2 end
 |While ( _x0,_x1,_x2,_x3)  -> 
- begin _self#option (fun _self -> _self#label) _x0;_self#expression _x1;_self#block _x2 end
+ begin option (_self#label) _x0;_self#expression _x1;_self#block _x2 end
 |ForRange ( _x0,_x1,_x2,_x3,_x4,_x5)  -> 
- begin _self#option (fun _self -> _self#for_ident_expression) _x0;_self#finish_ident_expression _x1;_self#for_ident _x2;_self#for_direction _x3;_self#block _x4 end
+ begin option (_self#for_ident_expression) _x0;_self#finish_ident_expression _x1;_self#for_ident _x2;_self#for_direction _x3;_self#block _x4 end
 |Continue ( _x0)  -> 
  begin _self#label _x0 end
 |Break -> ()
 |Return ( _x0)  -> 
  begin _self#expression _x0 end
 |Int_switch ( _x0,_x1,_x2)  -> 
- begin _self#expression _x0;_self#list (fun _self -> _self#int_clause) _x1;_self#option (fun _self -> _self#block) _x2 end
+ begin _self#expression _x0;_self#list (fun _self -> _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;_self#option (fun _self -> _self#block) _x2 end
+ begin _self#expression _x0;_self#list (fun _self -> _self#string_clause) _x1;option (_self#block) _x2 end
 |Throw ( _x0)  -> 
  begin _self#expression _x0 end
 |Try ( _x0,_x1,_x2)  -> 
- begin _self#block _x0;_self#option (fun _self -> fun ( _x0,_x1) -> begin _self#exception_ident _x0;_self#block _x1 end) _x1;_self#option (fun _self -> _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;_self#option (fun _self -> unknown _self) _x1 end  
-method statement : statement -> unit = fun { statement_desc = _x0;comment = _x1} -> begin _self#statement_desc _x0;_self#option (fun _self -> unknown _self) _x1 end  
-method variable_declaration : variable_declaration -> unit = fun { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> begin _self#ident _x0;_self#option (fun _self -> _self#expression) _x1 end  
+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 case_clause : case_clause -> unit = fun { switch_body = _x0;should_break = _x1;comment = _x2} -> begin _self#block _x0;_self#option (fun _self -> unknown _self) _x2 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 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;_self#option (fun _self -> unknown _self) _x2 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
 

jscomp/core/js_map.ml

@@ -1,12 +1,12 @@
 
 open J
 let unknown : 'a. 'a -> 'a = fun x -> x 
+let option sub = fun v -> 
+  match v with 
+  | None -> None
+  | Some v -> Some (sub v)
 class map = object
 ((_self : 'self_type))
-method option :
-  'a 'a_out. ('self_type -> 'a -> 'a_out) -> 'a option -> 'a_out option =
-  fun _f_a ->
-    function | None -> None | Some _x -> let _x = _f_a _self _x in Some _x
 method list :
   'a 'a_out. ('self_type -> 'a -> 'a_out) -> 'a list -> 'a_out list =
   fun _f_a ->
@@ -25,7 +25,6 @@ let _x0 = _self#ident _x0 in
 Id ( _x0) 
 |Qualified ( _x0,_x1)  -> 
 let _x0 = _self#module_id _x0 in 
-let _x1 = _self#option (fun _self -> unknown) _x1 in 
 Qualified ( _x0,_x1)   
 method exception_ident : exception_ident -> exception_ident = _self#ident  
 method for_ident : for_ident -> for_ident = _self#ident  
@@ -88,11 +87,10 @@ let _x1 = _self#expression _x1 in
 Array_index ( _x0,_x1) 
 |Static_index ( _x0,_x1,_x2)  -> 
 let _x0 = _self#expression _x0 in 
-let _x2 = _self#option (fun _self -> unknown) _x2 in 
 Static_index ( _x0,_x1,_x2) 
 |New ( _x0,_x1)  -> 
 let _x0 = _self#expression _x0 in 
-let _x1 = _self#option (fun _self -> _self#list (fun _self -> _self#expression)) _x1 in 
+let _x1 = option (_self#list (fun _self -> _self#expression)) _x1 in 
 New ( _x0,_x1) 
 |Var ( _x0)  -> 
 let _x0 = _self#vident _x0 in 
@@ -141,12 +139,12 @@ let _x1 = _self#block _x1 in
 let _x2 = _self#block _x2 in 
 If ( _x0,_x1,_x2) 
 |While ( _x0,_x1,_x2,_x3)  -> 
-let _x0 = _self#option (fun _self -> _self#label) _x0 in 
+let _x0 = option (_self#label) _x0 in 
 let _x1 = _self#expression _x1 in 
 let _x2 = _self#block _x2 in 
 While ( _x0,_x1,_x2,_x3) 
 |ForRange ( _x0,_x1,_x2,_x3,_x4,_x5)  -> 
-let _x0 = _self#option (fun _self -> _self#for_ident_expression) _x0 in 
+let _x0 = option (_self#for_ident_expression) _x0 in 
 let _x1 = _self#finish_ident_expression _x1 in 
 let _x2 = _self#for_ident _x2 in 
 let _x3 = _self#for_direction _x3 in 
@@ -162,35 +160,31 @@ 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 _x2 = _self#option (fun _self -> _self#block) _x2 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 _x2 = _self#option (fun _self -> _self#block) _x2 in 
+let _x2 = option (_self#block) _x2 in 
 String_switch ( _x0,_x1,_x2) 
 |Throw ( _x0)  -> 
 let _x0 = _self#expression _x0 in 
 Throw ( _x0) 
 |Try ( _x0,_x1,_x2)  -> 
 let _x0 = _self#block _x0 in 
-let _x1 = _self#option (fun _self -> fun ( _x0,_x1) -> let _x0 = _self#exception_ident _x0 in  let _x1 = _self#block _x1 in  _x0,_x1) _x1 in 
-let _x2 = _self#option (fun _self -> _self#block) _x2 in 
+let _x1 = option (fun ( _x0,_x1) -> let _x0 = _self#exception_ident _x0 in  let _x1 = _self#block _x1 in  _x0,_x1) _x1 in 
+let _x2 = option (_self#block) _x2 in 
 Try ( _x0,_x1,_x2) 
 |Debugger as v -> v  
-method expression : expression -> expression = fun { expression_desc = _x0;comment = _x1} -> let _x0 = _self#expression_desc _x0 in 
-let _x1 = _self#option (fun _self -> unknown) _x1 in  {expression_desc = _x0;comment = _x1}  
-method statement : statement -> statement = fun { statement_desc = _x0;comment = _x1} -> let _x0 = _self#statement_desc _x0 in 
-let _x1 = _self#option (fun _self -> unknown) _x1 in  {statement_desc = _x0;comment = _x1}  
+method expression : expression -> expression = fun { expression_desc = _x0;comment = _x1} -> let _x0 = _self#expression_desc _x0 in  {expression_desc = _x0;comment = _x1}  
+method statement : statement -> statement = fun { statement_desc = _x0;comment = _x1} -> let _x0 = _self#statement_desc _x0 in  {statement_desc = _x0;comment = _x1}  
 method variable_declaration : variable_declaration -> variable_declaration = fun { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> let _x0 = _self#ident _x0 in 
-let _x1 = _self#option (fun _self -> _self#expression) _x1 in  {ident = _x0;value = _x1;property = _x2;ident_info = _x3}  
+let _x1 = option (_self#expression) _x1 in  {ident = _x0;value = _x1;property = _x2;ident_info = _x3}  
 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 
-let _x2 = _self#option (fun _self -> unknown) _x2 in  {switch_body = _x0;should_break = _x1;comment = _x2}  
+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 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 
-let _x2 = _self#option (fun _self -> unknown) _x2 in  {program = _x0;modules = _x1;side_effect = _x2}  
+let _x1 = _self#required_modules _x1 in  {program = _x0;modules = _x1;side_effect = _x2}  
 end