snapshot

bobzhang · bobzhang · commit a8602584c335 · 2020-09-16T12:14:26.000+08:00
diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml
@@ -5281,8 +5281,8 @@ let fn_method = "fn_method"
 let fn_mk = "fn_mk"
 (*let js_fn_runmethod = "js_fn_runmethod"*)
 
-let bs_deriving = "bs.deriving"
-let bs_deriving_dot = "bs.deriving."
+
+
 
 
 (** nodejs *)
diff --git a/lib/4.06.1/bsb_helper.ml b/lib/4.06.1/bsb_helper.ml
@@ -1258,8 +1258,8 @@ let fn_method = "fn_method"
 let fn_mk = "fn_mk"
 (*let js_fn_runmethod = "js_fn_runmethod"*)
 
-let bs_deriving = "bs.deriving"
-let bs_deriving_dot = "bs.deriving."
+
+
 
 
 (** nodejs *)
diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml
@@ -6048,8 +6048,8 @@ let fn_method = "fn_method"
 let fn_mk = "fn_mk"
 (*let js_fn_runmethod = "js_fn_runmethod"*)
 
-let bs_deriving = "bs.deriving"
-let bs_deriving_dot = "bs.deriving."
+
+
 
 
 (** nodejs *)
diff --git a/lib/4.06.1/unstable/bspack.ml b/lib/4.06.1/unstable/bspack.ml
@@ -10827,8 +10827,8 @@ let fn_method = "fn_method"
 let fn_mk = "fn_mk"
 (*let js_fn_runmethod = "js_fn_runmethod"*)
 
-let bs_deriving = "bs.deriving"
-let bs_deriving_dot = "bs.deriving."
+
+
 
 
 (** nodejs *)
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -69536,8 +69536,8 @@ let fn_method = "fn_method"
 let fn_mk = "fn_mk"
 (*let js_fn_runmethod = "js_fn_runmethod"*)
 
-let bs_deriving = "bs.deriving"
-let bs_deriving_dot = "bs.deriving."
+
+
 
 
 (** nodejs *)
@@ -400907,21 +400907,21 @@ let external_needs_to_be_encoded (attrs : t)=
     (fun {txt} ->
        Ext_string.starts_with txt "bs." || txt = Literals.gentype_import) 
 
+let is_inline : attr -> bool =        
+  (fun 
+    (({txt;},_) as attr) -> 
+    let b = txt = "bs.inline" || txt = "inline" in 
+    (if b then 
+       Bs_ast_invariant.mark_used_bs_attribute  attr);
+    b
+  )  (* still needs to be marked, since we are going to drop it right now *)
+  
 let has_inline_in_stru (attrs : t) : bool =
-  Ext_list.exists attrs (fun 
-    ({txt;},_) -> 
-    if txt = "bs.inline" then      
-      true
-    else false)       
+  Ext_list.exists attrs is_inline
 
 let has_inline_payload_in_sig (attrs : t)  = 
-  Ext_list.find_first attrs 
-    (fun 
-      ({txt},_)  ->
-       if txt = "bs.inline" then
-        true
-       else false
-    ) 
+  Ext_list.find_first attrs is_inline
+    
 
 type derive_attr = {
   bs_deriving : Ast_payload.action list option
@@ -403063,12 +403063,6 @@ val gen_signature:
   Ast_signature.t
 
 
-val gen_expression : 
-  string Asttypes.loc -> 
-  Parsetree.core_type -> 
-  Parsetree.expression
-
-
 
 val gen_structure_signature :  
   Location.t -> 
@@ -403145,15 +403139,7 @@ let gen_signature
        (Ast_payload.table_dispatch !derive_table action).signature_gen
          tdcls explict_nonrec) 
 
-(** used for cases like [%sexp] *)         
-let gen_expression ({Asttypes.txt ; loc}) typ =
-  let txt = Ext_string.tail_from txt (String.length Literals.bs_deriving_dot) in 
-  match (Ast_payload.table_dispatch !derive_table 
-           ({txt ; loc}, None)).expression_gen with 
-  | None ->
-    Bs_syntaxerr.err loc (Unregistered txt)
 
-  | Some f -> f typ
 
 open Ast_helper  
 let gen_structure_signature 
@@ -406838,7 +406824,7 @@ open Ast_helper
 
   
 let handle_extension record_as_js_object e (self : Bs_ast_mapper.mapper)
-    (({txt ; loc} as lid , payload) : Parsetree.extension) = 
+    (({txt ; loc}  , payload) : Parsetree.extension) = 
   begin match txt with
     | "bs.raw" | "raw" -> 
        Ast_exp_handle_external.handle_raw ~kind:Raw_exp loc payload      
@@ -406951,10 +406937,6 @@ let handle_extension record_as_js_object e (self : Bs_ast_mapper.mapper)
         | _ -> Location.raise_errorf ~loc "Expect an expression here"
       end
     | _ ->
-      match payload with
-      | PTyp typ when Ext_string.starts_with txt Literals.bs_deriving_dot ->
-        self.expr self (Ast_derive.gen_expression lid typ)
-      | _ ->  
         e (* For an unknown extension, we don't really need to process further*)
         (* Exp.extension ~loc ~attrs:e.pexp_attributes (
             self.extension self extension) *)
@@ -408022,7 +408004,7 @@ let signature_item_mapper (self : mapper) (sigi : Parsetree.signature_item) =
           (match 
            Ast_attributes.has_inline_payload_in_sig
            pval_attributes with 
-         | Some ({loc},PStr [{pstr_desc = Pstr_eval ({pexp_desc },_)}]) ->
+         | Some (_,PStr [{pstr_desc = Pstr_eval ({pexp_desc },_)}]) ->
            begin match pexp_desc with
              | Pexp_constant (
                Pconst_string
@@ -408074,12 +408056,11 @@ let signature_item_mapper (self : mapper) (sigi : Parsetree.signature_item) =
                        pval_attributes = []
                      }}
               | _ -> 
-                Location.raise_errorf ~loc "invalid payload in bs.inline"
+                default_mapper.signature_item self sigi
            end 
-         | Some ({loc}, _) ->                  
-           Location.raise_errorf ~loc "invalid payload in bs.inline"
+         | Some  _            
          | None ->
-          default_mapper.signature_item self sigi
+         default_mapper.signature_item self sigi
           )
       | _ -> default_mapper.signature_item self sigi
 
@@ -408105,65 +408086,63 @@ let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) =
     let pvb_expr = self.expr self pvb_expr in 
     let pvb_attributes = self.attributes self pvb_attributes in 
     let has_inline_property = Ast_attributes.has_inline_in_stru pvb_attributes in
-    if has_inline_property then
-      begin match pvb_expr.pexp_desc with 
-        | Pexp_constant(
-            Pconst_string
-              (s,dec))
-          ->      
-          Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
-          {str with pstr_desc = Pstr_primitive  {
-               pval_name = pval_name ;
-               pval_type = Ast_literal.type_string (); 
-               pval_loc = pvb_loc;
-               pval_attributes = [];
-               pval_prim = External_ffi_types.inline_string_primitive s dec
-             } } 
-        | Pexp_constant(Pconst_integer (s,None))
-          -> 
-          let s = Int32.of_string s in  
-          Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
-          {str with pstr_desc = Pstr_primitive  {
-               pval_name = pval_name ;
-               pval_type = Ast_literal.type_int (); 
-               pval_loc = pvb_loc;
-               pval_attributes = [];
-               pval_prim = External_ffi_types.inline_int_primitive s
-             } }
-        | Pexp_constant(Pconst_integer (s, Some 'L'))
-          -> 
-          let s = Int64.of_string s in  
-          Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
-          {str with pstr_desc = Pstr_primitive  {
-               pval_name = pval_name ;
-               pval_type = Ast_literal.type_int64; 
-               pval_loc = pvb_loc;
-               pval_attributes = [];
-               pval_prim = External_ffi_types.inline_int64_primitive s
-             } }             
-        | Pexp_constant(Pconst_float (s, None))
-          ->
-          Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
-          {str with pstr_desc = Pstr_primitive  {
-               pval_name = pval_name ;
-               pval_type = Ast_literal.type_float; 
-               pval_loc = pvb_loc;
-               pval_attributes = [];
-               pval_prim = External_ffi_types.inline_float_primitive s
-             } }                 
-        | Pexp_construct ({txt = Lident ("true" | "false" as txt) },None) -> 
-          Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
-          {str with pstr_desc = Pstr_primitive  {
-               pval_name = pval_name ;
-               pval_type = Ast_literal.type_bool (); 
-               pval_loc = pvb_loc;
-               pval_attributes = [];
-               pval_prim = External_ffi_types.inline_bool_primitive (txt = "true")
-             } }
-        | _ -> Location.raise_errorf ~loc:pvb_loc "invalid payload in bs.inline"
-      end 
-    else      
-      { str with pstr_desc =  Pstr_value(Nonrecursive, [{pvb_pat ; pvb_expr; pvb_attributes; pvb_loc}])}
+    begin match has_inline_property, pvb_expr.pexp_desc with 
+      | true, Pexp_constant(
+          Pconst_string
+            (s,dec))
+        ->      
+        Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
+        {str with pstr_desc = Pstr_primitive  {
+             pval_name = pval_name ;
+             pval_type = Ast_literal.type_string (); 
+             pval_loc = pvb_loc;
+             pval_attributes = [];
+             pval_prim = External_ffi_types.inline_string_primitive s dec
+           } } 
+      | true, Pexp_constant(Pconst_integer (s,None))
+        -> 
+        let s = Int32.of_string s in  
+        Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
+        {str with pstr_desc = Pstr_primitive  {
+             pval_name = pval_name ;
+             pval_type = Ast_literal.type_int (); 
+             pval_loc = pvb_loc;
+             pval_attributes = [];
+             pval_prim = External_ffi_types.inline_int_primitive s
+           } }
+      | true, Pexp_constant(Pconst_integer (s, Some 'L'))
+        -> 
+        let s = Int64.of_string s in  
+        Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
+        {str with pstr_desc = Pstr_primitive  {
+             pval_name = pval_name ;
+             pval_type = Ast_literal.type_int64; 
+             pval_loc = pvb_loc;
+             pval_attributes = [];
+             pval_prim = External_ffi_types.inline_int64_primitive s
+           } }             
+      | true, Pexp_constant(Pconst_float (s, None))
+        ->
+        Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
+        {str with pstr_desc = Pstr_primitive  {
+             pval_name = pval_name ;
+             pval_type = Ast_literal.type_float; 
+             pval_loc = pvb_loc;
+             pval_attributes = [];
+             pval_prim = External_ffi_types.inline_float_primitive s
+           } }                 
+      | true, Pexp_construct ({txt = Lident ("true" | "false" as txt) },None) -> 
+        Bs_ast_invariant.warn_discarded_unused_attributes pvb_attributes; 
+        {str with pstr_desc = Pstr_primitive  {
+             pval_name = pval_name ;
+             pval_type = Ast_literal.type_bool (); 
+             pval_loc = pvb_loc;
+             pval_attributes = [];
+             pval_prim = External_ffi_types.inline_bool_primitive (txt = "true")
+           } }
+      | _ ->
+        { str with pstr_desc =  Pstr_value(Nonrecursive, [{pvb_pat ; pvb_expr; pvb_attributes; pvb_loc}])}
+    end
   | Pstr_attribute({txt = "bs.config" },_)  -> str      
   | _ -> default_mapper.structure_item self str
 
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
