Skip to content

Commit 2a34a34

Browse files
bobzhangbobzhang
committed
simplify generated code
1 parent 7c01aea commit 2a34a34

File tree

7 files changed

+168
-137
lines changed

7 files changed

+168
-137
lines changed

‎jscomp/core/js_record_iter.ml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ deps_program : deps_program fn
4040
and 'a fn = iter -> 'a -> unit
4141
let iter : iter = {
4242
label : label fn = ( unknown ) ;
43-
required_modules : required_modules fn = ( fun _self arg -> list ((fun _self arg -> _self.module_id _self arg)) _self arg ) ;
43+
required_modules : required_modules fn = ( fun _self arg -> list _self.module_id _self arg ) ;
4444
ident : ident fn = ( unknown ) ;
4545
module_id : module_id fn = ( fun _self { id = _x0;kind = _x1} -> begin _self.ident _self _x0 end ) ;
4646
vident : vident fn = ( fun _self -> function
@@ -78,28 +78,28 @@ deps_program : deps_program fn
7878
|FlatCall ( _x0,_x1) ->
7979
begin _self.expression _self _x0;_self.expression _self _x1 end
8080
|Call ( _x0,_x1,_x2) ->
81-
begin _self.expression _self _x0;list ((fun _self arg -> _self.expression _self arg)) _self _x1 end
81+
begin _self.expression _self _x0;list _self.expression _self _x1 end
8282
|String_index ( _x0,_x1) ->
8383
begin _self.expression _self _x0;_self.expression _self _x1 end
8484
|Array_index ( _x0,_x1) ->
8585
begin _self.expression _self _x0;_self.expression _self _x1 end
8686
|Static_index ( _x0,_x1,_x2) ->
8787
begin _self.expression _self _x0 end
8888
|New ( _x0,_x1) ->
89-
begin _self.expression _self _x0;option (fun _self arg -> list ((fun _self arg -> _self.expression _self arg)) _self arg) _self _x1 end
89+
begin _self.expression _self _x0;option (fun _self arg -> list _self.expression _self arg) _self _x1 end
9090
|Var ( _x0) ->
9191
begin _self.vident _self _x0 end
9292
|Fun ( _x0,_x1,_x2,_x3) ->
93-
begin list ((fun _self arg -> _self.ident _self arg)) _self _x1;_self.block _self _x2 end
93+
begin list _self.ident _self _x1;_self.block _self _x2 end
9494
|Str _ -> ()
9595
|Unicode _ -> ()
9696
|Raw_js_code _ -> ()
9797
|Array ( _x0,_x1) ->
98-
begin list ((fun _self arg -> _self.expression _self arg)) _self _x0 end
98+
begin list _self.expression _self _x0 end
9999
|Optional_block ( _x0,_x1) ->
100100
begin _self.expression _self _x0 end
101101
|Caml_block ( _x0,_x1,_x2,_x3) ->
102-
begin list ((fun _self arg -> _self.expression _self arg)) _self _x0;_self.expression _self _x2 end
102+
begin list _self.expression _self _x0;_self.expression _self _x2 end
103103
|Caml_block_tag ( _x0) ->
104104
begin _self.expression _self _x0 end
105105
|Number _ -> ()
@@ -119,30 +119,30 @@ deps_program : deps_program fn
119119
|If ( _x0,_x1,_x2) ->
120120
begin _self.expression _self _x0;_self.block _self _x1;_self.block _self _x2 end
121121
|While ( _x0,_x1,_x2,_x3) ->
122-
begin option ((fun _self arg -> _self.label _self arg)) _self _x0;_self.expression _self _x1;_self.block _self _x2 end
122+
begin option _self.label _self _x0;_self.expression _self _x1;_self.block _self _x2 end
123123
|ForRange ( _x0,_x1,_x2,_x3,_x4,_x5) ->
124-
begin option ((fun _self arg -> _self.for_ident_expression _self arg)) _self _x0;_self.finish_ident_expression _self _x1;_self.for_ident _self _x2;_self.for_direction _self _x3;_self.block _self _x4 end
124+
begin option _self.for_ident_expression _self _x0;_self.finish_ident_expression _self _x1;_self.for_ident _self _x2;_self.for_direction _self _x3;_self.block _self _x4 end
125125
|Continue ( _x0) ->
126126
begin _self.label _self _x0 end
127127
|Break -> ()
128128
|Return ( _x0) ->
129129
begin _self.expression _self _x0 end
130130
|Int_switch ( _x0,_x1,_x2) ->
131-
begin _self.expression _self _x0;list ((fun _self arg -> _self.int_clause _self arg)) _self _x1;option ((fun _self arg -> _self.block _self arg)) _self _x2 end
131+
begin _self.expression _self _x0;list _self.int_clause _self _x1;option _self.block _self _x2 end
132132
|String_switch ( _x0,_x1,_x2) ->
133-
begin _self.expression _self _x0;list ((fun _self arg -> _self.string_clause _self arg)) _self _x1;option ((fun _self arg -> _self.block _self arg)) _self _x2 end
133+
begin _self.expression _self _x0;list _self.string_clause _self _x1;option _self.block _self _x2 end
134134
|Throw ( _x0) ->
135135
begin _self.expression _self _x0 end
136136
|Try ( _x0,_x1,_x2) ->
137-
begin _self.block _self _x0;option ((fun _self (_x0,_x1) -> begin _self.exception_ident _self _x0;_self.block _self _x1 end)) _self _x1;option ((fun _self arg -> _self.block _self arg)) _self _x2 end
137+
begin _self.block _self _x0;option ((fun _self (_x0,_x1) -> begin _self.exception_ident _self _x0;_self.block _self _x1 end)) _self _x1;option _self.block _self _x2 end
138138
|Debugger -> () ) ;
139139
expression : expression fn = ( fun _self { expression_desc = _x0;comment = _x1} -> begin _self.expression_desc _self _x0 end ) ;
140140
statement : statement fn = ( fun _self { statement_desc = _x0;comment = _x1} -> begin _self.statement_desc _self _x0 end ) ;
141-
variable_declaration : variable_declaration fn = ( fun _self { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> begin _self.ident _self _x0;option ((fun _self arg -> _self.expression _self arg)) _self _x1 end ) ;
141+
variable_declaration : variable_declaration fn = ( fun _self { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> begin _self.ident _self _x0;option _self.expression _self _x1 end ) ;
142142
string_clause : string_clause fn = ( (fun _self (_x0,_x1) -> begin _self.case_clause _self _x1 end) ) ;
143143
int_clause : int_clause fn = ( (fun _self (_x0,_x1) -> begin _self.case_clause _self _x1 end) ) ;
144144
case_clause : case_clause fn = ( fun _self { switch_body = _x0;should_break = _x1;comment = _x2} -> begin _self.block _self _x0 end ) ;
145-
block : block fn = ( fun _self arg -> list ((fun _self arg -> _self.statement _self arg)) _self arg ) ;
145+
block : block fn = ( fun _self arg -> list _self.statement _self arg ) ;
146146
program : program fn = ( fun _self { block = _x0;exports = _x1;export_set = _x2} -> begin _self.block _self _x0 end ) ;
147147
deps_program : deps_program fn = ( fun _self { program = _x0;modules = _x1;side_effect = _x2} -> begin _self.program _self _x0;_self.required_modules _self _x1 end )
148148
}

‎jscomp/core/js_record_map.ml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ deps_program : deps_program fn
4040
and 'a fn = iter -> 'a -> 'a
4141
let super : iter = {
4242
label : label fn = ( unknown ) ;
43-
required_modules : required_modules fn = ( fun _self arg -> list ((fun _self arg -> _self.module_id _self arg)) _self arg ) ;
43+
required_modules : required_modules fn = ( fun _self arg -> list _self.module_id _self arg ) ;
4444
ident : ident fn = ( unknown ) ;
4545
module_id : module_id fn = ( fun _self { id = _x0;kind = _x1} -> begin let _x0 = _self.ident _self _x0 in {id = _x0;kind = _x1} end ) ;
4646
vident : vident fn = ( fun _self -> function
@@ -86,7 +86,7 @@ let _x2 = _self.expression _self _x2 in Bin ( _x0,_x1,_x2) end
8686
let _x1 = _self.expression _self _x1 in FlatCall ( _x0,_x1) end
8787
|Call ( _x0,_x1,_x2) ->
8888
begin let _x0 = _self.expression _self _x0 in
89-
let _x1 = list ((fun _self arg -> _self.expression _self arg)) _self _x1 in Call ( _x0,_x1,_x2) end
89+
let _x1 = list _self.expression _self _x1 in Call ( _x0,_x1,_x2) end
9090
|String_index ( _x0,_x1) ->
9191
begin let _x0 = _self.expression _self _x0 in
9292
let _x1 = _self.expression _self _x1 in String_index ( _x0,_x1) end
@@ -97,21 +97,21 @@ let _x1 = _self.expression _self _x1 in Array_index ( _x0,_x1) end
9797
begin let _x0 = _self.expression _self _x0 in Static_index ( _x0,_x1,_x2) end
9898
|New ( _x0,_x1) ->
9999
begin let _x0 = _self.expression _self _x0 in
100-
let _x1 = option (fun _self arg -> list ((fun _self arg -> _self.expression _self arg)) _self arg) _self _x1 in New ( _x0,_x1) end
100+
let _x1 = option (fun _self arg -> list _self.expression _self arg) _self _x1 in New ( _x0,_x1) end
101101
|Var ( _x0) ->
102102
begin let _x0 = _self.vident _self _x0 in Var ( _x0) end
103103
|Fun ( _x0,_x1,_x2,_x3) ->
104-
begin let _x1 = list ((fun _self arg -> _self.ident _self arg)) _self _x1 in
104+
begin let _x1 = list _self.ident _self _x1 in
105105
let _x2 = _self.block _self _x2 in Fun ( _x0,_x1,_x2,_x3) end
106106
|Str _ as v -> v
107107
|Unicode _ as v -> v
108108
|Raw_js_code _ as v -> v
109109
|Array ( _x0,_x1) ->
110-
begin let _x0 = list ((fun _self arg -> _self.expression _self arg)) _self _x0 in Array ( _x0,_x1) end
110+
begin let _x0 = list _self.expression _self _x0 in Array ( _x0,_x1) end
111111
|Optional_block ( _x0,_x1) ->
112112
begin let _x0 = _self.expression _self _x0 in Optional_block ( _x0,_x1) end
113113
|Caml_block ( _x0,_x1,_x2,_x3) ->
114-
begin let _x0 = list ((fun _self arg -> _self.expression _self arg)) _self _x0 in
114+
begin let _x0 = list _self.expression _self _x0 in
115115
let _x2 = _self.expression _self _x2 in Caml_block ( _x0,_x1,_x2,_x3) end
116116
|Caml_block_tag ( _x0) ->
117117
begin let _x0 = _self.expression _self _x0 in Caml_block_tag ( _x0) end
@@ -134,11 +134,11 @@ let _x2 = _self.expression _self _x2 in Caml_block ( _x0,_x1,_x2,_x3) end
134134
let _x1 = _self.block _self _x1 in
135135
let _x2 = _self.block _self _x2 in If ( _x0,_x1,_x2) end
136136
|While ( _x0,_x1,_x2,_x3) ->
137-
begin let _x0 = option ((fun _self arg -> _self.label _self arg)) _self _x0 in
137+
begin let _x0 = option _self.label _self _x0 in
138138
let _x1 = _self.expression _self _x1 in
139139
let _x2 = _self.block _self _x2 in While ( _x0,_x1,_x2,_x3) end
140140
|ForRange ( _x0,_x1,_x2,_x3,_x4,_x5) ->
141-
begin let _x0 = option ((fun _self arg -> _self.for_ident_expression _self arg)) _self _x0 in
141+
begin let _x0 = option _self.for_ident_expression _self _x0 in
142142
let _x1 = _self.finish_ident_expression _self _x1 in
143143
let _x2 = _self.for_ident _self _x2 in
144144
let _x3 = _self.for_direction _self _x3 in
@@ -150,27 +150,27 @@ let _x4 = _self.block _self _x4 in ForRange ( _x0,_x1,_x2,_x3,_x4,_x5) end
150150
begin let _x0 = _self.expression _self _x0 in Return ( _x0) end
151151
|Int_switch ( _x0,_x1,_x2) ->
152152
begin let _x0 = _self.expression _self _x0 in
153-
let _x1 = list ((fun _self arg -> _self.int_clause _self arg)) _self _x1 in
154-
let _x2 = option ((fun _self arg -> _self.block _self arg)) _self _x2 in Int_switch ( _x0,_x1,_x2) end
153+
let _x1 = list _self.int_clause _self _x1 in
154+
let _x2 = option _self.block _self _x2 in Int_switch ( _x0,_x1,_x2) end
155155
|String_switch ( _x0,_x1,_x2) ->
156156
begin let _x0 = _self.expression _self _x0 in
157-
let _x1 = list ((fun _self arg -> _self.string_clause _self arg)) _self _x1 in
158-
let _x2 = option ((fun _self arg -> _self.block _self arg)) _self _x2 in String_switch ( _x0,_x1,_x2) end
157+
let _x1 = list _self.string_clause _self _x1 in
158+
let _x2 = option _self.block _self _x2 in String_switch ( _x0,_x1,_x2) end
159159
|Throw ( _x0) ->
160160
begin let _x0 = _self.expression _self _x0 in Throw ( _x0) end
161161
|Try ( _x0,_x1,_x2) ->
162162
begin let _x0 = _self.block _self _x0 in
163163
let _x1 = option ((fun _self (_x0,_x1) -> begin let _x0 = _self.exception_ident _self _x0 in let _x1 = _self.block _self _x1 in (_x0,_x1) end)) _self _x1 in
164-
let _x2 = option ((fun _self arg -> _self.block _self arg)) _self _x2 in Try ( _x0,_x1,_x2) end
164+
let _x2 = option _self.block _self _x2 in Try ( _x0,_x1,_x2) end
165165
|Debugger as v -> v ) ;
166166
expression : expression fn = ( fun _self { expression_desc = _x0;comment = _x1} -> begin let _x0 = _self.expression_desc _self _x0 in {expression_desc = _x0;comment = _x1} end ) ;
167167
statement : statement fn = ( fun _self { statement_desc = _x0;comment = _x1} -> begin let _x0 = _self.statement_desc _self _x0 in {statement_desc = _x0;comment = _x1} end ) ;
168168
variable_declaration : variable_declaration fn = ( fun _self { ident = _x0;value = _x1;property = _x2;ident_info = _x3} -> begin let _x0 = _self.ident _self _x0 in
169-
let _x1 = option ((fun _self arg -> _self.expression _self arg)) _self _x1 in {ident = _x0;value = _x1;property = _x2;ident_info = _x3} end ) ;
169+
let _x1 = option _self.expression _self _x1 in {ident = _x0;value = _x1;property = _x2;ident_info = _x3} end ) ;
170170
string_clause : string_clause fn = ( (fun _self (_x0,_x1) -> begin let _x1 = _self.case_clause _self _x1 in (_x0,_x1) end) ) ;
171171
int_clause : int_clause fn = ( (fun _self (_x0,_x1) -> begin let _x1 = _self.case_clause _self _x1 in (_x0,_x1) end) ) ;
172172
case_clause : case_clause fn = ( fun _self { switch_body = _x0;should_break = _x1;comment = _x2} -> begin let _x0 = _self.block _self _x0 in {switch_body = _x0;should_break = _x1;comment = _x2} end ) ;
173-
block : block fn = ( fun _self arg -> list ((fun _self arg -> _self.statement _self arg)) _self arg ) ;
173+
block : block fn = ( fun _self arg -> list _self.statement _self arg ) ;
174174
program : program fn = ( fun _self { block = _x0;exports = _x1;export_set = _x2} -> begin let _x0 = _self.block _self _x0 in {block = _x0;exports = _x1;export_set = _x2} end ) ;
175175
deps_program : deps_program fn = ( fun _self { program = _x0;modules = _x1;side_effect = _x2} -> begin let _x0 = _self.program _self _x0 in
176176
let _x1 = _self.required_modules _self _x1 in {program = _x0;modules = _x1;side_effect = _x2} end )

0 commit comments

Comments
 (0)