refactor

Author: bobzhang

jscomp/frontend/ast_core_type.ml

@@ -56,11 +56,26 @@ open Ast_helper
     | _ -> result in
   aux ty *)
 
+let is_builtin_rank0_type txt =   
+  match txt with 
+  | "int"         
+  | "char"
+  | "bytes"
+  | "float"
+  | "bool"
+  | "unit"
+  | "exn"
+  | "int32"
+  | "int64"
+  | "string" -> true 
+  | _ -> false
+    
 let is_unit (ty : t ) =
   match ty.ptyp_desc with
   | Ptyp_constr({txt =Lident "unit"}, []) -> true
   | _ -> false
 
+
 (* let is_array (ty : t) =
   match ty.ptyp_desc with
   | Ptyp_constr({txt =Lident "array"}, [_]) -> true

jscomp/frontend/ast_core_type.mli

@@ -29,13 +29,10 @@ type t = Parsetree.core_type
 
 val lift_option_type : t -> t
 
-(* val replace_result : t -> t -> t *)
-
-(* val opt_arrow: Location.t -> string -> t -> t -> t *)
-
 val is_unit : t -> bool
-(* val is_array : t -> bool *)
 
+val is_builtin_rank0_type : 
+  string -> bool
 
 (** return a function type
     [from_labels ~loc tyvars labels]
@@ -52,11 +49,6 @@ val make_obj :
 
 val is_user_option : t -> bool
 
-(* val is_user_bool : t -> bool
-
-val is_user_int : t -> bool *)
-
-
 
 (**
   returns 0 when it can not tell arity from the syntax

jscomp/frontend/bs_ast_invariant.ml

@@ -117,27 +117,10 @@ let emit_external_warnings : iterator=
     super with
     type_declaration = (fun self ptyp -> 
         let txt = ptyp.ptype_name.txt in
-        (match txt with 
-         | "int"         
-         | "char"
-         | "bytes"
-         | "float"
-         | "bool"
-         | "unit"
-         | "exn"
-         | "int32"
-         | "int64"
-         | "string" 
-         (* not adding parametric types yet 
-         | "array"
-         | "list"
-         | "option"
-         *)
-          ->
-           Location.raise_errorf ~loc:ptyp.ptype_loc 
-           "built-in type `%s` can not be redefined " txt
-         | _ -> ()
-        );
+        if Ast_core_type.is_builtin_rank0_type txt then 
+          Location.raise_errorf ~loc:ptyp.ptype_loc 
+            "built-in type `%s` can not be redefined " txt
+        ;
         super.type_declaration self ptyp
       );
     attribute = (fun _ attr -> warn_unused_attribute attr);