snapshot

Author: bobzhang

lib/4.06.1/bsb.ml

@@ -3746,9 +3746,9 @@ module Bsb_db : sig
 type case = bool 
 
 type info = 
-  | Mli (* intemediate state *)
-  | Ml
-  | Ml_mli
+  | Intf (* intemediate state *)
+  | Impl
+  | Impl_intf
 
 
 
@@ -3816,9 +3816,9 @@ type case = bool
 
 
 type info = 
-  | Mli (* intemediate state *)
-  | Ml
-  | Ml_mli
+  | Intf (* intemediate state *)
+  | Impl
+  | Impl_intf
 
 type module_info = 
   {
@@ -10295,7 +10295,7 @@ let merge (acc : t) (sources : t) : t =
 
 let sanity_check (map : t) = 
   Map_string.iter map (fun m module_info -> 
-      if module_info.info = Mli then
+      if module_info.info = Intf then
         Bsb_exception.no_implementation m 
     )    
 
@@ -10313,13 +10313,13 @@ let check (x : module_info)
    || x.case <> case 
    || x.is_re <> is_re 
    || x_ml_info = module_info 
-   || x_ml_info = Ml_mli
+   || x_ml_info = Impl_intf
    then 
      Bsb_exception.invalid_spec 
        (Printf.sprintf 
           "implementation and interface have different path names or different cases %s vs %s"
           x.name_sans_extension name_sans_extension));
-  x.info <- Ml_mli;      
+  x.info <- Impl_intf;      
   x
 
 
@@ -10331,7 +10331,7 @@ let add_basename
     (map : t)  
     ?(error_on_invalid_suffix)
     basename : t =   
-  let info = ref Bsb_db.Ml in   
+  let info = ref Bsb_db.Impl in   
   let is_re = ref false in 
   let invalid_suffix = ref false in
   (match Ext_filename.get_extension_maybe basename with 
@@ -10340,9 +10340,9 @@ let add_basename
    | ".re" ->
      is_re := true
    | ".mli" -> 
-     info := Mli
+     info := Intf
    | ".rei" -> 
-     info := Mli;
+     info := Intf;
      is_re := true 
    | _ -> 
      invalid_suffix := true
@@ -13443,7 +13443,7 @@ let emit_module_build
     namespace
     (module_info : Bsb_db.module_info)
   =    
-  let has_intf_file = module_info.info = Ml_mli in 
+  let has_intf_file = module_info.info = Impl_intf in 
   let is_re = module_info.is_re in 
   let filename_sans_extension = module_info.name_sans_extension in 
   let input_impl = 

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -5218,9 +5218,9 @@ module Bsb_db : sig
 type case = bool 
 
 type info = 
-  | Mli (* intemediate state *)
-  | Ml
-  | Ml_mli
+  | Intf (* intemediate state *)
+  | Impl
+  | Impl_intf
 
 
 
@@ -5288,9 +5288,9 @@ type case = bool
 
 
 type info = 
-  | Mli (* intemediate state *)
-  | Ml
-  | Ml_mli
+  | Intf (* intemediate state *)
+  | Impl
+  | Impl_intf
 
 type module_info = 
   {
@@ -7276,12 +7276,12 @@ let s_test1 s a =
 
 let group0 = Map_string.of_list [
   "Liba", 
-  {Bsb_db.info = Ml_mli; dir= "a";is_re=false;case = false;
+  {Bsb_db.info = Impl_intf; dir= "a";is_re=false;case = false;
   name_sans_extension = "liba"}
 ]
 let group1 =  Map_string.of_list [
   "Ciba", 
-  {Bsb_db.info = Ml_mli; dir= "b";is_re=false;case = false;
+  {Bsb_db.info = Impl_intf; dir= "b";is_re=false;case = false;
   name_sans_extension = "liba"}
 ] 
 

lib/4.06.1/unstable/bsb_native.ml

@@ -3746,9 +3746,9 @@ module Bsb_db : sig
 type case = bool 
 
 type info = 
-  | Mli (* intemediate state *)
-  | Ml
-  | Ml_mli
+  | Intf (* intemediate state *)
+  | Impl
+  | Impl_intf
 
 
 
@@ -3816,9 +3816,9 @@ type case = bool
 
 
 type info = 
-  | Mli (* intemediate state *)
-  | Ml
-  | Ml_mli
+  | Intf (* intemediate state *)
+  | Impl
+  | Impl_intf
 
 type module_info = 
   {
@@ -10327,7 +10327,7 @@ let merge (acc : t) (sources : t) : t =
 
 let sanity_check (map : t) = 
   Map_string.iter map (fun m module_info -> 
-      if module_info.info = Mli then
+      if module_info.info = Intf then
         Bsb_exception.no_implementation m 
     )    
 
@@ -10345,13 +10345,13 @@ let check (x : module_info)
    || x.case <> case 
    || x.is_re <> is_re 
    || x_ml_info = module_info 
-   || x_ml_info = Ml_mli
+   || x_ml_info = Impl_intf
    then 
      Bsb_exception.invalid_spec 
        (Printf.sprintf 
           "implementation and interface have different path names or different cases %s vs %s"
           x.name_sans_extension name_sans_extension));
-  x.info <- Ml_mli;      
+  x.info <- Impl_intf;      
   x
 
 
@@ -10363,7 +10363,7 @@ let add_basename
     (map : t)  
     ?(error_on_invalid_suffix)
     basename : t =   
-  let info = ref Bsb_db.Ml in   
+  let info = ref Bsb_db.Impl in   
   let is_re = ref false in 
   let invalid_suffix = ref false in
   (match Ext_filename.get_extension_maybe basename with 
@@ -10372,9 +10372,9 @@ let add_basename
    | ".re" ->
      is_re := true
    | ".mli" -> 
-     info := Mli
+     info := Intf
    | ".rei" -> 
-     info := Mli;
+     info := Intf;
      is_re := true 
    | _ -> 
      invalid_suffix := true
@@ -13592,7 +13592,7 @@ let emit_module_build
     namespace
     (module_info : Bsb_db.module_info)
   =    
-  let has_intf_file = module_info.info = Ml_mli in 
+  let has_intf_file = module_info.info = Impl_intf in 
   let is_re = module_info.is_re in 
   let filename_sans_extension = module_info.name_sans_extension in 
   let input_impl =