Fix

Author: cknitt

compiler/frontend/bs_ast_invariant.ml

@@ -50,6 +50,21 @@ type iterator = Ast_iterator.iterator
 
 let super = Ast_iterator.default_iterator
 
+let warning_attribute_iterator =
+  let structure_item self str_item =
+    (match str_item.pstr_desc with
+    | Pstr_attribute attr -> Builtin_attributes.warning_attribute attr
+    | _ -> ());
+    super.structure_item self str_item
+  in
+  let signature_item self sig_item =
+    (match sig_item.psig_desc with
+    | Psig_attribute attr -> Builtin_attributes.warning_attribute attr
+    | _ -> ());
+    super.signature_item self sig_item
+  in
+  {super with structure_item; signature_item}
+
 let check_constant loc (const : Parsetree.constant) =
   match const with
   | Pconst_string (_, Some s) ->
@@ -148,28 +163,14 @@ let emit_external_warnings : iterator =
         | _ -> super.pat self pat);
   }
 
-let rec iter_warnings_on_stru (stru : Parsetree.structure) =
-  match stru with
-  | [] -> ()
-  | head :: rest -> (
-    match head.pstr_desc with
-    | Pstr_attribute attr ->
-      Builtin_attributes.warning_attribute attr;
-      iter_warnings_on_stru rest
-    | _ -> ())
+let iter_warnings_on_structure (structure : Parsetree.structure) =
+  warning_attribute_iterator.structure warning_attribute_iterator structure
 
-let rec iter_warnings_on_sigi (stru : Parsetree.signature) =
-  match stru with
-  | [] -> ()
-  | head :: rest -> (
-    match head.psig_desc with
-    | Psig_attribute attr ->
-      Builtin_attributes.warning_attribute attr;
-      iter_warnings_on_sigi rest
-    | _ -> ())
+let iter_warnings_on_signature (signature : Parsetree.signature) =
+  warning_attribute_iterator.signature warning_attribute_iterator signature
 
-let emit_external_warnings_on_structure (stru : Parsetree.structure) =
-  emit_external_warnings.structure emit_external_warnings stru
+let emit_external_warnings_on_structure (structure : Parsetree.structure) =
+  emit_external_warnings.structure emit_external_warnings structure
 
-let emit_external_warnings_on_signature (sigi : Parsetree.signature) =
-  emit_external_warnings.signature emit_external_warnings sigi
+let emit_external_warnings_on_signature (signature : Parsetree.signature) =
+  emit_external_warnings.signature emit_external_warnings signature

compiler/frontend/bs_ast_invariant.mli

@@ -30,9 +30,9 @@ type iterator = Ast_iterator.iterator
 val warn_discarded_unused_attributes : Parsetree.attributes -> unit
 (** Ast invariant checking for detecting errors *)
 
-val iter_warnings_on_stru : Parsetree.structure -> unit
+val iter_warnings_on_structure : Parsetree.structure -> unit
 
-val iter_warnings_on_sigi : Parsetree.signature -> unit
+val iter_warnings_on_signature : Parsetree.signature -> unit
 
 val emit_external_warnings_on_structure : Parsetree.structure -> unit
 

compiler/frontend/ppx_entry.ml

@@ -25,7 +25,7 @@
 let unsafe_mapper = Bs_builtin_ppx.mapper
 
 let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
-  Bs_ast_invariant.iter_warnings_on_sigi ast;
+  Bs_ast_invariant.iter_warnings_on_signature ast;
   Ast_config.process_sig ast;
   let ast =
     match !Js_config.jsx_version with
@@ -44,7 +44,7 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
     result
 
 let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
-  Bs_ast_invariant.iter_warnings_on_stru ast;
+  Bs_ast_invariant.iter_warnings_on_structure ast;
   Ast_config.process_str ast;
   let ast =
     match !Js_config.jsx_version with

tests/build_tests/super_errors/expected/malformed_warning_attribute.resi.expected

@@ -7,4 +7,4 @@
   3 │ let x: int
 
   illegal payload for attribute 'warning'.
-A single string literal is expected
+A single string literal is expected