Merge pull request #4911 from ELLIOTTCABLE/agnostic-deriving

Relax uninterpretable attributes (such as non-BuckleScript @@deriving payloads) from error to warn

Author: bobzhang

jscomp/syntax/ast_derive_util.mli

@@ -49,4 +49,4 @@ val notApplicable:
   string -> 
   unit 
 
-val invalid_config : Parsetree.expression -> 'a   
+val invalid_config : Parsetree.expression -> 'a   

jscomp/syntax/ast_payload.ml

@@ -130,6 +130,11 @@ type action =
 *)
 
 
+let unrecognizedConfigRecord loc text =
+  Location.prerr_warning
+    loc
+    (Warnings.Bs_derive_warning text)
+
 
 let ident_or_record_as_config     
     loc
@@ -156,11 +161,11 @@ let ident_or_record_as_config
                -> 
                ({Asttypes.txt = name ; loc}, Some y)
              | _ -> 
-               Location.raise_errorf ~loc "Qualified label is not allood"
+               Location.raise_errorf ~loc "Qualified label is not allowed"
           )
 
       | Some _ -> 
-        Location.raise_errorf ~loc "with is not supported"
+        unrecognizedConfigRecord loc "`with` is not supported, discarding"; []
     end
   | PStr [
       {pstr_desc =
@@ -174,7 +179,7 @@ let ident_or_record_as_config
     ] -> [ {Asttypes.txt ; loc = lloc}, None] 
   | PStr [] -> []
   | _ -> 
-    Location.raise_errorf ~loc "this is not a valid record config"
+      unrecognizedConfigRecord loc "invalid attribute config-record, ignoring"; []
 
 
 

jscomp/syntax/ast_payload.mli

@@ -83,3 +83,10 @@ val empty : t
 
 val table_dispatch : 
   (Parsetree.expression option  -> 'a) Map_string.t -> action -> 'a
+
+(** Report to the user, as a warning, that the bs-attribute parser is bailing out. (This is to allow
+  external ppx, like ppx_deriving, to pick up where the builtin ppx leave off.) *)
+val unrecognizedConfigRecord:
+  Location.t ->
+  string ->
+  unit

lib/4.06.1/unstable/js_compiler.ml

@@ -398616,6 +398616,13 @@ val empty : t
 val table_dispatch : 
   (Parsetree.expression option  -> 'a) Map_string.t -> action -> 'a
 
+(** Report to the user, as a warning, that the bs-attribute parser is bailing out. (This is to allow
+  external ppx, like ppx_deriving, to pick up where the builtin ppx leave off.) *)
+val unrecognizedConfigRecord:
+  Location.t ->
+  string ->
+  unit
+
 end = struct
 #1 "ast_payload.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -398750,6 +398757,11 @@ type action =
 *)
 
 
+let unrecognizedConfigRecord loc text =
+  Location.prerr_warning
+    loc
+    (Warnings.Bs_derive_warning text)
+
 
 let ident_or_record_as_config     
     loc
@@ -398776,11 +398788,11 @@ let ident_or_record_as_config
                -> 
                ({Asttypes.txt = name ; loc}, Some y)
              | _ -> 
-               Location.raise_errorf ~loc "Qualified label is not allood"
+               Location.raise_errorf ~loc "Qualified label is not allowed"
           )
 
       | Some _ -> 
-        Location.raise_errorf ~loc "with is not supported"
+        unrecognizedConfigRecord loc "`with` is not supported, discarding"; []
     end
   | PStr [
       {pstr_desc =
@@ -398794,7 +398806,7 @@ let ident_or_record_as_config
     ] -> [ {Asttypes.txt ; loc = lloc}, None] 
   | PStr [] -> []
   | _ -> 
-    Location.raise_errorf ~loc "this is not a valid record config"
+      unrecognizedConfigRecord loc "invalid attribute config-record, ignoring"; []
 
 
 
@@ -402807,6 +402819,7 @@ val notApplicable:
   unit 
 
 val invalid_config : Parsetree.expression -> 'a   
+
 end = struct
 #1 "ast_derive_util.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -398616,6 +398616,13 @@ val empty : t
 val table_dispatch : 
   (Parsetree.expression option  -> 'a) Map_string.t -> action -> 'a
 
+(** Report to the user, as a warning, that the bs-attribute parser is bailing out. (This is to allow
+  external ppx, like ppx_deriving, to pick up where the builtin ppx leave off.) *)
+val unrecognizedConfigRecord:
+  Location.t ->
+  string ->
+  unit
+
 end = struct
 #1 "ast_payload.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -398750,6 +398757,11 @@ type action =
 *)
 
 
+let unrecognizedConfigRecord loc text =
+  Location.prerr_warning
+    loc
+    (Warnings.Bs_derive_warning text)
+
 
 let ident_or_record_as_config     
     loc
@@ -398776,11 +398788,11 @@ let ident_or_record_as_config
                -> 
                ({Asttypes.txt = name ; loc}, Some y)
              | _ -> 
-               Location.raise_errorf ~loc "Qualified label is not allood"
+               Location.raise_errorf ~loc "Qualified label is not allowed"
           )
 
       | Some _ -> 
-        Location.raise_errorf ~loc "with is not supported"
+        unrecognizedConfigRecord loc "`with` is not supported, discarding"; []
     end
   | PStr [
       {pstr_desc =
@@ -398794,7 +398806,7 @@ let ident_or_record_as_config
     ] -> [ {Asttypes.txt ; loc = lloc}, None] 
   | PStr [] -> []
   | _ -> 
-    Location.raise_errorf ~loc "this is not a valid record config"
+      unrecognizedConfigRecord loc "invalid attribute config-record, ignoring"; []
 
 
 
@@ -402807,6 +402819,7 @@ val notApplicable:
   unit 
 
 val invalid_config : Parsetree.expression -> 'a   
+
 end = struct
 #1 "ast_derive_util.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.

lib/4.06.1/whole_compiler.ml

@@ -288146,6 +288146,13 @@ val empty : t
 val table_dispatch : 
   (Parsetree.expression option  -> 'a) Map_string.t -> action -> 'a
 
+(** Report to the user, as a warning, that the bs-attribute parser is bailing out. (This is to allow
+  external ppx, like ppx_deriving, to pick up where the builtin ppx leave off.) *)
+val unrecognizedConfigRecord:
+  Location.t ->
+  string ->
+  unit
+
 end = struct
 #1 "ast_payload.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -288280,6 +288287,11 @@ type action =
 *)
 
 
+let unrecognizedConfigRecord loc text =
+  Location.prerr_warning
+    loc
+    (Warnings.Bs_derive_warning text)
+
 
 let ident_or_record_as_config     
     loc
@@ -288306,11 +288318,11 @@ let ident_or_record_as_config
                -> 
                ({Asttypes.txt = name ; loc}, Some y)
              | _ -> 
-               Location.raise_errorf ~loc "Qualified label is not allood"
+               Location.raise_errorf ~loc "Qualified label is not allowed"
           )
 
       | Some _ -> 
-        Location.raise_errorf ~loc "with is not supported"
+        unrecognizedConfigRecord loc "`with` is not supported, discarding"; []
     end
   | PStr [
       {pstr_desc =
@@ -288324,7 +288336,7 @@ let ident_or_record_as_config
     ] -> [ {Asttypes.txt ; loc = lloc}, None] 
   | PStr [] -> []
   | _ -> 
-    Location.raise_errorf ~loc "this is not a valid record config"
+      unrecognizedConfigRecord loc "invalid attribute config-record, ignoring"; []
 
 
 
@@ -405636,6 +405648,7 @@ val notApplicable:
   unit 
 
 val invalid_config : Parsetree.expression -> 'a   
+
 end = struct
 #1 "ast_derive_util.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.