@@ -362,12 +362,10 @@ and lfunction = {
362362
363363and prim_info = {primitive : primitive ; args : t list ; loc : Location .t }
364364
365- and ap_info = {ap_loc : Location .t }
366-
367365and lambda_apply = {
368366 ap_func : t ;
369367 ap_args : t list ;
370- ap_info : ap_info ;
368+ ap_loc : Location .t ;
371369 ap_transformed_jsx : bool ;
372370}
373371
@@ -1074,7 +1072,7 @@ let prim ~primitive:(prim : primitive) ~args loc : t =
10741072 *)
10751073 | _ -> default () )
10761074
1077- let rec apply ?(ap_transformed_jsx = false ) fn args (ap_info : ap_info ) : t =
1075+ let rec apply ?(ap_transformed_jsx = false ) fn args (ap_loc : Location.t ) : t =
10781076 match fn with
10791077 | Lfunction
10801078 {
@@ -1091,21 +1089,20 @@ let rec apply ?(ap_transformed_jsx = false) fn args (ap_info : ap_info) : t =
10911089 } -> (
10921090 match is_eta_conversion_exn params inner_args args with
10931091 | args ->
1094- let loc = ap_info.ap_loc in
10951092 prim ~primitive: wrap
1096- ~args: [prim ~primitive: primitive_call.primitive ~args loc ]
1097- loc
1093+ ~args: [prim ~primitive: primitive_call.primitive ~args ap_loc ]
1094+ ap_loc
10981095 | exception Not_simple_form ->
1099- Lapply {ap_func = fn; ap_args = args; ap_info ; ap_transformed_jsx})
1096+ Lapply {ap_func = fn; ap_args = args; ap_loc ; ap_transformed_jsx})
11001097 | Lfunction
11011098 {
11021099 params;
11031100 body = Lprim ({primitive = _; args = inner_args} as primitive_call);
11041101 } -> (
11051102 match is_eta_conversion_exn params inner_args args with
1106- | args -> prim ~primitive: primitive_call.primitive ~args ap_info. ap_loc
1103+ | args -> prim ~primitive: primitive_call.primitive ~args ap_loc
11071104 | exception _ ->
1108- Lapply {ap_func = fn; ap_args = args; ap_info ; ap_transformed_jsx})
1105+ Lapply {ap_func = fn; ap_args = args; ap_loc ; ap_transformed_jsx})
11091106 | Lfunction
11101107 {
11111108 params;
@@ -1115,20 +1112,19 @@ let rec apply ?(ap_transformed_jsx = false) fn args (ap_info : ap_info) : t =
11151112 (Lconst _ as const) );
11161113 } -> (
11171114 match is_eta_conversion_exn params inner_args args with
1118- | args ->
1119- seq (prim ~primitive: primitive_call.primitive ~args ap_info.ap_loc) const
1115+ | args -> seq (prim ~primitive: primitive_call.primitive ~args ap_loc) const
11201116 | exception _ ->
1121- Lapply {ap_func = fn; ap_args = args; ap_info ; ap_transformed_jsx}
1117+ Lapply {ap_func = fn; ap_args = args; ap_loc ; ap_transformed_jsx}
11221118 (* | Lfunction {params;body} when Ext_list.same_length params args ->
11231119 Ext_list.fold_right2 (fun p arg acc ->
11241120 Llet(Strict,p,arg,acc)
11251121 ) params args body *)
11261122 (* TODO: more rigirous analysis on [let_kind] *) )
11271123 | Llet (kind , id , e , (Lfunction _ as fn )) ->
1128- let_ kind id e (apply fn args ap_info ~ap_transformed_jsx )
1124+ let_ kind id e (apply fn args ap_loc ~ap_transformed_jsx )
11291125 (* | Llet (kind0, id0, e0, Llet (kind,id, e, (Lfunction _ as fn))) ->
11301126 Llet(kind0,id0,e0,Llet (kind, id, e, apply fn args loc status)) *)
1131- | _ -> Lapply {ap_func = fn; ap_args = args; ap_info ; ap_transformed_jsx}
1127+ | _ -> Lapply {ap_func = fn; ap_args = args; ap_loc ; ap_transformed_jsx}
11321128
11331129let not_ loc x : t =
11341130 match x with
0 commit comments