clean

Author: Hongbo Zhang

jscomp/syntax/ppx_entry.ml

@@ -200,37 +200,32 @@ let handle_typ
     ptyp_loc = loc 
     } -> 
 
-    let check_auto_uncurry core_type = self.typ self core_type in 
-    let methods  =
-      methods
-      |> List.map (fun (label, ptyp_attrs, core_type )   ->
-          (match Ast_attributes.process_attributes_rev ptyp_attrs with 
-           | `Nothing,  _ -> 
-             label, ptyp_attrs , check_auto_uncurry  core_type
-           |  `Uncurry, ptyp_attrs  -> 
-             label , ptyp_attrs, 
-             check_auto_uncurry
-               { core_type with 
-                 ptyp_attributes = 
-                   Ast_attributes.bs :: core_type.ptyp_attributes}
-           | `Method, ptyp_attrs 
-             ->  
-             label , ptyp_attrs, 
-             check_auto_uncurry
-               { core_type with 
-                 ptyp_attributes = 
-                   Ast_attributes.bs_method :: core_type.ptyp_attributes}
-           | `Meth_callback, ptyp_attrs 
-             ->  
-             label , ptyp_attrs, 
-             check_auto_uncurry
-               { core_type with 
-                 ptyp_attributes = 
-                   Ast_attributes.bs_this :: core_type.ptyp_attributes})
-        )
-    in
     let methods =
       List.fold_right (fun (label, ptyp_attrs, core_type) acc ->
+          let (label,ptyp_attrs, core_type) =
+            (match Ast_attributes.process_attributes_rev ptyp_attrs with 
+             | `Nothing,  _ -> 
+               label, ptyp_attrs , self.typ self  core_type
+             |  `Uncurry, ptyp_attrs  -> 
+               label , ptyp_attrs, 
+               self.typ self 
+                 { core_type with 
+                   ptyp_attributes = 
+                     Ast_attributes.bs :: core_type.ptyp_attributes}
+             | `Method, ptyp_attrs 
+               ->  
+               label , ptyp_attrs, 
+               self.typ self 
+                 { core_type with 
+                   ptyp_attributes = 
+                     Ast_attributes.bs_method :: core_type.ptyp_attributes}
+             | `Meth_callback, ptyp_attrs 
+               ->  
+               label , ptyp_attrs, 
+               self.typ self
+                 { core_type with 
+                   ptyp_attributes = 
+                     Ast_attributes.bs_this :: core_type.ptyp_attributes}) in            
           let get ty name attrs =
             name , attrs, ty in
           let set ty name attrs =