clean up unused attributes warning handling

Author: bobzhang

jscomp/core/lam_compile_const.ml

@@ -84,7 +84,7 @@ and translate (x : Lam_constant.t ) : J.expression =
     E.str  i 
   | Const_unicode i -> 
     E.unicode i 
-    (* E.str i ~delimiter:Literals.escaped_j_delimiter *)   
+
 
   | Const_pointer (c,pointer_info) ->     
     E.int ?comment:(Lam_compile_util.comment_of_pointer_info pointer_info)

jscomp/syntax/bs_ast_invariant.ml

@@ -35,16 +35,39 @@ let is_bs_attribute txt =
 
 let used_attributes : Parsetree.attribute Hash_set_poly.t = Hash_set_poly.create 16 
 
+let dump_attribute fmt = (fun ( (sloc : string Asttypes.loc),payload) -> 
+    Format.fprintf fmt "@[%s %a@]" sloc.txt (Printast.payload 0 ) payload
+    )
+
+let dump_used_attributes fmt = 
+  Format.fprintf fmt "Used attributes Listing Start:@.";
+  Hash_set_poly.iter  (fun attr -> dump_attribute fmt attr) used_attributes;
+  Format.fprintf fmt "Used attributes Listing End:@."
+
+
 let mark_used_bs_attribute (x : Parsetree.attribute) = 
   Hash_set_poly.add used_attributes x
 
-let warn_unused_attributes attrs = 
+let dummy_unused_attribute : Warnings.t = (Bs_unused_attribute "")
+
+
+
+let warn_unused_attribute 
+  (({txt; loc}, _) as attr : Parsetree.attribute) = 
+  if is_bs_attribute txt && 
+     not (Hash_set_poly.mem used_attributes attr) then 
+    begin    
+#if BS_DEBUG then (*COMMENT*)
+      dump_used_attributes Format.err_formatter; 
+      dump_attribute Format.err_formatter attr ;
+#end
+      Location.prerr_warning loc (Bs_unused_attribute txt)
+    end
+
+let warn_unused_attributes (attrs : Parsetree.attributes) = 
   if attrs <> [] then 
-    List.iter (fun (({txt; loc}, _) as a : Parsetree.attribute) -> 
-        if is_bs_attribute txt && 
-           not (Hash_set_poly.mem used_attributes a) then 
-          Location.prerr_warning loc (Warnings.Bs_unused_attribute txt)
-      ) attrs
+    Ext_list.iter attrs warn_unused_attribute
+    
 #if OCAML_VERSION =~ ">4.03.0" then 
 type iterator = Ast_iterator.iterator
 let default_iterator = Ast_iterator.default_iterator
@@ -57,13 +80,7 @@ let default_iterator = Bs_ast_iterator.default_iterator
 let emit_external_warnings : iterator=
   {
     default_iterator with
-    attribute = (fun _ a ->
-        match a with
-        | {txt ; loc}, _ ->
-          if is_bs_attribute txt && 
-             not (Hash_set_poly.mem used_attributes a)  then
-            Location.prerr_warning loc (Bs_unused_attribute txt)
-      );
+    attribute = (fun _ attr -> warn_unused_attribute attr);
     expr = (fun self a -> 
         match a.Parsetree.pexp_desc with 
         | Pexp_constant (
@@ -97,3 +114,11 @@ let emit_external_warnings : iterator=
            default_iterator.value_description self v 
       )
   }
+
+let emit_external_warnings_on_structure  (stru : Parsetree.structure) = 
+  if Warnings.is_active dummy_unused_attribute then 
+    emit_external_warnings.structure emit_external_warnings stru
+
+let emit_external_warnings_on_signature  (sigi : Parsetree.signature) = 
+  if Warnings.is_active dummy_unused_attribute then 
+    emit_external_warnings.signature emit_external_warnings sigi

jscomp/syntax/bs_ast_invariant.mli

@@ -36,4 +36,9 @@ val mark_used_bs_attribute :
 val warn_unused_attributes :   
   Parsetree.attributes -> unit 
 (** Ast invariant checking for detecting errors *)
-val emit_external_warnings : iterator
+
+val emit_external_warnings_on_structure:
+  Parsetree.structure -> unit 
+
+val emit_external_warnings_on_signature:  
+  Parsetree.signature -> unit

jscomp/syntax/ppx_entry.ml

@@ -285,7 +285,6 @@ let signature_config_table :
   (Parsetree.expression option -> unit) String_map.t=
   String_map.of_list common_actions_table
 
-let dummy_unused_attribute : Warnings.t = (Bs_unused_attribute "")
 
 let rewrite_signature :
   (Parsetree.signature  -> Parsetree.signature) ref =
@@ -303,8 +302,7 @@ let rewrite_signature :
           unsafe_mapper.signature  unsafe_mapper x in
       reset ();
       (* Keep this check, since the check is not inexpensive*)
-      if Warnings.is_active dummy_unused_attribute then
-        Bs_ast_invariant.emit_external_warnings.signature Bs_ast_invariant.emit_external_warnings result ;
+      Bs_ast_invariant.emit_external_warnings_on_signature result;
       result
     )
 
@@ -331,8 +329,7 @@ let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref =
           unsafe_mapper.structure  unsafe_mapper x  in
       reset ();
       (* Keep this check since it is not inexpensive*)
-      (if Warnings.is_active dummy_unused_attribute then
-         Bs_ast_invariant.emit_external_warnings.structure Bs_ast_invariant.emit_external_warnings result);
+      Bs_ast_invariant.emit_external_warnings_on_structure result;
       result
     )