add test for get_extension

fix the long standing duplicate path problem in bspack

Author: bobzhang

Diff for: .gitignore

@@ -77,4 +77,4 @@ jscomp/bin/bsb
 jscomp/bin/bsc
 jscomp/bin/config_whole_compiler.ml
 lib/bs
-lib/js/jscomp/test
+lib/js/jscomp/test

Diff for: jscomp/Makefile

@@ -178,7 +178,7 @@ bin/bsdep.ml:./bin/bspack.exe
 
 
 bin/bsb.ml:./bin/bspack.exe  
-	$< -bs-MD -I common -I ext -I syntax -I depends -I bsb -bs-main Bsb_main -o $@
+	$< -bs-MD -I common -I ext -I syntax -I depends -I bsb -I ext  -bs-main Bsb_main -o $@
 
 # Actually we can not make it correct by including..
 # if we force it, then the initial build will fail

Diff for: jscomp/bin/bsb.ml

@@ -954,6 +954,30 @@ val combine : string -> string -> string
 
 val normalize_absolute_path : string -> string
 
+(** 
+TODO: could be highly optimized
+if [from] and [to] resolve to the same path, a zero-length string is returned 
+Given that two paths are directory
+
+A typical use case is 
+{[
+Filename.concat 
+  (rel_normalized_absolute_path cwd (Filename.dirname a))
+  (Filename.basename a)
+]}
+*)
+val rel_normalized_absolute_path : string -> string -> string 
+
+
+
+(**
+{[
+get_extension "a.txt" = ".txt"
+get_extension "a" = ""
+]}
+*)
+val get_extension : string -> string
+
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1047,6 +1071,11 @@ let chop_extension_if_any fname =
 
 
 
+
+
+let os_path_separator_char = String.unsafe_get Filename.dir_sep 0 
+
+
 (** example
     {[
     "/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/external/pervasives.cmj"
@@ -1068,7 +1097,7 @@ let chop_extension_if_any fname =
     ]}
  *)
 let relative_path file_or_dir_1 file_or_dir_2 = 
-  let sep_char = Filename.dir_sep.[0] in
+  let sep_char = os_path_separator_char in
   let relevant_dir1 = 
     (match file_or_dir_1 with 
     | `Dir x -> x 
@@ -1094,11 +1123,6 @@ let relative_path file_or_dir_1 file_or_dir_2 =
       String.concat node_sep  @@ node_current :: ys
 
 
-
-
-
-let os_path_separator_char = String.unsafe_get Filename.dir_sep 0 
-
 (** path2: a/b 
     path1: a 
     result:  ./b 
@@ -1208,8 +1232,27 @@ let split_aux p =
     else go dir (Filename.basename p :: acc)
   in go p []
 
-
-
+(** 
+TODO: optimization
+if [from] and [to] resolve to the same path, a zero-length string is returned 
+*)
+let rel_normalized_absolute_path from to_ =
+  let root1, paths1 = split_aux from in 
+  let root2, paths2 = split_aux to_ in 
+  if root1 <> root2 then root2 else
+    let rec go xss yss =
+      match xss, yss with 
+      | x::xs, y::ys -> 
+        if x = y then go xs ys 
+        else 
+          let start = 
+            List.fold_left (fun acc _ -> acc // ".." ) ".." xs in 
+          List.fold_left (fun acc v -> acc // v) start yss
+      | [], [] -> ""
+      | [], y::ys -> List.fold_left (fun acc x -> acc // x) y ys
+      | x::xs, [] ->
+        List.fold_left (fun acc _ -> acc // ".." ) ".." xs in
+    go paths1 paths2
 
 (*TODO: could be hgighly optimized later 
 {[
@@ -1255,6 +1298,12 @@ let normalize_absolute_path x =
   | last :: rest -> go last rest 
 
 
+let get_extension x =
+  try
+    let pos = String.rindex x '.' in
+    Ext_string.tail_from x pos
+  with Not_found -> ""
+
 end
 module String_map : sig 
 #1 "string_map.mli"
@@ -3372,6 +3421,8 @@ val sort_via_array :
 
 val last : 'a list -> 'a
 
+
+
 end = struct
 #1 "ext_list.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -3734,6 +3785,7 @@ let rec last xs =
   | _ :: tl -> last tl 
   | [] -> invalid_arg "Ext_list.last"
 
+
 end
 module Bs_build_util : sig 
 #1 "bs_build_util.mli"

Diff for: jscomp/bin/bsdep.ml

@@ -3750,6 +3750,30 @@ val combine : string -> string -> string
 
 val normalize_absolute_path : string -> string
 
+(** 
+TODO: could be highly optimized
+if [from] and [to] resolve to the same path, a zero-length string is returned 
+Given that two paths are directory
+
+A typical use case is 
+{[
+Filename.concat 
+  (rel_normalized_absolute_path cwd (Filename.dirname a))
+  (Filename.basename a)
+]}
+*)
+val rel_normalized_absolute_path : string -> string -> string 
+
+
+
+(**
+{[
+get_extension "a.txt" = ".txt"
+get_extension "a" = ""
+]}
+*)
+val get_extension : string -> string
+
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -3843,6 +3867,11 @@ let chop_extension_if_any fname =
 
 
 
+
+
+let os_path_separator_char = String.unsafe_get Filename.dir_sep 0 
+
+
 (** example
     {[
     "/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/external/pervasives.cmj"
@@ -3864,7 +3893,7 @@ let chop_extension_if_any fname =
     ]}
  *)
 let relative_path file_or_dir_1 file_or_dir_2 = 
-  let sep_char = Filename.dir_sep.[0] in
+  let sep_char = os_path_separator_char in
   let relevant_dir1 = 
     (match file_or_dir_1 with 
     | `Dir x -> x 
@@ -3890,11 +3919,6 @@ let relative_path file_or_dir_1 file_or_dir_2 =
       String.concat node_sep  @@ node_current :: ys
 
 
-
-
-
-let os_path_separator_char = String.unsafe_get Filename.dir_sep 0 
-
 (** path2: a/b 
     path1: a 
     result:  ./b 
@@ -4004,8 +4028,27 @@ let split_aux p =
     else go dir (Filename.basename p :: acc)
   in go p []
 
-
-
+(** 
+TODO: optimization
+if [from] and [to] resolve to the same path, a zero-length string is returned 
+*)
+let rel_normalized_absolute_path from to_ =
+  let root1, paths1 = split_aux from in 
+  let root2, paths2 = split_aux to_ in 
+  if root1 <> root2 then root2 else
+    let rec go xss yss =
+      match xss, yss with 
+      | x::xs, y::ys -> 
+        if x = y then go xs ys 
+        else 
+          let start = 
+            List.fold_left (fun acc _ -> acc // ".." ) ".." xs in 
+          List.fold_left (fun acc v -> acc // v) start yss
+      | [], [] -> ""
+      | [], y::ys -> List.fold_left (fun acc x -> acc // x) y ys
+      | x::xs, [] ->
+        List.fold_left (fun acc _ -> acc // ".." ) ".." xs in
+    go paths1 paths2
 
 (*TODO: could be hgighly optimized later 
 {[
@@ -4051,6 +4094,12 @@ let normalize_absolute_path x =
   | last :: rest -> go last rest 
 
 
+let get_extension x =
+  try
+    let pos = String.rindex x '.' in
+    Ext_string.tail_from x pos
+  with Not_found -> ""
+
 end
 module String_map : sig 
 #1 "string_map.mli"
@@ -5387,6 +5436,8 @@ val sort_via_array :
 
 val last : 'a list -> 'a
 
+
+
 end = struct
 #1 "ext_list.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -5749,6 +5800,7 @@ let rec last xs =
   | _ :: tl -> last tl 
   | [] -> invalid_arg "Ext_list.last"
 
+
 end
 module Js_config : sig 
 #1 "js_config.mli"
@@ -6217,13 +6269,18 @@ val collect_ast_map :
   (Format.formatter -> string -> 'b) ->
   ('a, 'b) t String_map.t
 
+type dir_spec = 
+  { dir : string ;
+    mutable  excludes : string list 
+  }
 
 (** If the genereated queue is empty, it means 
     1. The main module  does not exist (does not exist due to typo)
     2. It does exist but not in search path
+    The order matters from head to tail 
 *)
 val collect_from_main :
-  ?extra_dirs:[`Dir of string  | `Dir_with_excludes of string * string list] list -> 
+  ?extra_dirs:dir_spec list -> 
   ?excludes : string list -> 
   Format.formatter ->
   (Format.formatter -> string -> 'a) ->
@@ -6459,8 +6516,11 @@ let collect_ast_map ppf files parse_implementation parse_interface  =
                module_name} acc
         end
     ) String_map.empty files
-
-
+;;
+type dir_spec = 
+  { dir : string ;
+    mutable  excludes : string list 
+  }
 
 let collect_from_main 
     ?(extra_dirs=[])
@@ -6475,8 +6535,9 @@ let collect_from_main
     List.fold_left (fun acc dir_spec -> 
         let  dirname, excludes = 
           match dir_spec with 
-          | `Dir dirname -> dirname, excludes
-          | `Dir_with_excludes (dirname, dir_excludes) ->
+          | { dir =  dirname; excludes = dir_excludes} ->
+          (*   dirname, excludes *)
+          (* | `Dir_with_excludes (dirname, dir_excludes) -> *)
             dirname,
             Ext_list.flat_map 
               (fun x -> [x ^ ".ml" ; x ^ ".mli" ])