tweak

Author: bobzhang

jscomp/bsb_helper/bsb_db_decode.ml

@@ -131,5 +131,11 @@ let find_opt
     in    
     Some {case ; dir_name = String.sub whole dir_name_start (dir_name_finish - dir_name_start)}
 
-        
-      
+let find db dependent_module is_not_lib_dir =         
+  let opt = find_opt db 0 dependent_module in 
+  match opt with 
+  | Some _ -> opt
+  | None -> 
+    if is_not_lib_dir then 
+      find_opt db 1 dependent_module 
+    else None       

jscomp/bsb_helper/bsb_db_decode.mli

@@ -52,8 +52,8 @@ type module_info = {
   dir_name : string
 } 
 
-val find_opt :
+val find:
   t -> (* contains global info *)
-  int -> (* more likely to be zero *)
   string -> (* module name *)
+  bool -> (* more likely to be zero *)
   module_info option 

jscomp/bsb_helper/bsb_helper_depfile_gen.ml

@@ -119,15 +119,6 @@ let oc_cmi buf namespace source =
     When ns is turned on, `B` is interprted as `Ns-B` which is a cyclic dependency,
     it can be errored out earlier
 *)
-let find_module db dependent_module is_not_lib_dir 
-  : Bsb_db_decode.module_info option = 
-  let opt = Bsb_db_decode.find_opt db 0 dependent_module in 
-  match opt with 
-  | Some _ -> opt
-  | None -> 
-    if is_not_lib_dir then 
-      Bsb_db_decode.find_opt db 1 dependent_module 
-    else None 
 let oc_impl 
     (mlast : string)
     (index : Bsb_dir_index.t)
@@ -164,7 +155,7 @@ let oc_impl
       end
     );
     (match  
-      find_module db dependent_module is_not_lib_dir 
+      Bsb_db_decode.find db dependent_module is_not_lib_dir 
     with      
     | None -> ()
     | Some ({dir_name; case }) -> 
@@ -226,7 +217,7 @@ let oc_intf
          exit 2
        end
     );
-    (match  find_module db dependent_module is_not_lib_dir 
+    (match  Bsb_db_decode.find db dependent_module is_not_lib_dir 
      with     
      | None -> ()
      | Some {dir_name; case} ->       

lib/4.06.1/bsb_helper.ml

@@ -3413,10 +3413,10 @@ type module_info = {
   dir_name : string
 } 
 
-val find_opt :
+val find:
   t -> (* contains global info *)
-  int -> (* more likely to be zero *)
   string -> (* module name *)
+  bool -> (* more likely to be zero *)
   module_info option 
 end = struct
 #1 "bsb_db_decode.ml"
@@ -3553,8 +3553,14 @@ let find_opt
     in    
     Some {case ; dir_name = String.sub whole dir_name_start (dir_name_finish - dir_name_start)}
 
-        
-      
+let find db dependent_module is_not_lib_dir =         
+  let opt = find_opt db 0 dependent_module in 
+  match opt with 
+  | Some _ -> opt
+  | None -> 
+    if is_not_lib_dir then 
+      find_opt db 1 dependent_module 
+    else None       
 end
 module Ext_filename : sig 
 #1 "ext_filename.mli"
@@ -4050,15 +4056,6 @@ let oc_cmi buf namespace source =
     When ns is turned on, `B` is interprted as `Ns-B` which is a cyclic dependency,
     it can be errored out earlier
 *)
-let find_module db dependent_module is_not_lib_dir 
-  : Bsb_db_decode.module_info option = 
-  let opt = Bsb_db_decode.find_opt db 0 dependent_module in 
-  match opt with 
-  | Some _ -> opt
-  | None -> 
-    if is_not_lib_dir then 
-      Bsb_db_decode.find_opt db 1 dependent_module 
-    else None 
 let oc_impl 
     (mlast : string)
     (index : Bsb_dir_index.t)
@@ -4095,7 +4092,7 @@ let oc_impl
       end
     );
     (match  
-      find_module db dependent_module is_not_lib_dir 
+      Bsb_db_decode.find db dependent_module is_not_lib_dir 
     with      
     | None -> ()
     | Some ({dir_name; case }) -> 
@@ -4157,7 +4154,7 @@ let oc_intf
          exit 2
        end
     );
-    (match  find_module db dependent_module is_not_lib_dir 
+    (match  Bsb_db_decode.find db dependent_module is_not_lib_dir 
      with     
      | None -> ()
      | Some {dir_name; case} ->