Merge pull request #3883 from BuckleScript/snapshot_for_4.06

snapshot for 4.06

Author: bobzhang

lib/4.06.1/bsb.ml

@@ -611,10 +611,18 @@ val map :
   ('a -> 'b) -> 
   'b list 
 
+val map_combine :  
+  'a list -> 
+  'b list -> 
+  ('a -> 'c) -> 
+  ('c * 'b) list 
+  
 val has_string :   
   string list ->
   string -> 
   bool
+
+
 val map_split_opt :  
   'a list ->
   ('a -> 'b option * 'c option) ->
@@ -1019,6 +1027,13 @@ let rec has_string l f =
   | x1 :: x2 :: x3 :: x4 ->
     x1 = f || x2 = f || x3 = f || has_string x4 f 
 
+let rec map_combine l1 l2 f =
+  match (l1, l2) with
+    ([], []) -> []
+  | (a1::l1, a2::l2) -> 
+    (f a1, a2) :: map_combine l1 l2 f 
+  | (_, _) -> 
+    invalid_arg "Ext_list.map_combine"
 
 let rec map_split_opt 
   (xs : 'a list)  (f : 'a -> 'b option * 'c option) 
@@ -4126,13 +4141,14 @@ type kind = Js | Bytecode | Native
 val deps_of_channel : in_channel -> string list
 
 
-
-val emit_d:  
+val emit_d: 
+  kind -> 
   Bsb_dir_index.t ->  
   string  option ->
   string ->
   string -> (* empty string means no mliast *)
   unit
+
 end = struct
 #1 "bsb_helper_depfile_gen.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4380,6 +4396,7 @@ let oc_intf
 
 
 let emit_d 
+  compilation_kind
   (index : Bsb_dir_index.t) 
   (namespace : string option) (mlast : string) (mliast : string) = 
   let data  =
@@ -4388,9 +4405,12 @@ let emit_d
   let buf = Ext_buffer.create 2048 in 
   let filename = 
       Ext_filename.new_extension mlast Literals.suffix_d in   
-  let lhs_suffix = Literals.suffix_cmj in   
-  let rhs_suffix = Literals.suffix_cmj in 
-  
+  let lhs_suffix, rhs_suffix =
+    match compilation_kind with
+    | Js       -> Literals.suffix_cmj, Literals.suffix_cmj
+    | Bytecode -> Literals.suffix_cmo, Literals.suffix_cmo
+    | Native   -> Literals.suffix_cmx, Literals.suffix_cmx 
+  in   
   oc_impl 
     mlast
     index 
@@ -4409,12 +4429,6 @@ let emit_d
   end;          
   write_file filename buf 
 
-
-
-
-
-
-
 end
 module Bsb_helper_main : sig 
 #1 "bsb_helper_main.mli"
@@ -4480,6 +4494,8 @@ end = struct
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+let compilation_kind = ref Bsb_helper_depfile_gen.Js
+
 let hash : string ref = ref ""
 let batch_files = ref []
 let collect_file name =
@@ -4509,11 +4525,13 @@ let () =
   match !batch_files with
   | [x]
     ->  Bsb_helper_depfile_gen.emit_d
+          !compilation_kind
           (Bsb_dir_index.of_int !dev_group )          
           !namespace x ""
   | [y; x] (* reverse order *)
     -> 
     Bsb_helper_depfile_gen.emit_d
+      !compilation_kind
       (Bsb_dir_index.of_int !dev_group)
       !namespace x y
   | _ -> 

lib/4.06.1/bsb_helper.ml

@@ -29330,10 +29330,18 @@ val map :
   ('a -> 'b) -> 
   'b list 
 
+val map_combine :  
+  'a list -> 
+  'b list -> 
+  ('a -> 'c) -> 
+  ('c * 'b) list 
+  
 val has_string :   
   string list ->
   string -> 
   bool
+
+
 val map_split_opt :  
   'a list ->
   ('a -> 'b option * 'c option) ->
@@ -29738,6 +29746,13 @@ let rec has_string l f =
   | x1 :: x2 :: x3 :: x4 ->
     x1 = f || x2 = f || x3 = f || has_string x4 f 
 
+let rec map_combine l1 l2 f =
+  match (l1, l2) with
+    ([], []) -> []
+  | (a1::l1, a2::l2) -> 
+    (f a1, a2) :: map_combine l1 l2 f 
+  | (_, _) -> 
+    invalid_arg "Ext_list.map_combine"
 
 let rec map_split_opt 
   (xs : 'a list)  (f : 'a -> 'b option * 'c option) 
@@ -35392,6 +35407,8 @@ val refmt : string option ref
 val is_reason : bool ref 
 
 val js_stdout : bool ref 
+
+val all_module_aliases : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -35506,6 +35523,8 @@ let refmt = ref None
 let is_reason = ref false
 
 let js_stdout = ref true
+
+let all_module_aliases = ref false
 end
 module Bs_warnings : sig 
 #1 "bs_warnings.mli"
@@ -45505,7 +45524,7 @@ let set_attrs = [Ast_attributes.bs_set]
 
 let deprecated name = 
   Ast_attributes.deprecated  
-    ("use " ^ name ^ "Get instead, or swith to the new [@bs.deriving {abstract: light}] for the type declaration (OCaml syntax: [@@bs.deriving {abstract = light}])")
+    ("use " ^ name ^ "Get instead, or switch to the new [@bs.deriving {abstract: light}] for the type declaration (OCaml syntax: [@@bs.deriving {abstract = light}])")
 
 
 let handleTdcl 

lib/4.06.1/bsdep.ml

@@ -4900,6 +4900,8 @@ val refmt : string option ref
 val is_reason : bool ref 
 
 val js_stdout : bool ref 
+
+val all_module_aliases : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -5014,6 +5016,8 @@ let refmt = ref None
 let is_reason = ref false
 
 let js_stdout = ref true
+
+let all_module_aliases = ref false
 end
 (** Interface as module  *)
 module Asttypes
@@ -7837,10 +7841,18 @@ val map :
   ('a -> 'b) -> 
   'b list 
 
+val map_combine :  
+  'a list -> 
+  'b list -> 
+  ('a -> 'c) -> 
+  ('c * 'b) list 
+  
 val has_string :   
   string list ->
   string -> 
   bool
+
+
 val map_split_opt :  
   'a list ->
   ('a -> 'b option * 'c option) ->
@@ -8245,6 +8257,13 @@ let rec has_string l f =
   | x1 :: x2 :: x3 :: x4 ->
     x1 = f || x2 = f || x3 = f || has_string x4 f 
 
+let rec map_combine l1 l2 f =
+  match (l1, l2) with
+    ([], []) -> []
+  | (a1::l1, a2::l2) -> 
+    (f a1, a2) :: map_combine l1 l2 f 
+  | (_, _) -> 
+    invalid_arg "Ext_list.map_combine"
 
 let rec map_split_opt 
   (xs : 'a list)  (f : 'a -> 'b option * 'c option) 
@@ -24537,7 +24556,7 @@ let set_attrs = [Ast_attributes.bs_set]
 
 let deprecated name = 
   Ast_attributes.deprecated  
-    ("use " ^ name ^ "Get instead, or swith to the new [@bs.deriving {abstract: light}] for the type declaration (OCaml syntax: [@@bs.deriving {abstract = light}])")
+    ("use " ^ name ^ "Get instead, or switch to the new [@bs.deriving {abstract: light}] for the type declaration (OCaml syntax: [@@bs.deriving {abstract = light}])")
 
 
 let handleTdcl 

lib/4.06.1/bsppx.ml

@@ -1776,10 +1776,18 @@ val map :
   ('a -> 'b) -> 
   'b list 
 
+val map_combine :  
+  'a list -> 
+  'b list -> 
+  ('a -> 'c) -> 
+  ('c * 'b) list 
+  
 val has_string :   
   string list ->
   string -> 
   bool
+
+
 val map_split_opt :  
   'a list ->
   ('a -> 'b option * 'c option) ->
@@ -2184,6 +2192,13 @@ let rec has_string l f =
   | x1 :: x2 :: x3 :: x4 ->
     x1 = f || x2 = f || x3 = f || has_string x4 f 
 
+let rec map_combine l1 l2 f =
+  match (l1, l2) with
+    ([], []) -> []
+  | (a1::l1, a2::l2) -> 
+    (f a1, a2) :: map_combine l1 l2 f 
+  | (_, _) -> 
+    invalid_arg "Ext_list.map_combine"
 
 let rec map_split_opt 
   (xs : 'a list)  (f : 'a -> 'b option * 'c option) 
@@ -7261,6 +7276,8 @@ val refmt : string option ref
 val is_reason : bool ref 
 
 val js_stdout : bool ref 
+
+val all_module_aliases : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7375,6 +7392,8 @@ let refmt = ref None
 let is_reason = ref false
 
 let js_stdout = ref true
+
+let all_module_aliases = ref false
 end
 module Ml_binary : sig 
 #1 "ml_binary.mli"