also need to transform attrbiutes, remove some unused dead code

Author: Hongbo Zhang

jscomp/bin/bs_ppx.ml

@@ -1,4 +1,4 @@
-(** Bundled by bspack 08/24-16:25 *)
+(** Bundled by bspack 08/25-10:52 *)
 module String_map : sig 
 #1 "string_map.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1399,7 +1399,7 @@ val init : int -> (int -> 'a) -> 'a list
 val take : int -> 'a list -> 'a list * 'a list
 val try_take : int -> 'a list -> 'a list * int * 'a list 
 
-val exclude_tail : 'a list -> 'a list
+val exclude_tail : 'a list -> 'a * 'a list
 
 val filter_map2 : ('a -> 'b -> 'c option) -> 'a list -> 'b list -> 'c list
 
@@ -1463,6 +1463,8 @@ val ref_push : 'a -> 'a t -> unit
 
 val ref_pop : 'a t -> 'a
 
+val rev_except_last : 'a list -> 'a list * 'a
+
 end = struct
 #1 "ext_list.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1651,11 +1653,11 @@ let try_take n l =
     l,  arr_length, []
   else Array.to_list (Array.sub arr 0 n ), n, (Array.to_list (Array.sub arr n (arr_length - n)))
 
-let exclude_tail (x : 'a list) : 'a list = 
+let exclude_tail (x : 'a list) = 
   let rec aux acc x = 
     match x with 
     | [] -> invalid_arg "Ext_list.exclude_tail"
-    | [ _ ] ->  List.rev acc
+    | [ x ] ->  x, List.rev acc
     | y0::ys -> aux (y0::acc) ys in
   aux [] x
 
@@ -1800,6 +1802,14 @@ let ref_pop refs =
     refs := rest ; 
     x     
 
+let rev_except_last xs =
+  let rec aux acc xs =
+    match xs with
+    | [ ] -> invalid_arg "Ext_list.rev_except_last"
+    | [ x ] -> acc ,x
+    | x :: xs -> aux (x::acc) xs in
+  aux [] xs   
+
 end
 module Ast_comb : sig 
 #1 "ast_comb.mli"
@@ -4267,7 +4277,9 @@ type t  =
 
 
 
-
+(**
+   return value is of [pval_type, pval_prim]
+*)    
 val handle_attributes_as_string : 
   Bs_loc.t ->
   string  ->
@@ -4276,6 +4288,7 @@ val handle_attributes_as_string :
   string   ->
   Ast_core_type.t * string list
 
+
 val bs_external : string 
 val to_string : t -> string 
 val from_string : string -> t 

jscomp/bin/compiler.ml

@@ -1,4 +1,4 @@
-(** Bundled by bspack 08/24-16:25 *)
+(** Bundled by bspack 08/25-10:52 *)
 module String_map : sig 
 #1 "string_map.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1399,7 +1399,7 @@ val init : int -> (int -> 'a) -> 'a list
 val take : int -> 'a list -> 'a list * 'a list
 val try_take : int -> 'a list -> 'a list * int * 'a list 
 
-val exclude_tail : 'a list -> 'a list
+val exclude_tail : 'a list -> 'a * 'a list
 
 val filter_map2 : ('a -> 'b -> 'c option) -> 'a list -> 'b list -> 'c list
 
@@ -1463,6 +1463,8 @@ val ref_push : 'a -> 'a t -> unit
 
 val ref_pop : 'a t -> 'a
 
+val rev_except_last : 'a list -> 'a list * 'a
+
 end = struct
 #1 "ext_list.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1651,11 +1653,11 @@ let try_take n l =
     l,  arr_length, []
   else Array.to_list (Array.sub arr 0 n ), n, (Array.to_list (Array.sub arr n (arr_length - n)))
 
-let exclude_tail (x : 'a list) : 'a list = 
+let exclude_tail (x : 'a list) = 
   let rec aux acc x = 
     match x with 
     | [] -> invalid_arg "Ext_list.exclude_tail"
-    | [ _ ] ->  List.rev acc
+    | [ x ] ->  x, List.rev acc
     | y0::ys -> aux (y0::acc) ys in
   aux [] x
 
@@ -1800,6 +1802,14 @@ let ref_pop refs =
     refs := rest ; 
     x     
 
+let rev_except_last xs =
+  let rec aux acc xs =
+    match xs with
+    | [ ] -> invalid_arg "Ext_list.rev_except_last"
+    | [ x ] -> acc ,x
+    | x :: xs -> aux (x::acc) xs in
+  aux [] xs   
+
 end
 module Ast_comb : sig 
 #1 "ast_comb.mli"
@@ -4267,7 +4277,9 @@ type t  =
 
 
 
-
+(**
+   return value is of [pval_type, pval_prim]
+*)    
 val handle_attributes_as_string : 
   Bs_loc.t ->
   string  ->
@@ -4276,6 +4288,7 @@ val handle_attributes_as_string :
   string   ->
   Ast_core_type.t * string list
 
+
 val bs_external : string 
 val to_string : t -> string 
 val from_string : string -> t 
@@ -26040,14 +26053,8 @@ let translate_ffi (ffi : Ast_external_attributes.ffi ) prim_name
       end
     | Js_send { name ; pipe = true ; splice = js_splice}
       -> (* splice should not happen *)
-      let self, args =
-        match List.rev args with
-        | self :: args -> self, List.rev args
-        | _ -> assert false in
-      let self_type, arg_types =
-        match List.rev arg_types with
-        | self_type ::  arg_types -> self_type, List.rev arg_types
-        | _ -> assert false in                                      
+      let self, args = Ext_list.exclude_tail args in
+      let self_type, arg_types = Ext_list.exclude_tail arg_types in
       let args = Ext_list.flat_map2_last (ocaml_to_js js_splice) arg_types args in
       E.call ~info:{arity=Full; call_info = Call_na}  (E.dot self name) args
 

jscomp/build.sh

@@ -69,5 +69,5 @@ make _build/bspack 2>> ./build.compile
 
 # make snapshot
 # generate new js_cmj_datasets
-make snapshotml
+# make snapshotml
 echo "Done" >> ./build.compile

jscomp/ext/ext_list.ml

@@ -184,11 +184,11 @@ let try_take n l =
     l,  arr_length, []
   else Array.to_list (Array.sub arr 0 n ), n, (Array.to_list (Array.sub arr n (arr_length - n)))
 
-let exclude_tail (x : 'a list) : 'a list = 
+let exclude_tail (x : 'a list) = 
   let rec aux acc x = 
     match x with 
     | [] -> invalid_arg "Ext_list.exclude_tail"
-    | [ _ ] ->  List.rev acc
+    | [ x ] ->  x, List.rev acc
     | y0::ys -> aux (y0::acc) ys in
   aux [] x
 
@@ -332,3 +332,11 @@ let ref_pop refs =
   | x::rest -> 
     refs := rest ; 
     x     
+
+let rev_except_last xs =
+  let rec aux acc xs =
+    match xs with
+    | [ ] -> invalid_arg "Ext_list.rev_except_last"
+    | [ x ] -> acc ,x
+    | x :: xs -> aux (x::acc) xs in
+  aux [] xs   

jscomp/ext/ext_list.mli

@@ -46,7 +46,7 @@ val init : int -> (int -> 'a) -> 'a list
 val take : int -> 'a list -> 'a list * 'a list
 val try_take : int -> 'a list -> 'a list * int * 'a list 
 
-val exclude_tail : 'a list -> 'a list
+val exclude_tail : 'a list -> 'a * 'a list
 
 val filter_map2 : ('a -> 'b -> 'c option) -> 'a list -> 'b list -> 'c list
 
@@ -109,3 +109,5 @@ val ref_empty : 'a t -> bool
 val ref_push : 'a -> 'a t -> unit
 
 val ref_pop : 'a t -> 'a
+
+val rev_except_last : 'a list -> 'a list * 'a

jscomp/lam_compile_external_call.ml

@@ -241,14 +241,8 @@ let translate_ffi (ffi : Ast_external_attributes.ffi ) prim_name
       end
     | Js_send { name ; pipe = true ; splice = js_splice}
       -> (* splice should not happen *)
-      let self, args =
-        match List.rev args with
-        | self :: args -> self, List.rev args
-        | _ -> assert false in
-      let self_type, arg_types =
-        match List.rev arg_types with
-        | self_type ::  arg_types -> self_type, List.rev arg_types
-        | _ -> assert false in                                      
+      let self, args = Ext_list.exclude_tail args in
+      let self_type, arg_types = Ext_list.exclude_tail arg_types in
       let args = Ext_list.flat_map2_last (ocaml_to_js js_splice) arg_types args in
       E.call ~info:{arity=Full; call_info = Call_na}  (E.dot self name) args
 

jscomp/syntax/ast_attributes.ml

@@ -117,16 +117,6 @@ let process_external attrs =
       else false
     ) attrs
 
-let process_bs_type attrs = 
-  List.fold_right (fun (attr : attr) (st, acc) -> 
-      match attr  with 
-      | {txt = "bs.type" }, PTyp typ
-        -> 
-        Some typ, acc
-      | _  -> 
-        st, attr::acc 
-    )  attrs (None, [])
-
 
 type derive_attr = {
   explict_nonrec : bool;
@@ -217,11 +207,8 @@ let bs_this : attr
 let bs_method : attr 
   =  {txt = "bs.meth"; loc = Location.none}, Ast_payload.empty
 
-let mk_bs_type ?(loc=Location.none) ty : attr = 
-  { txt = Literals.bs_type; loc }, PTyp ty
 
 let bs_obj pval_type : t
   = 
-  [{txt = "bs.obj" ; loc = Location.none}, Ast_payload.empty ;
-   mk_bs_type pval_type
+  [{txt = "bs.obj" ; loc = Location.none}, Ast_payload.empty 
   ]

jscomp/syntax/ast_attributes.mli

@@ -39,7 +39,7 @@ val process_bs :
   t -> [ `Nothing | `Has] * t 
 
 val process_external : t -> bool 
-val process_bs_type : t -> Parsetree.core_type option * t 
+
 type derive_attr = {
   explict_nonrec : bool;
   bs_deriving : [`Has_deriving of Ast_payload.action list | `Nothing ]
@@ -62,4 +62,4 @@ val bs : attr
 val bs_this : attr
 val bs_method : attr
 
-val mk_bs_type : ?loc:Location.t -> Parsetree.core_type -> attr
+