Using safer and more efficient APIs

Author: bobzhang

jscomp/ext/ext_filename.ml

@@ -56,6 +56,17 @@ let chop_extension_maybe name =
     else search_dot (i - 1) in
   search_dot (String.length name - 1)
 
+let chop_all_extensions_maybe name =
+  let rec search_dot i last =
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then 
+      (match last with 
+      | None -> name
+      | Some i -> String.sub name 0 i)  
+    else if String.unsafe_get name i = '.' then 
+      search_dot (i - 1) (Some i)
+    else search_dot (i - 1) last in
+  search_dot (String.length name - 1) None
+
 
 let new_extension name (ext : string) = 
   let rec search_dot name i ext =
@@ -70,3 +81,17 @@ let new_extension name (ext : string) =
     else search_dot name (i - 1) ext  in
   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)

jscomp/ext/ext_filename.mli

@@ -51,4 +51,8 @@ val chop_extension_maybe:
 val new_extension:  
   string -> 
   string -> 
-  string
+  string
+
+val chop_all_extensions_maybe:
+  string -> 
+  string  

jscomp/ext/ext_path.ml

@@ -132,10 +132,7 @@ let combine path1 path2 =
 
 
 
-let rec chop_all_extensions_if_any fname =
-  match Filename.chop_extension fname with 
-  | x -> chop_all_extensions_if_any x 
-  | exception _ -> fname
+
 
 let get_extension x =
   let pos = Ext_string.rindex_neg x '.' in 

jscomp/ext/ext_path.mli

@@ -48,13 +48,6 @@ val combine :
 
 
 
-
-
-
-
-val chop_all_extensions_if_any : 
-  string -> string 
-
 (**
    {[
      get_extension "a.txt" = ".txt"

jscomp/jsgen_main.ml

@@ -29,7 +29,7 @@ let get_files dir =
     |> Ext_array.filter_map 
       (fun  x -> 
          if Ext_path.check_suffix_case x ".js"  then 
-           let y = Ext_path.chop_all_extensions_if_any x in 
+           let y = Ext_filename.chop_all_extensions_maybe x in 
            if y <> "unix" &&
               y <> "bigarray" && 
               y <> "std_exit" &&

jscomp/ounit_tests/ounit_string_tests.ml

@@ -405,10 +405,10 @@ let suites =
     end;
     __LOC__ >:: begin fun _ -> 
       let (=~) = OUnit.assert_equal ~printer:printer_string in 
-      Ext_path.chop_all_extensions_if_any "a.bs.js" =~ "a" ; 
-      Ext_path.chop_all_extensions_if_any "a.js" =~ "a";
-      Ext_path.chop_all_extensions_if_any "a" =~ "a";
-      Ext_path.chop_all_extensions_if_any "a.x.bs.js" =~ "a"
+      Ext_filename.chop_all_extensions_maybe "a.bs.js" =~ "a" ; 
+      Ext_filename.chop_all_extensions_maybe "a.js" =~ "a";
+      Ext_filename.chop_all_extensions_maybe "a" =~ "a";
+      Ext_filename.chop_all_extensions_maybe "a.x.bs.js" =~ "a"
     end;
     (* let (=~) = OUnit.assert_equal ~printer:(fun x -> x) in  *)
     __LOC__ >:: begin fun _ ->
@@ -462,6 +462,10 @@ let suites =
         string_eq (Ext_filename.new_extension ".c" ".xx")  ".xx";
         string_eq (Ext_filename.new_extension "a/b" ".xx")  "a/b.xx";
         string_eq (Ext_filename.new_extension "a/b." ".xx")  "a/b.xx";
+        string_eq (Ext_filename.chop_all_extensions_maybe "a.b.x") "a";
+        string_eq (Ext_filename.chop_all_extensions_maybe "a.b") "a";
+        string_eq (Ext_filename.chop_all_extensions_maybe ".a.b.x") "";
+        string_eq (Ext_filename.chop_all_extensions_maybe "abx") "abx";
     end;
   ]
 

lib/4.02.3/bsb.ml

@@ -6060,13 +6060,6 @@ val combine :
 
 
 
-
-
-
-
-val chop_all_extensions_if_any : 
-  string -> string 
-
 (**
    {[
      get_extension "a.txt" = ".txt"
@@ -6254,10 +6247,7 @@ let combine path1 path2 =
 
 
 
-let rec chop_all_extensions_if_any fname =
-  match Filename.chop_extension fname with 
-  | x -> chop_all_extensions_if_any x 
-  | exception _ -> fname
+
 
 let get_extension x =
   let pos = Ext_string.rindex_neg x '.' in 
@@ -7325,6 +7315,10 @@ val new_extension:
   string -> 
   string -> 
   string
+
+val chop_all_extensions_maybe:
+  string -> 
+  string  
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7385,6 +7379,17 @@ let chop_extension_maybe name =
     else search_dot (i - 1) in
   search_dot (String.length name - 1)
 
+let chop_all_extensions_maybe name =
+  let rec search_dot i last =
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then 
+      (match last with 
+      | None -> name
+      | Some i -> String.sub name 0 i)  
+    else if String.unsafe_get name i = '.' then 
+      search_dot (i - 1) (Some i)
+    else search_dot (i - 1) last in
+  search_dot (String.length name - 1) None
+
 
 let new_extension name (ext : string) = 
   let rec search_dot name i ext =
@@ -7400,6 +7405,19 @@ 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)
 end
 module Ext_modulename : sig 
 #1 "ext_modulename.mli"

lib/4.02.3/bsb_helper.ml

@@ -4294,6 +4294,10 @@ val new_extension:
   string -> 
   string -> 
   string
+
+val chop_all_extensions_maybe:
+  string -> 
+  string  
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4354,6 +4358,17 @@ let chop_extension_maybe name =
     else search_dot (i - 1) in
   search_dot (String.length name - 1)
 
+let chop_all_extensions_maybe name =
+  let rec search_dot i last =
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then 
+      (match last with 
+      | None -> name
+      | Some i -> String.sub name 0 i)  
+    else if String.unsafe_get name i = '.' then 
+      search_dot (i - 1) (Some i)
+    else search_dot (i - 1) last in
+  search_dot (String.length name - 1) None
+
 
 let new_extension name (ext : string) = 
   let rec search_dot name i ext =
@@ -4369,6 +4384,19 @@ 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)
 end
 module Ext_namespace : sig 
 #1 "ext_namespace.mli"

lib/4.02.3/bsdep.ml

@@ -33794,6 +33794,10 @@ val new_extension:
   string -> 
   string -> 
   string
+
+val chop_all_extensions_maybe:
+  string -> 
+  string  
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -33854,6 +33858,17 @@ let chop_extension_maybe name =
     else search_dot (i - 1) in
   search_dot (String.length name - 1)
 
+let chop_all_extensions_maybe name =
+  let rec search_dot i last =
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then 
+      (match last with 
+      | None -> name
+      | Some i -> String.sub name 0 i)  
+    else if String.unsafe_get name i = '.' then 
+      search_dot (i - 1) (Some i)
+    else search_dot (i - 1) last in
+  search_dot (String.length name - 1) None
+
 
 let new_extension name (ext : string) = 
   let rec search_dot name i ext =
@@ -33869,6 +33884,19 @@ 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)
 end
 module Ext_option : sig 
 #1 "ext_option.mli"

lib/4.02.3/bsppx.ml

@@ -15847,6 +15847,10 @@ val new_extension:
   string -> 
   string -> 
   string
+
+val chop_all_extensions_maybe:
+  string -> 
+  string  
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -15907,6 +15911,17 @@ let chop_extension_maybe name =
     else search_dot (i - 1) in
   search_dot (String.length name - 1)
 
+let chop_all_extensions_maybe name =
+  let rec search_dot i last =
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then 
+      (match last with 
+      | None -> name
+      | Some i -> String.sub name 0 i)  
+    else if String.unsafe_get name i = '.' then 
+      search_dot (i - 1) (Some i)
+    else search_dot (i - 1) last in
+  search_dot (String.length name - 1) None
+
 
 let new_extension name (ext : string) = 
   let rec search_dot name i ext =
@@ -15922,6 +15937,19 @@ 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)
 end
 module Bs_version : sig 
 #1 "bs_version.mli"