tweak

Author: bobzhang

Diff for: jscomp/bsb/bsb_db_encode.ml

@@ -89,13 +89,14 @@ let encode (dbs : Bsb_db.ts) buf =
   Ext_array.iter dbs (fun x ->  encode_single x  buf)
 
 
-
+(* TODO: shall we avoid writing such file (checking the digest) *)
 let write_build_cache ~dir (bs_files : Bsb_db.ts)  : string = 
   let oc = open_out_bin (Filename.concat dir bsbuild_cache) in 
   let buf = Ext_buffer.create 100_000 in 
   encode bs_files buf ; 
-  let digest = Digest.to_hex (Ext_buffer.digest buf) in
+  let digest = Ext_buffer.digest buf in 
+  let hex_digest = Digest.to_hex digest in
   output_string oc digest;
   Ext_buffer.output_buffer oc buf;
   close_out oc; 
-  digest
+  hex_digest

Diff for: jscomp/bsb_helper/bsb_db_decode.ml

@@ -37,10 +37,6 @@ type t = group array * string (* string is whole content*)
 
 type cursor = int ref 
 
-let extract_line (x : string) (cur : cursor) : string =
-  Ext_string.extract_until x cur '\n'
-
-
 
 (*TODO: special case when module_count is zero *)
 let rec decode_internal (x : string) (offset : cursor) =   
@@ -83,18 +79,12 @@ and decode_modules x (offset : cursor) module_number =
   result
 
 
-
-
-
-
+(* TODO: shall we check the consistency of digest *)
 let read_build_cache ~dir  : t = 
   let ic = open_in_bin (Filename.concat dir bsbuild_cache) in 
   let len = in_channel_length ic in 
-  let all_content = really_input_string ic len in 
-  let offset = ref 0 in 
-  let _cur_module_info_magic_number = extract_line all_content offset in 
-  (* assert (cur_module_info_magic_number = Bs_version.version);  *)
-  decode_internal all_content offset, all_content
+  let all_content = really_input_string ic len in   
+  decode_internal all_content (ref (Ext_digest.length + 1)), all_content
 
 let cmp (a : string) b = String_map.compare_key a b   
 

Diff for: jscomp/ext/ext_digest.ml

@@ -23,4 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
- let length = 16
+ let length = 16
+
+ let hex_length = 32

Diff for: jscomp/ext/ext_digest.mli

@@ -23,4 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
- val length : int 
+ val length : int 
+
+ val hex_length : int

Diff for: jscomp/ounit_tests/ounit_util_tests.ml

@@ -51,13 +51,17 @@ let suites =
         let buf = Ext_buffer.create 0 in 
         Ext_buffer.add_string_char buf "hello" 'v';
         Ext_buffer.contents buf =~ "hellov";
-        Ext_buffer.length buf =~ 5
+        Ext_buffer.length buf =~ 6
     end;
     __LOC__ >:: begin fun _ -> 
         let buf = Ext_buffer.create 0 in 
         Ext_buffer.add_char_string buf 'h' "ellov";
         Ext_buffer.contents buf =~ "hellov";
-        Ext_buffer.length buf =~ 5
+        Ext_buffer.length buf =~ 6
+    end;
+    __LOC__ >:: begin fun _ -> 
+        String.length 
+        (Digest.to_hex(Digest.string "")) =~ 32
     end
 
   ]

Diff for: lib/4.02.3/bsb.ml

@@ -13091,16 +13091,17 @@ let encode (dbs : Bsb_db.ts) buf =
   Ext_array.iter dbs (fun x ->  encode_single x  buf)
 
 
-
+(* TODO: shall we avoid writing such file (checking the digest) *)
 let write_build_cache ~dir (bs_files : Bsb_db.ts)  : string = 
   let oc = open_out_bin (Filename.concat dir bsbuild_cache) in 
   let buf = Ext_buffer.create 100_000 in 
   encode bs_files buf ; 
-  let digest = Digest.to_hex (Ext_buffer.digest buf) in
+  let digest = Ext_buffer.digest buf in 
+  let hex_digest = Digest.to_hex digest in
   output_string oc digest;
   Ext_buffer.output_buffer oc buf;
   close_out oc; 
-  digest
+  hex_digest
 
 end
 module Ext_digest : sig 
@@ -13131,6 +13132,8 @@ module Ext_digest : sig
 
 
  val length : int 
+
+ val hex_length : int
 end = struct
 #1 "ext_digest.ml"
 (* Copyright (C) 2019- Authors of BuckleScript
@@ -13159,6 +13162,8 @@ end = struct
 
 
  let length = 16
+
+ let hex_length = 32
 end
 module Bsb_namespace_map_gen : sig 
 #1 "bsb_namespace_map_gen.mli"

Diff for: lib/4.02.3/bsb_helper.ml

@@ -3542,6 +3542,67 @@ let has_reason_files (map  : t ) =
 
 
 
+end
+module Ext_digest : sig 
+#1 "ext_digest.mli"
+(* Copyright (C) 2019- Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+ val length : int 
+
+ val hex_length : int
+end = struct
+#1 "ext_digest.ml"
+(* Copyright (C) 2019- Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+ let length = 16
+
+ let hex_length = 32
 end
 module Literals : sig 
 #1 "literals.mli"
@@ -3917,10 +3978,6 @@ type t = group array * string (* string is whole content*)
 
 type cursor = int ref 
 
-let extract_line (x : string) (cur : cursor) : string =
-  Ext_string.extract_until x cur '\n'
-
-
 
 (*TODO: special case when module_count is zero *)
 let rec decode_internal (x : string) (offset : cursor) =   
@@ -3963,18 +4020,12 @@ and decode_modules x (offset : cursor) module_number =
   result
 
 
-
-
-
-
+(* TODO: shall we check the consistency of digest *)
 let read_build_cache ~dir  : t = 
   let ic = open_in_bin (Filename.concat dir bsbuild_cache) in 
   let len = in_channel_length ic in 
-  let all_content = really_input_string ic len in 
-  let offset = ref 0 in 
-  let _cur_module_info_magic_number = extract_line all_content offset in 
-  (* assert (cur_module_info_magic_number = Bs_version.version);  *)
-  decode_internal all_content offset, all_content
+  let all_content = really_input_string ic len in   
+  decode_internal all_content (ref (Ext_digest.length + 1)), all_content
 
 let cmp (a : string) b = String_map.compare_key a b   
 

Diff for: lib/4.02.3/bsb_helper.ml.d

@@ -1 +1 @@
-../lib/4.02.3/bsb_helper.ml: ./bsb_helper/bsb_db_decode.ml ./bsb_helper/bsb_db_decode.mli ./bsb_helper/bsb_helper_depfile_gen.ml ./bsb_helper/bsb_helper_depfile_gen.mli ./ext/bsb_db.ml ./ext/bsb_db.mli ./ext/bsb_dir_index.ml ./ext/bsb_dir_index.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_buffer.ml ./ext/ext_buffer.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_char.ml ./ext/ext_char.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_namespace.ml ./ext/ext_namespace.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/string_map.ml ./ext/string_map.mli ./main/bsb_helper_main.ml ./main/bsb_helper_main.mli 
+../lib/4.02.3/bsb_helper.ml: ./bsb_helper/bsb_db_decode.ml ./bsb_helper/bsb_db_decode.mli ./bsb_helper/bsb_helper_depfile_gen.ml ./bsb_helper/bsb_helper_depfile_gen.mli ./ext/bsb_db.ml ./ext/bsb_db.mli ./ext/bsb_dir_index.ml ./ext/bsb_dir_index.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_buffer.ml ./ext/ext_buffer.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_char.ml ./ext/ext_char.mli ./ext/ext_digest.ml ./ext/ext_digest.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_namespace.ml ./ext/ext_namespace.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/string_map.ml ./ext/string_map.mli ./main/bsb_helper_main.ml ./main/bsb_helper_main.mli 

Diff for: lib/4.02.3/unstable/all_ounit_tests.ml

@@ -16591,6 +16591,8 @@ module Ext_digest : sig
 
 
  val length : int 
+
+ val hex_length : int
 end = struct
 #1 "ext_digest.ml"
 (* Copyright (C) 2019- Authors of BuckleScript
@@ -16619,6 +16621,8 @@ end = struct
 
 
  let length = 16
+
+ let hex_length = 32
 end
 module Ext_modulename : sig 
 #1 "ext_modulename.mli"
@@ -20549,13 +20553,17 @@ let suites =
         let buf = Ext_buffer.create 0 in 
         Ext_buffer.add_string_char buf "hello" 'v';
         Ext_buffer.contents buf =~ "hellov";
-        Ext_buffer.length buf =~ 5
+        Ext_buffer.length buf =~ 6
     end;
     __LOC__ >:: begin fun _ -> 
         let buf = Ext_buffer.create 0 in 
         Ext_buffer.add_char_string buf 'h' "ellov";
         Ext_buffer.contents buf =~ "hellov";
-        Ext_buffer.length buf =~ 5
+        Ext_buffer.length buf =~ 6
+    end;
+    __LOC__ >:: begin fun _ -> 
+        String.length 
+        (Digest.to_hex(Digest.string "")) =~ 32
     end
 
   ]

Diff for: lib/4.02.3/unstable/bsb_native.ml

@@ -13091,16 +13091,17 @@ let encode (dbs : Bsb_db.ts) buf =
   Ext_array.iter dbs (fun x ->  encode_single x  buf)
 
 
-
+(* TODO: shall we avoid writing such file (checking the digest) *)
 let write_build_cache ~dir (bs_files : Bsb_db.ts)  : string = 
   let oc = open_out_bin (Filename.concat dir bsbuild_cache) in 
   let buf = Ext_buffer.create 100_000 in 
   encode bs_files buf ; 
-  let digest = Digest.to_hex (Ext_buffer.digest buf) in
+  let digest = Ext_buffer.digest buf in 
+  let hex_digest = Digest.to_hex digest in
   output_string oc digest;
   Ext_buffer.output_buffer oc buf;
   close_out oc; 
-  digest
+  hex_digest
 
 end
 module Ext_digest : sig 
@@ -13131,6 +13132,8 @@ module Ext_digest : sig
 
 
  val length : int 
+
+ val hex_length : int
 end = struct
 #1 "ext_digest.ml"
 (* Copyright (C) 2019- Authors of BuckleScript
@@ -13159,6 +13162,8 @@ end = struct
 
 
  let length = 16
+
+ let hex_length = 32
 end
 module Bsb_namespace_map_gen : sig 
 #1 "bsb_namespace_map_gen.mli"

Diff for: lib/4.02.3/whole_compiler.ml

@@ -59211,6 +59211,8 @@ module Ext_digest : sig
 
 
  val length : int 
+
+ val hex_length : int
 end = struct
 #1 "ext_digest.ml"
 (* Copyright (C) 2019- Authors of BuckleScript
@@ -59239,6 +59241,8 @@ end = struct
 
 
  let length = 16
+
+ let hex_length = 32
 end
 module Ext_io : sig 
 #1 "ext_io.mli"