more efficient module_name implementation

Author: bobzhang

jscomp/ext/ext_filename.ml

@@ -82,16 +82,20 @@ let new_extension name (ext : string) =
   search_dot name (String.length name - 1) ext
 
 
-let generic_basename  name =
-  let rec find_end n =
-    if n < 0 then String.sub name 0 1
-    else if is_dir_sep name.[n] then find_end (n - 1)
-    else find_beg n (n + 1)
-  and find_beg n p =
-    if n < 0 then String.sub name 0 p
-    else if is_dir_sep name.[n] then String.sub name (n + 1) (p - n - 1)
-    else find_beg (n - 1) p
-  in
-  if name = ""
-  then "."
-  else find_end (String.length name - 1)
+
+(** TODO: improve efficiency
+   given a path, calcuate its module name *)
+let module_name name = 
+  let rec search_dot i last name =
+    if i < 0  then 
+      (match last with 
+       | None -> Ext_string.capitalize_ascii name
+       | Some i -> Ext_string.capitalize_sub name  i)        
+    else 
+      search_dot (i - 1) 
+        (if String.unsafe_get name i = '.' then Some i else last)
+        name in  
+  let name = Filename.basename  name in 
+  let name_len = String.length name in 
+  search_dot (name_len - 1) None name 
+

jscomp/ext/ext_filename.mli

@@ -55,4 +55,9 @@ val new_extension:
 
 val chop_all_extensions_maybe:
   string -> 
-  string  
+  string  
+
+(* OCaml specific abstraction*)
+val module_name:  
+  string ->
+  string

jscomp/ounit_tests/ounit_string_tests.ml

@@ -467,5 +467,31 @@ let suites =
         string_eq (Ext_filename.chop_all_extensions_maybe ".a.b.x") "";
         string_eq (Ext_filename.chop_all_extensions_maybe "abx") "abx";
     end;
+    __LOC__ >:: begin fun _ ->
+        string_eq 
+          (Ext_filename.module_name "a/b/c.d")
+          "C";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.re")
+          "Xc";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.ml")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.mli")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.cppo.mli")
+          "Xc";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.cppo.")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc..")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.")
+          "Xc"  ;
+      end
   ]
 

lib/4.02.3/bsb.ml

@@ -7319,6 +7319,11 @@ val new_extension:
 val chop_all_extensions_maybe:
   string -> 
   string  
+
+(* OCaml specific abstraction*)
+val module_name:  
+  string ->
+  string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7405,19 +7410,24 @@ let new_extension name (ext : string) =
   search_dot name (String.length name - 1) ext
 
 
-let generic_basename  name =
-  let rec find_end n =
-    if n < 0 then String.sub name 0 1
-    else if is_dir_sep name.[n] then find_end (n - 1)
-    else find_beg n (n + 1)
-  and find_beg n p =
-    if n < 0 then String.sub name 0 p
-    else if is_dir_sep name.[n] then String.sub name (n + 1) (p - n - 1)
-    else find_beg (n - 1) p
-  in
-  if name = ""
-  then "."
-  else find_end (String.length name - 1)
+
+(** TODO: improve efficiency
+   given a path, calcuate its module name *)
+let module_name name = 
+  let rec search_dot i last name =
+    if i < 0  then 
+      (match last with 
+       | None -> Ext_string.capitalize_ascii name
+       | Some i -> Ext_string.capitalize_sub name  i)        
+    else 
+      search_dot (i - 1) 
+        (if String.unsafe_get name i = '.' then Some i else last)
+        name in  
+  let name = Filename.basename  name in 
+  let name_len = String.length name in 
+  search_dot (name_len - 1) None name 
+
+
 end
 module Ext_modulename : sig 
 #1 "ext_modulename.mli"

lib/4.02.3/bsb_helper.ml

@@ -4298,6 +4298,11 @@ val new_extension:
 val chop_all_extensions_maybe:
   string -> 
   string  
+
+(* OCaml specific abstraction*)
+val module_name:  
+  string ->
+  string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4384,19 +4389,24 @@ let new_extension name (ext : string) =
   search_dot name (String.length name - 1) ext
 
 
-let generic_basename  name =
-  let rec find_end n =
-    if n < 0 then String.sub name 0 1
-    else if is_dir_sep name.[n] then find_end (n - 1)
-    else find_beg n (n + 1)
-  and find_beg n p =
-    if n < 0 then String.sub name 0 p
-    else if is_dir_sep name.[n] then String.sub name (n + 1) (p - n - 1)
-    else find_beg (n - 1) p
-  in
-  if name = ""
-  then "."
-  else find_end (String.length name - 1)
+
+(** TODO: improve efficiency
+   given a path, calcuate its module name *)
+let module_name name = 
+  let rec search_dot i last name =
+    if i < 0  then 
+      (match last with 
+       | None -> Ext_string.capitalize_ascii name
+       | Some i -> Ext_string.capitalize_sub name  i)        
+    else 
+      search_dot (i - 1) 
+        (if String.unsafe_get name i = '.' then Some i else last)
+        name in  
+  let name = Filename.basename  name in 
+  let name_len = String.length name in 
+  search_dot (name_len - 1) None name 
+
+
 end
 module Ext_namespace : sig 
 #1 "ext_namespace.mli"

lib/4.02.3/bsdep.ml

@@ -33798,6 +33798,11 @@ val new_extension:
 val chop_all_extensions_maybe:
   string -> 
   string  
+
+(* OCaml specific abstraction*)
+val module_name:  
+  string ->
+  string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -33884,19 +33889,24 @@ let new_extension name (ext : string) =
   search_dot name (String.length name - 1) ext
 
 
-let generic_basename  name =
-  let rec find_end n =
-    if n < 0 then String.sub name 0 1
-    else if is_dir_sep name.[n] then find_end (n - 1)
-    else find_beg n (n + 1)
-  and find_beg n p =
-    if n < 0 then String.sub name 0 p
-    else if is_dir_sep name.[n] then String.sub name (n + 1) (p - n - 1)
-    else find_beg (n - 1) p
-  in
-  if name = ""
-  then "."
-  else find_end (String.length name - 1)
+
+(** TODO: improve efficiency
+   given a path, calcuate its module name *)
+let module_name name = 
+  let rec search_dot i last name =
+    if i < 0  then 
+      (match last with 
+       | None -> Ext_string.capitalize_ascii name
+       | Some i -> Ext_string.capitalize_sub name  i)        
+    else 
+      search_dot (i - 1) 
+        (if String.unsafe_get name i = '.' then Some i else last)
+        name in  
+  let name = Filename.basename  name in 
+  let name_len = String.length name in 
+  search_dot (name_len - 1) None name 
+
+
 end
 module Ext_option : sig 
 #1 "ext_option.mli"

lib/4.02.3/bsppx.ml

@@ -15851,6 +15851,11 @@ val new_extension:
 val chop_all_extensions_maybe:
   string -> 
   string  
+
+(* OCaml specific abstraction*)
+val module_name:  
+  string ->
+  string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -15937,19 +15942,24 @@ let new_extension name (ext : string) =
   search_dot name (String.length name - 1) ext
 
 
-let generic_basename  name =
-  let rec find_end n =
-    if n < 0 then String.sub name 0 1
-    else if is_dir_sep name.[n] then find_end (n - 1)
-    else find_beg n (n + 1)
-  and find_beg n p =
-    if n < 0 then String.sub name 0 p
-    else if is_dir_sep name.[n] then String.sub name (n + 1) (p - n - 1)
-    else find_beg (n - 1) p
-  in
-  if name = ""
-  then "."
-  else find_end (String.length name - 1)
+
+(** TODO: improve efficiency
+   given a path, calcuate its module name *)
+let module_name name = 
+  let rec search_dot i last name =
+    if i < 0  then 
+      (match last with 
+       | None -> Ext_string.capitalize_ascii name
+       | Some i -> Ext_string.capitalize_sub name  i)        
+    else 
+      search_dot (i - 1) 
+        (if String.unsafe_get name i = '.' then Some i else last)
+        name in  
+  let name = Filename.basename  name in 
+  let name_len = String.length name in 
+  search_dot (name_len - 1) None name 
+
+
 end
 module Bs_version : sig 
 #1 "bs_version.mli"

lib/4.02.3/unstable/all_ounit_tests.ml

@@ -7246,6 +7246,11 @@ val new_extension:
 val chop_all_extensions_maybe:
   string -> 
   string  
+
+(* OCaml specific abstraction*)
+val module_name:  
+  string ->
+  string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7332,19 +7337,24 @@ let new_extension name (ext : string) =
   search_dot name (String.length name - 1) ext
 
 
-let generic_basename  name =
-  let rec find_end n =
-    if n < 0 then String.sub name 0 1
-    else if is_dir_sep name.[n] then find_end (n - 1)
-    else find_beg n (n + 1)
-  and find_beg n p =
-    if n < 0 then String.sub name 0 p
-    else if is_dir_sep name.[n] then String.sub name (n + 1) (p - n - 1)
-    else find_beg (n - 1) p
-  in
-  if name = ""
-  then "."
-  else find_end (String.length name - 1)
+
+(** TODO: improve efficiency
+   given a path, calcuate its module name *)
+let module_name name = 
+  let rec search_dot i last name =
+    if i < 0  then 
+      (match last with 
+       | None -> Ext_string.capitalize_ascii name
+       | Some i -> Ext_string.capitalize_sub name  i)        
+    else 
+      search_dot (i - 1) 
+        (if String.unsafe_get name i = '.' then Some i else last)
+        name in  
+  let name = Filename.basename  name in 
+  let name_len = String.length name in 
+  search_dot (name_len - 1) None name 
+
+
 end
 module Ext_format : sig 
 #1 "ext_format.mli"
@@ -17711,6 +17721,32 @@ let suites =
         string_eq (Ext_filename.chop_all_extensions_maybe ".a.b.x") "";
         string_eq (Ext_filename.chop_all_extensions_maybe "abx") "abx";
     end;
+    __LOC__ >:: begin fun _ ->
+        string_eq 
+          (Ext_filename.module_name "a/b/c.d")
+          "C";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.re")
+          "Xc";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.ml")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.mli")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.cppo.mli")
+          "Xc";
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.cppo.")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc..")
+          "Xc"  ;
+        string_eq 
+          (Ext_filename.module_name "a/b/xc.")
+          "Xc"  ;
+      end
   ]