introducing optimized iterator pattern

Author: bobzhang

jscomp/core/j.ml

@@ -39,38 +39,38 @@
 *)
 
 
+type mutable_flag = Js_op.mutable_flag 
 
-type label = string
+type binop = Js_op.binop
 
-and binop = Js_op.binop
+type int_op = Js_op.int_op
 
-and int_op = Js_op.int_op
- 
-and kind = Js_op.kind
+type kind = Js_op.kind
 
-and property = Js_op.property
+type property = Js_op.property
 
-and number = Js_op.number 
+type number = Js_op.number 
 
-and mutable_flag = Js_op.mutable_flag 
+type ident_info = Js_op.ident_info
 
-and ident_info = Js_op.ident_info
+type exports = Js_op.exports
 
-and exports = Js_op.exports
+type tag_info = Js_op.tag_info 
 
-and tag_info = Js_op.tag_info 
+type property_name =  Js_op.property_name
+
+type label = string
 
 and required_modules = module_id list
 
-
-
+and ident = Ident.t (* we override `method ident` *)
 
 (** object literal, if key is ident, in this case, it might be renamed by 
     Google Closure  optimizer,
     currently we always use quote
  *)
-and property_name =  Js_op.property_name
-and ident = Ident.t 
+
+
 and module_id = {
   id : ident; kind : Js_op.kind
 }
@@ -350,3 +350,4 @@ and deps_program =
     modules : required_modules ;
     side_effect : string option (* None: no, Some reason  *)
   }
+  [@@deriving]

jscomp/core/js_fold.ml

@@ -1,9 +1,8 @@
 
     open J  
-    class virtual fold =
+    let [@inline] unknown o _ = o
+    class  fold =
       object ((o : 'self_type))
-        method unknown : 'a. 'a -> 'self_type = fun _ -> o
-        method string : string -> 'self_type = fun _ -> o
         method option :
           'a. ('self_type -> 'a -> 'self_type) -> 'a option -> 'self_type =
           fun _f_a -> function | None -> o | Some _x -> let o = _f_a o _x in o
@@ -13,37 +12,24 @@
             function
             | [] -> o
             | _x :: _x_i1 -> let o = _f_a o _x in let o = o#list _f_a _x_i1 in o
-        method int32 : int32 -> 'self_type = fun _ -> o
-        method int : int -> 'self_type = fun _ -> o 
-        method bool : bool -> 'self_type = fun _ -> o
-    method label : label -> 'self_type = o#string  
-method binop : binop -> 'self_type = o#unknown  
-method int_op : int_op -> 'self_type = o#unknown  
-method kind : kind -> 'self_type = o#unknown  
-method property : property -> 'self_type = o#unknown  
-method number : number -> 'self_type = o#unknown  
-method mutable_flag : mutable_flag -> 'self_type = o#unknown  
-method ident_info : ident_info -> 'self_type = o#unknown  
-method exports : exports -> 'self_type = o#unknown  
-method tag_info : tag_info -> 'self_type = o#unknown  
+    method label : label -> 'self_type = unknown o  
 method required_modules : required_modules -> 'self_type = o#list (fun o -> o#module_id)  
-method property_name : property_name -> 'self_type = o#unknown  
-method ident : ident -> 'self_type = o#unknown  
+method ident : ident -> 'self_type = unknown o  
 method module_id : module_id -> 'self_type = fun { id = _x0;kind = _x1} -> let o = o#ident _x0 in
-let o = o#unknown _x1 in o  
+let o = unknown o _x1 in o  
 method vident : vident -> 'self_type = function 
 | Id ( _x0)  -> 
 let o = o#ident _x0 in
  o
 |Qualified ( _x0,_x1)  -> 
 let o = o#module_id _x0 in
-let o = o#option (fun o -> o#string) _x1 in
+let o = o#option (fun o -> unknown o) _x1 in
  o  
 method exception_ident : exception_ident -> 'self_type = o#ident  
 method for_ident : for_ident -> 'self_type = o#ident  
-method for_direction : for_direction -> 'self_type = o#unknown  
-method property_map : property_map -> 'self_type = o#list (fun o -> fun ( _x0,_x1) -> let o = o#property_name _x0 in let o = o#expression _x1 in o)  
-method length_object : length_object -> 'self_type = o#unknown  
+method for_direction : for_direction -> 'self_type = unknown o  
+method property_map : property_map -> 'self_type = o#list (fun o -> fun ( _x0,_x1) -> let o = unknown o _x0 in let o = o#expression _x1 in o)  
+method length_object : length_object -> 'self_type = unknown o  
 method expression_desc : expression_desc -> 'self_type = function 
 | Length ( _x0,_x1)  -> 
 let o = o#expression _x0 in
@@ -63,7 +49,7 @@ let o = o#expression _x0 in
 let o = o#expression _x1 in
  o
 |Bool ( _x0)  -> 
-let o = o#bool _x0 in
+let o = unknown o _x0 in
  o
 |Typeof ( _x0)  -> 
 let o = o#expression _x0 in
@@ -81,7 +67,7 @@ let o = o#expression _x1 in
 let o = o#expression _x2 in
  o
 |Bin ( _x0,_x1,_x2)  -> 
-let o = o#binop _x0 in
+let o = unknown o _x0 in
 let o = o#expression _x1 in
 let o = o#expression _x2 in
  o
@@ -92,7 +78,7 @@ let o = o#expression _x1 in
 |Call ( _x0,_x1,_x2)  -> 
 let o = o#expression _x0 in
 let o = o#list (fun o -> o#expression) _x1 in
-let o = o#unknown _x2 in
+let o = unknown o _x2 in
  o
 |String_index ( _x0,_x1)  -> 
 let o = o#expression _x0 in
@@ -104,8 +90,8 @@ let o = o#expression _x1 in
  o
 |Static_index ( _x0,_x1,_x2)  -> 
 let o = o#expression _x0 in
-let o = o#string _x1 in
-let o = o#option (fun o -> o#int32) _x2 in
+let o = unknown o _x1 in
+let o = o#option (fun o -> unknown o) _x2 in
  o
 |New ( _x0,_x1)  -> 
 let o = o#expression _x0 in
@@ -115,40 +101,40 @@ let o = o#option (fun o -> o#list (fun o -> o#expression)) _x1 in
 let o = o#vident _x0 in
  o
 |Fun ( _x0,_x1,_x2,_x3)  -> 
-let o = o#bool _x0 in
+let o = unknown o _x0 in
 let o = o#list (fun o -> o#ident) _x1 in
 let o = o#block _x2 in
-let o = o#unknown _x3 in
+let o = unknown o _x3 in
  o
 |Str ( _x0,_x1)  -> 
-let o = o#bool _x0 in
-let o = o#string _x1 in
+let o = unknown o _x0 in
+let o = unknown o _x1 in
  o
 |Unicode ( _x0)  -> 
-let o = o#string _x0 in
+let o = unknown o _x0 in
  o
 |Raw_js_code ( _x0)  -> 
-let o = o#unknown _x0 in
+let o = unknown o _x0 in
  o
 |Array ( _x0,_x1)  -> 
 let o = o#list (fun o -> o#expression) _x0 in
-let o = o#mutable_flag _x1 in
+let o = unknown o _x1 in
  o
 |Optional_block ( _x0,_x1)  -> 
 let o = o#expression _x0 in
-let o = o#bool _x1 in
+let o = unknown o _x1 in
  o
 |Caml_block ( _x0,_x1,_x2,_x3)  -> 
 let o = o#list (fun o -> o#expression) _x0 in
-let o = o#mutable_flag _x1 in
+let o = unknown o _x1 in
 let o = o#expression _x2 in
-let o = o#tag_info _x3 in
+let o = unknown o _x3 in
  o
 |Caml_block_tag ( _x0)  -> 
 let o = o#expression _x0 in
  o
 |Number ( _x0)  -> 
-let o = o#number _x0 in
+let o = unknown o _x0 in
  o
 |Object ( _x0)  -> 
 let o = o#property_map _x0 in
@@ -176,15 +162,15 @@ let o = o#block _x2 in
 let o = o#option (fun o -> o#label) _x0 in
 let o = o#expression _x1 in
 let o = o#block _x2 in
-let o = o#unknown _x3 in
+let o = unknown o _x3 in
  o
 |ForRange ( _x0,_x1,_x2,_x3,_x4,_x5)  -> 
 let o = o#option (fun o -> o#for_ident_expression) _x0 in
 let o = o#finish_ident_expression _x1 in
 let o = o#for_ident _x2 in
 let o = o#for_direction _x3 in
 let o = o#block _x4 in
-let o = o#unknown _x5 in
+let o = unknown o _x5 in
  o
 |Continue ( _x0)  -> 
 let o = o#label _x0 in
@@ -213,24 +199,24 @@ let o = o#option (fun o -> o#block) _x2 in
  o
 |Debugger -> o  
 method expression : expression -> 'self_type = fun { expression_desc = _x0;comment = _x1} -> let o = o#expression_desc _x0 in
-let o = o#option (fun o -> o#string) _x1 in o  
+let o = o#option (fun o -> unknown o) _x1 in o  
 method statement : statement -> 'self_type = fun { statement_desc = _x0;comment = _x1} -> let o = o#statement_desc _x0 in
-let o = o#option (fun o -> o#string) _x1 in o  
+let o = o#option (fun o -> unknown o) _x1 in o  
 method variable_declaration : variable_declaration -> 'self_type = fun { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> let o = o#ident _x0 in
 let o = o#option (fun o -> o#expression) _x1 in
-let o = o#property _x2 in
-let o = o#ident_info _x3 in o  
-method string_clause : string_clause -> 'self_type = fun ( _x0,_x1) -> let o = o#string _x0 in let o = o#case_clause _x1 in o  
-method int_clause : int_clause -> 'self_type = fun ( _x0,_x1) -> let o = o#int _x0 in let o = o#case_clause _x1 in o  
+let o = unknown o _x2 in
+let o = unknown o _x3 in o  
+method string_clause : string_clause -> 'self_type = fun ( _x0,_x1) -> let o = unknown o _x0 in let o = o#case_clause _x1 in o  
+method int_clause : int_clause -> 'self_type = fun ( _x0,_x1) -> let o = unknown o _x0 in let o = o#case_clause _x1 in o  
 method case_clause : case_clause -> 'self_type = fun { switch_body = _x0;should_break = _x1;comment = _x2} -> let o = o#block _x0 in
-let o = o#bool _x1 in
-let o = o#option (fun o -> o#string) _x2 in o  
+let o = unknown o _x1 in
+let o = o#option (fun o -> unknown o) _x2 in o  
 method block : block -> 'self_type = o#list (fun o -> o#statement)  
 method program : program -> 'self_type = fun { block = _x0;exports = _x1;export_set = _x2} -> let o = o#block _x0 in
-let o = o#exports _x1 in
-let o = o#unknown _x2 in o  
+let o = unknown o _x1 in
+let o = unknown o _x2 in o  
 method deps_program : deps_program -> 'self_type = fun { program = _x0;modules = _x1;side_effect = _x2} -> let o = o#program _x0 in
 let o = o#required_modules _x1 in
-let o = o#option (fun o -> o#string) _x2 in o      
+let o = o#option (fun o -> unknown o) _x2 in o      
     end