review comments

Author: Rahul Kumar

jscomp/tools/ppx_class.ml

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *)
 
-(* Author: Hongbo Zhang  *)
+(* Author: Rahul Kumar *)
 open Ast_mapper
 open Ast_helper
 open Asttypes
@@ -34,7 +34,8 @@ type indication =
 let compare_indication : indication -> indication -> int = compare
 
 (* Given an attribute string, determine the indications *)
-let classify_indication name = match name with
+let classify_indication name = 
+  match name with
   | "r" -> [Indication_read]
   | "w" -> [Indication_write]
   | "rw" -> [Indication_read;Indication_write]
@@ -44,7 +45,7 @@ let classify_indication name = match name with
 (* Get unique indications from an attribute list *)
 let indications_of_attr attrlst = 
   List.sort_uniq compare_indication (List.concat
-    (List.map (fun ({txt=x;_},_) -> classify_indication x) attrlst))
+                                       (List.map (fun ({txt=x;_},_) -> classify_indication x) attrlst))
 
 (* Define the methods generated by this ppx extension *)
 type methods = 
@@ -97,7 +98,8 @@ let filter_attributes attrlst = List.filter
 let strip_attr t = {t with ptyp_attributes=filter_attributes t.ptyp_attributes}
 
 (* Count the arity of a core_type *)
-let rec count_arity z = match z with
+let rec count_arity z = 
+  match z with
   | {ptyp_desc = Ptyp_arrow (_,_,y);_} -> 1 + (count_arity y)
   | _ -> 0
 
@@ -106,18 +108,23 @@ let is_non_nullary_fn z = (count_arity z) > 0
 
 (* Produce a new core_type from the given core_type, removing 'opt/option/def'
    from the return type*)
-let rec optless typ loc prefix = match typ with
-  | {ptyp_desc = Ptyp_constr ({txt=(Lident ("opt"|"def"|"option")) | 
-      (Ldot (Lident "Js",("opt"|"def"|"option")));_},[x]);_} -> x
+let rec optless typ loc prefix = 
+  match typ with
+  | {ptyp_desc = 
+       Ptyp_constr ({txt=
+                       (Lident ("opt"|"def"|"opt_def")) | 
+                       (Ldot (Lident "Js",
+                              ("opt"|"def"|"opt_def")));_},[x]);_} -> x
   | {ptyp_desc = Ptyp_arrow  (tag,t1,t2);_} as t_ -> 
-      {t_ with ptyp_desc = Ptyp_arrow (tag,t1,optless t2 loc prefix)}
+    {t_ with ptyp_desc = Ptyp_arrow (tag,t1,optless t2 loc prefix)}
   | _ -> begin
       pwarn loc true (prefix^"indication provided for non-option type."); 
       typ
     end
 
 (* Generate method signature with appropriate warnings/checks *)
-let gen_method loc original abs vis name attr typ meth = match meth with
+let gen_method loc original abs vis name attr typ meth = 
+  match meth with
   | Method_read -> begin
       let () = pwarn loc (is_non_nullary_fn typ) 
           "Read indication provided for non-property."
@@ -184,7 +191,8 @@ let new_methods m =
   | _ -> [m]
 
 (* Map class_type_declaration for FFI *)
-let new_ctd mapper ctd = match ctd with
+let new_ctd mapper ctd = 
+  match ctd with
   | { pci_name=name; 
       pci_expr = 
         { pcty_desc = Pcty_signature (
@@ -193,9 +201,9 @@ let new_ctd mapper ctd = match ctd with
       pci_attributes = attrlst
     } as c -> 
     { c with pci_expr = 
-      { expr with pcty_desc = Pcty_signature 
-        { flds with pcsig_fields = 
-          (List.concat (List.map new_methods methodlst)) } };
+               { expr with pcty_desc = Pcty_signature 
+                               { flds with pcsig_fields = 
+                                             (List.concat (List.map new_methods methodlst)) } };
     }
   | _ -> default_mapper.class_type_declaration mapper ctd