add Ext_filename.new_extension API

Author: bobzhang

Diff for: jscomp/bsb_helper/bsb_helper_depfile_gen.ml

@@ -231,7 +231,8 @@ let emit_d mlast
 
   let buf = Ext_buffer.create 2048 in 
   let input_file = Filename.chop_extension mlast in 
-  let filename = input_file ^ Literals.suffix_d in   
+  let filename = 
+      Ext_filename.new_extension mlast Literals.suffix_d in   
   let lhs_suffix = Literals.suffix_cmj in   
   let rhs_suffix = Literals.suffix_cmj in 
   oc_impl 

Diff for: jscomp/ext/ext_filename.ml

@@ -25,7 +25,12 @@
 
 
 
+let is_dir_sep_unix c = c = '/'
+let is_dir_sep_win_cygwin c = 
+  c = '/' || c = '\\' || c = ':'
 
+let is_dir_sep = 
+  if Sys.unix then is_dir_sep_unix else is_dir_sep_win_cygwin
 
 (* reference ninja.cc IsKnownShellSafeCharacter *)
 let maybe_quote ( s : string) = 
@@ -43,10 +48,23 @@ let maybe_quote ( s : string) =
     s
   else Filename.quote s 
 
-(*   
-let new_extension name = 
+
+let chop_extension_maybe name =
   let rec search_dot i =
-    if i < 0 || Filename.is_dir_sep name i then invalid_arg "Filename.chop_extension"
-    else if name.[i] = '.' then String.sub name 0 i
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then name
+    else if String.unsafe_get name i = '.' then String.sub name 0 i
     else search_dot (i - 1) in
-  search_dot (String.length name - 1) *)
+  search_dot (String.length name - 1)
+
+
+let new_extension name (ext : string) = 
+  let rec search_dot name i ext =
+    if i < 0 || is_dir_sep (String.unsafe_get name i) then name
+    else if String.unsafe_get name i = '.' then 
+      let ext_len = String.length ext in
+      let buf = Bytes.create (i + ext_len) in 
+      Bytes.blit_string name 0 buf 0 i;
+      Bytes.blit_string ext 0 buf i ext_len;
+      Bytes.unsafe_to_string buf
+    else search_dot name (i - 1) ext  in
+  search_dot name (String.length name - 1) ext

Diff for: jscomp/ext/ext_filename.mli

@@ -41,5 +41,14 @@
 
 
 val maybe_quote:
+  string -> 
+  string
+
+val chop_extension_maybe:
+  stirng -> 
+  string
+  
+val new_extension:  
+  string -> 
   string -> 
   string

Diff for: jscomp/ounit_tests/ounit_string_tests.ml

@@ -5,6 +5,7 @@ let (=~) = OUnit.assert_equal
 
 let printer_string = fun x -> x 
 
+let string_eq = OUnit.assert_equal ~printer:(fun id -> id)
 
 let suites = 
   __FILE__ >::: 
@@ -453,5 +454,12 @@ let suites =
       print_endline bench; *)
       OUnit.assert_bool
       __LOC__ (not (Ext_buffer.not_equal buf bench))
-    end 
+    end ;
+
+    __LOC__ >:: begin fun _ -> 
+        string_eq (Ext_filename.new_extension "a.c" ".xx")  "a.xx";
+        string_eq (Ext_filename.new_extension "abb.c" ".xx")  "abb.xx"
+    end;
   ]
+
+;; string_eq (Ext_filename.new_extension "abb.c" ".xx")  "abb.xx"  |> ignore

Diff for: lib/4.02.3/bsb.ml

@@ -14143,6 +14143,12 @@ module Ext_filename : sig
 val maybe_quote:
   string -> 
   string
+
+
+val new_extension:  
+  string -> 
+  string -> 
+  string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -14172,7 +14178,12 @@ end = struct
 
 
 
+let is_dir_sep_unix c = c = '/'
+let is_dir_sep_win_cygwin c = 
+  c = '/' || c = '\\' || c = ':'
 
+let is_dir_sep = 
+  if Sys.unix then is_dir_sep_unix else is_dir_sep_win_cygwin
 
 (* reference ninja.cc IsKnownShellSafeCharacter *)
 let maybe_quote ( s : string) = 
@@ -14190,13 +14201,26 @@ let maybe_quote ( s : string) =
     s
   else Filename.quote s 
 
-(*   
-let new_extension name = 
+
+let chop_extension_maybe name =
   let rec search_dot i =
-    if i < 0 || Filename.is_dir_sep name i then invalid_arg "Filename.chop_extension"
+    if i < 0 || is_dir_sep name.[i] then name
     else if name.[i] = '.' then String.sub name 0 i
     else search_dot (i - 1) in
-  search_dot (String.length name - 1) *)
+  search_dot (String.length name - 1)
+
+
+let new_extension name (ext : string) = 
+  let rec search_dot name i ext =
+    if i < 0 || is_dir_sep name.[i] then name
+    else if name.[i] = '.' then 
+      let ext_len = String.length ext in
+      let buf = Bytes.create (i + ext_len) in 
+      Bytes.blit_string name 0 buf 0 i;
+      Bytes.blit_string ext 0 buf i ext_len;
+      Bytes.unsafe_to_string buf
+    else search_dot name (i - 1) ext  in
+  search_dot name (String.length name - 1) ext
 
 end
 module Bsb_ninja_gen : sig 

Diff for: lib/4.02.3/bsb_helper.ml

@@ -4237,6 +4237,133 @@ let not_equal  (b : t) (s : string) =
   || not_equal_aux b.buffer s 0 s_len
 
 
+end
+module Ext_filename : sig 
+#1 "ext_filename.mli"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * 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. *)
+
+
+
+
+
+(* TODO:
+   Change the module name, this code is not really an extension of the standard 
+    library but rather specific to JS Module name convention. 
+*)
+
+
+
+
+
+(** An extension module to calculate relative path follow node/npm style. 
+    TODO : this short name will have to change upon renaming the file.
+*)
+
+
+val maybe_quote:
+  string -> 
+  string
+
+
+val new_extension:  
+  string -> 
+  string -> 
+  string
+end = struct
+#1 "ext_filename.ml"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * 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 is_dir_sep_unix c = c = '/'
+let is_dir_sep_win_cygwin c = 
+  c = '/' || c = '\\' || c = ':'
+
+let is_dir_sep = 
+  if Sys.unix then is_dir_sep_unix else is_dir_sep_win_cygwin
+
+(* reference ninja.cc IsKnownShellSafeCharacter *)
+let maybe_quote ( s : string) = 
+  let noneed_quote = 
+    Ext_string.for_all s (function
+        | '0' .. '9' 
+        | 'a' .. 'z' 
+        | 'A' .. 'Z'
+        | '_' | '+' 
+        | '-' | '.'
+        | '/' -> true
+        | _ -> false
+      )  in 
+  if noneed_quote then
+    s
+  else Filename.quote s 
+
+
+let chop_extension_maybe name =
+  let rec search_dot i =
+    if i < 0 || is_dir_sep name.[i] then name
+    else if name.[i] = '.' then String.sub name 0 i
+    else search_dot (i - 1) in
+  search_dot (String.length name - 1)
+
+
+let new_extension name (ext : string) = 
+  let rec search_dot name i ext =
+    if i < 0 || is_dir_sep name.[i] then name
+    else if name.[i] = '.' then 
+      let ext_len = String.length ext in
+      let buf = Bytes.create (i + ext_len) in 
+      Bytes.blit_string name 0 buf 0 i;
+      Bytes.blit_string ext 0 buf i ext_len;
+      Bytes.unsafe_to_string buf
+    else search_dot name (i - 1) ext  in
+  search_dot name (String.length name - 1) ext
+
 end
 module Ext_namespace : sig 
 #1 "ext_namespace.mli"
@@ -4806,7 +4933,8 @@ let emit_d mlast
 
   let buf = Ext_buffer.create 2048 in 
   let input_file = Filename.chop_extension mlast in 
-  let filename = input_file ^ Literals.suffix_d in   
+  let filename = 
+      Ext_filename.new_extension mlast Literals.suffix_d in   
   let lhs_suffix = Literals.suffix_cmj in   
   let rhs_suffix = Literals.suffix_cmj in 
   oc_impl 

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 ./common/bs_version.ml ./common/bs_version.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_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 ./common/bs_version.ml ./common/bs_version.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