diff --git a/jscomp/all.depend b/jscomp/all.depend
index 819e914c04..67bf1af042 100644
--- a/jscomp/all.depend
+++ b/jscomp/all.depend
@@ -627,7 +627,7 @@ bsb/bsb_build_util.cmx : ext/ext_list.cmx ext/ext_json.cmx \
     bsb/bsb_build_util.cmi
 bsb/bsb_config.cmx : common/js_config.cmx ext/ext_filename.cmx \
     bsb/bsb_config.cmi
-bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx \
+bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
     ext/ext_filename.cmx bsb/bsb_build_util.cmx common/bs_pkg.cmx \
     bsb/bsb_default.cmi
 bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
diff --git a/jscomp/bin/all_ounit_tests.i.ml b/jscomp/bin/all_ounit_tests.i.ml
index ca55636f38..b7adf159da 100644
--- a/jscomp/bin/all_ounit_tests.i.ml
+++ b/jscomp/bin/all_ounit_tests.i.ml
@@ -75,7 +75,7 @@ open OUnitTypes
 
 (** Most simple heuristic, just pick the first test. *)
 let simple state =
-  (* 94 *) List.hd state.tests_planned
+  (* 204 *) List.hd state.tests_planned
 
 end
 module OUnitUtils
@@ -97,28 +97,28 @@ let is_success =
 
 let is_failure = 
   function
-    | RFailure _ -> (* 0 *) true
-    | RSuccess _ | RError _  | RSkip _ | RTodo _ -> (* 188 *) false
+    | RFailure _ -> (* 2 *) true
+    | RSuccess _ | RError _  | RSkip _ | RTodo _ -> (* 406 *) false
 
 let is_error = 
   function 
     | RError _ -> (* 0 *) true
-    | RSuccess _ | RFailure _ | RSkip _ | RTodo _ -> (* 188 *) false
+    | RSuccess _ | RFailure _ | RSkip _ | RTodo _ -> (* 408 *) false
 
 let is_skip = 
   function
     | RSkip _ -> (* 0 *) true
-    | RSuccess _ | RFailure _ | RError _  | RTodo _ -> (* 188 *) false
+    | RSuccess _ | RFailure _ | RError _  | RTodo _ -> (* 408 *) false
 
 let is_todo = 
   function
     | RTodo _ -> (* 0 *) true
-    | RSuccess _ | RFailure _ | RError _  | RSkip _ -> (* 188 *) false
+    | RSuccess _ | RFailure _ | RError _  | RSkip _ -> (* 408 *) false
 
 let result_flavour = 
   function
     | RError _ -> (* 0 *) "Error"
-    | RFailure _ -> (* 0 *) "Failure"
+    | RFailure _ -> (* 2 *) "Failure"
     | RSuccess _ -> (* 0 *) "Success"
     | RSkip _ -> (* 0 *) "Skip"
     | RTodo _ -> (* 0 *) "Todo"
@@ -129,7 +129,7 @@ let result_path =
     | RError (path, _)
     | RFailure (path, _)
     | RSkip (path, _)
-    | RTodo (path, _) -> (* 0 *) path
+    | RTodo (path, _) -> (* 2 *) path
 
 let result_msg = 
   function
@@ -137,7 +137,7 @@ let result_msg =
     | RError (_, msg)
     | RFailure (_, msg)
     | RSkip (_, msg)
-    | RTodo (_, msg) -> (* 0 *) msg
+    | RTodo (_, msg) -> (* 2 *) msg
 
 (* Returns true if the result list contains successes only. *)
 let rec was_successful = 
@@ -145,32 +145,32 @@ let rec was_successful =
     | [] -> (* 3 *) true
     | RSuccess _::t 
     | RSkip _::t -> 
-        (* 282 *) was_successful t
+        (* 354 *) was_successful t
 
     | RFailure _::_
     | RError _::_ 
     | RTodo _::_ -> 
-        (* 0 *) false
+        (* 3 *) false
 
 let string_of_node = 
   function
     | ListItem n -> 
-        (* 376 *) string_of_int n
+        (* 820 *) string_of_int n
     | Label s -> 
-        (* 564 *) s
+        (* 1230 *) s
 
 (* Return the number of available tests *)
 let rec test_case_count = 
   function
-    | TestCase _ -> (* 94 *) 1 
-    | TestLabel (_, t) -> (* 111 *) test_case_count t
+    | TestCase _ -> (* 204 *) 1 
+    | TestLabel (_, t) -> (* 238 *) test_case_count t
     | TestList l -> 
-        (* 17 *) List.fold_left 
-          (fun c t -> (* 110 *) c + test_case_count t) 
+        (* 34 *) List.fold_left 
+          (fun c t -> (* 236 *) c + test_case_count t) 
           0 l
 
 let string_of_path path =
-  (* 188 *) String.concat ":" (List.rev_map string_of_node path)
+  (* 410 *) String.concat ":" (List.rev_map string_of_node path)
 
 let buff_format_printf f = 
   (* 0 *) let buff = Buffer.create 13 in
@@ -193,13 +193,13 @@ let mapi f l =
     rmapi 0 l
 
 let fold_lefti f accu l =
-  (* 17 *) let rec rfold_lefti cnt accup l = 
-    (* 127 *) match l with
+  (* 34 *) let rec rfold_lefti cnt accup l = 
+    (* 270 *) match l with
       | [] -> 
-          (* 17 *) accup
+          (* 34 *) accup
 
       | h::t -> 
-          (* 110 *) rfold_lefti (cnt + 1) (f accup h cnt) t
+          (* 236 *) rfold_lefti (cnt + 1) (f accup h cnt) t
   in
     rfold_lefti 0 accu l
 
@@ -217,23 +217,23 @@ open OUnitUtils
 type event_type = GlobalEvent of global_event | TestEvent of test_event
 
 let format_event verbose event_type =
-  (* 566 *) match event_type with
+  (* 1228 *) match event_type with
     | GlobalEvent e ->
-        (* 2 *) begin
+        (* 4 *) begin
           match e with 
             | GStart ->
                 (* 0 *) ""
             | GEnd ->
                 (* 0 *) ""
             | GResults (running_time, results, test_case_count) -> 
-                (* 2 *) let separator1 = String.make (Format.get_margin ()) '=' in
+                (* 4 *) let separator1 = String.make (Format.get_margin ()) '=' in
                 let separator2 = String.make (Format.get_margin ()) '-' in
                 let buf = Buffer.create 1024 in
-                let bprintf fmt = (* 7 *) Printf.bprintf buf fmt in
+                let bprintf fmt = (* 16 *) Printf.bprintf buf fmt in
                 let print_results = 
                   List.iter 
                     (fun result -> 
-                       (* 0 *) bprintf "%s\n%s: %s\n\n%s\n%s\n" 
+                       (* 2 *) bprintf "%s\n%s: %s\n\n%s\n%s\n" 
                          separator1 
                          (result_flavour result) 
                          (string_of_path (result_path result)) 
@@ -246,7 +246,7 @@ let format_event verbose event_type =
                 let todos    = List.filter is_todo results in
 
                   if not verbose then
-                    (* 1 *) bprintf "\n";
+                    (* 2 *) bprintf "\n";
 
                   print_results errors;
                   print_results failures;
@@ -263,7 +263,7 @@ let format_event verbose event_type =
                           test_case_count (List.length skips)
                     end
                   else
-                    (* 0 *) begin
+                    (* 2 *) begin
                       bprintf
                         "FAILED: Cases: %d Tried: %d Errors: %d \
                               Failures: %d Skip:%d Todo:%d" 
@@ -276,31 +276,31 @@ let format_event verbose event_type =
         end
 
     | TestEvent e ->
-        (* 564 *) begin
+        (* 1224 *) begin
           let string_of_result = 
             if verbose then
-              (* 282 *) function
-                | RSuccess _      -> (* 94 *) "ok\n"
-                | RFailure (_, _) -> (* 0 *) "FAIL\n"
+              (* 612 *) function
+                | RSuccess _      -> (* 203 *) "ok\n"
+                | RFailure (_, _) -> (* 1 *) "FAIL\n"
                 | RError (_, _)   -> (* 0 *) "ERROR\n"
                 | RSkip (_, _)    -> (* 0 *) "SKIP\n"
                 | RTodo (_, _)    -> (* 0 *) "TODO\n"
             else
-              (* 282 *) function
-                | RSuccess _      -> (* 94 *) "."
-                | RFailure (_, _) -> (* 0 *) "F"
+              (* 612 *) function
+                | RSuccess _      -> (* 203 *) "."
+                | RFailure (_, _) -> (* 1 *) "F"
                 | RError (_, _)   -> (* 0 *) "E"
                 | RSkip (_, _)    -> (* 0 *) "S"
                 | RTodo (_, _)    -> (* 0 *) "T"
           in
             if verbose then
-              (* 282 *) match e with 
+              (* 612 *) match e with 
                 | EStart p -> 
-                    (* 94 *) Printf.sprintf "%s start\n" (string_of_path p)
+                    (* 204 *) Printf.sprintf "%s start\n" (string_of_path p)
                 | EEnd p -> 
-                    (* 94 *) Printf.sprintf "%s end\n" (string_of_path p)
+                    (* 204 *) Printf.sprintf "%s end\n" (string_of_path p)
                 | EResult result -> 
-                    (* 94 *) string_of_result result
+                    (* 204 *) string_of_result result
                 | ELog (lvl, str) ->
                     (* 0 *) let prefix = 
                       match lvl with 
@@ -312,40 +312,40 @@ let format_event verbose event_type =
                 | ELogRaw str ->
                     (* 0 *) str
             else 
-              (* 282 *) match e with 
-                | EStart _ | EEnd _ | ELog _ | ELogRaw _ -> (* 188 *) ""
-                | EResult result -> (* 94 *) string_of_result result
+              (* 612 *) match e with 
+                | EStart _ | EEnd _ | ELog _ | ELogRaw _ -> (* 408 *) ""
+                | EResult result -> (* 204 *) string_of_result result
         end
 
 let file_logger fn =
-  (* 1 *) let chn = open_out fn in
+  (* 2 *) let chn = open_out fn in
     (fun ev ->
-       (* 283 *) output_string chn (format_event true ev);
+       (* 614 *) output_string chn (format_event true ev);
        flush chn),
-    (fun () -> (* 1 *) close_out chn)
+    (fun () -> (* 2 *) close_out chn)
 
 let std_logger verbose =
-  (* 1 *) (fun ev -> 
-     (* 283 *) print_string (format_event verbose ev);
+  (* 2 *) (fun ev -> 
+     (* 614 *) print_string (format_event verbose ev);
      flush stdout),
-  (fun () -> (* 1 *) ())
+  (fun () -> (* 2 *) ())
 
 let null_logger =
   ignore, ignore
 
 let create output_file_opt verbose (log,close) =
-  (* 1 *) let std_log, std_close = std_logger verbose in
+  (* 2 *) let std_log, std_close = std_logger verbose in
   let file_log, file_close = 
     match output_file_opt with 
       | Some fn ->
-          (* 1 *) file_logger fn
+          (* 2 *) file_logger fn
       | None ->
           (* 0 *) null_logger
   in
     (fun ev ->
-       (* 283 *) std_log ev; file_log ev; log ev),
+       (* 614 *) std_log ev; file_log ev; log ev),
     (fun () ->
-       (* 1 *) std_close (); file_close (); close ())
+       (* 2 *) std_close (); file_close (); close ())
 
 let printf log fmt =
   (* 0 *) Printf.ksprintf
@@ -445,6 +445,8 @@ val assert_equal :
     @raise Failure description *)
 val assert_raises : ?msg:string -> exn -> (unit -> 'a) -> unit
 
+val assert_raise_any : ?msg:string ->  (unit -> 'a) -> unit
+
 (** {2 Skipping tests } 
   
    In certain condition test can be written but there is no point running it, because they
@@ -647,7 +649,7 @@ let global_output_file =
     if Sys.file_exists ocamlbuild_dir && Sys.is_directory ocamlbuild_dir then
       (* 0 *) ocamlbuild_dir
     else 
-      (* 1 *) pwd
+      (* 2 *) pwd
   in
     ref (Some (Filename.concat dir "oUnit.log"))
 
@@ -700,16 +702,16 @@ let todo msg =
   (* 0 *) raise (Todo msg)
 
 let assert_failure msg = 
-  (* 0 *) failwith ("OUnit: " ^ msg)
+  (* 1 *) failwith ("OUnit: " ^ msg)
 
 let assert_bool msg b =
-  (* 2001326 *) if not b then (* 0 *) assert_failure msg
+  (* 4002653 *) if not b then (* 0 *) assert_failure msg
 
 let assert_string str =
   (* 0 *) if not (str = "") then (* 0 *) assert_failure str
 
 let assert_equal ?(cmp = ( = )) ?printer ?pp_diff ?msg expected actual =
-  (* 2001425 *) let get_error_string () =
+  (* 4002902 *) let get_error_string () =
     (* 0 *) let res =
       buff_format_printf
         (fun fmt ->
@@ -885,14 +887,14 @@ let assert_command
       ()
 
 let raises f =
-  (* 6 *) try
+  (* 14 *) try
     f ();
     None
   with e -> 
-    (* 6 *) Some e
+    (* 13 *) Some e
 
 let assert_raises ?msg exn (f: unit -> 'a) = 
-  (* 6 *) let pexn = 
+  (* 12 *) let pexn = 
     Printexc.to_string 
   in
   let get_error_string () =
@@ -913,8 +915,32 @@ let assert_raises ?msg exn (f: unit -> 'a) =
           (* 0 *) assert_failure (get_error_string ())
 
       | Some e -> 
-          (* 6 *) assert_equal ?msg ~printer:pexn exn e
+          (* 12 *) assert_equal ?msg ~printer:pexn exn e
 
+
+let assert_raise_any ?msg (f: unit -> 'a) = 
+  (* 2 *) let pexn = 
+    Printexc.to_string 
+  in
+  let get_error_string () =
+    (* 1 *) let str = 
+      Format.sprintf 
+        "expected exception , but no exception was raised." 
+        
+    in
+      match msg with
+        | None -> 
+            (* 1 *) assert_failure str
+              
+        | Some s -> 
+            (* 0 *) assert_failure (s^"\n"^str)
+  in    
+    match raises f with
+      | None -> 
+          (* 1 *) assert_failure (get_error_string ())
+
+      | Some exn -> 
+          (* 1 *) assert_bool (pexn exn) true
 (* Compare floats up to a given relative error *)
 let cmp_float ?(epsilon = 0.00001) a b =
   (* 0 *) abs_float (a -. b) <= epsilon *. (abs_float a) ||
@@ -925,8 +951,8 @@ let (@?) = assert_bool
 
 (* Some shorthands which allows easy test construction *)
 let (>:) s t = (* 0 *) TestLabel(s, t)             (* infix *)
-let (>::) s f = (* 94 *) TestLabel(s, TestCase(f))  (* infix *)
-let (>:::) s l = (* 17 *) TestLabel(s, TestList(l)) (* infix *)
+let (>::) s f = (* 204 *) TestLabel(s, TestCase(f))  (* infix *)
+let (>:::) s l = (* 34 *) TestLabel(s, TestList(l)) (* infix *)
 
 (* Utility function to manipulate test *)
 let rec test_decorate g =
@@ -1060,13 +1086,13 @@ let maybe_backtrace = ""
 
 (* Run all tests, report starts, errors, failures, and return the results *)
 let perform_test report test =
-  (* 1 *) let run_test_case f path =
-    (* 94 *) try 
+  (* 2 *) let run_test_case f path =
+    (* 204 *) try 
       f ();
       RSuccess path
     with
       | Failure s -> 
-          (* 0 *) RFailure (path, s ^ maybe_backtrace)
+          (* 1 *) RFailure (path, s ^ maybe_backtrace)
 
       | Skip s -> 
           (* 0 *) RSkip (path, s)
@@ -1080,22 +1106,22 @@ let perform_test report test =
   let rec flatten_test path acc = 
     function
       | TestCase(f) -> 
-          (* 94 *) (path, f) :: acc
+          (* 204 *) (path, f) :: acc
 
       | TestList (tests) ->
-          (* 17 *) fold_lefti 
+          (* 34 *) fold_lefti 
             (fun acc t cnt -> 
-               (* 110 *) flatten_test 
+               (* 236 *) flatten_test 
                  ((ListItem cnt)::path) 
                  acc t)
             acc tests
       
       | TestLabel (label, t) -> 
-          (* 111 *) flatten_test ((Label label)::path) acc t
+          (* 238 *) flatten_test ((Label label)::path) acc t
   in
   let test_cases = List.rev (flatten_test [] [] test) in
   let runner (path, f) = 
-    (* 94 *) let result = 
+    (* 204 *) let result = 
       report (EStart path);
       run_test_case f path 
     in
@@ -1104,18 +1130,18 @@ let perform_test report test =
       result
   in
   let rec iter state = 
-    (* 95 *) match state.tests_planned with 
+    (* 206 *) match state.tests_planned with 
       | [] ->
-          (* 1 *) state.results
+          (* 2 *) state.results
       | _ ->
-          (* 94 *) let (path, f) = !global_chooser state in            
+          (* 204 *) let (path, f) = !global_chooser state in            
           let result = runner (path, f) in
             iter 
               {
                 results = result :: state.results;
                 tests_planned = 
                   List.filter 
-                    (fun (path', _) -> (* 4465 *) path <> path') state.tests_planned
+                    (fun (path', _) -> (* 10506 *) path <> path') state.tests_planned
               }
   in
     iter {results = []; tests_planned = test_cases}
@@ -1123,14 +1149,14 @@ let perform_test report test =
 (* Function which runs the given function and returns the running time
    of the function, and the original result in a tuple *)
 let time_fun f x y =
-  (* 1 *) let begin_time = Unix.gettimeofday () in
+  (* 2 *) let begin_time = Unix.gettimeofday () in
   let result = f x y in
   let end_time = Unix.gettimeofday () in
     (end_time -. begin_time, result)
 
 (* A simple (currently too simple) text based test runner *)
 let run_test_tt ?verbose test =
-  (* 1 *) let log, log_close = 
+  (* 2 *) let log, log_close = 
     OUnitLogger.create 
       !global_output_file 
       !global_verbose 
@@ -1145,7 +1171,7 @@ let run_test_tt ?verbose test =
     time_fun 
       perform_test 
       (fun ev ->
-         (* 282 *) log (OUnitLogger.TestEvent ev))
+         (* 612 *) log (OUnitLogger.TestEvent ev))
       test 
   in
     
@@ -1161,7 +1187,7 @@ let run_test_tt ?verbose test =
       
 (* Call this one from you test suites *)
 let run_test_tt_main ?(arg_specs=[]) ?(set_verbose=ignore) suite = 
-  (* 1 *) let only_test = ref [] in
+  (* 2 *) let only_test = ref [] in
   let () = 
     Arg.parse
       (Arg.align
@@ -1198,7 +1224,7 @@ let run_test_tt_main ?(arg_specs=[]) ?(set_verbose=ignore) suite =
   in
   let nsuite = 
     if !only_test = [] then
-      (* 1 *) suite
+      (* 2 *) suite
     else
       (* 0 *) begin
         match test_filter ~skip:true !only_test suite with 
@@ -1216,7 +1242,7 @@ let run_test_tt_main ?(arg_specs=[]) ?(set_verbose=ignore) suite =
     run_test_tt ~verbose:!global_verbose nsuite 
   in
     if not (was_successful result) then
-      (* 0 *) exit 1
+      (* 1 *) exit 1
     else
       (* 1 *) result
 
@@ -1316,10 +1342,10 @@ end = struct
 
 
 let reverse_range a i len =
-  (* 1 *) if len=0 then (* 0 *) ()
+  (* 2 *) if len=0 then (* 0 *) ()
   else
-    (* 1 *) for k = 0 to (len-1)/2 do
-      (* 1 *) let t = Array.unsafe_get a (i+k) in
+    (* 2 *) for k = 0 to (len-1)/2 do
+      (* 2 *) let t = Array.unsafe_get a (i+k) in
       Array.unsafe_set a (i+k) ( Array.unsafe_get a (i+len-1-k));
       Array.unsafe_set a (i+len-1-k) t;
     done
@@ -1329,22 +1355,22 @@ let reverse_in_place a =
   (* 0 *) reverse_range a 0 (Array.length a)
 
 let reverse a =
-  (* 2 *) let b_len = Array.length a in
-  if b_len = 0 then (* 1 *) [||] else  
-  (* 1 *) let b = Array.copy a in  
+  (* 4 *) let b_len = Array.length a in
+  if b_len = 0 then (* 2 *) [||] else  
+  (* 2 *) let b = Array.copy a in  
   for i = 0 to  b_len - 1 do
-      (* 2 *) Array.unsafe_set b i (Array.unsafe_get a (b_len - 1 -i )) 
+      (* 4 *) Array.unsafe_set b i (Array.unsafe_get a (b_len - 1 -i )) 
   done;
   b  
 
 let reverse_of_list =  function
-  | [] -> (* 1 *) [||]
+  | [] -> (* 2 *) [||]
   | hd::tl as l ->
-    (* 2 *) let len = List.length l in
+    (* 4 *) let len = List.length l in
     let a = Array.make len hd in
     let rec fill i = function
-      | [] -> (* 2 *) a
-      | hd::tl -> (* 2 *) Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
+      | [] -> (* 4 *) a
+      | hd::tl -> (* 4 *) Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
 let filter f a =
@@ -1425,19 +1451,19 @@ let rfind_and_split arr cmp v : _ split =
 
 
 let find_with_index arr cmp v = 
-  (* 4 *) let len  = Array.length arr in 
+  (* 8 *) let len  = Array.length arr in 
   let rec aux i len = 
-    (* 12 *) if i >= len then (* 1 *) -1 
-    else (* 11 *) if cmp (Array.unsafe_get arr i ) v then (* 3 *) i 
-    else (* 8 *) aux (i + 1) len in 
+    (* 24 *) if i >= len then (* 2 *) -1 
+    else (* 22 *) if cmp (Array.unsafe_get arr i ) v then (* 6 *) i 
+    else (* 16 *) aux (i + 1) len in 
   aux 0 len
 
 let find_and_split arr cmp v : _ split = 
-  (* 4 *) let i = find_with_index arr cmp v in 
+  (* 8 *) let i = find_with_index arr cmp v in 
   if i < 0 then 
-    (* 1 *) `No_split
+    (* 2 *) `No_split
   else
-    (* 3 *) `Split (Array.sub arr 0 i, Array.sub arr (i + 1 ) (Array.length arr - i - 1))        
+    (* 6 *) `Split (Array.sub arr 0 i, Array.sub arr (i + 1 ) (Array.length arr - i - 1))        
 
 (** TODO: available since 4.03, use {!Array.exists} *)
 
@@ -1665,6 +1691,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1697,83 +1725,107 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
-  (* 1086 *) let len = String.length str in
+  (* 2172 *) let len = String.length str in
   let rec loop acc last_pos pos =
-    (* 46932 *) if pos = -1 then
-      (* 1086 *) if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
-        (* 965 *) acc
+    (* 93864 *) if pos = -1 then
+      (* 2172 *) if last_pos = 0 && not keep_empty then
+
+        (* 1930 *) acc
       else 
-        (* 121 *) String.sub str 0 last_pos :: acc
+        (* 242 *) String.sub str 0 last_pos :: acc
     else
-    (* 45846 *) if is_delim str.[pos] then
-      (* 17756 *) let new_len = (last_pos - pos - 1) in
+    (* 91692 *) if is_delim str.[pos] then
+      (* 35512 *) let new_len = (last_pos - pos - 1) in
       if new_len <> 0 || keep_empty then 
-        (* 3127 *) let v = String.sub str (pos + 1) new_len in
+        (* 6254 *) let v = String.sub str (pos + 1) new_len in
         loop ( v :: acc)
           pos (pos - 1)
-      else (* 14629 *) loop acc pos (pos - 1)
-    else (* 28090 *) loop acc last_pos (pos - 1)
+      else (* 29258 *) loop acc pos (pos - 1)
+    else (* 56180 *) loop acc last_pos (pos - 1)
   in
   loop [] len (len - 1)
 
 let trim s = 
-  (* 0 *) let i = ref 0  in
+  (* 8 *) let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
-    (* 0 *) incr i;
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
+    (* 18 *) incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
-    (* 0 *) decr k ;
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
+    (* 12 *) decr k ;
   done;
   String.sub s !i (!k - !i + 1)
 
 let split ?keep_empty  str on = 
-  (* 173 *) if str = "" then (* 0 *) [] else 
-    (* 173 *) split_by ?keep_empty (fun x -> (* 24320 *) (x : char) = on) str  ;;
+  (* 346 *) if str = "" then (* 0 *) [] else 
+    (* 346 *) split_by ?keep_empty (fun x -> (* 48640 *) (x : char) = on) str  ;;
 
 let quick_split_by_ws str : string list = 
-  (* 913 *) split_by ~keep_empty:false (fun x -> (* 21526 *) x = '\t' || x = '\n' || x = ' ') str
+  (* 1826 *) split_by ~keep_empty:false (fun x -> (* 43052 *) x = '\t' || x = '\n' || x = ' ') str
 
 let starts_with s beg = 
-  (* 0 *) let beg_len = String.length beg in
+  (* 8 *) let beg_len = String.length beg in
   let s_len = String.length s in
   beg_len <=  s_len &&
   (let i = ref 0 in
    while !i <  beg_len 
          && String.unsafe_get s !i =
             String.unsafe_get beg !i do 
-     (* 0 *) incr i 
+     (* 8 *) incr i 
    done;
    !i = beg_len
   )
 
 
-
-let ends_with_index s beg = 
-  (* 0 *) let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
+  (* 126 *) let s_finish = String.length s - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then (* 0 *) -1
   else
-    (* 0 *) let rec aux j k = 
-      (* 0 *) if k < 0 then (* 0 *) (j + 1)
-      else (* 0 *) if String.unsafe_get s j = String.unsafe_get beg k then 
-        (* 0 *) aux (j - 1) (k - 1)
-      else  (* 0 *) -1 in 
+    (* 126 *) let rec aux j k = 
+      (* 318 *) if k < 0 then (* 54 *) (j + 1)
+      else (* 264 *) if String.unsafe_get s j = String.unsafe_get end_ k then 
+        (* 192 *) aux (j - 1) (k - 1)
+      else  (* 72 *) -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = (* 0 *) ends_with_index s beg >= 0 
-
+let ends_with s end_ = (* 0 *) ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
-  (* 0 *) let i =  ends_with_index s beg in 
-  if i >= 0 then (* 0 *) Some (String.sub s 0 i) 
-  else (* 0 *) None
+  (* 4 *) let i =  ends_with_index s beg in 
+  if i >= 0 then (* 2 *) Some (String.sub s 0 i) 
+  else (* 2 *) None
+
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  (* 0 *) List.exists (fun x -> (* 0 *) check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  (* 54 *) let rec aux suffixes = 
+    (* 124 *) match suffixes with 
+    | [] -> (* 2 *) None 
+    | x::xs -> 
+      (* 122 *) let id = ends_with_index s x in 
+      if id >= 0 then (* 52 *) Some (String.sub s 0 id)
+      else (* 70 *) aux xs in 
+  aux suffixes    
+
+
 
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
@@ -1794,16 +1846,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  (* 27 *) if i >= len then (* 14 *) true 
-  else  (* 13 *) p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  (* 85 *) start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  (* 12 *) let len = String.length s in 
+  if start < 0 || finish >= len then (* 1 *) invalid_arg "Ext_string.for_all_range"
+  else (* 11 *) unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  (* 0 *) let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  (* 6 *) unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = (* 0 *) String.length s = 0
 
@@ -1820,49 +1876,50 @@ let equal (x : string) y  = (* 0 *) x = y
 
 
 
-let _is_sub ~sub i s j ~len =
-  (* 0 *) let rec check k =
-    (* 0 *) if k = len
-    then (* 0 *) true
+let unsafe_is_sub ~sub i s j ~len =
+  (* 32 *) let rec check k =
+    (* 72 *) if k = len
+    then (* 8 *) true
     else 
-      (* 0 *) String.unsafe_get sub (i+k) = 
+      (* 64 *) String.unsafe_get sub (i+k) = 
       String.unsafe_get s (j+k) && check (k+1)
   in
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
-  (* 0 *) let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  (* 4 *) let n = String.length sub in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      (* 0 *) if _is_sub ~sub 0 s !i ~len:n then (* 0 *) raise M.Exit;
+      (* 16 *) if unsafe_is_sub ~sub 0 s !i ~len:n then
+        (* 4 *) raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
-    (* 0 *) !i
+  with Local_exit ->
+    (* 4 *) !i
 
 
 let rfind ~sub s =
-  (* 0 *) let n = String.length sub in
+  (* 4 *) let n = String.length sub in
   let i = ref (String.length s - n) in
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      (* 0 *) if _is_sub ~sub 0 s !i ~len:n then (* 0 *) raise M.Exit;
+      (* 16 *) if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        (* 4 *) raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
-    (* 0 *) !i
+  with Local_exit ->
+    (* 4 *) !i
 
 let tail_from s x = 
-  (* 0 *) let len = String.length s  in 
+  (* 4 *) let len = String.length s  in 
   if  x > len then (* 0 *) invalid_arg ("Ext_string.tail_from " ^s ^ " : "^ string_of_int x )
-  else (* 0 *) String.sub s x (len - x)
+  else (* 4 *) String.sub s x (len - x)
 
 
 (**
@@ -1871,9 +1928,9 @@ let tail_from s x =
    ]}
 *)
 let digits_of_str s ~offset x = 
-  (* 0 *) let rec aux i acc s x  = 
-    (* 0 *) if i >= x then (* 0 *) acc 
-    else (* 0 *) aux (i + 1) (10 * acc + Char.code s.[offset + i] - 48 (* Char.code '0' *)) s x in 
+  (* 10 *) let rec aux i acc s x  = 
+    (* 30 *) if i >= x then (* 10 *) acc 
+    else (* 20 *) aux (i + 1) (10 * acc + Char.code s.[offset + i] - 48 (* Char.code '0' *)) s x in 
   aux 0 0 s x 
 
 
@@ -1889,24 +1946,24 @@ let digits_of_str s ~offset x =
    ]}
 *)
 let starts_with_and_number s ~offset beg =
-  (* 0 *) let beg_len = String.length beg in
+  (* 12 *) let beg_len = String.length beg in
   let s_len = String.length s in
   let finish_delim = offset + beg_len in 
 
   if finish_delim >  s_len  then (* 0 *) -1 
   else 
-    (* 0 *) let i = ref offset  in
+    (* 12 *) let i = ref offset  in
     while !i <  finish_delim
           && String.unsafe_get s !i =
              String.unsafe_get beg (!i - offset) do 
-      (* 0 *) incr i 
+      (* 52 *) incr i 
     done;
     if !i = finish_delim then 
-      (* 0 *) digits_of_str ~offset:finish_delim s 2 
+      (* 8 *) digits_of_str ~offset:finish_delim s 2 
     else 
-      (* 0 *) -1 
+      (* 4 *) -1 
 
-let equal (x : string) y  = (* 8829526 *) x = y
+let equal (x : string) y  = (* 17659052 *) x = y
 
 let unsafe_concat_with_length len sep l =
   (* 0 *) match l with 
@@ -1929,46 +1986,55 @@ let unsafe_concat_with_length len sep l =
 
 
 let rec rindex_rec s i c =
-  (* 21 *) if i < 0 then (* 2 *) i else
-  (* 19 *) if String.unsafe_get s i = c then (* 5 *) i else (* 14 *) rindex_rec s (i - 1) c;;
+  (* 42 *) if i < 0 then (* 4 *) i else
+  (* 38 *) if String.unsafe_get s i = c then (* 10 *) i else (* 28 *) rindex_rec s (i - 1) c;;
 
 let rec rindex_rec_opt s i c =
   (* 0 *) if i < 0 then (* 0 *) None else
   (* 0 *) if String.unsafe_get s i = c then (* 0 *) Some i else (* 0 *) rindex_rec_opt s (i - 1) c;;
 
 let rindex_neg s c = 
-  (* 7 *) rindex_rec s (String.length s - 1) c;;
+  (* 14 *) rindex_rec s (String.length s - 1) c;;
 
 let rindex_opt s c = 
   (* 0 *) rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  (* 22 *) match s.[0] with 
+let is_valid_module_file (s : string) = 
+  (* 52 *) let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    (* 10 *) for_all_range s ~start:1 ~finish
+    (* 24 *) unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
-         (* 7 *) match x with 
-         | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> (* 7 *) true
-         | _ -> (* 0 *) false )
-  | _ -> (* 12 *) false 
+         (* 18 *) match x with 
+         | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> (* 14 *) true
+         | _ -> (* 4 *) false )
+  | _ -> (* 24 *) false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  (* 23 *) ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  (* 54 *) match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> (* 2 *) false 
+  | Some x -> (* 52 *) is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  (* 0 *) i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  (* 0 *) let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then (* 0 *) invalid_arg "Ext_string.no_char"   
+  else (* 0 *) unsafe_no_char x ch i len 
+
 end
 module Ounit_array_tests
 = struct
@@ -1982,27 +2048,27 @@ let suites =
     >:::
     [
      __LOC__ >:: begin fun _ ->
-        (* 1 *) Ext_array.find_and_split 
+        (* 2 *) Ext_array.find_and_split 
             [|"a"; "b";"c"|]
             Ext_string.equal "--" =~ `No_split
      end;
     __LOC__ >:: begin fun _ ->
-        (* 1 *) Ext_array.find_and_split 
+        (* 2 *) Ext_array.find_and_split 
             [|"a"; "b";"c";"--"|]
             Ext_string.equal "--" =~ `Split ([|"a";"b";"c"|],[||])
      end;
      __LOC__ >:: begin fun _ ->
-        (* 1 *) Ext_array.find_and_split 
+        (* 2 *) Ext_array.find_and_split 
             [|"--"; "a"; "b";"c";"--"|]
             Ext_string.equal "--" =~ `Split ([||], [|"a";"b";"c";"--"|])
      end;
     __LOC__ >:: begin fun _ ->
-        (* 1 *) Ext_array.find_and_split 
+        (* 2 *) Ext_array.find_and_split 
             [| "u"; "g"; "--"; "a"; "b";"c";"--"|]
             Ext_string.equal "--" =~ `Split ([|"u";"g"|], [|"a";"b";"c";"--"|])
      end;
     __LOC__ >:: begin fun _ ->
-        (* 1 *) Ext_array.reverse [|1;2|] =~ [|2;1|];
+        (* 2 *) Ext_array.reverse [|1;2|] =~ [|2;1|];
         Ext_array.reverse [||] =~ [||]  
     end     ;
     ]
@@ -2049,8 +2115,8 @@ let rec cons_enum s e =
   | Node(l,v,r,_) -> (* 0 *) cons_enum l (More(v,r,e))
 
 let rec height = function
-  | Empty -> (* 11938 *) 0 
-  | Node(_,_,_,h) -> (* 36064 *) h   
+  | Empty -> (* 23876 *) 0 
+  | Node(_,_,_,h) -> (* 72128 *) h   
 
 (* Smallest and greatest element of a set *)
 
@@ -2069,21 +2135,21 @@ let rec max_elt = function
 
 let empty = Empty
 
-let is_empty = function Empty -> (* 3 *) true | _ -> (* 12 *) false
+let is_empty = function Empty -> (* 6 *) true | _ -> (* 24 *) false
 
 let rec cardinal_aux acc  = function
-  | Empty -> (* 21302 *) acc 
+  | Empty -> (* 42604 *) acc 
   | Node (l,_,r, _) -> 
-    (* 21100 *) cardinal_aux  (cardinal_aux (acc + 1)  r ) l 
+    (* 42200 *) cardinal_aux  (cardinal_aux (acc + 1)  r ) l 
 
-let cardinal s = (* 202 *) cardinal_aux 0 s 
+let cardinal s = (* 404 *) cardinal_aux 0 s 
 
 let rec elements_aux accu = function
-  | Empty -> (* 533 *) accu
-  | Node(l, v, r, _) -> (* 520 *) elements_aux (v :: elements_aux accu r) l
+  | Empty -> (* 1066 *) accu
+  | Node(l, v, r, _) -> (* 1040 *) elements_aux (v :: elements_aux accu r) l
 
 let elements s =
-  (* 13 *) elements_aux [] s
+  (* 26 *) elements_aux [] s
 
 let choose = min_elt
 
@@ -2113,7 +2179,7 @@ let max_int3 (a : int) b c =
   (* 0 *) if b >=c then (* 0 *) b
   else (* 0 *) c     
 let max_int_2 (a : int) b =  
-  (* 125715 *) if a >= b then (* 101074 *) a else (* 24641 *) b 
+  (* 251430 *) if a >= b then (* 202148 *) a else (* 49282 *) b 
 
 
 
@@ -2122,18 +2188,18 @@ exception Height_diff_borken
 
 let rec check_height_and_diff = 
   function 
-  | Empty -> (* 125923 *) 0
+  | Empty -> (* 251846 *) 0
   | Node(l,_,r,h) -> 
-    (* 125715 *) let hl = check_height_and_diff l in
+    (* 251430 *) let hl = check_height_and_diff l in
     let hr = check_height_and_diff r in
     if h <>  max_int_2 hl hr + 1 then (* 0 *) raise Height_invariant_broken
     else  
-      (* 125715 *) let diff = (abs (hl - hr)) in  
+      (* 251430 *) let diff = (abs (hl - hr)) in  
       if  diff > 2 then (* 0 *) raise Height_diff_borken 
-      else (* 125715 *) h     
+      else (* 251430 *) h     
 
 let check tree = 
-  (* 208 *) ignore (check_height_and_diff tree)
+  (* 416 *) ignore (check_height_and_diff tree)
 (* 
     Invariants: 
     1. {[ l < v < r]}
@@ -2141,9 +2207,9 @@ let check tree =
     3. [height l] - [height r] <= 2
 *)
 let create l v r = 
-  (* 182796 *) let hl = match l with Empty -> (* 18117 *) 0 | Node (_,_,_,h) -> (* 164679 *) h in
-  let hr = match r with Empty -> (* 18196 *) 0 | Node (_,_,_,h) -> (* 164600 *) h in
-  Node(l,v,r, if hl >= hr then (* 140669 *) hl + 1 else (* 42127 *) hr + 1)         
+  (* 365592 *) let hl = match l with Empty -> (* 36234 *) 0 | Node (_,_,_,h) -> (* 329358 *) h in
+  let hr = match r with Empty -> (* 36392 *) 0 | Node (_,_,_,h) -> (* 329200 *) h in
+  Node(l,v,r, if hl >= hr then (* 281338 *) hl + 1 else (* 84254 *) hr + 1)         
 
 (* Same as create, but performs one step of rebalancing if necessary.
     Invariants:
@@ -2240,19 +2306,19 @@ let internal_bal l v r =
     end
 *)
 let internal_bal l v r =
-  (* 1675847 *) let hl = match l with Empty -> (* 91131 *) 0 | Node(_,_,_,h) -> (* 1584716 *) h in
-  let hr = match r with Empty -> (* 98494 *) 0 | Node(_,_,_,h) -> (* 1577353 *) h in
-  if hl > hr + 2 then (* 11835 *) begin
+  (* 3351694 *) let hl = match l with Empty -> (* 182262 *) 0 | Node(_,_,_,h) -> (* 3169432 *) h in
+  let hr = match r with Empty -> (* 196988 *) 0 | Node(_,_,_,h) -> (* 3154706 *) h in
+  if hl > hr + 2 then (* 23670 *) begin
     match l with
       Empty -> (* 0 *) assert false
     | Node(ll, lv, lr, _) ->   
-      (* 11835 *) if height ll >= height lr then
+      (* 23670 *) if height ll >= height lr then
         (* [ll] >~ [lr] 
            [ll] >~ [r] 
            [ll] ~~ [ lr ^ r]  
         *)
-        (* 6333 *) create ll lv (create lr v r)
-      else (* 5502 *) begin
+        (* 12666 *) create ll lv (create lr v r)
+      else (* 11004 *) begin
         match lr with
           Empty -> (* 0 *) assert false
         | Node(lrl, lrv, lrr, _)->
@@ -2260,29 +2326,29 @@ let internal_bal l v r =
              [lr] >~ [r]
              [ll ^ lrl] ~~ [lrr ^ r]   
           *)
-          (* 5502 *) create (create ll lv lrl) lrv (create lrr v r)
+          (* 11004 *) create (create ll lv lrl) lrv (create lrr v r)
       end
-  end else (* 1664012 *) if hr > hl + 2 then (* 12166 *) begin
+  end else (* 3328024 *) if hr > hl + 2 then (* 24332 *) begin
     match r with
       Empty -> (* 0 *) assert false
     | Node(rl, rv, rr, _) ->
-      (* 12166 *) if height rr >= height rl then
-        (* 6630 *) create (create l v rl) rv rr
-      else (* 5536 *) begin
+      (* 24332 *) if height rr >= height rl then
+        (* 13260 *) create (create l v rl) rv rr
+      else (* 11072 *) begin
         match rl with
           Empty -> (* 0 *) assert false
         | Node(rll, rlv, rlr, _) ->
-          (* 5536 *) create (create l v rll) rlv (create rlr rv rr)
+          (* 11072 *) create (create l v rll) rlv (create rlr rv rr)
       end
   end else
-    (* 1651846 *) Node(l, v, r, (if hl >= hr then (* 1131780 *) hl + 1 else (* 520066 *) hr + 1))    
+    (* 3303692 *) Node(l, v, r, (if hl >= hr then (* 2263560 *) hl + 1 else (* 1040132 *) hr + 1))    
 
 let rec remove_min_elt = function
     Empty -> (* 0 *) invalid_arg "Set.remove_min_elt"
   | Node(Empty, v, r, _) -> (* 0 *) r
   | Node(l, v, r, _) -> (* 0 *) internal_bal (remove_min_elt l) v r
 
-let singleton x = (* 66290 *) Node(Empty, x, Empty, 1)    
+let singleton x = (* 132580 *) Node(Empty, x, Empty, 1)    
 
 (* 
    All elements of l must precede the elements of r.
@@ -2304,14 +2370,14 @@ let internal_merge l r =
 *)
 
 let rec add_min_element v = function
-  | Empty -> (* 40147 *) singleton v
+  | Empty -> (* 80294 *) singleton v
   | Node (l, x, r, h) ->
-    (* 34582 *) internal_bal (add_min_element v l) x r
+    (* 69164 *) internal_bal (add_min_element v l) x r
 
 let rec add_max_element v = function
-  | Empty -> (* 26143 *) singleton v
+  | Empty -> (* 52286 *) singleton v
   | Node (l, x, r, h) ->
-    (* 34224 *) internal_bal l x (add_max_element v r)
+    (* 68448 *) internal_bal l x (add_max_element v r)
 
 (** 
     Invariants:
@@ -2323,18 +2389,18 @@ let rec add_max_element v = function
     Also use the lemma from [bal]
 *)
 let rec internal_join l v r =
-  (* 154598 *) match (l, r) with
-    (Empty, _) -> (* 40147 *) add_min_element v r
-  | (_, Empty) -> (* 26143 *) add_max_element v l
+  (* 309196 *) match (l, r) with
+    (Empty, _) -> (* 80294 *) add_min_element v r
+  | (_, Empty) -> (* 52286 *) add_max_element v l
   | (Node(ll, lv, lr, lh), Node(rl, rv, rr, rh)) ->
-    (* 88308 *) if lh > rh + 2 then 
+    (* 176616 *) if lh > rh + 2 then 
       (* proof by induction:
          now [height of ll] is [lh - 1] 
       *)
-      (* 2103 *) internal_bal ll lv (internal_join lr v r) 
+      (* 4206 *) internal_bal ll lv (internal_join lr v r) 
     else
-    (* 86205 *) if rh > lh + 2 then (* 1730 *) internal_bal (internal_join l v rl) rv rr 
-    else (* 84475 *) create l v r
+    (* 172410 *) if rh > lh + 2 then (* 3460 *) internal_bal (internal_join l v rl) rv rr 
+    else (* 168950 *) create l v r
 
 
 (*
@@ -2369,41 +2435,41 @@ let rec partition p = function
     else (* 0 *) (internal_concat lt rt, internal_join lf v rf)
 
 let of_sorted_list l =
-  (* 1 *) let rec sub n l =
-    (* 511 *) match n, l with
+  (* 2 *) let rec sub n l =
+    (* 1022 *) match n, l with
     | 0, l -> (* 0 *) Empty, l
     | 1, x0 :: l -> (* 0 *) Node (Empty, x0, Empty, 1), l
-    | 2, x0 :: x1 :: l -> (* 23 *) Node (Node(Empty, x0, Empty, 1), x1, Empty, 2), l
+    | 2, x0 :: x1 :: l -> (* 46 *) Node (Node(Empty, x0, Empty, 1), x1, Empty, 2), l
     | 3, x0 :: x1 :: x2 :: l ->
-      (* 233 *) Node (Node(Empty, x0, Empty, 1), x1, Node(Empty, x2, Empty, 1), 2),l
+      (* 466 *) Node (Node(Empty, x0, Empty, 1), x1, Node(Empty, x2, Empty, 1), 2),l
     | n, l ->
-      (* 255 *) let nl = n / 2 in
+      (* 510 *) let nl = n / 2 in
       let left, l = sub nl l in
       match l with
       | [] -> (* 0 *) assert false
       | mid :: l ->
-        (* 255 *) let right, l = sub (n - nl - 1) l in
+        (* 510 *) let right, l = sub (n - nl - 1) l in
         create left mid right, l
   in
   fst (sub (List.length l) l)
 
 let of_sorted_array l =   
-  (* 402 *) let rec sub start n l  =
-    (* 78454 *) if n = 0 then (* 1 *) Empty else 
-    (* 78453 *) if n = 1 then 
-      (* 5518 *) let x0 = Array.unsafe_get l start in
+  (* 804 *) let rec sub start n l  =
+    (* 156908 *) if n = 0 then (* 2 *) Empty else 
+    (* 156906 *) if n = 1 then 
+      (* 11036 *) let x0 = Array.unsafe_get l start in
       Node (Empty, x0, Empty, 1)
-    else (* 72935 *) if n = 2 then     
-      (* 22123 *) let x0 = Array.unsafe_get l start in 
+    else (* 145870 *) if n = 2 then     
+      (* 44246 *) let x0 = Array.unsafe_get l start in 
       let x1 = Array.unsafe_get l (start + 1) in 
       Node (Node(Empty, x0, Empty, 1), x1, Empty, 2) else
-    (* 50812 *) if n = 3 then 
-      (* 11786 *) let x0 = Array.unsafe_get l start in 
+    (* 101624 *) if n = 3 then 
+      (* 23572 *) let x0 = Array.unsafe_get l start in 
       let x1 = Array.unsafe_get l (start + 1) in
       let x2 = Array.unsafe_get l (start + 2) in
       Node (Node(Empty, x0, Empty, 1), x1, Node(Empty, x2, Empty, 1), 2)
     else 
-      (* 39026 *) let nl = n / 2 in
+      (* 78052 *) let nl = n / 2 in
       let left = sub start nl l in
       let mid = start + nl in 
       let v = Array.unsafe_get l mid in 
@@ -2413,33 +2479,33 @@ let of_sorted_array l =
   sub 0 (Array.length l) l 
 
 let is_ordered cmp tree =
-  (* 208 *) let rec is_ordered_min_max tree =
-    (* 251638 *) match tree with
-    | Empty -> (* 125923 *) `Empty
+  (* 416 *) let rec is_ordered_min_max tree =
+    (* 503276 *) match tree with
+    | Empty -> (* 251846 *) `Empty
     | Node(l,v,r,_) -> 
-      (* 125715 *) begin match is_ordered_min_max l with
+      (* 251430 *) begin match is_ordered_min_max l with
         | `No -> (* 0 *) `No 
         | `Empty ->
-          (* 60932 *) begin match is_ordered_min_max r with
+          (* 121864 *) begin match is_ordered_min_max r with
             | `No  -> (* 0 *) `No
-            | `Empty -> (* 48072 *) `V (v,v)
+            | `Empty -> (* 96144 *) `V (v,v)
             | `V(l,r) ->
-              (* 12860 *) if cmp v l < 0 then
-                (* 12860 *) `V(v,r)
+              (* 25720 *) if cmp v l < 0 then
+                (* 25720 *) `V(v,r)
               else
                 (* 0 *) `No
           end
         | `V(min_v,max_v)->
-          (* 64783 *) begin match is_ordered_min_max r with
+          (* 129566 *) begin match is_ordered_min_max r with
             | `No -> (* 0 *) `No
             | `Empty -> 
-              (* 16918 *) if cmp max_v v < 0 then 
-                (* 16918 *) `V(min_v,v)
+              (* 33836 *) if cmp max_v v < 0 then 
+                (* 33836 *) `V(min_v,v)
               else
                 (* 0 *) `No 
             | `V(min_v_r, max_v_r) ->
-              (* 47865 *) if cmp max_v min_v_r < 0 then
-                (* 47865 *) `V(min_v,max_v_r)
+              (* 95730 *) if cmp max_v min_v_r < 0 then
+                (* 95730 *) `V(min_v,max_v_r)
               else (* 0 *) `No
           end
       end  in 
@@ -2563,7 +2629,7 @@ end = struct
 
 type t = int
 
-let compare (x : t) (y : t) = (* 1667119 *) Pervasives.compare x y 
+let compare (x : t) (y : t) = (* 3334238 *) Pervasives.compare x y 
 
 let equal (x : t) (y : t) = (* 0 *) x = y
 
@@ -2637,12 +2703,12 @@ let rec split x (tree : _ Set_gen.t) : _ Set_gen.t * bool * _ Set_gen.t =  (* 0
       (* 0 *) let (ll, pres, rl) = split x l in (ll, pres, Set_gen.internal_join rl v r)
     else
       (* 0 *) let (lr, pres, rr) = split x r in (Set_gen.internal_join l v lr, pres, rr)
-let rec add x (tree : _ Set_gen.t) : _ Set_gen.t =  (* 1675925 *) match tree with 
-  | Empty -> (* 100516 *) Node(Empty, x, Empty, 1)
+let rec add x (tree : _ Set_gen.t) : _ Set_gen.t =  (* 3351850 *) match tree with 
+  | Empty -> (* 201032 *) Node(Empty, x, Empty, 1)
   | Node(l, v, r, _) as t ->
-    (* 1575409 *) let c = compare_elt x v in
-    if c = 0 then (* 4 *) t else
-    (* 1575405 *) if c < 0 then (* 784852 *) Set_gen.internal_bal (add x l) v r else (* 790553 *) Set_gen.internal_bal l v (add x r)
+    (* 3150818 *) let c = compare_elt x v in
+    if c = 0 then (* 8 *) t else
+    (* 3150810 *) if c < 0 then (* 1569704 *) Set_gen.internal_bal (add x l) v r else (* 1581106 *) Set_gen.internal_bal l v (add x r)
 
 let rec union (s1 : _ Set_gen.t) (s2 : _ Set_gen.t) : _ Set_gen.t  =
   (* 0 *) match (s1, s2) with
@@ -2685,11 +2751,11 @@ let rec diff (s1 : _ Set_gen.t) (s2 : _ Set_gen.t) : _ Set_gen.t  =
     end
 
 
-let rec mem x (tree : _ Set_gen.t) =  (* 92 *) match tree with 
-  | Empty -> (* 18 *) false
+let rec mem x (tree : _ Set_gen.t) =  (* 184 *) match tree with 
+  | Empty -> (* 36 *) false
   | Node(l, v, r, _) ->
-    (* 74 *) let c = compare_elt x v in
-    c = 0 || mem x (if c < 0 then (* 19 *) l else (* 23 *) r)
+    (* 148 *) let c = compare_elt x v in
+    c = 0 || mem x (if c < 0 then (* 38 *) l else (* 46 *) r)
 
 let rec remove x (tree : _ Set_gen.t) : _ Set_gen.t = (* 0 *) match tree with 
   | Empty -> (* 0 *) Empty
@@ -2746,7 +2812,7 @@ let of_array l =
 
 (* also check order *)
 let invariant t =
-  (* 1 *) Set_gen.check t ;
+  (* 2 *) Set_gen.check t ;
   Set_gen.is_ordered compare_elt t          
 
 
@@ -2888,35 +2954,35 @@ let filter = Set_gen.filter
 let of_sorted_list = Set_gen.of_sorted_list
 let of_sorted_array = Set_gen.of_sorted_array
 
-let rec split x (tree : _ Set_gen.t) : _ Set_gen.t * bool * _ Set_gen.t =  (* 150765 *) match tree with 
+let rec split x (tree : _ Set_gen.t) : _ Set_gen.t * bool * _ Set_gen.t =  (* 301530 *) match tree with 
   | Empty ->
-    (* 706 *) (Empty, false, Empty)
+    (* 1412 *) (Empty, false, Empty)
   | Node(l, v, r, _) ->
-    (* 150059 *) let c = compare_elt x v in
-    if c = 0 then (* 61512 *) (l, true, r)
-    else (* 88547 *) if c < 0 then
-      (* 45015 *) let (ll, pres, rl) = split x l in (ll, pres, Set_gen.internal_join rl v r)
+    (* 300118 *) let c = compare_elt x v in
+    if c = 0 then (* 123024 *) (l, true, r)
+    else (* 177094 *) if c < 0 then
+      (* 90030 *) let (ll, pres, rl) = split x l in (ll, pres, Set_gen.internal_join rl v r)
     else
-      (* 43532 *) let (lr, pres, rr) = split x r in (Set_gen.internal_join l v lr, pres, rr)
-let rec add x (tree : _ Set_gen.t) : _ Set_gen.t =  (* 71340 *) match tree with 
-  | Empty -> (* 2620 *) Node(Empty, x, Empty, 1)
+      (* 87064 *) let (lr, pres, rr) = split x r in (Set_gen.internal_join l v lr, pres, rr)
+let rec add x (tree : _ Set_gen.t) : _ Set_gen.t =  (* 142680 *) match tree with 
+  | Empty -> (* 5240 *) Node(Empty, x, Empty, 1)
   | Node(l, v, r, _) as t ->
-    (* 68720 *) let c = compare_elt x v in
-    if c = 0 then (* 40917 *) t else
-    (* 27803 *) if c < 0 then (* 13657 *) Set_gen.internal_bal (add x l) v r else (* 14146 *) Set_gen.internal_bal l v (add x r)
+    (* 137440 *) let c = compare_elt x v in
+    if c = 0 then (* 81834 *) t else
+    (* 55606 *) if c < 0 then (* 27314 *) Set_gen.internal_bal (add x l) v r else (* 28292 *) Set_gen.internal_bal l v (add x r)
 
 let rec union (s1 : _ Set_gen.t) (s2 : _ Set_gen.t) : _ Set_gen.t  =
-  (* 124636 *) match (s1, s2) with
-  | (Empty, t2) -> (* 21115 *) t2
-  | (t1, Empty) -> (* 766 *) t1
+  (* 249272 *) match (s1, s2) with
+  | (Empty, t2) -> (* 42230 *) t2
+  | (t1, Empty) -> (* 1532 *) t1
   | (Node(l1, v1, r1, h1), Node(l2, v2, r2, h2)) ->
-    (* 102755 *) if h1 >= h2 then
-      (* 100870 *) if h2 = 1 then (* 40537 *) add v2 s1 else (* 60333 *) begin
+    (* 205510 *) if h1 >= h2 then
+      (* 201740 *) if h2 = 1 then (* 81074 *) add v2 s1 else (* 120666 *) begin
         let (l2, _, r2) = split v1 s2 in
         Set_gen.internal_join (union l1 l2) v1 (union r1 r2)
       end
     else
-    (* 1885 *) if h1 = 1 then (* 0 *) add v1 s2 else (* 1885 *) begin
+    (* 3770 *) if h1 = 1 then (* 0 *) add v1 s2 else (* 3770 *) begin
       let (l1, _, r1) = split v2 s1 in
       Set_gen.internal_join (union l1 l2) v2 (union r1 r2)
     end    
@@ -3003,11 +3069,11 @@ let of_list l =
   | _ -> (* 0 *) of_sorted_list (List.sort_uniq compare_elt l)
 
 let of_array l = 
-  (* 3 *) Array.fold_left (fun  acc x -> (* 3000 *) add x acc) empty l
+  (* 6 *) Array.fold_left (fun  acc x -> (* 6000 *) add x acc) empty l
 
 (* also check order *)
 let invariant t =
-  (* 207 *) Set_gen.check t ;
+  (* 414 *) Set_gen.check t ;
   Set_gen.is_ordered compare_elt t          
 
 
@@ -3029,35 +3095,35 @@ let suites =
   __FILE__ >:::
   [
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_bool __LOC__
+      (* 2 *) OUnit.assert_bool __LOC__
         (Set_poly.invariant 
-           (Set_poly.of_array (Array.init 1000 (fun n -> (* 1000 *) n))))
+           (Set_poly.of_array (Array.init 1000 (fun n -> (* 2000 *) n))))
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_bool __LOC__
+      (* 2 *) OUnit.assert_bool __LOC__
         (Set_poly.invariant 
-           (Set_poly.of_array (Array.init 1000 (fun n -> (* 1000 *) 1000-n))))
+           (Set_poly.of_array (Array.init 1000 (fun n -> (* 2000 *) 1000-n))))
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_bool __LOC__
+      (* 2 *) OUnit.assert_bool __LOC__
         (Set_poly.invariant 
-           (Set_poly.of_array (Array.init 1000 (fun n -> (* 1000 *) Random.int 1000))))
+           (Set_poly.of_array (Array.init 1000 (fun n -> (* 2000 *) Random.int 1000))))
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_bool __LOC__
+      (* 2 *) OUnit.assert_bool __LOC__
         (Set_poly.invariant 
-           (Set_poly.of_sorted_list (Array.to_list (Array.init 1000 (fun n -> (* 1000 *) n)))))
+           (Set_poly.of_sorted_list (Array.to_list (Array.init 1000 (fun n -> (* 2000 *) n)))))
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let arr = Array.init 1000 (fun n -> (* 1000 *) n) in
+      (* 2 *) let arr = Array.init 1000 (fun n -> (* 2000 *) n) in
       let set = (Set_poly.of_sorted_array arr) in
       OUnit.assert_bool __LOC__
         (Set_poly.invariant set );
       OUnit.assert_equal 1000 (Set_poly.cardinal set)    
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) for i = 0 to 200 do 
-        (* 201 *) let arr = Array.init i (fun n -> (* 20100 *) n) in
+      (* 2 *) for i = 0 to 200 do 
+        (* 402 *) let arr = Array.init i (fun n -> (* 40200 *) n) in
         let set = (Set_poly.of_sorted_array arr) in
         OUnit.assert_bool __LOC__
           (Set_poly.invariant set );
@@ -3065,11 +3131,11 @@ let suites =
       done    
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let arr_size = 200 in
+      (* 2 *) let arr_size = 200 in
       let arr_sets = Array.make 200 Set_poly.empty in  
       for i = 0 to arr_size - 1 do
-        (* 200 *) let size = Random.int 1000 in  
-        let arr = Array.init size (fun n -> (* 103048 *) n) in
+        (* 400 *) let size = Random.int 1000 in  
+        let arr = Array.init size (fun n -> (* 206096 *) n) in
         arr_sets.(i)<- (Set_poly.of_sorted_array arr)            
       done;
       let large = Array.fold_left Set_poly.union Set_poly.empty arr_sets in 
@@ -3077,10 +3143,10 @@ let suites =
     end;
 
      __LOC__ >:: begin fun _ ->
-      (* 1 *) let arr_size = 1_00_000 in
+      (* 2 *) let arr_size = 1_00_000 in
       let v = ref Set_int.empty in 
       for i = 0 to arr_size - 1 do
-        (* 100000 *) let size = Random.int 0x3FFFFFFF in  
+        (* 200000 *) let size = Random.int 0x3FFFFFFF in  
          v := Set_int.add size !v                      
       done;       
       OUnit.assert_bool __LOC__ (Set_int.invariant !v)
@@ -3228,13 +3294,13 @@ end = struct
    ]}
 *)
 let rec power_2_above x n =
-  (* 81 *) if x >= n then (* 31 *) x
-  else (* 50 *) if x * 2 > Sys.max_array_length then (* 0 *) x
-  else (* 50 *) power_2_above (x * 2) n
+  (* 162 *) if x >= n then (* 62 *) x
+  else (* 100 *) if x * 2 > Sys.max_array_length then (* 0 *) x
+  else (* 100 *) power_2_above (x * 2) n
 
 
 let stats_to_string ({num_bindings; num_buckets; max_bucket_length; bucket_histogram} : Hashtbl.statistics) = 
-  (* 4 *) Printf.sprintf 
+  (* 8 *) Printf.sprintf 
     "bindings: %d,buckets: %d, longest: %d, hist:[%s]" 
     num_bindings 
     num_buckets 
@@ -3282,7 +3348,7 @@ type 'a t =
 
 
 let create  initial_size =
-  (* 7 *) let s = Ext_util.power_2_above 16 initial_size in
+  (* 14 *) let s = Ext_util.power_2_above 16 initial_size in
   { initial_size = s; size = 0; data = Array.make s [] }
 
 let clear h =
@@ -3299,7 +3365,7 @@ let reset h =
 
 let copy h = (* 0 *) { h with data = Array.copy h.data }
 
-let length h = (* 11 *) h.size
+let length h = (* 22 *) h.size
 
 let iter f h =
   (* 0 *) let rec do_bucket = function
@@ -3327,21 +3393,21 @@ let fold f h init =
   !accu
 
 let resize indexfun h =
-  (* 14 *) let odata = h.data in
+  (* 28 *) let odata = h.data in
   let osize = Array.length odata in
   let nsize = osize * 2 in
-  if nsize < Sys.max_array_length then (* 14 *) begin
+  if nsize < Sys.max_array_length then (* 28 *) begin
     let ndata = Array.make nsize [ ] in
     h.data <- ndata;          (* so that indexfun sees the new bucket count *)
     let rec insert_bucket = function
-        [ ] -> (* 2464 *) ()
+        [ ] -> (* 4928 *) ()
       | key :: rest ->
-        (* 4942 *) let nidx = indexfun h key in
+        (* 9884 *) let nidx = indexfun h key in
         ndata.(nidx) <- key :: ndata.(nidx);
         insert_bucket rest
     in
     for i = 0 to osize - 1 do
-      (* 2464 *) insert_bucket (Array.unsafe_get odata i)
+      (* 4928 *) insert_bucket (Array.unsafe_get odata i)
     done
   end
 
@@ -3366,28 +3432,28 @@ let stats h =
    bucket_histogram = histo }
 
 let rec small_bucket_mem eq_key key lst =
-  (* 26088 *) match lst with 
-  | [] -> (* 1921 *) false 
+  (* 52176 *) match lst with 
+  | [] -> (* 3842 *) false 
   | key1::rest -> 
-    (* 24167 *) eq_key key   key1 ||
+    (* 48334 *) eq_key key   key1 ||
     match rest with 
-    | [] -> (* 1963 *) false 
+    | [] -> (* 3926 *) false 
     | key2 :: rest -> 
-      (* 7398 *) eq_key key   key2 ||
+      (* 14796 *) eq_key key   key2 ||
       match rest with 
-      | [] -> (* 1329 *) false 
+      | [] -> (* 2658 *) false 
       | key3 :: rest -> 
-        (* 3197 *) eq_key key   key3 ||
+        (* 6394 *) eq_key key   key3 ||
         small_bucket_mem eq_key key rest 
 
 let rec remove_bucket eq_key key (h : _ t) buckets = 
-  (* 11351 *) match buckets with 
+  (* 22702 *) match buckets with 
   | [ ] ->
-    (* 4002 *) [ ]
+    (* 8004 *) [ ]
   | k :: next ->
-    (* 7349 *) if  eq_key k   key
-    then (* 1013 *) begin h.size <- h.size - 1; next end
-    else (* 6336 *) k :: remove_bucket eq_key key h next    
+    (* 14698 *) if  eq_key k   key
+    then (* 2026 *) begin h.size <- h.size - 1; next end
+    else (* 12672 *) k :: remove_bucket eq_key key h next    
 
 module type S =
 sig
@@ -3480,7 +3546,7 @@ module Make (H: Hashtbl.HashedType) : (Hash_set_gen.S with type key = H.t) = str
 type key = H.t 
 let eq_key = H.equal
 let key_index (h :  _ Hash_set_gen.t ) key =
-  (* 13196 *) (H.hash  key) land (Array.length h.data - 1)
+  (* 26392 *) (H.hash  key) land (Array.length h.data - 1)
 type t = key Hash_set_gen.t
 
 
@@ -3498,24 +3564,24 @@ let elements = Hash_set_gen.elements
 
 
 let remove (h : _ Hash_set_gen.t) key =  
-  (* 4002 *) let i = key_index h key in
+  (* 8004 *) let i = key_index h key in
   let h_data = h.data in
   let old_h_size = h.size in 
   let new_bucket = Hash_set_gen.remove_bucket eq_key key h (Array.unsafe_get h_data i) in
   if old_h_size <> h.size then  
-    (* 1001 *) Array.unsafe_set h_data i new_bucket
+    (* 2002 *) Array.unsafe_set h_data i new_bucket
 
 
 
 let add (h : _ Hash_set_gen.t) key =
-  (* 4103 *) let i = key_index h key  in 
+  (* 8206 *) let i = key_index h key  in 
   let h_data = h.data in 
   let old_bucket = (Array.unsafe_get h_data i) in
   if not (Hash_set_gen.small_bucket_mem eq_key key old_bucket) then 
-    (* 2102 *) begin 
+    (* 4204 *) begin 
       Array.unsafe_set h_data i (key :: old_bucket);
       h.size <- h.size + 1 ;
-      if h.size > Array.length h_data lsl 1 then (* 5 *) Hash_set_gen.resize key_index h
+      if h.size > Array.length h_data lsl 1 then (* 10 *) Hash_set_gen.resize key_index h
     end
 
 let check_add (h : _ Hash_set_gen.t) key =
@@ -3533,7 +3599,7 @@ let check_add (h : _ Hash_set_gen.t) key =
 
 
 let mem (h :  _ Hash_set_gen.t) key =
-  (* 3102 *) Hash_set_gen.small_bucket_mem eq_key key (Array.unsafe_get h.data (key_index h key)) 
+  (* 6204 *) Hash_set_gen.small_bucket_mem eq_key key (Array.unsafe_get h.data (key_index h key)) 
 
 # 110
 end
@@ -3620,7 +3686,7 @@ end = struct
 external seeded_hash_param :
   int -> int -> int -> 'a -> int = "caml_hash" "noalloc"
 let key_index (h :  _ Hash_set_gen.t ) (key : 'a) =
-  (* 20969 *) seeded_hash_param 10 100 0 key land (Array.length h.data - 1)
+  (* 41938 *) seeded_hash_param 10 100 0 key land (Array.length h.data - 1)
 let eq_key = (=)
 type  'a t = 'a Hash_set_gen.t 
 
@@ -3639,24 +3705,24 @@ let elements = Hash_set_gen.elements
 
 
 let remove (h : _ Hash_set_gen.t) key =  
-  (* 1011 *) let i = key_index h key in
+  (* 2022 *) let i = key_index h key in
   let h_data = h.data in
   let old_h_size = h.size in 
   let new_bucket = Hash_set_gen.remove_bucket eq_key key h (Array.unsafe_get h_data i) in
   if old_h_size <> h.size then  
-    (* 11 *) Array.unsafe_set h_data i new_bucket
+    (* 22 *) Array.unsafe_set h_data i new_bucket
 
 
 
 let add (h : _ Hash_set_gen.t) key =
-  (* 15004 *) let i = key_index h key  in 
+  (* 30008 *) let i = key_index h key  in 
   let h_data = h.data in 
   let old_bucket = (Array.unsafe_get h_data i) in
   if not (Hash_set_gen.small_bucket_mem eq_key key old_bucket) then 
-    (* 3003 *) begin 
+    (* 6006 *) begin 
       Array.unsafe_set h_data i (key :: old_bucket);
       h.size <- h.size + 1 ;
-      if h.size > Array.length h_data lsl 1 then (* 9 *) Hash_set_gen.resize key_index h
+      if h.size > Array.length h_data lsl 1 then (* 18 *) Hash_set_gen.resize key_index h
     end
 
 let check_add (h : _ Hash_set_gen.t) key =
@@ -3674,7 +3740,7 @@ let check_add (h : _ Hash_set_gen.t) key =
 
 
 let mem (h :  _ Hash_set_gen.t) key =
-  (* 2001 *) Hash_set_gen.small_bucket_mem eq_key key (Array.unsafe_get h.data (key_index h key)) 
+  (* 4002 *) Hash_set_gen.small_bucket_mem eq_key key (Array.unsafe_get h.data (key_index h key)) 
 
   
 
@@ -3771,7 +3837,7 @@ type 'a t =
 
 
 let create  initial_size =
-  (* 13 *) let initial_size = Ext_util.power_2_above 16 initial_size in
+  (* 26 *) let initial_size = Ext_util.power_2_above 16 initial_size in
   { initial_size ; 
     size = 0; 
     data = Array.make initial_size Empty;
@@ -3779,10 +3845,10 @@ let create  initial_size =
   }
 
 let clear h =
-  (* 2 *) h.size <- 0;
+  (* 4 *) h.size <- 0;
   let h_data = h.data in 
   for i = 0 to h.data_mask  do 
-    (* 1572864 *) Array.unsafe_set h_data i  Empty
+    (* 3145728 *) Array.unsafe_set h_data i  Empty
   done
 
 (** Note this function is only used internally, make sure [h_initial_size] 
@@ -3798,30 +3864,30 @@ let reset h  =
 
 let copy h = (* 0 *) { h with data = Array.copy h.data }
 
-let length h = (* 5 *) h.size
+let length h = (* 10 *) h.size
 
 
 let rec insert_bucket nmask ndata hash = function
-  | Empty -> (* 454914 *) ()
+  | Empty -> (* 909828 *) ()
   | Cons(key,info,rest) ->
-    (* 597814 *) let nidx = hash key land nmask in (* so that indexfun sees the new bucket count *)
+    (* 1195628 *) let nidx = hash key land nmask in (* so that indexfun sees the new bucket count *)
     Array.unsafe_set ndata nidx  (Cons(key,info, (Array.unsafe_get ndata nidx)));
     insert_bucket nmask ndata hash rest
 
 let resize hash h =
-  (* 24 *) let odata = h.data in
+  (* 48 *) let odata = h.data in
   let odata_mask = h.data_mask in 
   let nsize = (odata_mask + 1) * 2 in
-  if nsize < Sys.max_array_length then (* 24 *) begin
+  if nsize < Sys.max_array_length then (* 48 *) begin
     let ndata = Array.make nsize Empty in
     h.data <- ndata;          
     let nmask = nsize - 1 in
     h.data_mask <- nmask ; 
     for i = 0 to odata_mask do
-      (* 526352 *) match Array.unsafe_get odata i with 
-      | Empty -> (* 71438 *) ()
+      (* 1052704 *) match Array.unsafe_get odata i with 
+      | Empty -> (* 142876 *) ()
       | Cons(key,info,rest) -> 
-        (* 454914 *) let nidx = hash key land nmask in 
+        (* 909828 *) let nidx = hash key land nmask in 
         Array.unsafe_set ndata nidx  (Cons(key,info, (Array.unsafe_get ndata nidx)));
         insert_bucket nmask ndata hash rest 
     done
@@ -3830,58 +3896,58 @@ let resize hash h =
 
 let rec do_bucket f = function
   | Empty ->
-    (* 1572864 *) ()
+    (* 3145728 *) ()
   | Cons(k ,i,  rest) ->
-    (* 2000000 *) f k i ; do_bucket f rest 
+    (* 4000000 *) f k i ; do_bucket f rest 
 
 let iter f h =
-  (* 2 *) let d = h.data in
+  (* 4 *) let d = h.data in
   for i = 0 to h.data_mask do
-    (* 1572864 *) do_bucket f (Array.unsafe_get d i)
+    (* 3145728 *) do_bucket f (Array.unsafe_get d i)
   done
 
 (* find one element *)
 let choose_exn h = 
-  (* 10 *) let rec aux arr offset last_index = 
-    (* 49 *) if offset > last_index then 
-      (* 1 *) raise Not_found (* This happens when size is 0, otherwise it is never called *)
+  (* 20 *) let rec aux arr offset last_index = 
+    (* 98 *) if offset > last_index then 
+      (* 2 *) raise Not_found (* This happens when size is 0, otherwise it is never called *)
     else 
-      (* 48 *) match Array.unsafe_get arr offset with 
-      | Empty -> (* 39 *) aux arr (offset + 1) last_index 
-      | Cons (k,_,rest) -> (* 9 *) k 
+      (* 96 *) match Array.unsafe_get arr offset with 
+      | Empty -> (* 78 *) aux arr (offset + 1) last_index 
+      | Cons (k,_,rest) -> (* 18 *) k 
   in
   let h_data = h.data in 
   aux h_data 0 h.data_mask
 
 let fold f h init =
-  (* 2 *) let rec do_bucket b accu =
-    (* 3572864 *) match b with
+  (* 4 *) let rec do_bucket b accu =
+    (* 7145728 *) match b with
       Empty ->
-      (* 1572864 *) accu
+      (* 3145728 *) accu
     | Cons( k , i,  rest) ->
-      (* 2000000 *) do_bucket rest (f k i  accu) in
+      (* 4000000 *) do_bucket rest (f k i  accu) in
   let d = h.data in
   let accu = ref init in
   for i = 0 to h.data_mask do
-    (* 1572864 *) accu := do_bucket (Array.unsafe_get d i) !accu
+    (* 3145728 *) accu := do_bucket (Array.unsafe_get d i) !accu
   done;
   !accu
 
 
 let rec set_bucket arr = function 
-  | Empty -> (* 5248 *) ()
+  | Empty -> (* 10496 *) ()
   | Cons(k,i,rest) ->
-    (* 5610 *) Array.unsafe_set arr i k;
+    (* 11220 *) Array.unsafe_set arr i k;
     set_bucket arr rest 
 
 let to_sorted_array h = 
-  (* 11 *) if h.size = 0 then (* 2 *) [||]
+  (* 22 *) if h.size = 0 then (* 4 *) [||]
   else 
-    (* 9 *) let v = choose_exn h in 
+    (* 18 *) let v = choose_exn h in 
     let arr = Array.make h.size v in
     let d = h.data in 
     for i = 0 to h.data_mask do 
-      (* 5248 *) set_bucket  arr (Array.unsafe_get d i)
+      (* 10496 *) set_bucket  arr (Array.unsafe_get d i)
     done;
     arr 
 
@@ -3889,17 +3955,17 @@ let to_sorted_array h =
 
 
 let rec bucket_length acc (x : _ bucket) = 
-  (* 7155858 *) match x with 
-  | Empty -> (* 3149856 *) acc
-  | Cons(_,_,rest) -> (* 4006002 *) bucket_length (acc + 1) rest  
+  (* 14311716 *) match x with 
+  | Empty -> (* 6299712 *) acc
+  | Cons(_,_,rest) -> (* 8012004 *) bucket_length (acc + 1) rest  
 
 let stats h =
-  (* 4 *) let mbl =
-    Array.fold_left (fun m (b : _ bucket) -> (* 1574928 *) max m (bucket_length 0 b)) 0 h.data in
+  (* 8 *) let mbl =
+    Array.fold_left (fun m (b : _ bucket) -> (* 3149856 *) max m (bucket_length 0 b)) 0 h.data in
   let histo = Array.make (mbl + 1) 0 in
   Array.iter
     (fun b ->
-       (* 1574928 *) let l = bucket_length 0 b in
+       (* 3149856 *) let l = bucket_length 0 b in
        histo.(l) <- histo.(l) + 1)
     h.data;
   { Hashtbl.num_bindings = h.size;
@@ -3942,68 +4008,68 @@ let to_sorted_array = to_sorted_array
 
 
 let rec small_bucket_mem key lst =
-  (* 4345998 *) match lst with 
-  | Empty -> (* 1027775 *) false 
+  (* 8691996 *) match lst with 
+  | Empty -> (* 2055550 *) false 
   | Cons(key1,_, rest) -> 
-    (* 3318223 *) equal_key key key1 ||
+    (* 6636446 *) equal_key key key1 ||
     match rest with 
-    | Empty -> (* 644881 *) false 
+    | Empty -> (* 1289762 *) false 
     | Cons(key2 , _, rest) -> 
-      (* 1496647 *) equal_key key  key2 ||
+      (* 2993294 *) equal_key key  key2 ||
       match rest with 
-      | Empty -> (* 333954 *) false 
+      | Empty -> (* 667908 *) false 
       | Cons(key3,_,  rest) -> 
-        (* 578375 *) equal_key key  key3 ||
+        (* 1156750 *) equal_key key  key3 ||
         small_bucket_mem key rest 
 
 let rec small_bucket_rank key lst =
-  (* 2122497 *) match lst with 
+  (* 4244994 *) match lst with 
   | Empty -> (* 0 *) -1
   | Cons(key1,i,rest) -> 
-    (* 2122497 *) if equal_key key key1 then (* 1176296 *) i 
-    else (* 946201 *) match rest with 
+    (* 4244994 *) if equal_key key key1 then (* 2352592 *) i 
+    else (* 1892402 *) match rest with 
       | Empty -> (* 0 *) -1 
       | Cons(key2,i2,  rest) -> 
-        (* 946201 *) if equal_key key  key2 then (* 584225 *) i2 else
-          (* 361976 *) match rest with 
+        (* 1892402 *) if equal_key key  key2 then (* 1168450 *) i2 else
+          (* 723952 *) match rest with 
           | Empty -> (* 0 *) -1 
           | Cons(key3,i3, rest) -> 
-            (* 361976 *) if equal_key key  key3 then (* 239479 *) i3 else
-              (* 122497 *) small_bucket_rank key rest 
+            (* 723952 *) if equal_key key  key3 then (* 478958 *) i3 else
+              (* 244994 *) small_bucket_rank key rest 
 
 let add h key =
-  (* 2006120 *) let h_data_mask = h.data_mask in 
+  (* 4012240 *) let h_data_mask = h.data_mask in 
   let i = hash key land h_data_mask in 
   if not (small_bucket_mem key  h.data.(i)) then 
-    (* 2005610 *) begin 
+    (* 4011220 *) begin 
       Array.unsafe_set h.data i (Cons(key,h.size, Array.unsafe_get h.data i));
       h.size <- h.size + 1 ;
-      if h.size > Array.length h.data lsl 1 then (* 24 *) resize hash h
+      if h.size > Array.length h.data lsl 1 then (* 48 *) resize hash h
     end
 
 let old_key_not_exist = Replace_failure false 
 let new_key_already_exist = Replace_failure true 
 
 let rec small_bucket_rank_and_delete key lst =
-  (* 1068 *) match lst with 
+  (* 2136 *) match lst with 
   | Empty -> (* 0 *) raise old_key_not_exist
   | Cons(key1,i,rest) -> 
-    (* 1068 *) if equal_key key key1 then (* 429 *) i, rest  
-    else (* 639 *) match rest with 
+    (* 2136 *) if equal_key key key1 then (* 858 *) i, rest  
+    else (* 1278 *) match rest with 
       | Empty -> (* 0 *) raise old_key_not_exist
       | Cons(key2,i2,  rest) -> 
-        (* 639 *) if equal_key key  key2 then (* 397 *) i2, (Cons (key1,i,rest)) else
-          (* 242 *) match rest with 
+        (* 1278 *) if equal_key key  key2 then (* 794 *) i2, (Cons (key1,i,rest)) else
+          (* 484 *) match rest with 
           | Empty -> (* 0 *) raise old_key_not_exist
           | Cons(key3,i3, rest) -> 
-            (* 242 *) if equal_key key  key3 then (* 174 *) i3, (Cons (key1,i,Cons(key2,i2,rest))) else
-              (* 68 *) let (rank, rest ) = small_bucket_rank_and_delete key rest in 
+            (* 484 *) if equal_key key  key3 then (* 348 *) i3, (Cons (key1,i,Cons(key2,i2,rest))) else
+              (* 136 *) let (rank, rest ) = small_bucket_rank_and_delete key rest in 
               rank, Cons (key1,i, 
                     Cons (key2,i2, 
                           Cons(key3,i3,rest))) 
 
 let replace h old_key new_key =
-  (* 1000 *) let h_data_mask = h.data_mask in 
+  (* 2000 *) let h_data_mask = h.data_mask in 
   let i = hash old_key land h_data_mask in
   let h_data = h.data in 
   let bucket = Array.unsafe_get h_data  i in 
@@ -4015,13 +4081,13 @@ let replace h old_key new_key =
   let mem = small_bucket_mem new_key insert_bucket in 
   if mem then (* 0 *) raise new_key_already_exist
   else 
-    (* 1000 *) Array.unsafe_set h_data j (Cons (new_key,rank, insert_bucket))
+    (* 2000 *) Array.unsafe_set h_data j (Cons (new_key,rank, insert_bucket))
 
 let of_array arr =
-  (* 8 *) let len = Array.length arr in 
+  (* 16 *) let len = Array.length arr in 
   let h = create len in 
   for i = 0 to len - 1 do 
-    (* 3009 *) add h (Array.unsafe_get arr i)
+    (* 6018 *) add h (Array.unsafe_get arr i)
   done;
   h
 
@@ -4032,10 +4098,10 @@ let reset_to_list h lst =
   List.iter (fun x -> (* 0 *) add h x ) lst 
 
 let mem h key =
-  (* 2000000 *) small_bucket_mem key (Array.unsafe_get h.data (hash  key land h.data_mask)) 
+  (* 4000000 *) small_bucket_mem key (Array.unsafe_get h.data (hash  key land h.data_mask)) 
 
 let rank h key = 
-  (* 2000000 *) small_bucket_rank key (Array.unsafe_get h.data (hash  key land h.data_mask))  
+  (* 4000000 *) small_bucket_rank key (Array.unsafe_get h.data (hash  key land h.data_mask))  
 
 
 
@@ -4108,7 +4174,7 @@ end = struct
 # 31
 type key = string 
 let key_index (h :  _ Hash_set_gen.t ) (key : key) =
-  (* 111 *) (Bs_hash_stubs.hash_string  key) land (Array.length h.data - 1)
+  (* 222 *) (Bs_hash_stubs.hash_string  key) land (Array.length h.data - 1)
 let eq_key = Ext_string.equal 
 type  t = key  Hash_set_gen.t 
 
@@ -4127,38 +4193,38 @@ let elements = Hash_set_gen.elements
 
 
 let remove (h : _ Hash_set_gen.t) key =  
-  (* 2 *) let i = key_index h key in
+  (* 4 *) let i = key_index h key in
   let h_data = h.data in
   let old_h_size = h.size in 
   let new_bucket = Hash_set_gen.remove_bucket eq_key key h (Array.unsafe_get h_data i) in
   if old_h_size <> h.size then  
-    (* 1 *) Array.unsafe_set h_data i new_bucket
+    (* 2 *) Array.unsafe_set h_data i new_bucket
 
 
 
 let add (h : _ Hash_set_gen.t) key =
-  (* 101 *) let i = key_index h key  in 
+  (* 202 *) let i = key_index h key  in 
   let h_data = h.data in 
   let old_bucket = (Array.unsafe_get h_data i) in
   if not (Hash_set_gen.small_bucket_mem eq_key key old_bucket) then 
-    (* 101 *) begin 
+    (* 202 *) begin 
       Array.unsafe_set h_data i (key :: old_bucket);
       h.size <- h.size + 1 ;
       if h.size > Array.length h_data lsl 1 then (* 0 *) Hash_set_gen.resize key_index h
     end
 
 let check_add (h : _ Hash_set_gen.t) key =
-  (* 8 *) let i = key_index h key  in 
+  (* 16 *) let i = key_index h key  in 
   let h_data = h.data in  
   let old_bucket = (Array.unsafe_get h_data i) in
   if not (Hash_set_gen.small_bucket_mem eq_key key old_bucket) then 
-    (* 7 *) begin 
+    (* 14 *) begin 
       Array.unsafe_set h_data i  (key :: old_bucket);
       h.size <- h.size + 1 ;
       if h.size > Array.length h_data lsl 1 then (* 0 *) Hash_set_gen.resize key_index h;
       true 
     end
-  else (* 1 *) false 
+  else (* 2 *) false 
 
 
 let mem (h :  _ Hash_set_gen.t) key =
@@ -4179,8 +4245,8 @@ type id = { name : string ; stamp : int }
 
 module Id_hash_set = Hash_set.Make(struct 
     type t = id 
-    let equal x y = (* 17873 *) x.stamp = y.stamp && x.name = y.name 
-    let hash x = (* 13196 *) Hashtbl.hash x.stamp
+    let equal x y = (* 35746 *) x.stamp = y.stamp && x.name = y.name 
+    let hash x = (* 26392 *) Hashtbl.hash x.stamp
   end
   )
 
@@ -4197,33 +4263,33 @@ let suites =
   >:::
   [
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let v = Hash_set_poly.create 31 in
+      (* 2 *) let v = Hash_set_poly.create 31 in
       for i = 0 to 1000 do
-        (* 1001 *) Hash_set_poly.add v i  
+        (* 2002 *) Hash_set_poly.add v i  
       done  ;
       OUnit.assert_equal (Hash_set_poly.length v) 1001
     end ;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let v = Hash_set_poly.create 31 in
+      (* 2 *) let v = Hash_set_poly.create 31 in
       for i = 0 to 1_0_000 do
-        (* 10001 *) Hash_set_poly.add v 0
+        (* 20002 *) Hash_set_poly.add v 0
       done  ;
       OUnit.assert_equal (Hash_set_poly.length v) 1
     end ;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Hash_set_poly.create 30 in 
+      (* 2 *) let v = Hash_set_poly.create 30 in 
       for i = 0 to 2_000 do 
-        (* 2001 *) Hash_set_poly.add v {name = "x" ; stamp = i}
+        (* 4002 *) Hash_set_poly.add v {name = "x" ; stamp = i}
       done ;
       for i = 0 to 2_000 do 
-        (* 2001 *) Hash_set_poly.add v {name = "x" ; stamp = i}
+        (* 4002 *) Hash_set_poly.add v {name = "x" ; stamp = i}
       done  ; 
       for i = 0 to 2_000 do 
-        (* 2001 *) assert (Hash_set_poly.mem v {name = "x"; stamp = i})
+        (* 4002 *) assert (Hash_set_poly.mem v {name = "x"; stamp = i})
       done;  
       OUnit.assert_equal (Hash_set_poly.length v)  2_001;
       for i =  1990 to 3_000 do 
-        (* 1011 *) Hash_set_poly.remove v {name = "x"; stamp = i}
+        (* 2022 *) Hash_set_poly.remove v {name = "x"; stamp = i}
       done ;
       OUnit.assert_equal (Hash_set_poly.length v) 1990;
       (* OUnit.assert_equal (Hash_set.stats v) *)
@@ -4231,31 +4297,31 @@ let suites =
       (*    bucket_histogram = [|139; 303; 264; 178; 93; 32; 12; 3|]} *)
     end ;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Id_hash_set.create 30 in 
+      (* 2 *) let v = Id_hash_set.create 30 in 
       for i = 0 to 2_000 do 
-        (* 2001 *) Id_hash_set.add v {name = "x" ; stamp = i}
+        (* 4002 *) Id_hash_set.add v {name = "x" ; stamp = i}
       done ;
       for i = 0 to 2_000 do 
-        (* 2001 *) Id_hash_set.add v {name = "x" ; stamp = i}
+        (* 4002 *) Id_hash_set.add v {name = "x" ; stamp = i}
       done  ; 
       for i = 0 to 2_000 do 
-        (* 2001 *) assert (Id_hash_set.mem v {name = "x"; stamp = i})
+        (* 4002 *) assert (Id_hash_set.mem v {name = "x"; stamp = i})
       done;  
       OUnit.assert_equal (Id_hash_set.length v)  2_001;
       for i =  1990 to 3_000 do 
-        (* 1011 *) Id_hash_set.remove v {name = "x"; stamp = i}
+        (* 2022 *) Id_hash_set.remove v {name = "x"; stamp = i}
       done ;
       OUnit.assert_equal (Id_hash_set.length v) 1990;
       for i = 1000 to 3990 do 
-        (* 2991 *) Id_hash_set.remove v { name = "x"; stamp = i }
+        (* 5982 *) Id_hash_set.remove v { name = "x"; stamp = i }
       done;
       OUnit.assert_equal (Id_hash_set.length v) 1000;
       for i = 1000 to 1100 do 
-        (* 101 *) Id_hash_set.add v { name = "x"; stamp = i};
+        (* 202 *) Id_hash_set.add v { name = "x"; stamp = i};
       done;
       OUnit.assert_equal (Id_hash_set.length v ) 1101;
       for i = 0 to 1100 do 
-        (* 1101 *) OUnit.assert_bool "exist" (Id_hash_set.mem v {name = "x"; stamp = i})
+        (* 2202 *) OUnit.assert_bool "exist" (Id_hash_set.mem v {name = "x"; stamp = i})
       done  
       (* OUnit.assert_equal (Hash_set.stats v) *)
       (*   {num_bindings = 1990; num_buckets = 1024; max_bucket_length = 8; *)
@@ -4264,34 +4330,34 @@ let suites =
     end 
     ;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let v = Ordered_hash_set_string.create 3 in 
+      (* 2 *) let v = Ordered_hash_set_string.create 3 in 
       for i =  0 to 10 do
-        (* 11 *) Ordered_hash_set_string.add v (string_of_int i) 
+        (* 22 *) Ordered_hash_set_string.add v (string_of_int i) 
       done; 
       for i = 100 downto 2 do
-        (* 99 *) Ordered_hash_set_string.add v (string_of_int i)
+        (* 198 *) Ordered_hash_set_string.add v (string_of_int i)
       done;
       OUnit.assert_equal (Ordered_hash_set_string.to_sorted_array v )
         const_tbl
     end;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let duplicate arr = 
-        (* 2 *) let len = Array.length arr in 
+      (* 2 *) let duplicate arr = 
+        (* 4 *) let len = Array.length arr in 
         let rec aux tbl off = 
-          (* 9 *) if off >= len  then (* 1 *) None
+          (* 18 *) if off >= len  then (* 2 *) None
           else 
-            (* 8 *) let curr = (Array.unsafe_get arr off) in
+            (* 16 *) let curr = (Array.unsafe_get arr off) in
             if String_hash_set.check_add tbl curr then 
-              (* 7 *) aux tbl (off + 1)
-            else   (* 1 *) Some curr in 
+              (* 14 *) aux tbl (off + 1)
+            else   (* 2 *) Some curr in 
         aux (String_hash_set.create len) 0 in 
       let v = [| "if"; "a"; "b"; "c" |] in 
       OUnit.assert_equal (duplicate v) None;
       OUnit.assert_equal (duplicate [|"if"; "a"; "b"; "b"; "c"|]) (Some "b")
     end;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let of_array lst =
-        (* 1 *) let len = Array.length lst in 
+      (* 2 *) let of_array lst =
+        (* 2 *) let len = Array.length lst in 
         let tbl = String_hash_set.create len in 
         Array.iter (String_hash_set.add tbl ) lst; tbl  in 
       let hash = of_array const_tbl  in 
@@ -4457,37 +4523,37 @@ let bench () =
 
 
 type id (* = Ident.t *) = { stamp : int; name : string; mutable flags : int; }
-let hash id = (* 4 *) Bs_hash_stubs.hash_stamp_and_name id.stamp id.name 
+let hash id = (* 8 *) Bs_hash_stubs.hash_stamp_and_name id.stamp id.name 
 let suites = 
     __FILE__
     >:::
     [
       __LOC__ >:: begin fun _ -> 
-        (* 1 *) Bs_hash_stubs.hash_int 0 =~ Hashtbl.hash 0
+        (* 2 *) Bs_hash_stubs.hash_int 0 =~ Hashtbl.hash 0
       end;
       __LOC__ >:: begin fun _ -> 
-        (* 1 *) Bs_hash_stubs.hash_int max_int =~ Hashtbl.hash max_int
+        (* 2 *) Bs_hash_stubs.hash_int max_int =~ Hashtbl.hash max_int
       end;
       __LOC__ >:: begin fun _ -> 
-        (* 1 *) Bs_hash_stubs.hash_int max_int =~ Hashtbl.hash max_int
+        (* 2 *) Bs_hash_stubs.hash_int max_int =~ Hashtbl.hash max_int
       end;
       __LOC__ >:: begin fun _ -> 
-        (* 1 *) Bs_hash_stubs.hash_string "The quick brown fox jumps over the lazy dog"  =~ 
+        (* 2 *) Bs_hash_stubs.hash_string "The quick brown fox jumps over the lazy dog"  =~ 
         Hashtbl.hash "The quick brown fox jumps over the lazy dog"
       end;
       __LOC__ >:: begin fun _ ->
-        (* 1 *) Array.init 100 (fun i -> (* 100 *) String.make i 'a' )
+        (* 2 *) Array.init 100 (fun i -> (* 200 *) String.make i 'a' )
         |> Array.iter (fun x -> 
-          (* 100 *) Bs_hash_stubs.hash_string x =~ Hashtbl.hash x) 
+          (* 200 *) Bs_hash_stubs.hash_string x =~ Hashtbl.hash x) 
       end;
       __LOC__ >:: begin fun _ ->
         (** only stamp matters here *)
-        (* 1 *) hash {stamp = 1 ; name = "xx"; flags = 0} =~ Bs_hash_stubs.hash_small_int 1 ;
+        (* 2 *) hash {stamp = 1 ; name = "xx"; flags = 0} =~ Bs_hash_stubs.hash_small_int 1 ;
         hash {stamp = 11 ; name = "xx"; flags = 0} =~ Bs_hash_stubs.hash_small_int 11;
       end;
       __LOC__ >:: begin fun _ ->
         (* only string matters here *)
-        (* 1 *) hash {stamp = 0 ; name = "Pervasives"; flags = 0} =~ Bs_hash_stubs.hash_string "Pervasives";
+        (* 2 *) hash {stamp = 0 ; name = "Pervasives"; flags = 0} =~ Bs_hash_stubs.hash_string "Pervasives";
         hash {stamp = 0 ; name = "UU"; flags = 0} =~ Bs_hash_stubs.hash_string "UU";
       end
       
@@ -4554,7 +4620,7 @@ and ('a, 'b) bucketlist =
 
 
 let create  initial_size =
-  (* 11 *) let s = Ext_util.power_2_above 16 initial_size in
+  (* 22 *) let s = Ext_util.power_2_above 16 initial_size in
   { initial_size = s; size = 0; seed = 0; data = Array.make s Empty }
 
 let clear h =
@@ -4571,37 +4637,37 @@ let reset h =
 
 let copy h = (* 0 *) { h with data = Array.copy h.data }
 
-let length h = (* 11 *) h.size
+let length h = (* 22 *) h.size
 
 let resize indexfun h =
-  (* 11 *) let odata = h.data in
+  (* 22 *) let odata = h.data in
   let osize = Array.length odata in
   let nsize = osize * 2 in
-  if nsize < Sys.max_array_length then (* 11 *) begin
+  if nsize < Sys.max_array_length then (* 22 *) begin
     let ndata = Array.make nsize Empty in
     h.data <- ndata;          (* so that indexfun sees the new bucket count *)
     let rec insert_bucket = function
-        Empty -> (* 1504 *) ()
+        Empty -> (* 3008 *) ()
       | Cons(key, data, rest) ->
-        (* 3019 *) insert_bucket rest; (* preserve original order of elements *)
+        (* 6038 *) insert_bucket rest; (* preserve original order of elements *)
         let nidx = indexfun h key in
         ndata.(nidx) <- Cons(key, data, ndata.(nidx)) in
     for i = 0 to osize - 1 do
-      (* 1504 *) insert_bucket (Array.unsafe_get odata i)
+      (* 3008 *) insert_bucket (Array.unsafe_get odata i)
     done
   end
 
 
 
 let iter f h =
-  (* 2 *) let rec do_bucket = function
+  (* 4 *) let rec do_bucket = function
     | Empty ->
-      (* 64 *) ()
+      (* 128 *) ()
     | Cons(k, d, rest) ->
-      (* 9 *) f k d; do_bucket rest in
+      (* 18 *) f k d; do_bucket rest in
   let d = h.data in
   for i = 0 to Array.length d - 1 do
-    (* 64 *) do_bucket (Array.unsafe_get d i)
+    (* 128 *) do_bucket (Array.unsafe_get d i)
   done
 
 let fold f h init =
@@ -4724,7 +4790,7 @@ end = struct
 type key = string
 type 'a t = (key, 'a)  Hashtbl_gen.t 
 let key_index (h : _ t ) (key : key) =
-  (* 7240 *) (Bs_hash_stubs.hash_string  key ) land (Array.length h.data - 1)
+  (* 14480 *) (Bs_hash_stubs.hash_string  key ) land (Array.length h.data - 1)
 let eq_key = Ext_string.equal 
 
 # 33
@@ -4741,11 +4807,11 @@ let stats = Hashtbl_gen.stats
 
 
 let add (h : _ t) key info =
-  (* 2043 *) let i = key_index h key in
+  (* 4086 *) let i = key_index h key in
   let h_data = h.data in   
   Array.unsafe_set h_data i (Cons(key, info, (Array.unsafe_get h_data i)));
   h.size <- h.size + 1;
-  if h.size > Array.length h_data lsl 1 then (* 6 *) Hashtbl_gen.resize key_index h
+  if h.size > Array.length h_data lsl 1 then (* 12 *) Hashtbl_gen.resize key_index h
 
 (* after upgrade to 4.04 we should provide an efficient [replace_or_init] *)
 let modify_or_init (h : _ t) key modf default =
@@ -4789,14 +4855,14 @@ let rec find_rec key (bucketlist : _ bucketlist) = (* 0 *) match bucketlist with
     (* 0 *) if eq_key key k then (* 0 *) d else (* 0 *) find_rec key rest
 
 let find_exn (h : _ t) key =
-  (* 89 *) match Array.unsafe_get h.data (key_index h key) with
+  (* 178 *) match Array.unsafe_get h.data (key_index h key) with
   | Empty -> (* 0 *) raise Not_found
   | Cons(k1, d1, rest1) ->
-    (* 89 *) if eq_key key k1 then (* 87 *) d1 else
-      (* 2 *) match rest1 with
+    (* 178 *) if eq_key key k1 then (* 174 *) d1 else
+      (* 4 *) match rest1 with
       | Empty -> (* 0 *) raise Not_found
       | Cons(k2, d2, rest2) ->
-        (* 2 *) if eq_key key k2 then (* 2 *) d2 else
+        (* 4 *) if eq_key key k2 then (* 4 *) d2 else
           (* 0 *) match rest2 with
           | Empty -> (* 0 *) raise Not_found
           | Cons(k3, d3, rest3) ->
@@ -4817,31 +4883,31 @@ let find_all (h : _ t) key =
   find_in_bucket (Array.unsafe_get h.data (key_index h key))
 
 let replace h key info =
-  (* 2000 *) let rec replace_bucket (bucketlist : _ bucketlist) : _ bucketlist = (* 4462 *) match bucketlist with 
+  (* 4000 *) let rec replace_bucket (bucketlist : _ bucketlist) : _ bucketlist = (* 8924 *) match bucketlist with 
     | Empty ->
-      (* 1000 *) raise_notrace Not_found
+      (* 2000 *) raise_notrace Not_found
     | Cons(k, i, next) ->
-      (* 3462 *) if eq_key k key
-      then (* 1000 *) Cons(key, info, next)
-      else (* 2462 *) Cons(k, i, replace_bucket next) in
+      (* 6924 *) if eq_key k key
+      then (* 2000 *) Cons(key, info, next)
+      else (* 4924 *) Cons(k, i, replace_bucket next) in
   let i = key_index h key in
   let h_data = h.data in 
   let l = Array.unsafe_get h_data i in
   try
     Array.unsafe_set h_data i  (replace_bucket l)
   with Not_found ->
-    (* 1000 *) begin 
+    (* 2000 *) begin 
       Array.unsafe_set h_data i (Cons(key, info, l));
       h.size <- h.size + 1;
-      if h.size > Array.length h_data lsl 1 then (* 5 *) Hashtbl_gen.resize key_index h;
+      if h.size > Array.length h_data lsl 1 then (* 10 *) Hashtbl_gen.resize key_index h;
     end 
 
 let mem (h : _ t) key =
-  (* 89 *) let rec mem_in_bucket (bucketlist : _ bucketlist) = (* 91 *) match bucketlist with 
+  (* 178 *) let rec mem_in_bucket (bucketlist : _ bucketlist) = (* 182 *) match bucketlist with 
     | Empty ->
-      (* 43 *) false
+      (* 86 *) false
     | Cons(k, d, rest) ->
-      (* 48 *) eq_key k key  || mem_in_bucket rest in
+      (* 96 *) eq_key k key  || mem_in_bucket rest in
   mem_in_bucket (Array.unsafe_get h.data (key_index h key))
 
 
@@ -4878,21 +4944,21 @@ let suites =
     (* end; *)
 
     "add semantics " >:: begin fun _ -> 
-      (* 1 *) let h = String_hashtbl.create 0 in 
+      (* 2 *) let h = String_hashtbl.create 0 in 
       let count = 1000 in 
       for j = 0 to 1 do  
-        (* 2 *) for i = 0 to count - 1 do                 
-          (* 2000 *) String_hashtbl.add h (string_of_int i) i 
+        (* 4 *) for i = 0 to count - 1 do                 
+          (* 4000 *) String_hashtbl.add h (string_of_int i) i 
         done
       done ;
       String_hashtbl.length h =~ 2 * count 
     end; 
     "replace semantics" >:: begin fun _ -> 
-      (* 1 *) let h = String_hashtbl.create 0 in 
+      (* 2 *) let h = String_hashtbl.create 0 in 
       let count = 1000 in 
       for j = 0 to 1 do  
-        (* 2 *) for i = 0 to count - 1 do                 
-          (* 2000 *) String_hashtbl.replace h (string_of_int i) i 
+        (* 4 *) for i = 0 to count - 1 do                 
+          (* 4000 *) String_hashtbl.replace h (string_of_int i) i 
         done
       done ;
       String_hashtbl.length h =~  count 
@@ -4927,11 +4993,11 @@ type ('key,'a) enumeration =
   | More of 'key * 'a * ('key,'a) t * ('key, 'a) enumeration
 
 let rec cardinal_aux acc  = function
-  | Empty -> (* 2008 *) acc 
+  | Empty -> (* 4016 *) acc 
   | Node (l,_,_,r, _) -> 
-    (* 2004 *) cardinal_aux  (cardinal_aux (acc + 1)  r ) l 
+    (* 4008 *) cardinal_aux  (cardinal_aux (acc + 1)  r ) l 
 
-let cardinal s = (* 4 *) cardinal_aux 0 s 
+let cardinal s = (* 8 *) cardinal_aux 0 s 
 
 let rec bindings_aux accu = function
   | Empty -> (* 0 *) accu
@@ -4941,10 +5007,10 @@ let bindings s =
   (* 0 *) bindings_aux [] s
 
 let rec keys_aux accu = function
-    Empty -> (* 5 *) accu
-  | Node(l, v, _, r, _) -> (* 4 *) keys_aux (v :: keys_aux accu r) l
+    Empty -> (* 10 *) accu
+  | Node(l, v, _, r, _) -> (* 8 *) keys_aux (v :: keys_aux accu r) l
 
-let keys s = (* 1 *) keys_aux [] s
+let keys s = (* 2 *) keys_aux [] s
 
 
 
@@ -4955,18 +5021,18 @@ let rec cons_enum m e =
 
 
 let height = function
-  | Empty -> (* 3000 *) 0
-  | Node(_,_,_,_,h) -> (* 8880 *) h
+  | Empty -> (* 6000 *) 0
+  | Node(_,_,_,_,h) -> (* 17760 *) h
 
 let create l x d r =
-  (* 3960 *) let hl = height l and hr = height r in
-  Node(l, x, d, r, (if hl >= hr then (* 1980 *) hl + 1 else (* 1980 *) hr + 1))
+  (* 7920 *) let hl = height l and hr = height r in
+  Node(l, x, d, r, (if hl >= hr then (* 3960 *) hl + 1 else (* 3960 *) hr + 1))
 
 let singleton x d = (* 0 *) Node(Empty, x, d, Empty, 1)
 
 let bal l x d r =
-  (* 27932 *) let hl = match l with Empty -> (* 5003 *) 0 | Node(_,_,_,_,h) -> (* 22929 *) h in
-  let hr = match r with Empty -> (* 2 *) 0 | Node(_,_,_,_,h) -> (* 27930 *) h in
+  (* 55864 *) let hl = match l with Empty -> (* 10006 *) 0 | Node(_,_,_,_,h) -> (* 45858 *) h in
+  let hr = match r with Empty -> (* 4 *) 0 | Node(_,_,_,_,h) -> (* 55860 *) h in
   if hl > hr + 2 then (* 0 *) begin
     match l with
       Empty -> (* 0 *) invalid_arg "Map.bal"
@@ -4979,12 +5045,12 @@ let bal l x d r =
         | Node(lrl, lrv, lrd, lrr, _)->
           (* 0 *) create (create ll lv ld lrl) lrv lrd (create lrr x d r)
       end
-  end else (* 27932 *) if hr > hl + 2 then (* 1980 *) begin
+  end else (* 55864 *) if hr > hl + 2 then (* 3960 *) begin
     match r with
       Empty -> (* 0 *) invalid_arg "Map.bal"
     | Node(rl, rv, rd, rr, _) ->
-      (* 1980 *) if height rr >= height rl then
-        (* 1980 *) create (create l x d rl) rv rd rr
+      (* 3960 *) if height rr >= height rl then
+        (* 3960 *) create (create l x d rl) rv rd rr
       else (* 0 *) begin
         match rl with
           Empty -> (* 0 *) invalid_arg "Map.bal"
@@ -4992,11 +5058,11 @@ let bal l x d r =
           (* 0 *) create (create l x d rll) rlv rld (create rlr rv rd rr)
       end
   end else
-    (* 25952 *) Node(l, x, d, r, (if hl >= hr then (* 6082 *) hl + 1 else (* 19870 *) hr + 1))
+    (* 51904 *) Node(l, x, d, r, (if hl >= hr then (* 12164 *) hl + 1 else (* 39740 *) hr + 1))
 
 let empty = Empty
 
-let is_empty = function Empty -> (* 1 *) true | _ -> (* 0 *) false
+let is_empty = function Empty -> (* 2 *) true | _ -> (* 0 *) false
 
 let rec min_binding_exn = function
     Empty -> (* 0 *) raise Not_found
@@ -5025,9 +5091,9 @@ let merge t1 t2 =
 
 
 let rec iter f = function
-    Empty -> (* 1001 *) ()
+    Empty -> (* 2002 *) ()
   | Node(l, v, d, r, _) ->
-    (* 1000 *) iter f l; f v d; iter f r
+    (* 2000 *) iter f l; f v d; iter f r
 
 let rec map f = function
     Empty ->
@@ -5348,9 +5414,9 @@ let max_binding_exn = Map_gen.max_binding_exn
 let min_binding_exn = Map_gen.min_binding_exn
 
 
-let rec add x data (tree : _ Map_gen.t as 'a) : 'a = (* 4 *) match tree with 
+let rec add x data (tree : _ Map_gen.t as 'a) : 'a = (* 8 *) match tree with 
   | Empty ->
-    (* 4 *) Node(Empty, x, data, Empty, 1)
+    (* 8 *) Node(Empty, x, data, Empty, 1)
   | Node(l, v, d, r, h) ->
     (* 0 *) let c = compare_key x v in
     if c = 0 then
@@ -5375,12 +5441,12 @@ let rec adjust x data replace (tree : _ Map_gen.t as 'a) : 'a =
       (* 0 *) bal l v d (adjust x data replace r)
 
 
-let rec find_exn x (tree : _ Map_gen.t )  = (* 2 *) match tree with 
+let rec find_exn x (tree : _ Map_gen.t )  = (* 4 *) match tree with 
   | Empty ->
     (* 0 *) raise Not_found
   | Node(l, v, d, r, _) ->
-    (* 2 *) let c = compare_key x v in
-    if c = 0 then (* 2 *) d
+    (* 4 *) let c = compare_key x v in
+    if c = 0 then (* 4 *) d
     else (* 0 *) find_exn x (if c < 0 then (* 0 *) l else (* 0 *) r)
 
 let rec find_opt x (tree : _ Map_gen.t )  = (* 0 *) match tree with 
@@ -5475,8 +5541,8 @@ let of_array xs =
   (* 0 *) Array.fold_left (fun acc (k,v) -> (* 0 *) add k v acc) empty xs
 
 end
-module Bsb_json : sig 
-#1 "bsb_json.mli"
+module Ext_json : sig 
+#1 "ext_json.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -5551,8 +5617,8 @@ val test:
 val query : path -> t ->  status
 
 end = struct
-#1 "bsb_json.ml"
-# 1 "bsb/bsb_json.mll"
+#1 "ext_json.ml"
+# 1 "ext/ext_json.mll"
  
 type error =
   | Illegal_character of char
@@ -5604,11 +5670,11 @@ let print_position fmt (pos : Lexing.position) =
 let () = 
   Printexc.register_printer
     (function x -> 
-     (* 0 *) match x with 
+     (* 1 *) match x with 
      | Error (e , a, b) -> 
        (* 0 *) Some (Format.asprintf "@[%a:@ %a@ -@ %a)@]" report_error e 
                print_position a print_position b)
-     | _ -> (* 0 *) None
+     | _ -> (* 1 *) None
     )
   
 type path = string list 
@@ -5631,7 +5697,7 @@ type token =
   
 
 let error  (lexbuf : Lexing.lexbuf) e = 
-  (* 5 *) raise (Error (e, lexbuf.lex_start_p, lexbuf.lex_curr_p))
+  (* 10 *) raise (Error (e, lexbuf.lex_start_p, lexbuf.lex_curr_p))
 
 let lexeme_len (x : Lexing.lexbuf) =
   (* 0 *) x.lex_curr_pos - x.lex_start_pos
@@ -5669,7 +5735,7 @@ let hex_code c1 c2 =
 
 let lf = '\010'
 
-# 119 "bsb/bsb_json.ml"
+# 119 "ext/ext_json.ml"
 let __ocaml_lex_tables = {
   Lexing.lex_base = 
    "\000\000\239\255\240\255\241\255\000\000\025\000\011\000\244\255\
@@ -5853,107 +5919,107 @@ let __ocaml_lex_tables = {
 }
 
 let rec lex_json buf lexbuf =
-    (* 86 *) __ocaml_lex_lex_json_rec buf lexbuf 0
+    (* 172 *) __ocaml_lex_lex_json_rec buf lexbuf 0
 and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
-  (* 86 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
+  (* 172 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 137 "bsb/bsb_json.mll"
-          (* 31 *) ( lex_json buf lexbuf)
-# 309 "bsb/bsb_json.ml"
+# 137 "ext/ext_json.mll"
+          (* 62 *) ( lex_json buf lexbuf)
+# 309 "ext/ext_json.ml"
 
   | 1 ->
-# 138 "bsb/bsb_json.mll"
+# 138 "ext/ext_json.mll"
                    (* 0 *) ( 
     update_loc lexbuf 0;
     lex_json buf  lexbuf
   )
-# 317 "bsb/bsb_json.ml"
+# 317 "ext/ext_json.ml"
 
   | 2 ->
-# 142 "bsb/bsb_json.mll"
+# 142 "ext/ext_json.mll"
                 (* 0 *) ( comment buf lexbuf)
-# 322 "bsb/bsb_json.ml"
+# 322 "ext/ext_json.ml"
 
   | 3 ->
-# 143 "bsb/bsb_json.mll"
+# 143 "ext/ext_json.mll"
          (* 0 *) ( True)
-# 327 "bsb/bsb_json.ml"
+# 327 "ext/ext_json.ml"
 
   | 4 ->
-# 144 "bsb/bsb_json.mll"
+# 144 "ext/ext_json.mll"
           (* 0 *) (False)
-# 332 "bsb/bsb_json.ml"
+# 332 "ext/ext_json.ml"
 
   | 5 ->
-# 145 "bsb/bsb_json.mll"
+# 145 "ext/ext_json.mll"
          (* 0 *) (Null)
-# 337 "bsb/bsb_json.ml"
+# 337 "ext/ext_json.ml"
 
   | 6 ->
-# 146 "bsb/bsb_json.mll"
-       (* 5 *) (Lbracket)
-# 342 "bsb/bsb_json.ml"
+# 146 "ext/ext_json.mll"
+       (* 10 *) (Lbracket)
+# 342 "ext/ext_json.ml"
 
   | 7 ->
-# 147 "bsb/bsb_json.mll"
-       (* 3 *) (Rbracket)
-# 347 "bsb/bsb_json.ml"
+# 147 "ext/ext_json.mll"
+       (* 6 *) (Rbracket)
+# 347 "ext/ext_json.ml"
 
   | 8 ->
-# 148 "bsb/bsb_json.mll"
-       (* 6 *) (Lbrace)
-# 352 "bsb/bsb_json.ml"
+# 148 "ext/ext_json.mll"
+       (* 12 *) (Lbrace)
+# 352 "ext/ext_json.ml"
 
   | 9 ->
-# 149 "bsb/bsb_json.mll"
-       (* 3 *) (Rbrace)
-# 357 "bsb/bsb_json.ml"
+# 149 "ext/ext_json.mll"
+       (* 6 *) (Rbrace)
+# 357 "ext/ext_json.ml"
 
   | 10 ->
-# 150 "bsb/bsb_json.mll"
-       (* 13 *) (Comma)
-# 362 "bsb/bsb_json.ml"
+# 150 "ext/ext_json.mll"
+       (* 26 *) (Comma)
+# 362 "ext/ext_json.ml"
 
   | 11 ->
-# 151 "bsb/bsb_json.mll"
-        (* 4 *) (Colon)
-# 367 "bsb/bsb_json.ml"
+# 151 "ext/ext_json.mll"
+        (* 8 *) (Colon)
+# 367 "ext/ext_json.ml"
 
   | 12 ->
-# 152 "bsb/bsb_json.mll"
+# 152 "ext/ext_json.mll"
                       (* 0 *) (lex_json buf lexbuf)
-# 372 "bsb/bsb_json.ml"
+# 372 "ext/ext_json.ml"
 
   | 13 ->
-# 154 "bsb/bsb_json.mll"
-         (* 11 *) ( Number (Lexing.lexeme lexbuf))
-# 377 "bsb/bsb_json.ml"
+# 154 "ext/ext_json.mll"
+         (* 22 *) ( Number (Lexing.lexeme lexbuf))
+# 377 "ext/ext_json.ml"
 
   | 14 ->
-# 156 "bsb/bsb_json.mll"
-      (* 4 *) (
+# 156 "ext/ext_json.mll"
+      (* 8 *) (
   let pos = Lexing.lexeme_start_p lexbuf in
   scan_string buf pos lexbuf;
   let content = (Buffer.contents  buf) in 
   Buffer.clear buf ;
   String content 
 )
-# 388 "bsb/bsb_json.ml"
+# 388 "ext/ext_json.ml"
 
   | 15 ->
-# 163 "bsb/bsb_json.mll"
-       (* 6 *) (Eof )
-# 393 "bsb/bsb_json.ml"
+# 163 "ext/ext_json.mll"
+       (* 12 *) (Eof )
+# 393 "ext/ext_json.ml"
 
   | 16 ->
 (* 0 *) let
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
        c
-# 399 "bsb/bsb_json.ml"
+# 399 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf lexbuf.Lexing.lex_start_pos in
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
           ( error lexbuf (Illegal_character c ))
-# 403 "bsb/bsb_json.ml"
+# 403 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> (* 0 *) lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state
@@ -5963,86 +6029,86 @@ and comment buf lexbuf =
 and __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state =
   (* 0 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 166 "bsb/bsb_json.mll"
+# 166 "ext/ext_json.mll"
               (* 0 *) (lex_json buf lexbuf)
-# 415 "bsb/bsb_json.ml"
+# 415 "ext/ext_json.ml"
 
   | 1 ->
-# 167 "bsb/bsb_json.mll"
+# 167 "ext/ext_json.mll"
      (* 0 *) (comment buf lexbuf)
-# 420 "bsb/bsb_json.ml"
+# 420 "ext/ext_json.ml"
 
   | 2 ->
-# 168 "bsb/bsb_json.mll"
+# 168 "ext/ext_json.mll"
        (* 0 *) (error lexbuf Unterminated_comment)
-# 425 "bsb/bsb_json.ml"
+# 425 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> (* 0 *) lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state
 
 and scan_string buf start lexbuf =
-    (* 8 *) __ocaml_lex_scan_string_rec buf start lexbuf 45
+    (* 16 *) __ocaml_lex_scan_string_rec buf start lexbuf 45
 and __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state =
-  (* 8 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
+  (* 16 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 172 "bsb/bsb_json.mll"
-      (* 4 *) ( () )
-# 437 "bsb/bsb_json.ml"
+# 172 "ext/ext_json.mll"
+      (* 8 *) ( () )
+# 437 "ext/ext_json.ml"
 
   | 1 ->
-# 174 "bsb/bsb_json.mll"
+# 174 "ext/ext_json.mll"
   (* 0 *) (
         let len = lexeme_len lexbuf - 2 in
         update_loc lexbuf len;
 
         scan_string buf start lexbuf
       )
-# 447 "bsb/bsb_json.ml"
+# 447 "ext/ext_json.ml"
 
   | 2 ->
-# 181 "bsb/bsb_json.mll"
+# 181 "ext/ext_json.mll"
       (* 0 *) (
         let len = lexeme_len lexbuf - 3 in
         update_loc lexbuf len;
         scan_string buf start lexbuf
       )
-# 456 "bsb/bsb_json.ml"
+# 456 "ext/ext_json.ml"
 
   | 3 ->
 (* 0 *) let
-# 186 "bsb/bsb_json.mll"
+# 186 "ext/ext_json.mll"
                                                c
-# 462 "bsb/bsb_json.ml"
+# 462 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 187 "bsb/bsb_json.mll"
+# 187 "ext/ext_json.mll"
       (
         Buffer.add_char buf (char_for_backslash c);
         scan_string buf start lexbuf
       )
-# 469 "bsb/bsb_json.ml"
+# 469 "ext/ext_json.ml"
 
   | 4 ->
 (* 0 *) let
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                  c1
-# 475 "bsb/bsb_json.ml"
+# 475 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                c2
-# 480 "bsb/bsb_json.ml"
+# 480 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                              c3
-# 485 "bsb/bsb_json.ml"
+# 485 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                                     s
-# 490 "bsb/bsb_json.ml"
+# 490 "ext/ext_json.ml"
 = Lexing.sub_lexeme lexbuf lexbuf.Lexing.lex_start_pos (lexbuf.Lexing.lex_start_pos + 4) in
-# 192 "bsb/bsb_json.mll"
+# 192 "ext/ext_json.mll"
       (
         let v = dec_code c1 c2 c3 in
         if v > 255 then
@@ -6051,77 +6117,77 @@ and
 
         scan_string buf start lexbuf
       )
-# 501 "bsb/bsb_json.ml"
+# 501 "ext/ext_json.ml"
 
   | 5 ->
 (* 0 *) let
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                         c1
-# 507 "bsb/bsb_json.ml"
+# 507 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                                          c2
-# 512 "bsb/bsb_json.ml"
+# 512 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3) in
-# 201 "bsb/bsb_json.mll"
+# 201 "ext/ext_json.mll"
       (
         let v = hex_code c1 c2 in
         Buffer.add_char buf (Char.chr v);
 
         scan_string buf start lexbuf
       )
-# 521 "bsb/bsb_json.ml"
+# 521 "ext/ext_json.ml"
 
   | 6 ->
 (* 0 *) let
-# 207 "bsb/bsb_json.mll"
+# 207 "ext/ext_json.mll"
              c
-# 527 "bsb/bsb_json.ml"
+# 527 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 208 "bsb/bsb_json.mll"
+# 208 "ext/ext_json.mll"
       (
         Buffer.add_char buf '\\';
         Buffer.add_char buf c;
 
         scan_string buf start lexbuf
       )
-# 536 "bsb/bsb_json.ml"
+# 536 "ext/ext_json.ml"
 
   | 7 ->
-# 215 "bsb/bsb_json.mll"
+# 215 "ext/ext_json.mll"
       (* 0 *) (
         update_loc lexbuf 0;
         Buffer.add_char buf lf;
 
         scan_string buf start lexbuf
       )
-# 546 "bsb/bsb_json.ml"
+# 546 "ext/ext_json.ml"
 
   | 8 ->
-# 222 "bsb/bsb_json.mll"
-      (* 4 *) (
+# 222 "ext/ext_json.mll"
+      (* 8 *) (
         let ofs = lexbuf.lex_start_pos in
         let len = lexbuf.lex_curr_pos - ofs in
         Buffer.add_substring buf lexbuf.lex_buffer ofs len;
 
         scan_string buf start lexbuf
       )
-# 557 "bsb/bsb_json.ml"
+# 557 "ext/ext_json.ml"
 
   | 9 ->
-# 230 "bsb/bsb_json.mll"
+# 230 "ext/ext_json.mll"
       (* 0 *) (
         error lexbuf Unterminated_string
       )
-# 564 "bsb/bsb_json.ml"
+# 564 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> (* 0 *) lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state
 
 ;;
 
-# 234 "bsb/bsb_json.mll"
+# 234 "ext/ext_json.mll"
  
 
 type js_array =
@@ -6150,76 +6216,76 @@ type status =
 
 
 let rec parse_json lexbuf =
-  (* 11 *) let buf = Buffer.create 64 in 
+  (* 22 *) let buf = Buffer.create 64 in 
   let look_ahead = ref None in
   let token () : token = 
-    (* 63 *) match !look_ahead with 
+    (* 126 *) match !look_ahead with 
     | None ->  
-      (* 55 *) lex_json buf lexbuf 
+      (* 110 *) lex_json buf lexbuf 
     | Some x -> 
-      (* 8 *) look_ahead := None ;
+      (* 16 *) look_ahead := None ;
       x 
   in
-  let push e = (* 8 *) look_ahead := Some e in 
+  let push e = (* 16 *) look_ahead := Some e in 
   let rec json (lexbuf : Lexing.lexbuf) : t = 
-    (* 23 *) match token () with 
+    (* 46 *) match token () with 
     | True -> (* 0 *) `True
     | False -> (* 0 *) `False
     | Null -> (* 0 *) `Null
-    | Number s ->  (* 10 *) `Flo s 
+    | Number s ->  (* 20 *) `Flo s 
     | String s -> (* 0 *) `Str { str = s; loc =    lexbuf.lex_start_p}
-    | Lbracket -> (* 5 *) parse_array false lexbuf.lex_start_p lexbuf.lex_curr_p [] lexbuf
-    | Lbrace -> (* 6 *) parse_map false String_map.empty lexbuf
-    |  _ -> (* 2 *) error lexbuf Unexpected_token
+    | Lbracket -> (* 10 *) parse_array false lexbuf.lex_start_p lexbuf.lex_curr_p [] lexbuf
+    | Lbrace -> (* 12 *) parse_map false String_map.empty lexbuf
+    |  _ -> (* 4 *) error lexbuf Unexpected_token
   and parse_array  trailing_comma loc_start loc_finish acc lexbuf : t =
-    (* 10 *) match token () with 
+    (* 20 *) match token () with 
     | Rbracket ->
       (* if trailing_comma then  *)
       (*   error lexbuf Trailing_comma_in_array *)
       (* else  *)
-        (* 2 *) `Arr {loc_start ; content = Ext_array.reverse_of_list acc ; 
+        (* 4 *) `Arr {loc_start ; content = Ext_array.reverse_of_list acc ; 
               loc_end = lexbuf.lex_curr_p }
     | x -> 
-      (* 8 *) push x ;
+      (* 16 *) push x ;
       let new_one = json lexbuf in 
       begin match token ()  with 
       | Comma -> 
-          (* 5 *) parse_array true loc_start loc_finish (new_one :: acc) lexbuf 
+          (* 10 *) parse_array true loc_start loc_finish (new_one :: acc) lexbuf 
       | Rbracket 
-        -> (* 1 *) `Arr {content = (Ext_array.reverse_of_list (new_one::acc));
+        -> (* 2 *) `Arr {content = (Ext_array.reverse_of_list (new_one::acc));
                      loc_start ; 
                      loc_end = lexbuf.lex_curr_p }
       | _ -> 
         (* 0 *) error lexbuf Expect_comma_or_rbracket
       end
   and parse_map trailing_comma acc lexbuf : t = 
-    (* 10 *) match token () with 
+    (* 20 *) match token () with 
     | Rbrace -> 
       (* if trailing_comma then  *)
       (*   error lexbuf Trailing_comma_in_obj *)
       (* else  *)
-        (* 3 *) `Obj acc 
+        (* 6 *) `Obj acc 
     | String key -> 
-      (* 4 *) begin match token () with 
+      (* 8 *) begin match token () with 
       | Colon ->
-        (* 4 *) let value = json lexbuf in
+        (* 8 *) let value = json lexbuf in
         begin match token () with 
         | Rbrace -> (* 0 *) `Obj (String_map.add key value acc )
         | Comma -> 
-          (* 4 *) parse_map true  (String_map.add key value acc) lexbuf 
+          (* 8 *) parse_map true  (String_map.add key value acc) lexbuf 
         | _ -> (* 0 *) error lexbuf Expect_comma_or_rbrace
         end
       | _ -> (* 0 *) error lexbuf Expect_colon
       end
-    | _ -> (* 3 *) error lexbuf Expect_string_or_rbrace
+    | _ -> (* 6 *) error lexbuf Expect_string_or_rbrace
   in 
   let v = json lexbuf in 
   match token () with 
-  | Eof -> (* 6 *) v 
+  | Eof -> (* 12 *) v 
   | _ -> (* 0 *) error lexbuf Expect_eof
 
 let parse_json_from_string s = 
-  (* 11 *) parse_json (Lexing.from_string s )
+  (* 22 *) parse_json (Lexing.from_string s )
 
 let parse_json_from_chan in_chan = 
   (* 0 *) let lexbuf = Lexing.from_channel in_chan in 
@@ -6250,14 +6316,14 @@ type callback =
 let test   ?(fail=(fun () -> ())) key 
     (cb : callback) m 
      =
-     (* 2 *) begin match String_map.find_exn key m, cb with 
+     (* 4 *) begin match String_map.find_exn key m, cb with 
        | exception Not_found  ->
         (* 0 *) begin match cb with `Not_found f ->  (* 0 *) f ()
         | _ -> (* 0 *) fail ()
         end
        | `True, `Bool cb -> (* 0 *) cb true
        | `False, `Bool cb  -> (* 0 *) cb false 
-       | `Flo s , `Flo cb  -> (* 2 *) cb s 
+       | `Flo s , `Flo cb  -> (* 4 *) cb s 
        | `Obj b , `Obj cb -> (* 0 *) cb b 
        | `Arr {content}, `Arr cb -> (* 0 *) cb content 
        | `Arr {content; loc_start ; loc_end}, `Arr_loc cb -> 
@@ -6283,7 +6349,7 @@ let query path (json : t ) =
       end
   in aux [] path json
 
-# 733 "bsb/bsb_json.ml"
+# 733 "ext/ext_json.ml"
 
 end
 module Ounit_json_tests
@@ -6293,9 +6359,9 @@ module Ounit_json_tests
 let ((>::),
     (>:::)) = OUnit.((>::),(>:::))
 
-open Bsb_json
+open Ext_json
 let (|?)  m (key, cb) =
-    (* 2 *) m  |> Bsb_json.test key cb 
+    (* 4 *) m  |> Ext_json.test key cb 
 
 exception Parse_error 
 let suites = 
@@ -6303,45 +6369,45 @@ let suites =
   >:::
   [
     "empty_json" >:: begin fun _ -> 
-      (* 1 *) let v =parse_json_from_string "{}" in
+      (* 2 *) let v =parse_json_from_string "{}" in
       match v with 
-      | `Obj v -> (* 1 *) OUnit.assert_equal (String_map.is_empty v ) true
+      | `Obj v -> (* 2 *) OUnit.assert_equal (String_map.is_empty v ) true
       | _ -> (* 0 *) OUnit.assert_failure "should be empty"
     end
     ;
     "empty_arr" >:: begin fun _ -> 
-      (* 1 *) let v =parse_json_from_string "[]" in
+      (* 2 *) let v =parse_json_from_string "[]" in
       match v with 
-      | `Arr {content = [||]} -> (* 1 *) ()
+      | `Arr {content = [||]} -> (* 2 *) ()
       | _ -> (* 0 *) OUnit.assert_failure "should be empty"
     end
     ;
     "empty trails" >:: begin fun _ -> 
-      (* 1 *) (OUnit.assert_raises Parse_error @@ fun _ -> 
-       (* 1 *) try parse_json_from_string {| [,]|} with _ -> (* 1 *) raise Parse_error);
+      (* 2 *) (OUnit.assert_raises Parse_error @@ fun _ -> 
+       (* 2 *) try parse_json_from_string {| [,]|} with _ -> (* 2 *) raise Parse_error);
       OUnit.assert_raises Parse_error @@ fun _ -> 
-        (* 1 *) try parse_json_from_string {| {,}|} with _ -> (* 1 *) raise Parse_error
+        (* 2 *) try parse_json_from_string {| {,}|} with _ -> (* 2 *) raise Parse_error
     end;
     "two trails" >:: begin fun _ -> 
-      (* 1 *) (OUnit.assert_raises Parse_error @@ fun _ -> 
-       (* 1 *) try parse_json_from_string {| [1,2,,]|} with _ -> (* 1 *) raise Parse_error);
+      (* 2 *) (OUnit.assert_raises Parse_error @@ fun _ -> 
+       (* 2 *) try parse_json_from_string {| [1,2,,]|} with _ -> (* 2 *) raise Parse_error);
       (OUnit.assert_raises Parse_error @@ fun _ -> 
-       (* 1 *) try parse_json_from_string {| { "x": 3, ,}|} with _ -> (* 1 *) raise Parse_error)
+       (* 2 *) try parse_json_from_string {| { "x": 3, ,}|} with _ -> (* 2 *) raise Parse_error)
     end;
 
     "two trails fail" >:: begin fun _ -> 
-      (* 1 *) (OUnit.assert_raises Parse_error @@ fun _ -> 
-       (* 1 *) try parse_json_from_string {| { "x": 3, 2 ,}|} with _ -> (* 1 *) raise Parse_error)
+      (* 2 *) (OUnit.assert_raises Parse_error @@ fun _ -> 
+       (* 2 *) try parse_json_from_string {| { "x": 3, 2 ,}|} with _ -> (* 2 *) raise Parse_error)
     end;
 
     "trail comma obj" >:: begin fun _ -> 
-      (* 1 *) let v =  parse_json_from_string {| { "x" : 3 , }|} in 
+      (* 2 *) let v =  parse_json_from_string {| { "x" : 3 , }|} in 
       let v1 =  parse_json_from_string {| { "x" : 3 , }|} in 
       let test v = 
-        (* 2 *) match v with 
+        (* 4 *) match v with 
         |`Obj v -> 
-          (* 2 *) v
-          |? ("x" , `Flo (fun x -> (* 2 *) OUnit.assert_equal x "3"))
+          (* 4 *) v
+          |? ("x" , `Flo (fun x -> (* 4 *) OUnit.assert_equal x "3"))
           |> ignore 
         | _ -> (* 0 *) OUnit.assert_failure "trail comma" in 
       test v ;
@@ -6349,11 +6415,11 @@ let suites =
     end
     ;
     "trail comma arr" >:: begin fun _ -> 
-      (* 1 *) let v = parse_json_from_string {| [ 1, 3, ]|} in
+      (* 2 *) let v = parse_json_from_string {| [ 1, 3, ]|} in
       let v1 = parse_json_from_string {| [ 1, 3 ]|} in
       let test v = 
-        (* 2 *) match v with 
-        | `Arr { content = [|`Flo "1" ; `Flo "3" |] } -> (* 2 *) ()
+        (* 4 *) match v with 
+        | `Arr { content = [|`Flo "1" ; `Flo "3" |] } -> (* 4 *) ()
         | _ -> (* 0 *) OUnit.assert_failure "trailing comma array" in 
       test v ;
       test v1
@@ -6637,14 +6703,14 @@ let flat_map2 f lx ly =
   aux [] lx ly
 
 let rec flat_map_aux f acc append lx =
-  (* 9 *) match lx with
-  | [] -> (* 3 *) List.rev_append acc append
-  | y::ys -> (* 6 *) flat_map_aux f (List.rev_append ( f y)  acc ) append ys 
+  (* 18 *) match lx with
+  | [] -> (* 6 *) List.rev_append acc append
+  | y::ys -> (* 12 *) flat_map_aux f (List.rev_append ( f y)  acc ) append ys 
 
 let flat_map f lx =
-  (* 1 *) flat_map_aux f [] [] lx
+  (* 2 *) flat_map_aux f [] [] lx
 
-let flat_map_acc f append lx = (* 2 *) flat_map_aux f [] append lx  
+let flat_map_acc f append lx = (* 4 *) flat_map_aux f [] append lx  
 
 let rec map2_last f l1 l2 =
   (* 0 *) match (l1, l2) with
@@ -6867,16 +6933,16 @@ let suites =
   >:::
   [
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) OUnit.assert_equal
-        (Ext_list.flat_map (fun x -> (* 2 *) [x;x]) [1;2]) [1;1;2;2] 
+      (* 2 *) OUnit.assert_equal
+        (Ext_list.flat_map (fun x -> (* 4 *) [x;x]) [1;2]) [1;1;2;2] 
     end;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) OUnit.assert_equal
-        (Ext_list.flat_map_acc (fun x -> (* 2 *) [x;x]) [3;4] [1;2]) [1;1;2;2;3;4] 
+      (* 2 *) OUnit.assert_equal
+        (Ext_list.flat_map_acc (fun x -> (* 4 *) [x;x]) [3;4] [1;2]) [1;1;2;2;3;4] 
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_equal (
-          Ext_list.flat_map_acc (fun x -> (* 2 *) if x mod 2 = 0 then (* 1 *) [true] else (* 1 *) [])
+      (* 2 *) OUnit.assert_equal (
+          Ext_list.flat_map_acc (fun x -> (* 4 *) if x mod 2 = 0 then (* 2 *) [true] else (* 2 *) [])
             [false;false] [1;2]
       )  [true;false;false]
     end;
@@ -6954,31 +7020,31 @@ let max_binding_exn = Map_gen.max_binding_exn
 let min_binding_exn = Map_gen.min_binding_exn
 
 
-let rec add x data (tree : _ Map_gen.t as 'a) : 'a = (* 10986 *) match tree with 
+let rec add x data (tree : _ Map_gen.t as 'a) : 'a = (* 21972 *) match tree with 
   | Empty ->
-    (* 1008 *) Node(Empty, x, data, Empty, 1)
+    (* 2016 *) Node(Empty, x, data, Empty, 1)
   | Node(l, v, d, r, h) ->
-    (* 9978 *) let c = compare_key x v in
+    (* 19956 *) let c = compare_key x v in
     if c = 0 then
       (* 0 *) Node(l, x, data, r, h)
-    else (* 9978 *) if c < 0 then
-      (* 2 *) bal (add x data l) v d r
+    else (* 19956 *) if c < 0 then
+      (* 4 *) bal (add x data l) v d r
     else
-      (* 9976 *) bal l v d (add x data r)
+      (* 19952 *) bal l v d (add x data r)
 
 
 let rec adjust x data replace (tree : _ Map_gen.t as 'a) : 'a = 
-  (* 19954 *) match tree with 
+  (* 39908 *) match tree with 
   | Empty ->
-    (* 1000 *) Node(Empty, x, data (), Empty, 1)
+    (* 2000 *) Node(Empty, x, data (), Empty, 1)
   | Node(l, v, d, r, h) ->
-    (* 18954 *) let c = compare_key x v in
+    (* 37908 *) let c = compare_key x v in
     if c = 0 then
-      (* 1000 *) Node(l, x, replace  d , r, h)
-    else (* 17954 *) if c < 0 then
-      (* 4029 *) bal (adjust x data replace l) v d r
+      (* 2000 *) Node(l, x, replace  d , r, h)
+    else (* 35908 *) if c < 0 then
+      (* 8058 *) bal (adjust x data replace l) v d r
     else
-      (* 13925 *) bal l v d (adjust x data replace r)
+      (* 27850 *) bal l v d (adjust x data replace r)
 
 
 let rec find_exn x (tree : _ Map_gen.t )  = (* 0 *) match tree with 
@@ -7073,12 +7139,12 @@ let compare cmp m1 m2 = (* 0 *) Map_gen.compare compare_key cmp m1 m2
 let equal cmp m1 m2 = (* 0 *) Map_gen.equal compare_key cmp m1 m2 
 
 let add_list (xs : _ list ) init = 
-  (* 2 *) List.fold_left (fun acc (k,v) -> (* 8 *) add k v acc) init xs 
+  (* 4 *) List.fold_left (fun acc (k,v) -> (* 16 *) add k v acc) init xs 
 
-let of_list xs = (* 2 *) add_list xs empty
+let of_list xs = (* 4 *) add_list xs empty
 
 let of_array xs = 
-  (* 1 *) Array.fold_left (fun acc (k,v) -> (* 1000 *) add k v acc) empty xs
+  (* 2 *) Array.fold_left (fun acc (k,v) -> (* 2000 *) add k v acc) empty xs
 
 end
 module Ounit_map_tests
@@ -7093,33 +7159,33 @@ let suites =
   __MODULE__ >:::
   [
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) [1,"1"; 2,"2"; 12,"12"; 3, "3"]
+      (* 2 *) [1,"1"; 2,"2"; 12,"12"; 3, "3"]
       |> Int_map.of_list 
       |> Int_map.keys 
       |> OUnit.assert_equal [1;2;3;12]
     end
     ;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) OUnit.assert_equal (Int_map.cardinal Int_map.empty) 0 ;
+      (* 2 *) OUnit.assert_equal (Int_map.cardinal Int_map.empty) 0 ;
       OUnit.assert_equal ([1,"1"; 2,"2"; 12,"12"; 3, "3"]
       |> Int_map.of_list|>Int_map.cardinal )  4
       
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) Int_map.cardinal (Int_map.of_array (Array.init 1000 (fun i -> (* 1000 *) (i,i))))
+      (* 2 *) Int_map.cardinal (Int_map.of_array (Array.init 1000 (fun i -> (* 2000 *) (i,i))))
       =~ 1000
     end;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let count = 1000 in 
-      let a = Array.init count (fun x -> (* 1000 *) x ) in 
+      (* 2 *) let count = 1000 in 
+      let a = Array.init count (fun x -> (* 2000 *) x ) in 
       let v = Int_map.empty in
       let u = 
         begin 
-          let v = Array.fold_left (fun acc key -> (* 1000 *) Int_map.adjust key (fun _ -> (* 1000 *) 1) (succ) acc ) v a   in 
-          Array.fold_left (fun acc key -> (* 1000 *) Int_map.adjust key (fun _ -> (* 0 *) 1) (succ) acc ) v a  
+          let v = Array.fold_left (fun acc key -> (* 2000 *) Int_map.adjust key (fun _ -> (* 2000 *) 1) (succ) acc ) v a   in 
+          Array.fold_left (fun acc key -> (* 2000 *) Int_map.adjust key (fun _ -> (* 0 *) 1) (succ) acc ) v a  
           end
         in  
-       Int_map.iter (fun _ v -> (* 1000 *) v =~ 2 ) u   ;
+       Int_map.iter (fun _ v -> (* 2000 *) v =~ 2 ) u   ;
        Int_map.cardinal u =~ count
     end
   ]
@@ -7138,32 +7204,32 @@ let suites =
   __FILE__
   >::: [
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let a = [|"a";"b";"c"|] in 
+      (* 2 *) let a = [|"a";"b";"c"|] in 
       Ordered_hash_set_string.(to_sorted_array (of_array a))
       =~ a 
     end;
 
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let a = Array.init 1000 (fun i -> (* 1000 *) string_of_int i) in 
+      (* 2 *) let a = Array.init 1000 (fun i -> (* 2000 *) string_of_int i) in 
       Ordered_hash_set_string.(to_sorted_array (of_array a))
       =~ a
     end;
 
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let a = [|"a";"b";"c"; "a"; "d"|] in 
+      (* 2 *) let a = [|"a";"b";"c"; "a"; "d"|] in 
       Ordered_hash_set_string.(to_sorted_array (of_array a))
       =~ [| "a" ; "b"; "c"; "d" |]
     end;
 
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let b = Array.init 500 (fun i -> (* 500 *) string_of_int i) in
+      (* 2 *) let b = Array.init 500 (fun i -> (* 1000 *) string_of_int i) in
       let a = Array.append b b in 
       Ordered_hash_set_string.(to_sorted_array (of_array a))
       =~ b
     end;
 
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let h = Ordered_hash_set_string.create 1 in
+      (* 2 *) let h = Ordered_hash_set_string.create 1 in
       Ordered_hash_set_string.(to_sorted_array h)
       =~ [||];
       Ordered_hash_set_string.add h "1";
@@ -7174,80 +7240,80 @@ let suites =
     end;
 
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let h = Ordered_hash_set_string.create 1 in
+      (* 2 *) let h = Ordered_hash_set_string.create 1 in
       let count = 3000 in
       for i = 0 to count - 1 do
-        (* 3000 *) Ordered_hash_set_string.add  h (string_of_int i) ;
+        (* 6000 *) Ordered_hash_set_string.add  h (string_of_int i) ;
       done ;
       print_endline ("\n"^__LOC__ ^ "\n" ^ Ext_util.stats_to_string (Ordered_hash_set_string.stats h));
       Ordered_hash_set_string.(to_sorted_array h)
-      =~ (Array.init count (fun i -> (* 3000 *) string_of_int i ))
+      =~ (Array.init count (fun i -> (* 6000 *) string_of_int i ))
     end;
 
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let h = Ordered_hash_set_string.create 1 in
+      (* 2 *) let h = Ordered_hash_set_string.create 1 in
       let count = 1000_000 in
       for i = 0 to count - 1 do
-        (* 1000000 *) Ordered_hash_set_string.add  h (string_of_int i) ;
+        (* 2000000 *) Ordered_hash_set_string.add  h (string_of_int i) ;
       done ;
       for i = 0 to count - 1 do
-        (* 1000000 *) OUnit.assert_bool "exists" (Ordered_hash_set_string.mem h (string_of_int i))
+        (* 2000000 *) OUnit.assert_bool "exists" (Ordered_hash_set_string.mem h (string_of_int i))
       done;
       for i = 0 to count - 1 do 
-        (* 1000000 *) OUnit.assert_equal (Ordered_hash_set_string.rank h (string_of_int i)) i 
+        (* 2000000 *) OUnit.assert_equal (Ordered_hash_set_string.rank h (string_of_int i)) i 
       done;  
       OUnit.assert_equal 
-        (Ordered_hash_set_string.fold(fun key rank acc -> (* 1000000 *) assert (string_of_int rank = key); (acc + 1) ) h 0)
+        (Ordered_hash_set_string.fold(fun key rank acc -> (* 2000000 *) assert (string_of_int rank = key); (acc + 1) ) h 0)
         count
       ;         
-      Ordered_hash_set_string.iter (fun key rank -> (* 1000000 *) assert (string_of_int rank = key))  h ; 
+      Ordered_hash_set_string.iter (fun key rank -> (* 2000000 *) assert (string_of_int rank = key))  h ; 
       OUnit.assert_equal (Ordered_hash_set_string.length h) count;
       print_endline ("\n"^__LOC__ ^ "\n" ^ Ext_util.stats_to_string (Ordered_hash_set_string.stats h));
       Ordered_hash_set_string.clear h ; 
       OUnit.assert_equal (Ordered_hash_set_string.length h) 0;
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let count = 1000_000 in
+      (* 2 *) let count = 1000_000 in
       let h = Ordered_hash_set_string.create ( count) in      
       for i = 0 to count - 1 do
-        (* 1000000 *) Ordered_hash_set_string.add  h (string_of_int i) ;
+        (* 2000000 *) Ordered_hash_set_string.add  h (string_of_int i) ;
       done ;
       for i = 0 to count - 1 do
-        (* 1000000 *) OUnit.assert_bool "exists" (Ordered_hash_set_string.mem h (string_of_int i))
+        (* 2000000 *) OUnit.assert_bool "exists" (Ordered_hash_set_string.mem h (string_of_int i))
       done;
       for i = 0 to count - 1 do 
-        (* 1000000 *) OUnit.assert_equal (Ordered_hash_set_string.rank h (string_of_int i)) i 
+        (* 2000000 *) OUnit.assert_equal (Ordered_hash_set_string.rank h (string_of_int i)) i 
       done;  
       OUnit.assert_equal 
-        (Ordered_hash_set_string.fold(fun key rank acc -> (* 1000000 *) assert (string_of_int rank = key); (acc + 1) ) h 0)
+        (Ordered_hash_set_string.fold(fun key rank acc -> (* 2000000 *) assert (string_of_int rank = key); (acc + 1) ) h 0)
         count
       ;         
-      Ordered_hash_set_string.iter (fun key rank -> (* 1000000 *) assert (string_of_int rank = key))  h ; 
+      Ordered_hash_set_string.iter (fun key rank -> (* 2000000 *) assert (string_of_int rank = key))  h ; 
       OUnit.assert_equal (Ordered_hash_set_string.length h) count;
       print_endline ("\n"^__LOC__ ^ "\n" ^ Ext_util.stats_to_string (Ordered_hash_set_string.stats h));
       Ordered_hash_set_string.clear h ; 
       OUnit.assert_equal (Ordered_hash_set_string.length h) 0;
     end;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) Ordered_hash_set_string.to_sorted_array (Ordered_hash_set_string.of_array [||]) =~ [||];
+      (* 2 *) Ordered_hash_set_string.to_sorted_array (Ordered_hash_set_string.of_array [||]) =~ [||];
       Ordered_hash_set_string.to_sorted_array (Ordered_hash_set_string.of_array [|"1"|]) =~ [|"1"|]
     end;
 
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) OUnit.assert_raises Not_found (fun _ -> (* 1 *) Ordered_hash_set_string.choose_exn (Ordered_hash_set_string.of_array [||]))
+      (* 2 *) OUnit.assert_raises Not_found (fun _ -> (* 2 *) Ordered_hash_set_string.choose_exn (Ordered_hash_set_string.of_array [||]))
     end;
 
 
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let count = 1000 in 
-      let v = Ordered_hash_set_string.of_array (Array.init count (fun i -> (* 1000 *) string_of_int i) ) in
+      (* 2 *) let count = 1000 in 
+      let v = Ordered_hash_set_string.of_array (Array.init count (fun i -> (* 2000 *) string_of_int i) ) in
       for i = 0 to count - 1 do 
-        (* 1000 *) Ordered_hash_set_string.replace v (string_of_int i) (string_of_int i ^ ":")
+        (* 2000 *) Ordered_hash_set_string.replace v (string_of_int i) (string_of_int i ^ ":")
       done ;
       OUnit.assert_equal (Ordered_hash_set_string.length v) count;
       OUnit.assert_equal 
         (Ordered_hash_set_string.to_sorted_array v )
-        (Array.init count (fun i -> (* 1000 *) string_of_int i ^ ":"))
+        (Array.init count (fun i -> (* 2000 *) string_of_int i ^ ":"))
       
     end
   ]
@@ -7787,10 +7853,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -8007,13 +8070,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  (* 0 *) i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   (* 0 *) let len = String.length x in
-  if no_char x '\\' 0  len then (* 0 *) x 
+  if Ext_string.no_char x '\\' 0  len then (* 0 *) x 
   else  
     (* 0 *) String.map (function 
         |'\\'-> (* 0 *) '/'
@@ -8022,7 +8081,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   (* 0 *) let len = String.length x in 
-  if no_char x '/' 0  len then (* 0 *) x 
+  if Ext_string.no_char x '/' 0  len then (* 0 *) x 
   else 
     (* 0 *) String.map (function 
         | '/' -> (* 0 *) '\\'
@@ -8059,10 +8118,10 @@ let combine p1 p2 =
    ]}
 *)
 let split_aux p =
-  (* 12 *) let rec go p acc =
-    (* 77 *) let dir = Filename.dirname p in
-    if dir = p then (* 12 *) dir, acc
-    else (* 65 *) go dir (Filename.basename p :: acc)
+  (* 24 *) let rec go p acc =
+    (* 154 *) let dir = Filename.dirname p in
+    if dir = p then (* 24 *) dir, acc
+    else (* 130 *) go dir (Filename.basename p :: acc)
   in go p []
 
 (** 
@@ -8107,28 +8166,28 @@ let rel_normalized_absolute_path from to_ =
   ]}
 *)
 let normalize_absolute_path x =
-  (* 12 *) let drop_if_exist xs =
-    (* 11 *) match xs with 
-    | [] -> (* 1 *) []
-    | _ :: xs -> (* 10 *) xs in 
+  (* 24 *) let drop_if_exist xs =
+    (* 22 *) match xs with 
+    | [] -> (* 2 *) []
+    | _ :: xs -> (* 20 *) xs in 
   let rec normalize_list acc paths =
-    (* 77 *) match paths with 
-    | [] -> (* 12 *) acc 
-    | "." :: xs -> (* 16 *) normalize_list acc xs
+    (* 154 *) match paths with 
+    | [] -> (* 24 *) acc 
+    | "." :: xs -> (* 32 *) normalize_list acc xs
     | ".." :: xs -> 
-      (* 11 *) normalize_list (drop_if_exist acc ) xs 
+      (* 22 *) normalize_list (drop_if_exist acc ) xs 
     | x :: xs -> 
-      (* 38 *) normalize_list (x::acc) xs 
+      (* 76 *) normalize_list (x::acc) xs 
   in
   let root, paths = split_aux x in
   let rev_paths =  normalize_list [] paths in 
   let rec go acc rev_paths =
-    (* 28 *) match rev_paths with 
-    | [] -> (* 10 *) Filename.concat root acc 
-    | last::rest ->  (* 18 *) go (Filename.concat last acc ) rest  in 
+    (* 56 *) match rev_paths with 
+    | [] -> (* 20 *) Filename.concat root acc 
+    | last::rest ->  (* 36 *) go (Filename.concat last acc ) rest  in 
   match rev_paths with 
-  | [] -> (* 2 *) root 
-  | last :: rest -> (* 10 *) go last rest 
+  | [] -> (* 4 *) root 
+  | last :: rest -> (* 20 *) go last rest 
 
 
 let get_extension x =
@@ -8153,14 +8212,14 @@ let ((>::),
 
 let normalize = Ext_filename.normalize_absolute_path
 let (=~) x y = 
-  (* 2 *) OUnit.assert_equal ~cmp:(fun x y ->   (* 2 *) String.compare x y = 0) x y
+  (* 4 *) OUnit.assert_equal ~cmp:(fun x y ->   (* 4 *) String.compare x y = 0) x y
     
 let suites = 
   __FILE__ 
   >:::
   [
     "linux path tests" >:: begin fun _ -> 
-      (* 1 *) let norm = 
+      (* 2 *) let norm = 
         Array.map normalize
           [|
             "/gsho/./..";
@@ -8189,10 +8248,10 @@ let suites =
         |]
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) normalize "/./a/.////////j/k//../////..///././b/./c/d/./." =~ "/a/b/c/d"
+      (* 2 *) normalize "/./a/.////////j/k//../////..///././b/./c/d/./." =~ "/a/b/c/d"
     end;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) normalize "/./a/.////////j/k//../////..///././b/./c/d/././../" =~ "/a/b/c"
+      (* 2 *) normalize "/./a/.////////j/k//../////..///././b/./c/d/././../" =~ "/a/b/c"
     end
   ]
 
@@ -8296,12 +8355,12 @@ type 'a t = {
   mutable len : int ;  
 }
 
-let length d = (* 93 *) d.len
+let length d = (* 186 *) d.len
 
 let compact d =
-  (* 2 *) let d_arr = d.arr in 
+  (* 4 *) let d_arr = d.arr in 
   if d.len <> Array.length d_arr then 
-    (* 2 *) begin
+    (* 4 *) begin
       let newarr = unsafe_sub d_arr 0 d.len in 
       d.arr <- newarr
     end
@@ -8312,13 +8371,13 @@ let singleton v =
   }
 
 let empty () =
-  (* 132 *) {
+  (* 264 *) {
     len = 0;
     arr = [||];
   }
 
 let is_empty d =
-  (* 50 *) d.len = 0
+  (* 100 *) d.len = 0
 
 let reset d = 
   (* 0 *) d.len <- 0; 
@@ -8336,7 +8395,7 @@ let to_list d =
 
 
 let of_list lst =
-  (* 21 *) let arr = Array.of_list lst in 
+  (* 42 *) let arr = Array.of_list lst in 
   { arr ; len = Array.length arr}
 
 
@@ -8344,7 +8403,7 @@ let to_array d =
   (* 0 *) unsafe_sub d.arr 0 d.len
 
 let of_array src =
-  (* 28 *) {
+  (* 56 *) {
     len = Array.length src;
     arr = Array.copy src;
     (* okay to call {!Array.copy}*)
@@ -8357,14 +8416,14 @@ let of_sub_array arr off len =
 let unsafe_internal_array v = (* 0 *) v.arr  
 (* we can not call {!Array.copy} *)
 let copy src =
-  (* 1 *) let len = src.len in
+  (* 2 *) let len = src.len in
   {
     len ;
     arr = unsafe_sub src.arr 0 len ;
   }
 (* FIXME *)
 let reverse_in_place src = 
-  (* 1 *) Ext_array.reverse_range src.arr 0 src.len 
+  (* 2 *) Ext_array.reverse_range src.arr 0 src.len 
 
 
 
@@ -8373,16 +8432,16 @@ let reverse_in_place src =
    may contain some garbage
  *)
 let sub (src : _ t) start len =
-  (* 3 *) let src_len = src.len in 
-  if len < 0 || start > src_len - len then (* 2 *) invalid_arg "Vec_gen.sub"
+  (* 6 *) let src_len = src.len in 
+  if len < 0 || start > src_len - len then (* 4 *) invalid_arg "Vec_gen.sub"
   else 
-  (* 1 *) { len ; 
+  (* 2 *) { len ; 
     arr = unsafe_sub src.arr start len }
 
 let iter f d = 
-  (* 118 *) let arr = d.arr in 
+  (* 236 *) let arr = d.arr in 
   for i = 0 to d.len - 1 do
-    (* 239 *) f (Array.unsafe_get arr i)
+    (* 478 *) f (Array.unsafe_get arr i)
   done
 
 let iteri f d =
@@ -8408,24 +8467,24 @@ let iteri_range ~from ~to_ f d =
     done
 
 let map_into_array f src =
-  (* 10 *) let src_len = src.len in 
+  (* 20 *) let src_len = src.len in 
   let src_arr = src.arr in 
   if src_len = 0 then (* 0 *) [||]
   else 
-    (* 10 *) let first_one = f (Array.unsafe_get src_arr 0) in 
+    (* 20 *) let first_one = f (Array.unsafe_get src_arr 0) in 
     let arr = Array.make  src_len  first_one in
     for i = 1 to src_len - 1 do
-      (* 7 *) Array.unsafe_set arr i (f (Array.unsafe_get src_arr i))
+      (* 14 *) Array.unsafe_set arr i (f (Array.unsafe_get src_arr i))
     done;
     arr 
 let map_into_list f src = 
-  (* 1 *) let src_len = src.len in 
+  (* 2 *) let src_len = src.len in 
   let src_arr = src.arr in 
   if src_len = 0 then (* 0 *) []
   else 
-    (* 1 *) let acc = ref [] in         
+    (* 2 *) let acc = ref [] in         
     for i =  src_len - 1 downto 0 do
-      (* 4 *) acc := f (Array.unsafe_get src_arr i) :: !acc
+      (* 8 *) acc := f (Array.unsafe_get src_arr i) :: !acc
     done;
     !acc
 
@@ -8444,9 +8503,9 @@ let mapi f src =
     }
 
 let fold_left f x a =
-  (* 9 *) let rec loop a_len a_arr idx x =
-    (* 46 *) if idx >= a_len then (* 9 *) x else 
-      (* 37 *) loop a_len a_arr (idx + 1) (f x (Array.unsafe_get a_arr idx))
+  (* 18 *) let rec loop a_len a_arr idx x =
+    (* 92 *) if idx >= a_len then (* 18 *) x else 
+      (* 74 *) loop a_len a_arr (idx + 1) (f x (Array.unsafe_get a_arr idx))
   in
   loop a.len a.arr 0 x
 
@@ -8461,15 +8520,15 @@ let fold_right f a x =
    [filter] and [inplace_filter]
 *)
 let filter f d =
-  (* 1 *) let new_d = copy d in 
+  (* 2 *) let new_d = copy d in 
   let new_d_arr = new_d.arr in 
   let d_arr = d.arr in
   let p = ref 0 in
   for i = 0 to d.len  - 1 do
-    (* 6 *) let x = Array.unsafe_get d_arr i in
+    (* 12 *) let x = Array.unsafe_get d_arr i in
     (* TODO: can be optimized for segments blit *)
     if f x  then
-      (* 2 *) begin
+      (* 4 *) begin
         Array.unsafe_set new_d_arr !p x;
         incr p;
       end;
@@ -8478,37 +8537,37 @@ let filter f d =
   new_d 
 
 let equal eq x y : bool = 
-  (* 22 *) if x.len <> y.len then (* 0 *) false 
+  (* 44 *) if x.len <> y.len then (* 0 *) false 
   else 
-    (* 22 *) let rec aux x_arr y_arr i =
-      (* 1627 *) if i < 0 then (* 22 *) true else  
-      (* 1605 *) if eq (Array.unsafe_get x_arr i) (Array.unsafe_get y_arr i) then 
-        (* 1605 *) aux x_arr y_arr (i - 1)
+    (* 44 *) let rec aux x_arr y_arr i =
+      (* 3254 *) if i < 0 then (* 44 *) true else  
+      (* 3210 *) if eq (Array.unsafe_get x_arr i) (Array.unsafe_get y_arr i) then 
+        (* 3210 *) aux x_arr y_arr (i - 1)
       else (* 0 *) false in 
     aux x.arr y.arr (x.len - 1)
 
 let get d i = 
   (* 0 *) if i < 0 || i >= d.len then (* 0 *) invalid_arg "Resize_array.get"
   else (* 0 *) Array.unsafe_get d.arr i
-let unsafe_get d i = (* 106 *) Array.unsafe_get d.arr i 
+let unsafe_get d i = (* 212 *) Array.unsafe_get d.arr i 
 let last d = 
-  (* 1 *) if d.len <= 0 then (* 0 *) invalid_arg   "Resize_array.last"
-  else (* 1 *) Array.unsafe_get d.arr (d.len - 1)
+  (* 2 *) if d.len <= 0 then (* 0 *) invalid_arg   "Resize_array.last"
+  else (* 2 *) Array.unsafe_get d.arr (d.len - 1)
 
-let capacity d = (* 7 *) Array.length d.arr
+let capacity d = (* 14 *) Array.length d.arr
 
 (* Attention can not use {!Array.exists} since the bound is not the same *)  
 let exists p d = 
-  (* 2 *) let a = d.arr in 
+  (* 4 *) let a = d.arr in 
   let n = d.len in   
   let rec loop i =
-    (* 2001 *) if i = n then (* 1 *) false
-    else (* 2000 *) if p (Array.unsafe_get a i) then (* 1 *) true
-    else (* 1999 *) loop (succ i) in
+    (* 4002 *) if i = n then (* 2 *) false
+    else (* 4000 *) if p (Array.unsafe_get a i) then (* 2 *) true
+    else (* 3998 *) loop (succ i) in
   loop 0
 
 let map f src =
-  (* 1 *) let src_len = src.len in 
+  (* 2 *) let src_len = src.len in 
   if src_len = 0 then (* 0 *) { len = 0 ; arr = [||]}
   (* TODO: we may share the empty array 
      but sharing mutable state is very challenging, 
@@ -8521,11 +8580,11 @@ let map f src =
      ]}
   *)
   else 
-    (* 1 *) let src_arr = src.arr in 
+    (* 2 *) let src_arr = src.arr in 
     let first = f (Array.unsafe_get src_arr 0 ) in 
     let arr = Array.make  src_len first in
     for i = 1 to src_len - 1 do
-      (* 999 *) Array.unsafe_set arr i (f (Array.unsafe_get src_arr i))
+      (* 1998 *) Array.unsafe_set arr i (f (Array.unsafe_get src_arr i))
     done;
     {
       len = src_len;
@@ -8533,13 +8592,13 @@ let map f src =
     }
 
 let init len f =
-  (* 2 *) if len < 0 then (* 0 *) invalid_arg  "Resize_array.init"
-  else (* 2 *) if len = 0 then (* 0 *) { len = 0 ; arr = [||] }
+  (* 4 *) if len < 0 then (* 0 *) invalid_arg  "Resize_array.init"
+  else (* 4 *) if len = 0 then (* 0 *) { len = 0 ; arr = [||] }
   else 
-    (* 2 *) let first = f 0 in 
+    (* 4 *) let first = f 0 in 
     let arr = Array.make len first in
     for i = 1 to len - 1 do
-      (* 18 *) Array.unsafe_set arr i (f i)
+      (* 36 *) Array.unsafe_set arr i (f i)
     done;
     {
 
@@ -8646,7 +8705,7 @@ let null = 0 (* can be optimized *)
   let init = Vec_gen.init 
 
   let make initsize : _ Vec_gen.t =
-    (* 2 *) if initsize < 0 then (* 0 *) invalid_arg  "Resize_array.make" ;
+    (* 4 *) if initsize < 0 then (* 0 *) invalid_arg  "Resize_array.make" ;
     {
 
       len = 0;
@@ -8656,28 +8715,28 @@ let null = 0 (* can be optimized *)
 
 
   let reserve (d : _ Vec_gen.t ) s = 
-    (* 2 *) let d_len = d.len in 
+    (* 4 *) let d_len = d.len in 
     let d_arr = d.arr in 
     if s < d_len || s < Array.length d_arr then (* 0 *) ()
     else 
-      (* 2 *) let new_capacity = min Sys.max_array_length s in 
+      (* 4 *) let new_capacity = min Sys.max_array_length s in 
       let new_d_arr = Array.make new_capacity null in 
       Vec_gen.unsafe_blit d_arr 0 new_d_arr 0 d_len;
       d.arr <- new_d_arr 
 
   let push v (d : _ Vec_gen.t) =
-    (* 1239 *) let d_len = d.len in
+    (* 2478 *) let d_len = d.len in
     let d_arr = d.arr in 
     let d_arr_len = Array.length d_arr in
     if d_arr_len = 0 then
-      (* 106 *) begin 
+      (* 212 *) begin 
         d.len <- 1 ;
         d.arr <- [| v |]
       end
     else  
-      (* 1133 *) begin 
+      (* 2266 *) begin 
         if d_len = d_arr_len then 
-          (* 136 *) begin
+          (* 272 *) begin
             if d_len >= Sys.max_array_length then 
               (* 0 *) failwith "exceeds max_array_length";
             let new_capacity = min Sys.max_array_length d_len * 2 
@@ -8693,8 +8752,8 @@ let null = 0 (* can be optimized *)
 
 (** delete element at offset [idx], will raise exception when have invalid input *)
   let delete (d : _ Vec_gen.t) idx =
-    (* 91 *) let d_len = d.len in 
-    if idx < 0 || idx >= d_len then (* 1 *) invalid_arg "Resize_array.delete" ;
+    (* 182 *) let d_len = d.len in 
+    if idx < 0 || idx >= d_len then (* 2 *) invalid_arg "Resize_array.delete" ;
     let arr = d.arr in 
     Vec_gen.unsafe_blit arr (idx + 1) arr idx  (d_len - idx - 1);
     let idx = d_len - 1 in 
@@ -8703,7 +8762,7 @@ let null = 0 (* can be optimized *)
 # 133
 (** pop the last element, a specialized version of [delete] *)
   let pop (d : _ Vec_gen.t) = 
-    (* 6 *) let idx  = d.len - 1  in
+    (* 12 *) let idx  = d.len - 1  in
     if idx < 0 then (* 0 *) invalid_arg "Resize_array.pop";
     d.len <- idx
   
@@ -8730,7 +8789,7 @@ let null = 0 (* can be optimized *)
 # 173
 (** delete elements from [idx] with length [len] return the deleted elements as a new vec*)
   let get_and_delete_range (d : _ Vec_gen.t) idx len : _ Vec_gen.t = 
-    (* 45 *) let d_len = d.len in 
+    (* 90 *) let d_len = d.len in 
     if len < 0 || idx < 0 || idx + len > d_len then (* 0 *) invalid_arg  "Resize_array.get_and_delete_range"  ;
     let arr = d.arr in 
     let value = Vec_gen.unsafe_sub arr idx len in
@@ -8751,16 +8810,16 @@ let null = 0 (* can be optimized *)
 
 
   let inplace_filter f (d : _ Vec_gen.t) : unit = 
-    (* 28 *) let d_arr = d.arr in     
+    (* 56 *) let d_arr = d.arr in     
     let d_len = d.len in
     let p = ref 0 in
     for i = 0 to d_len - 1 do 
-      (* 73 *) let x = Array.unsafe_get d_arr i in 
+      (* 146 *) let x = Array.unsafe_get d_arr i in 
       if f x then 
-        (* 27 *) begin 
+        (* 54 *) begin 
           let curr_p = !p in 
           (if curr_p <> i then 
-             (* 7 *) Array.unsafe_set d_arr curr_p x) ;
+             (* 14 *) Array.unsafe_set d_arr curr_p x) ;
           incr p
         end
     done ;
@@ -8773,17 +8832,17 @@ let null = 0 (* can be optimized *)
   
 # 225
   let inplace_filter_from start f (d : _ Vec_gen.t) : unit = 
-    (* 2 *) if start < 0 then (* 0 *) invalid_arg "Vec.inplace_filter_from"; 
+    (* 4 *) if start < 0 then (* 0 *) invalid_arg "Vec.inplace_filter_from"; 
     let d_arr = d.arr in     
     let d_len = d.len in
     let p = ref start in    
     for i = start to d_len - 1 do 
-      (* 14 *) let x = Array.unsafe_get d_arr i in 
+      (* 28 *) let x = Array.unsafe_get d_arr i in 
       if f x then 
-        (* 7 *) begin 
+        (* 14 *) begin 
           let curr_p = !p in 
           (if curr_p <> i then 
-             (* 6 *) Array.unsafe_set d_arr curr_p x) ;
+             (* 12 *) Array.unsafe_set d_arr curr_p x) ;
           incr p
         end
     done ;
@@ -8796,21 +8855,21 @@ let null = 0 (* can be optimized *)
 # 248
 (** inplace filter the elements and accumulate the non-filtered elements *)
   let inplace_filter_with  f ~cb_no acc (d : _ Vec_gen.t)  = 
-    (* 1 *) let d_arr = d.arr in     
+    (* 2 *) let d_arr = d.arr in     
     let p = ref 0 in
     let d_len = d.len in
     let acc = ref acc in 
     for i = 0 to d_len - 1 do 
-      (* 1000 *) let x = Array.unsafe_get d_arr i in 
+      (* 2000 *) let x = Array.unsafe_get d_arr i in 
       if f x then 
-        (* 500 *) begin 
+        (* 1000 *) begin 
           let curr_p = !p in 
           (if curr_p <> i then 
-             (* 499 *) Array.unsafe_set d_arr curr_p x) ;
+             (* 998 *) Array.unsafe_set d_arr curr_p x) ;
           incr p
         end
       else 
-        (* 500 *) acc := cb_no  x  !acc
+        (* 1000 *) acc := cb_no  x  !acc
     done ;
     let last = !p  in 
     
@@ -8926,7 +8985,7 @@ module Make ( Resize : Vec_gen.ResizeType) = struct
   let init = Vec_gen.init 
 
   let make initsize : _ Vec_gen.t =
-    (* 3 *) if initsize < 0 then (* 0 *) invalid_arg  "Resize_array.make" ;
+    (* 6 *) if initsize < 0 then (* 0 *) invalid_arg  "Resize_array.make" ;
     {
 
       len = 0;
@@ -8946,18 +9005,18 @@ module Make ( Resize : Vec_gen.ResizeType) = struct
       d.arr <- new_d_arr 
 
   let push v (d : _ Vec_gen.t) =
-    (* 65 *) let d_len = d.len in
+    (* 130 *) let d_len = d.len in
     let d_arr = d.arr in 
     let d_arr_len = Array.length d_arr in
     if d_arr_len = 0 then
-      (* 11 *) begin 
+      (* 22 *) begin 
         d.len <- 1 ;
         d.arr <- [| v |]
       end
     else  
-      (* 54 *) begin 
+      (* 108 *) begin 
         if d_len = d_arr_len then 
-          (* 24 *) begin
+          (* 48 *) begin
             if d_len >= Sys.max_array_length then 
               (* 0 *) failwith "exceeds max_array_length";
             let new_capacity = min Sys.max_array_length d_len * 2 
@@ -9013,7 +9072,7 @@ module Make ( Resize : Vec_gen.ResizeType) = struct
 
 (** delete elements start from [idx] with length [len] *)
   let delete_range (d : _ Vec_gen.t) idx len =
-    (* 15 *) let d_len = d.len in 
+    (* 30 *) let d_len = d.len in 
     if len < 0 || idx < 0 || idx + len > d_len then (* 0 *) invalid_arg  "Resize_array.delete_range"  ;
     let arr = d.arr in 
     Vec_gen.unsafe_blit arr (idx + len) arr idx (d_len  - idx - len);
@@ -9022,7 +9081,7 @@ module Make ( Resize : Vec_gen.ResizeType) = struct
 # 167
     ;
     for i = d_len - len to d_len - 1 do
-      (* 20 *) Array.unsafe_set arr i null
+      (* 40 *) Array.unsafe_set arr i null
     done
 
 # 173
@@ -9103,21 +9162,21 @@ module Make ( Resize : Vec_gen.ResizeType) = struct
 # 248
 (** inplace filter the elements and accumulate the non-filtered elements *)
   let inplace_filter_with  f ~cb_no acc (d : _ Vec_gen.t)  = 
-    (* 15 *) let d_arr = d.arr in     
+    (* 30 *) let d_arr = d.arr in     
     let p = ref 0 in
     let d_len = d.len in
     let acc = ref acc in 
     for i = 0 to d_len - 1 do 
-      (* 44 *) let x = Array.unsafe_get d_arr i in 
+      (* 88 *) let x = Array.unsafe_get d_arr i in 
       if f x then 
-        (* 24 *) begin 
+        (* 48 *) begin 
           let curr_p = !p in 
           (if curr_p <> i then 
              (* 0 *) Array.unsafe_set d_arr curr_p x) ;
           incr p
         end
       else 
-        (* 20 *) acc := cb_no  x  !acc
+        (* 40 *) acc := cb_no  x  !acc
     done ;
     let last = !p  in 
     
@@ -9276,11 +9335,11 @@ type node = Int_vec.t
    Cons:
    1. post processing input data  
  *)
-let min_int (x : int) y = (* 164 *) if x < y then (* 45 *) x else (* 119 *) y  
+let min_int (x : int) y = (* 328 *) if x < y then (* 90 *) x else (* 238 *) y  
 
 
 let graph  e =
-  (* 11 *) let index = ref 0 in 
+  (* 22 *) let index = ref 0 in 
   let s = Int_vec.empty () in
 
   let output = Int_vec_vec.empty () in (* collect output *)
@@ -9291,7 +9350,7 @@ let graph  e =
   let lowlink_array = Array.make node_numes (-1) in
   
   let rec scc v_data  =
-    (* 106 *) let new_index = !index + 1 in 
+    (* 212 *) let new_index = !index + 1 in 
     index := new_index ;
     Int_vec.push  v_data s ; 
 
@@ -9302,15 +9361,15 @@ let graph  e =
     let v = e.(v_data) in 
     v
     |> Int_vec.iter (fun w_data  ->
-        (* 215 *) if Array.unsafe_get index_array w_data < 0 then (* not processed *)
-          (* 87 *) begin  
+        (* 430 *) if Array.unsafe_get index_array w_data < 0 then (* not processed *)
+          (* 174 *) begin  
             scc w_data;
             Array.unsafe_set lowlink_array v_data  
               (min_int (Array.unsafe_get lowlink_array v_data) (Array.unsafe_get lowlink_array w_data))
           end  
-        else (* 128 *) if Array.unsafe_get on_stack_array w_data then 
+        else (* 256 *) if Array.unsafe_get on_stack_array w_data then 
           (* successor is in stack and hence in current scc *)
-          (* 77 *) begin 
+          (* 154 *) begin 
             Array.unsafe_set lowlink_array v_data  
               (min_int (Array.unsafe_get lowlink_array v_data) (Array.unsafe_get lowlink_array w_data))
           end
@@ -9318,12 +9377,12 @@ let graph  e =
 
     if Array.unsafe_get lowlink_array v_data = Array.unsafe_get index_array v_data then
       (* start a new scc *)
-      (* 45 *) begin
+      (* 90 *) begin
         let s_len = Int_vec.length s in
         let last_index = ref (s_len - 1) in 
         let u = ref (Int_vec.unsafe_get s !last_index) in
         while  !u <> v_data do 
-          (* 61 *) Array.unsafe_set on_stack_array (!u)  false ; 
+          (* 122 *) Array.unsafe_set on_stack_array (!u)  false ; 
           last_index := !last_index - 1;
           u := Int_vec.unsafe_get s !last_index
         done ;
@@ -9332,14 +9391,14 @@ let graph  e =
       end   
   in
   for i = 0 to node_numes - 1 do 
-    (* 106 *) if Array.unsafe_get index_array i < 0 then (* 19 *) scc i
+    (* 212 *) if Array.unsafe_get index_array i < 0 then (* 38 *) scc i
   done ;
   output 
 
 let graph_check v = 
-  (* 9 *) let v = graph v in 
+  (* 18 *) let v = graph v in 
   Int_vec_vec.length v, 
-  Int_vec_vec.fold_left (fun acc x -> (* 37 *) Int_vec.length x :: acc ) [] v  
+  Int_vec_vec.fold_left (fun acc x -> (* 74 *) Int_vec.length x :: acc ) [] v  
 
 end
 module Ounit_scc_tests
@@ -9534,18 +9593,18 @@ http://algs4.cs.princeton.edu/42digraph/KosarajuSharirSCC.java.html
 *)
 
 let handle_lines tiny_test_cases = 
-  (* 2 *) match Ext_string.split  tiny_test_cases '\n' with 
+  (* 4 *) match Ext_string.split  tiny_test_cases '\n' with 
   | nodes :: edges :: rest -> 
-    (* 2 *) let nodes_num = int_of_string nodes in 
+    (* 4 *) let nodes_num = int_of_string nodes in 
     let node_array = 
       Array.init nodes_num
-        (fun i -> (* 63 *) Int_vec.empty () )
+        (fun i -> (* 126 *) Int_vec.empty () )
     in 
     begin 
       rest |> List.iter (fun x ->
-          (* 169 *) match Ext_string.split x ' ' with 
+          (* 338 *) match Ext_string.split x ' ' with 
           | [ a ; b] -> 
-            (* 169 *) let a , b = int_of_string a , int_of_string b in 
+            (* 338 *) let a , b = int_of_string a , int_of_string b in 
             Int_vec.push  b node_array.(a) 
           | _ -> (* 0 *) assert false 
         );
@@ -9576,69 +9635,69 @@ let read_file file =
 let test  (input : (string * string list) list) = 
   (* string -> int mapping 
   *)
-  (* 7 *) let tbl = String_hashtbl.create 32 in
+  (* 14 *) let tbl = String_hashtbl.create 32 in
   let idx = ref 0 in 
   let add x =
-    (* 71 *) if not (String_hashtbl.mem tbl x ) then 
-      (* 34 *) begin 
+    (* 142 *) if not (String_hashtbl.mem tbl x ) then 
+      (* 68 *) begin 
         String_hashtbl.add  tbl x !idx ;
         incr idx 
       end in
   input |> List.iter 
-    (fun (x,others) -> (* 34 *) List.iter add (x::others));
+    (fun (x,others) -> (* 68 *) List.iter add (x::others));
   let nodes_num = String_hashtbl.length tbl in
   let node_array = 
       Array.init nodes_num
-        (fun i -> (* 34 *) Int_vec.empty () ) in 
+        (fun i -> (* 68 *) Int_vec.empty () ) in 
   input |> 
   List.iter (fun (x,others) -> 
-      (* 34 *) let idx = String_hashtbl.find_exn tbl  x  in 
+      (* 68 *) let idx = String_hashtbl.find_exn tbl  x  in 
       others |> 
-      List.iter (fun y -> (* 37 *) Int_vec.push (String_hashtbl.find_exn tbl y ) node_array.(idx) )
+      List.iter (fun y -> (* 74 *) Int_vec.push (String_hashtbl.find_exn tbl y ) node_array.(idx) )
     ) ; 
   Ext_scc.graph_check node_array 
 
 let test2  (input : (string * string list) list) = 
   (* string -> int mapping 
   *)
-  (* 2 *) let tbl = String_hashtbl.create 32 in
+  (* 4 *) let tbl = String_hashtbl.create 32 in
   let idx = ref 0 in 
   let add x =
-    (* 18 *) if not (String_hashtbl.mem tbl x ) then 
-      (* 9 *) begin 
+    (* 36 *) if not (String_hashtbl.mem tbl x ) then 
+      (* 18 *) begin 
         String_hashtbl.add  tbl x !idx ;
         incr idx 
       end in
   input |> List.iter 
-    (fun (x,others) -> (* 9 *) List.iter add (x::others));
+    (fun (x,others) -> (* 18 *) List.iter add (x::others));
   let nodes_num = String_hashtbl.length tbl in
   let other_mapping = Array.make nodes_num "" in 
-  String_hashtbl.iter (fun k v  -> (* 9 *) other_mapping.(v) <- k ) tbl ;
+  String_hashtbl.iter (fun k v  -> (* 18 *) other_mapping.(v) <- k ) tbl ;
   
   let node_array = 
       Array.init nodes_num
-        (fun i -> (* 9 *) Int_vec.empty () ) in 
+        (fun i -> (* 18 *) Int_vec.empty () ) in 
   input |> 
   List.iter (fun (x,others) -> 
-      (* 9 *) let idx = String_hashtbl.find_exn tbl  x  in 
+      (* 18 *) let idx = String_hashtbl.find_exn tbl  x  in 
       others |> 
-      List.iter (fun y -> (* 9 *) Int_vec.push (String_hashtbl.find_exn tbl y ) node_array.(idx) )
+      List.iter (fun y -> (* 18 *) Int_vec.push (String_hashtbl.find_exn tbl y ) node_array.(idx) )
     )  ;
   let output = Ext_scc.graph node_array in 
-  output |> Int_vec_vec.map_into_array (fun int_vec -> (* 8 *) Int_vec.map_into_array (fun i -> (* 9 *) other_mapping.(i)) int_vec )
+  output |> Int_vec_vec.map_into_array (fun int_vec -> (* 16 *) Int_vec.map_into_array (fun i -> (* 18 *) other_mapping.(i)) int_vec )
 
 
 let suites = 
     __FILE__
     >::: [
       __LOC__ >:: begin fun _ -> 
-        (* 1 *) OUnit.assert_equal (fst @@ Ext_scc.graph_check (handle_lines tiny_test_cases))  5
+        (* 2 *) OUnit.assert_equal (fst @@ Ext_scc.graph_check (handle_lines tiny_test_cases))  5
       end       ;
       __LOC__ >:: begin fun _ -> 
-        (* 1 *) OUnit.assert_equal (fst @@ Ext_scc.graph_check (handle_lines medium_test_cases))  10
+        (* 2 *) OUnit.assert_equal (fst @@ Ext_scc.graph_check (handle_lines medium_test_cases))  10
       end       ;
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "a", ["b" ; "c"];
             "b" , ["c" ; "d"];
             "c", [ "b"];
@@ -9646,7 +9705,7 @@ let suites =
           ]) (3 , [1;2;1])
       end ; 
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "a", ["b" ; "c"];
             "b" , ["c" ; "d"];
             "c", [ "b"];
@@ -9668,7 +9727,7 @@ let suites =
           *)
       end ;
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "a", ["b" ; "c"];
             "b" , ["c" ; "d"];
             "c", [ "b"];
@@ -9677,7 +9736,7 @@ let suites =
           ]) (4 , [1;2;1;1])
       end ; 
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "a", ["b" ; "c"];
             "b" , ["c" ; "d"];
             "c", [ "b"];
@@ -9686,7 +9745,7 @@ let suites =
           ]) (2, [1;4])
       end ;
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "a", ["b" ; "c"];
             "b" , ["c" ; "d"];
             "c", [ "b"];
@@ -9695,7 +9754,7 @@ let suites =
           ]) (1, [5])
       end ; 
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "a", ["b"];
             "b" , ["c" ];
             "c", [ ];
@@ -9704,7 +9763,7 @@ let suites =
           ]) (5, [1;1;1;1;1])
       end ; 
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test [
+        (* 2 *) OUnit.assert_equal (test [
             "1", ["0"];
             "0" , ["2" ];
             "2", ["1" ];
@@ -9718,7 +9777,7 @@ let suites =
       (* end *)
       (* ; *)
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test2 [
+        (* 2 *) OUnit.assert_equal (test2 [
             "a", ["b" ; "c"];
             "b" , ["c" ; "d"];
             "c", [ "b"];
@@ -9727,7 +9786,7 @@ let suites =
       end ;
 
       __LOC__ >:: begin fun _ ->
-        (* 1 *) OUnit.assert_equal (test2 [
+        (* 2 *) OUnit.assert_equal (test2 [
             "a", ["b"];
             "b" , ["c" ];
             "c", ["d" ];
@@ -9768,7 +9827,7 @@ type error =
 exception Error of error * Lexing.position * Lexing.position;;
 
 let error  (lexbuf : Lexing.lexbuf) e = 
-  (* 1 *) raise (Error (e, lexbuf.lex_start_p, lexbuf.lex_curr_p))
+  (* 2 *) raise (Error (e, lexbuf.lex_start_p, lexbuf.lex_curr_p))
 
 
 let char_for_backslash = function
@@ -9797,7 +9856,7 @@ let hex_code c1 c2 =
   val1 * 16 + val2
 
 let update_loc ({ lex_curr_p; _ } as lexbuf : Lexing.lexbuf) diff =
-  (* 12 *) lexbuf.lex_curr_p <-
+  (* 24 *) lexbuf.lex_curr_p <-
     {
       lex_curr_p with
       pos_lnum = lex_curr_p.pos_lnum + 1;
@@ -9826,32 +9885,32 @@ type st =
   }
 
 let push_atom lexbuf atom (buf : st ) = 
-  (* 55 *) buf.top <- atom:: buf.top
+  (* 110 *) buf.top <- atom:: buf.top
 
 (** entering the new stack *)
 let new_lparen has_prime buf = 
-  (* 18 *) buf.paren_depth <- buf.paren_depth + 1 ;
+  (* 36 *) buf.paren_depth <- buf.paren_depth + 1 ;
   Stack.push (buf.top, buf.has_prime) buf.sexps ;
   buf.top <- [];
   buf.has_prime <- has_prime
 
 (** exit the stack *)
 let new_rparen  buf lexbuf = 
-  (* 17 *) buf.paren_depth <- buf.paren_depth - 1 ; 
+  (* 34 *) buf.paren_depth <- buf.paren_depth - 1 ; 
   if buf.paren_depth < 0  then
     (* 0 *) error lexbuf Unbalanced_paren
   else 
-    (* 17 *) let new_sexp =
+    (* 34 *) let new_sexp =
       if buf.has_prime then 
-        (* 2 *) Data (List.rev   buf.top)
-      else (* 15 *) List (List.rev   buf.top) 
+        (* 4 *) Data (List.rev   buf.top)
+      else (* 30 *) List (List.rev   buf.top) 
     in 
     let top, has_prime =  Stack.pop buf.sexps in
     buf.top<- top;
     buf.has_prime<-has_prime;
     push_atom lexbuf new_sexp buf 
 
-let get_data buf = (* 6 *) buf.top
+let get_data buf = (* 12 *) buf.top
 
 
 # 101 "ext/ext_sexp.ml"
@@ -10026,19 +10085,19 @@ let __ocaml_lex_tables = {
 }
 
 let rec main buf lexbuf =
-    (* 136 *) __ocaml_lex_main_rec buf lexbuf 0
+    (* 272 *) __ocaml_lex_main_rec buf lexbuf 0
 and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
-  (* 136 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
+  (* 272 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
 # 111 "ext/ext_sexp.mll"
-                     (* 12 *) ( 
+                     (* 24 *) ( 
     update_loc lexbuf 0;
     main (buf : st ) lexbuf  )
 # 281 "ext/ext_sexp.ml"
 
   | 1 ->
 # 114 "ext/ext_sexp.mll"
-           (* 44 *) ( main buf lexbuf  )
+           (* 88 *) ( main buf lexbuf  )
 # 286 "ext/ext_sexp.ml"
 
   | 2 ->
@@ -10048,7 +10107,7 @@ and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
 
   | 3 ->
 # 116 "ext/ext_sexp.mll"
-         (* 2 *) (
+         (* 4 *) (
     new_lparen true buf; 
     main buf lexbuf
   )
@@ -10056,7 +10115,7 @@ and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
 
   | 4 ->
 # 120 "ext/ext_sexp.mll"
-        (* 16 *) ( 
+        (* 32 *) ( 
     new_lparen false buf ; 
     main buf lexbuf 
   )
@@ -10064,7 +10123,7 @@ and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
 
   | 5 ->
 # 124 "ext/ext_sexp.mll"
-        (* 17 *) ( 
+        (* 34 *) ( 
       new_rparen  buf lexbuf; 
       main buf lexbuf 
   )
@@ -10072,7 +10131,7 @@ and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
 
   | 6 ->
 # 129 "ext/ext_sexp.mll"
-      (* 10 *) (
+      (* 20 *) (
         let pos = Lexing.lexeme_start_p lexbuf in
         scan_string buf.buf pos lexbuf;
         push_atom lexbuf  ( Lit (Buffer.contents  buf.buf)) buf;
@@ -10082,7 +10141,7 @@ and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
 # 326 "ext/ext_sexp.ml"
 
   | 7 ->
-(* 28 *) let
+(* 56 *) let
 # 136 "ext/ext_sexp.mll"
                     s
 # 332 "ext/ext_sexp.ml"
@@ -10105,23 +10164,23 @@ and __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state =
 
   | 9 ->
 # 143 "ext/ext_sexp.mll"
-        (* 7 *) (
+        (* 14 *) (
     if buf.paren_depth > 0 then 
-      (* 1 *) error lexbuf Unterminated_paren
+      (* 2 *) error lexbuf Unterminated_paren
     else 
-      (* 6 *) get_data buf )
+      (* 12 *) get_data buf )
 # 357 "ext/ext_sexp.ml"
 
   | __ocaml_lex_state -> (* 0 *) lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_main_rec buf lexbuf __ocaml_lex_state
 
 and scan_string buf start lexbuf =
-    (* 20 *) __ocaml_lex_scan_string_rec buf start lexbuf 13
+    (* 40 *) __ocaml_lex_scan_string_rec buf start lexbuf 13
 and __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state =
-  (* 20 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
+  (* 40 *) match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
 # 150 "ext/ext_sexp.mll"
-        (* 10 *) ( () )
+        (* 20 *) ( () )
 # 369 "ext/ext_sexp.ml"
 
   | 1 ->
@@ -10235,7 +10294,7 @@ and
 
   | 8 ->
 # 200 "ext/ext_sexp.mll"
-      (* 10 *) (
+      (* 20 *) (
         let ofs = lexbuf.lex_start_pos in
         let len = lexbuf.lex_curr_pos - ofs in
         Buffer.add_substring buf lexbuf.lex_buffer ofs len;
@@ -10260,14 +10319,14 @@ and
   
 
     let token  lexbuf  =
-      (* 7 *) List.rev @@ main { 
+      (* 14 *) List.rev @@ main { 
         buf = Buffer.create 256 ;
         sexps = Stack.create () ; 
         paren_depth = 0; 
         top = [];
         has_prime = false } lexbuf
     let from_string str = 
-      (* 7 *) token (Lexing.from_string str)    
+      (* 14 *) token (Lexing.from_string str)    
     let from_file file = 
       (* 0 *) let in_channel =  open_in file in 
       match  token (Lexing.from_channel in_channel) with 
@@ -10289,32 +10348,32 @@ let suites =
     __FILE__
     >::: [
         __LOC__ >:: begin fun _ -> 
-             (* 1 *) Ext_sexp.from_string "( a)" =~ 
+             (* 2 *) Ext_sexp.from_string "( a)" =~ 
              [ List [ Atom "a"]]
         end;
         __LOC__ >:: begin fun _ -> 
-             (* 1 *) Ext_sexp.from_string "( a ())" =~ 
+             (* 2 *) Ext_sexp.from_string "( a ())" =~ 
              [ List [ Atom "a"; List []]]
         end;
         __LOC__ >:: begin fun _ -> 
-             (* 1 *) Ext_sexp.from_string "( a (b))" =~ 
+             (* 2 *) Ext_sexp.from_string "( a (b))" =~ 
              [ List [ Atom "a"; List [Atom "b"]]]
         end;
         __LOC__ >:: begin fun _ -> 
-             (* 1 *) Ext_sexp.from_string "( a (b)) (c d)" =~ 
+             (* 2 *) Ext_sexp.from_string "( a (b)) (c d)" =~ 
              [ List [ Atom "a"; List [Atom "b"]];
                 List [ Atom "c"; Atom "d"]
              ]
         end;
         __LOC__ >:: begin fun _ -> 
-             (* 1 *) Ext_sexp.from_string "( a (b 1 2 3)  c  d) (c d)" =~ 
+             (* 2 *) Ext_sexp.from_string "( a (b 1 2 3)  c  d) (c d)" =~ 
              [ List [ Atom "a"; List [Atom "b"; Atom "1"; Atom "2"; Atom "3"] ; Atom "c"; Atom "d"];
                 List [ Atom "c"; Atom "d"]
              ];
         end;
         __LOC__ ^ "raise" >:: begin fun _ -> 
-            (* 1 *) (try ignore @@ Ext_sexp.from_string  {|  (1 2 3  ( a (b) ) |}; false
-            with e -> (* 1 *) true) =~ true ;
+            (* 2 *) (try ignore @@ Ext_sexp.from_string  {|  (1 2 3  ( a (b) ) |}; false
+            with e -> (* 2 *) true) =~ true ;
 
             match Ext_sexp.from_string {|
 (setq 
@@ -10329,7 +10388,7 @@ let suites =
  bsc-flags '("-w" "-40" "-bs-no-version-header " "-bs-diagnose" "-bs-cross-module-opt"))
 
 |}       with 
-        | _ -> (* 1 *) ()
+        | _ -> (* 2 *) ()
         | exception _ -> (* 0 *) OUnit.assert_failure __LOC__
         end;
     ]
@@ -10338,7 +10397,7 @@ module Ounit_string_tests
 = struct
 #1 "ounit_string_tests.ml"
 let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
+     (>:::)) = OUnit.((>::),(>:::))
 
 let (=~) = OUnit.assert_equal    
 
@@ -10346,56 +10405,106 @@ let (=~) = OUnit.assert_equal
 
 
 let suites = 
-    __FILE__ >::: 
-    [
-        __LOC__ >:: begin fun _ ->
-            (* 1 *) OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
-        end;
+  __FILE__ >::: 
+  [
+    __LOC__ >:: begin fun _ ->
+      (* 2 *) OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            (* 1 *) Ext_string.rindex_neg "hello" 'h' =~ 0 ;
-            Ext_string.rindex_neg "hello" 'e' =~ 1 ;
-            Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-            Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-            Ext_string.rindex_neg "hello" 'o' =~ 4 ;
-        end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) Ext_string.rindex_neg "hello" 'h' =~ 0 ;
+      Ext_string.rindex_neg "hello" 'e' =~ 1 ;
+      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
+      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
+      Ext_string.rindex_neg "hello" 'o' =~ 4 ;
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            (* 1 *) OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
-        end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            (* 1 *) OUnit.assert_bool __LOC__
-            (Ext_string.for_all_range "xABc"~start:1
-            ~finish:3 (function 'A' .. 'Z' -> (* 2 *) true | _ -> (* 0 *) false));
-            OUnit.assert_bool __LOC__
-            (not (Ext_string.for_all_range "xABc"~start:1
-            ~finish:4 (function 'A' .. 'Z' -> (* 2 *) true | _ -> (* 1 *) false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:2 (function 'A' .. 'Z' -> (* 1 *) true | _ -> (* 0 *) false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:1 (function 'A' .. 'Z' -> (* 0 *) true | _ -> (* 0 *) false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:0 (function 'A' .. 'Z' -> (* 0 *) true | _ -> (* 0 *) false)));
-        end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) OUnit.assert_bool __LOC__
+        (Ext_string.for_all_range "xABc"~start:1
+           ~finish:2 (function 'A' .. 'Z' -> (* 4 *) true | _ -> (* 0 *) false));
+      OUnit.assert_bool __LOC__
+        (not (Ext_string.for_all_range "xABc"~start:1
+                ~finish:3(function 'A' .. 'Z' -> (* 4 *) true | _ -> (* 2 *) false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:2 (function 'A' .. 'Z' -> (* 4 *) true | _ -> (* 0 *) false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:1 (function 'A' .. 'Z' -> (* 2 *) true | _ -> (* 0 *) false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:0 (function 'A' .. 'Z' -> (* 0 *) true | _ -> (* 0 *) false)));    
+      OUnit.assert_raise_any       
+        (fun _ ->  (* 2 *) (Ext_string.for_all_range "xABc"~start:1
+             ~finish:4 (function 'A' .. 'Z' -> (* 2 *) true | _ -> (* 0 *) false)));    
+    
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            (* 1 *) OUnit.assert_bool __LOC__ @@
-             List.for_all Ext_string.is_valid_source_name
-            ["x.ml"; "x.mli"; "x.re"; "x.rei"; "x.mll"; 
-            "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
-            "ax.ml"];
-            OUnit.assert_bool __LOC__ @@ not @@
-                List.exists Ext_string.is_valid_source_name
-                [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
-                "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
-                ".#hello.ml"; ".#hello.rei"
-                ]
-        end
-    ]
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) OUnit.assert_bool __LOC__ @@
+      List.for_all Ext_string.is_valid_source_name
+        ["x.ml"; "x.mli"; "x.re"; "x.rei"; "x.mll"; 
+         "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
+         "ax.ml"];
+      OUnit.assert_bool __LOC__ @@ not @@
+      List.exists Ext_string.is_valid_source_name
+        [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
+         "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
+         ".#hello.ml"; ".#hello.rei"; "a-.ml"; "a-b.ml"; "-a-.ml"
+         ; "-.ml"
+        ]
+    end;
+    __LOC__ >:: begin fun _ -> 
+        (* 2 *) Ext_string.find ~sub:"hello" "xx hello xx" =~ 3 ;
+        Ext_string.rfind ~sub:"hello" "xx hello xx" =~ 3 ;
+        Ext_string.find ~sub:"hello" "xx hello hello xx" =~ 3 ;
+        Ext_string.rfind ~sub:"hello" "xx hello hello xx" =~ 9 ;
+    end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) Ext_string.trim " \t\n" =~ "";
+      Ext_string.trim " \t\nb" =~ "b";
+      Ext_string.trim "b \t\n" =~ "b";
+      Ext_string.trim "\t\n b \t\n" =~ "b";            
+    end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) Ext_string.starts_with "ab" "a" =~ true;
+      Ext_string.starts_with "ab" "" =~ true;
+      Ext_string.starts_with "abb" "abb" =~ true;
+      Ext_string.starts_with "abb" "abbc" =~ false;
+    end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) Ext_string.ends_with_then_chop "xx.ml"  ".ml" =~ Some "xx";
+      Ext_string.ends_with_then_chop "xx.ml" ".mll" =~ None
+    end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) Ext_string.starts_with_and_number "js_fn_mk_01" ~offset:0 "js_fn_mk_" =~ 1 ;
+      Ext_string.starts_with_and_number "js_fn_run_02" ~offset:0 "js_fn_mk_" =~ -1 ;
+      Ext_string.starts_with_and_number "js_fn_mk_03" ~offset:6 "mk_" =~ 3 ;
+      Ext_string.starts_with_and_number "js_fn_mk_04" ~offset:6 "run_" =~ -1;
+      Ext_string.starts_with_and_number "js_fn_run_04" ~offset:6 "run_" =~ 4;
+      Ext_string.(starts_with_and_number "js_fn_run_04" ~offset:6 "run_" = 3) =~ false 
+    end;
+    __LOC__ >:: begin fun _ -> 
+      (* 2 *) Ext_string.for_all (function '_' -> (* 8 *) true | _ -> (* 0 *) false)
+        "____" =~ true;
+      Ext_string.for_all (function '_' -> (* 6 *) true | _ -> (* 2 *) false)
+        "___-" =~ false;
+      Ext_string.for_all (function '_' -> (* 0 *) true | _ -> (* 0 *) false)        
+        "" =~ true
+    end;
+    __LOC__ >:: begin fun _ -> 
+        (* 2 *) Ext_string.tail_from "ghsogh" 1 =~ "hsogh";
+        Ext_string.tail_from "ghsogh" 0 =~ "ghsogh"
+    end;
+    __LOC__ >:: begin fun _ -> 
+        (* 2 *) Ext_string.digits_of_str "11_js" ~offset:0 2 =~ 11 
+    end
+  ]
 end
 module Ext_topsort : sig 
 #1 "ext_topsort.mli"
@@ -10479,19 +10588,19 @@ type t = Edge_vec.t
 *)
 
 let layered_dfs (g : t) =
-   (* 3 *) let queue = Queue.create () in 
+   (* 6 *) let queue = Queue.create () in 
    let rec aux g = 
-        (* 15 *) let new_entries = 
+        (* 30 *) let new_entries = 
         Edge_vec.inplace_filter_with 
-        (fun (x : edges) -> (* 44 *) not (Int_vec.is_empty x.deps) ) 
-        ~cb_no:(fun x acc -> (* 20 *) Set_int.add x.id acc) Set_int.empty  g in 
+        (fun (x : edges) -> (* 88 *) not (Int_vec.is_empty x.deps) ) 
+        ~cb_no:(fun x acc -> (* 40 *) Set_int.add x.id acc) Set_int.empty  g in 
         if not (Set_int.is_empty new_entries) 
         then 
-        (* 12 *) begin 
+        (* 24 *) begin 
             Queue.push new_entries queue ; 
             Edge_vec.iter 
-            (fun edges -> (* 24 *) Int_vec.inplace_filter  
-                (fun x -> (* 50 *) not (Set_int.mem x new_entries)) edges.deps ) g ;
+            (fun edges -> (* 48 *) Int_vec.inplace_filter  
+                (fun x -> (* 100 *) not (Set_int.mem x new_entries)) edges.deps ) g ;
             aux g 
         end
   in aux  g ; queue      
@@ -10505,10 +10614,10 @@ let ((>::),
      (>:::)) = OUnit.((>::),(>:::))
 
 let handle graph = 
-  (* 3 *) let len = List.length graph in 
+  (* 6 *) let len = List.length graph in 
   let result = Ext_topsort.Edge_vec.make len in 
   List.iter (fun (id,deps) -> 
-      (* 20 *) Ext_topsort.Edge_vec.push {id ; deps = Int_vec.of_list deps } result 
+      (* 40 *) Ext_topsort.Edge_vec.push {id ; deps = Int_vec.of_list deps } result 
     ) graph; 
   result 
 
@@ -10549,10 +10658,10 @@ let graph3 =
 
 
 let expect loc (graph1, v) = 
-  (* 3 *) let graph = handle graph1  in 
+  (* 6 *) let graph = handle graph1  in 
   let queue = Ext_topsort.layered_dfs graph  in 
   OUnit.assert_bool loc
-    (Queue.fold (fun acc x -> (* 12 *) Set_int.elements x::acc) [] queue =
+    (Queue.fold (fun acc x -> (* 24 *) Set_int.elements x::acc) [] queue =
      v)
 
 
@@ -10565,7 +10674,7 @@ let suites =
   >:::
   [
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) expect __LOC__ graph1;
+      (* 2 *) expect __LOC__ graph1;
       expect __LOC__ graph2 ;
       expect __LOC__ graph3
     end
@@ -10644,9 +10753,9 @@ type t = {
 } 
 
 let init n = 
-  (* 2 *) let id = Array.make n 0 in 
+  (* 4 *) let id = Array.make n 0 in 
   for i = 0 to  n - 1 do
-    (* 635 *) Array.unsafe_set id i i  
+    (* 1270 *) Array.unsafe_set id i i  
   done  ;
   {
     id ; 
@@ -10655,19 +10764,19 @@ let init n =
   }
 
 let rec find_aux id_store p = 
-  (* 3686 *) let parent = Array.unsafe_get id_store p in 
+  (* 7372 *) let parent = Array.unsafe_get id_store p in 
   if p <> parent then 
-    (* 1864 *) find_aux id_store parent 
-  else (* 1822 *) p       
+    (* 3728 *) find_aux id_store parent 
+  else (* 3644 *) p       
 
 let find store p = (* 0 *) find_aux store.id p 
 
 let union store p q =
-  (* 911 *) let id_store = store.id in 
+  (* 1822 *) let id_store = store.id in 
   let p_root = find_aux id_store p in 
   let q_root = find_aux id_store q in 
   if p_root <> q_root then 
-    (* 630 *) begin
+    (* 1260 *) begin
       let () = store.components <- store.components - 1 in
       let sz_store = store.sz in
       let sz_p_root = Array.unsafe_get sz_store p_root in 
@@ -10679,14 +10788,14 @@ let union store p q =
          but major will not be impacted 
       *) 
       if  sz_p_root < sz_q_root  then
-        (* 202 *) begin
+        (* 404 *) begin
           Array.unsafe_set id_store p q_root;   
           Array.unsafe_set id_store p_root q_root;
           Array.unsafe_set sz_store q_root bigger;            
           (* little optimization *) 
         end 
       else   
-        (* 428 *) begin
+        (* 856 *) begin
           Array.unsafe_set id_store q  p_root ;
           Array.unsafe_set id_store q_root p_root;   
           Array.unsafe_set sz_store p_root bigger;          
@@ -10694,7 +10803,7 @@ let union store p q =
         end
     end 
 
-let count store = (* 2 *) store.components    
+let count store = (* 4 *) store.components    
 
 
 end
@@ -11623,16 +11732,16 @@ let mediumUF = {|625
 
 
 let process_str tinyUF = 
-  (* 2 *) match Ext_string.split tinyUF '\n' with 
+  (* 4 *) match Ext_string.split tinyUF '\n' with 
   | number :: rest ->
-    (* 2 *) let n = int_of_string number in
+    (* 4 *) let n = int_of_string number in
     let store = Union_find.init n in
     List.iter (fun x ->
-        (* 913 *) match Ext_string.quick_split_by_ws x with 
+        (* 1826 *) match Ext_string.quick_split_by_ws x with 
         | [a;b] ->
-          (* 911 *) let a,b = int_of_string a , int_of_string b in 
+          (* 1822 *) let a,b = int_of_string a , int_of_string b in 
           Union_find.union store a b 
-        | _ -> (* 2 *) ()) rest;
+        | _ -> (* 4 *) ()) rest;
     Union_find.count store
   | _ -> (* 0 *) assert false
 ;;        
@@ -11673,10 +11782,10 @@ let suites =
   >:::
   [
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_equal (process_str tinyUF) 2
+      (* 2 *) OUnit.assert_equal (process_str tinyUF) 2
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) OUnit.assert_equal (process_str mediumUF) 3
+      (* 2 *) OUnit.assert_equal (process_str mediumUF) 3
     end;
 (*
    __LOC__ >:: begin fun _ ->
@@ -11692,13 +11801,13 @@ module Ounit_vec_test
 let ((>::),
      (>:::)) = OUnit.((>::),(>:::))
 
-open Bsb_json
+open Ext_json
 
-let v = Int_vec.init 10 (fun i -> (* 10 *) i);;
+let v = Int_vec.init 10 (fun i -> (* 20 *) i);;
 let (=~) x y = (* 0 *) OUnit.assert_equal ~cmp:(Int_vec.equal  (fun (x: int) y -> (* 0 *) x=y)) x y
 let (=~~) x y 
   = 
-  (* 22 *) OUnit.assert_equal ~cmp:(Int_vec.equal  (fun (x: int) y -> (* 1605 *) x=y)) 
+  (* 44 *) OUnit.assert_equal ~cmp:(Int_vec.equal  (fun (x: int) y -> (* 3210 *) x=y)) 
   x (Int_vec.of_array y) 
 
 let suites = 
@@ -11710,16 +11819,16 @@ let suites =
       or "inplace filter" [@bs.loc]
     *)
     "inplace_filter " ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9|];
+      (* 2 *) v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9|];
       
       ignore @@ Int_vec.push  32 v;
       let capacity = Int_vec.capacity v  in 
       v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 32|];
-      Int_vec.inplace_filter (fun x -> (* 11 *) x mod 2 = 0) v ;
+      Int_vec.inplace_filter (fun x -> (* 22 *) x mod 2 = 0) v ;
       v =~~ [|0; 2; 4; 6; 8; 32|];
-      Int_vec.inplace_filter (fun x -> (* 6 *) x mod 3 = 0) v ;
+      Int_vec.inplace_filter (fun x -> (* 12 *) x mod 3 = 0) v ;
       v =~~ [|0;6|];
-      Int_vec.inplace_filter (fun x -> (* 2 *) x mod 3 <> 0) v ;
+      Int_vec.inplace_filter (fun x -> (* 4 *) x mod 3 <> 0) v ;
       v =~~ [||];
       OUnit.assert_equal (Int_vec.capacity v ) capacity ;
       Int_vec.compact v ; 
@@ -11727,82 +11836,82 @@ let suites =
     end
     ;
     "inplace_filter_from " ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Int_vec.of_array (Array.init 10 (fun i -> (* 10 *) i)) in 
+      (* 2 *) let v = Int_vec.of_array (Array.init 10 (fun i -> (* 20 *) i)) in 
       v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9|]; 
       Int_vec.push 96 v  ;      
-      Int_vec.inplace_filter_from 2 (fun x -> (* 9 *) x mod 2 = 0) v ;
+      Int_vec.inplace_filter_from 2 (fun x -> (* 18 *) x mod 2 = 0) v ;
       v =~~ [|0; 1; 2; 4; 6; 8; 96|];
-      Int_vec.inplace_filter_from 2 (fun x -> (* 5 *) x mod 3 = 0) v ;
+      Int_vec.inplace_filter_from 2 (fun x -> (* 10 *) x mod 3 = 0) v ;
       v =~~ [|0; 1; 6; 96|];
-      Int_vec.inplace_filter (fun x -> (* 4 *) x mod 3 <> 0) v ;
+      Int_vec.inplace_filter (fun x -> (* 8 *) x mod 3 <> 0) v ;
       v =~~ [|1|];      
       Int_vec.compact v ; 
       OUnit.assert_equal (Int_vec.capacity v ) 1
     end
     ;
     "map " ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Int_vec.of_array (Array.init 1000 (fun i -> (* 1000 *) i )) in 
+      (* 2 *) let v = Int_vec.of_array (Array.init 1000 (fun i -> (* 2000 *) i )) in 
       Int_vec.map succ v =~~ (Array.init 1000 succ) ;
-      OUnit.assert_bool __LOC__ (Int_vec.exists (fun x -> (* 1000 *) x >= 999) v );
-      OUnit.assert_bool __LOC__ (not (Int_vec.exists (fun x -> (* 1000 *) x > 1000) v ));
+      OUnit.assert_bool __LOC__ (Int_vec.exists (fun x -> (* 2000 *) x >= 999) v );
+      OUnit.assert_bool __LOC__ (not (Int_vec.exists (fun x -> (* 2000 *) x > 1000) v ));
       OUnit.assert_equal (Int_vec.last v ) 999
     end ;  
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let count = 1000 in 
-      let init_array = (Array.init count (fun i -> (* 1000 *) i)) in 
+      (* 2 *) let count = 1000 in 
+      let init_array = (Array.init count (fun i -> (* 2000 *) i)) in 
       let u = Int_vec.of_array  init_array in 
-      let v = Int_vec.inplace_filter_with (fun x -> (* 1000 *) x mod 2 = 0) ~cb_no:Set_int.add Set_int.empty u  in
-      let (even,odd) = init_array |> Array.to_list |> List.partition (fun x -> (* 1000 *) x mod 2 = 0) in 
+      let v = Int_vec.inplace_filter_with (fun x -> (* 2000 *) x mod 2 = 0) ~cb_no:Set_int.add Set_int.empty u  in
+      let (even,odd) = init_array |> Array.to_list |> List.partition (fun x -> (* 2000 *) x mod 2 = 0) in 
       OUnit.assert_equal 
       (Set_int.elements v) odd ;
       u =~~ Array.of_list even 
     end ;
     "filter" ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Int_vec.of_array [|1;2;3;4;5;6|] in 
-      v |> Int_vec.filter (fun x -> (* 6 *) x mod 3 = 0) |> (fun x -> (* 1 *) x =~~ [|3;6|]);
+      (* 2 *) let v = Int_vec.of_array [|1;2;3;4;5;6|] in 
+      v |> Int_vec.filter (fun x -> (* 12 *) x mod 3 = 0) |> (fun x -> (* 2 *) x =~~ [|3;6|]);
       v =~~ [|1;2;3;4;5;6|];
       Int_vec.pop v ; 
       v =~~ [|1;2;3;4;5|];
       let count = ref 0 in 
       let len = Int_vec.length v  in 
       while not (Int_vec.is_empty v ) do 
-        (* 5 *) Int_vec.pop v ;
+        (* 10 *) Int_vec.pop v ;
         incr count
       done;
       OUnit.assert_equal len !count
     end
     ;
     __LOC__ >:: begin fun _ -> 
-      (* 1 *) let count = 100 in 
-      let v = Int_vec.of_array (Array.init count (fun i -> (* 100 *) i)) in 
+      (* 2 *) let count = 100 in 
+      let v = Int_vec.of_array (Array.init count (fun i -> (* 200 *) i)) in 
       OUnit.assert_bool __LOC__ 
-        (try Int_vec.delete v count; false with _ -> (* 1 *) true );
+        (try Int_vec.delete v count; false with _ -> (* 2 *) true );
       for i = count - 1 downto 10 do 
-        (* 90 *) Int_vec.delete v i ;
+        (* 180 *) Int_vec.delete v i ;
       done ;
       v =~~ [|0;1;2;3;4;5;6;7;8;9|] 
     end; 
     "sub" ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Int_vec.make 5 in 
+      (* 2 *) let v = Int_vec.make 5 in 
       OUnit.assert_bool __LOC__
-        (try ignore @@ Int_vec.sub v 0 2 ; false with Invalid_argument _  -> (* 1 *) true);
+        (try ignore @@ Int_vec.sub v 0 2 ; false with Invalid_argument _  -> (* 2 *) true);
       Int_vec.push 1 v;
       OUnit.assert_bool __LOC__
-        (try ignore @@ Int_vec.sub v 0 2 ; false with Invalid_argument _  -> (* 1 *) true);
+        (try ignore @@ Int_vec.sub v 0 2 ; false with Invalid_argument _  -> (* 2 *) true);
       Int_vec.push 2 v ;  
       ( Int_vec.sub v 0 2 =~~ [|1;2|])
     end;
     "reserve" ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Int_vec.empty () in 
+      (* 2 *) let v = Int_vec.empty () in 
       Int_vec.reserve v  1000 ;
       for i = 0 to 900 do
-        (* 901 *) Int_vec.push i v 
+        (* 1802 *) Int_vec.push i v 
       done ;
       OUnit.assert_equal (Int_vec.length v) 901 ;
       OUnit.assert_equal (Int_vec.capacity v) 1000
     end ; 
     "capacity"  ^ __LOC__ >:: begin fun _ -> 
-      (* 1 *) let v = Int_vec.of_array [|3|] in 
+      (* 2 *) let v = Int_vec.of_array [|3|] in 
       Int_vec.reserve v 10 ;
       v =~~ [|3 |];
       Int_vec.push 1 v ;
@@ -11811,7 +11920,7 @@ let suites =
       v=~~ [|3;1;2;5|];
       OUnit.assert_equal (Int_vec.capacity v  ) 10 ;
       for i = 0 to 5 do
-        (* 6 *) Int_vec.push i  v
+        (* 12 *) Int_vec.push i  v
       done;
       v=~~ [|3;1;2;5;0;1;2;3;4;5|];
       Int_vec.push   100 v;
@@ -11820,21 +11929,21 @@ let suites =
     end
     ;
     __LOC__  >:: begin fun _ -> 
-      (* 1 *) let empty = Int_vec.empty () in 
+      (* 2 *) let empty = Int_vec.empty () in 
       Int_vec.push   3 empty;
       empty =~~ [|3|];
 
     end
     ;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let lst = [1;2;3;4] in 
+      (* 2 *) let lst = [1;2;3;4] in 
       let v = Int_vec.of_list lst in 
       OUnit.assert_equal 
-        (Int_vec.map_into_list (fun x -> (* 4 *) x + 1) v)
-        (List.map (fun x -> (* 4 *) x + 1) lst)  
+        (Int_vec.map_into_list (fun x -> (* 8 *) x + 1) v)
+        (List.map (fun x -> (* 8 *) x + 1) lst)  
     end;
     __LOC__ >:: begin fun _ ->
-      (* 1 *) let v = Int_vec.make 4 in 
+      (* 2 *) let v = Int_vec.make 4 in 
       Int_vec.push 1 v;
       Int_vec.push 2 v;
       Int_vec.reverse_in_place v;
@@ -11854,7 +11963,7 @@ end = struct
 
 
 module Int_array = Resize_array.Make(struct type t = int let null = 0 end);;
-let v = Int_array.init 10 (fun i -> (* 10 *) i);;
+let v = Int_array.init 10 (fun i -> (* 20 *) i);;
 
 let ((>::),
     (>:::)) = OUnit.((>::),(>:::))
diff --git a/jscomp/bin/all_ounit_tests.ml b/jscomp/bin/all_ounit_tests.ml
index b3ca79fdab..2171d0c055 100644
--- a/jscomp/bin/all_ounit_tests.ml
+++ b/jscomp/bin/all_ounit_tests.ml
@@ -445,6 +445,8 @@ val assert_equal :
     @raise Failure description *)
 val assert_raises : ?msg:string -> exn -> (unit -> 'a) -> unit
 
+val assert_raise_any : ?msg:string ->  (unit -> 'a) -> unit
+
 (** {2 Skipping tests } 
   
    In certain condition test can be written but there is no point running it, because they
@@ -915,6 +917,30 @@ let assert_raises ?msg exn (f: unit -> 'a) =
       | Some e -> 
           assert_equal ?msg ~printer:pexn exn e
 
+
+let assert_raise_any ?msg (f: unit -> 'a) = 
+  let pexn = 
+    Printexc.to_string 
+  in
+  let get_error_string () =
+    let str = 
+      Format.sprintf 
+        "expected exception , but no exception was raised." 
+        
+    in
+      match msg with
+        | None -> 
+            assert_failure str
+              
+        | Some s -> 
+            assert_failure (s^"\n"^str)
+  in    
+    match raises f with
+      | None -> 
+          assert_failure (get_error_string ())
+
+      | Some exn -> 
+          assert_bool (pexn exn) true
 (* Compare floats up to a given relative error *)
 let cmp_float ?(epsilon = 0.00001) a b =
   abs_float (a -. b) <= epsilon *. (abs_float a) ||
@@ -1665,6 +1691,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1697,15 +1725,15 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -1724,11 +1752,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -1754,27 +1787,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -1794,16 +1846,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -1820,7 +1876,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -1831,18 +1887,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -1852,11 +1908,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -1942,11 +1999,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -1954,21 +2013,28 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
+
 end
 module Ounit_array_tests
 = struct
@@ -5552,7 +5618,7 @@ val query : path -> t ->  status
 
 end = struct
 #1 "ext_json.ml"
-# 1 "bsb/bsb_json.mll"
+# 1 "ext/ext_json.mll"
  
 type error =
   | Illegal_character of char
@@ -5669,7 +5735,7 @@ let hex_code c1 c2 =
 
 let lf = '\010'
 
-# 119 "bsb/bsb_json.ml"
+# 119 "ext/ext_json.ml"
 let __ocaml_lex_tables = {
   Lexing.lex_base = 
    "\000\000\239\255\240\255\241\255\000\000\025\000\011\000\244\255\
@@ -5857,80 +5923,80 @@ let rec lex_json buf lexbuf =
 and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 137 "bsb/bsb_json.mll"
+# 137 "ext/ext_json.mll"
           ( lex_json buf lexbuf)
-# 309 "bsb/bsb_json.ml"
+# 309 "ext/ext_json.ml"
 
   | 1 ->
-# 138 "bsb/bsb_json.mll"
+# 138 "ext/ext_json.mll"
                    ( 
     update_loc lexbuf 0;
     lex_json buf  lexbuf
   )
-# 317 "bsb/bsb_json.ml"
+# 317 "ext/ext_json.ml"
 
   | 2 ->
-# 142 "bsb/bsb_json.mll"
+# 142 "ext/ext_json.mll"
                 ( comment buf lexbuf)
-# 322 "bsb/bsb_json.ml"
+# 322 "ext/ext_json.ml"
 
   | 3 ->
-# 143 "bsb/bsb_json.mll"
+# 143 "ext/ext_json.mll"
          ( True)
-# 327 "bsb/bsb_json.ml"
+# 327 "ext/ext_json.ml"
 
   | 4 ->
-# 144 "bsb/bsb_json.mll"
+# 144 "ext/ext_json.mll"
           (False)
-# 332 "bsb/bsb_json.ml"
+# 332 "ext/ext_json.ml"
 
   | 5 ->
-# 145 "bsb/bsb_json.mll"
+# 145 "ext/ext_json.mll"
          (Null)
-# 337 "bsb/bsb_json.ml"
+# 337 "ext/ext_json.ml"
 
   | 6 ->
-# 146 "bsb/bsb_json.mll"
+# 146 "ext/ext_json.mll"
        (Lbracket)
-# 342 "bsb/bsb_json.ml"
+# 342 "ext/ext_json.ml"
 
   | 7 ->
-# 147 "bsb/bsb_json.mll"
+# 147 "ext/ext_json.mll"
        (Rbracket)
-# 347 "bsb/bsb_json.ml"
+# 347 "ext/ext_json.ml"
 
   | 8 ->
-# 148 "bsb/bsb_json.mll"
+# 148 "ext/ext_json.mll"
        (Lbrace)
-# 352 "bsb/bsb_json.ml"
+# 352 "ext/ext_json.ml"
 
   | 9 ->
-# 149 "bsb/bsb_json.mll"
+# 149 "ext/ext_json.mll"
        (Rbrace)
-# 357 "bsb/bsb_json.ml"
+# 357 "ext/ext_json.ml"
 
   | 10 ->
-# 150 "bsb/bsb_json.mll"
+# 150 "ext/ext_json.mll"
        (Comma)
-# 362 "bsb/bsb_json.ml"
+# 362 "ext/ext_json.ml"
 
   | 11 ->
-# 151 "bsb/bsb_json.mll"
+# 151 "ext/ext_json.mll"
         (Colon)
-# 367 "bsb/bsb_json.ml"
+# 367 "ext/ext_json.ml"
 
   | 12 ->
-# 152 "bsb/bsb_json.mll"
+# 152 "ext/ext_json.mll"
                       (lex_json buf lexbuf)
-# 372 "bsb/bsb_json.ml"
+# 372 "ext/ext_json.ml"
 
   | 13 ->
-# 154 "bsb/bsb_json.mll"
+# 154 "ext/ext_json.mll"
          ( Number (Lexing.lexeme lexbuf))
-# 377 "bsb/bsb_json.ml"
+# 377 "ext/ext_json.ml"
 
   | 14 ->
-# 156 "bsb/bsb_json.mll"
+# 156 "ext/ext_json.mll"
       (
   let pos = Lexing.lexeme_start_p lexbuf in
   scan_string buf pos lexbuf;
@@ -5938,22 +6004,22 @@ and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
   Buffer.clear buf ;
   String content 
 )
-# 388 "bsb/bsb_json.ml"
+# 388 "ext/ext_json.ml"
 
   | 15 ->
-# 163 "bsb/bsb_json.mll"
+# 163 "ext/ext_json.mll"
        (Eof )
-# 393 "bsb/bsb_json.ml"
+# 393 "ext/ext_json.ml"
 
   | 16 ->
 let
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
        c
-# 399 "bsb/bsb_json.ml"
+# 399 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf lexbuf.Lexing.lex_start_pos in
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
           ( error lexbuf (Illegal_character c ))
-# 403 "bsb/bsb_json.ml"
+# 403 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state
@@ -5963,19 +6029,19 @@ and comment buf lexbuf =
 and __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 166 "bsb/bsb_json.mll"
+# 166 "ext/ext_json.mll"
               (lex_json buf lexbuf)
-# 415 "bsb/bsb_json.ml"
+# 415 "ext/ext_json.ml"
 
   | 1 ->
-# 167 "bsb/bsb_json.mll"
+# 167 "ext/ext_json.mll"
      (comment buf lexbuf)
-# 420 "bsb/bsb_json.ml"
+# 420 "ext/ext_json.ml"
 
   | 2 ->
-# 168 "bsb/bsb_json.mll"
+# 168 "ext/ext_json.mll"
        (error lexbuf Unterminated_comment)
-# 425 "bsb/bsb_json.ml"
+# 425 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state
@@ -5985,64 +6051,64 @@ and scan_string buf start lexbuf =
 and __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 172 "bsb/bsb_json.mll"
+# 172 "ext/ext_json.mll"
       ( () )
-# 437 "bsb/bsb_json.ml"
+# 437 "ext/ext_json.ml"
 
   | 1 ->
-# 174 "bsb/bsb_json.mll"
+# 174 "ext/ext_json.mll"
   (
         let len = lexeme_len lexbuf - 2 in
         update_loc lexbuf len;
 
         scan_string buf start lexbuf
       )
-# 447 "bsb/bsb_json.ml"
+# 447 "ext/ext_json.ml"
 
   | 2 ->
-# 181 "bsb/bsb_json.mll"
+# 181 "ext/ext_json.mll"
       (
         let len = lexeme_len lexbuf - 3 in
         update_loc lexbuf len;
         scan_string buf start lexbuf
       )
-# 456 "bsb/bsb_json.ml"
+# 456 "ext/ext_json.ml"
 
   | 3 ->
 let
-# 186 "bsb/bsb_json.mll"
+# 186 "ext/ext_json.mll"
                                                c
-# 462 "bsb/bsb_json.ml"
+# 462 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 187 "bsb/bsb_json.mll"
+# 187 "ext/ext_json.mll"
       (
         Buffer.add_char buf (char_for_backslash c);
         scan_string buf start lexbuf
       )
-# 469 "bsb/bsb_json.ml"
+# 469 "ext/ext_json.ml"
 
   | 4 ->
 let
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                  c1
-# 475 "bsb/bsb_json.ml"
+# 475 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                c2
-# 480 "bsb/bsb_json.ml"
+# 480 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                              c3
-# 485 "bsb/bsb_json.ml"
+# 485 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                                     s
-# 490 "bsb/bsb_json.ml"
+# 490 "ext/ext_json.ml"
 = Lexing.sub_lexeme lexbuf lexbuf.Lexing.lex_start_pos (lexbuf.Lexing.lex_start_pos + 4) in
-# 192 "bsb/bsb_json.mll"
+# 192 "ext/ext_json.mll"
       (
         let v = dec_code c1 c2 c3 in
         if v > 255 then
@@ -6051,55 +6117,55 @@ and
 
         scan_string buf start lexbuf
       )
-# 501 "bsb/bsb_json.ml"
+# 501 "ext/ext_json.ml"
 
   | 5 ->
 let
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                         c1
-# 507 "bsb/bsb_json.ml"
+# 507 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                                          c2
-# 512 "bsb/bsb_json.ml"
+# 512 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3) in
-# 201 "bsb/bsb_json.mll"
+# 201 "ext/ext_json.mll"
       (
         let v = hex_code c1 c2 in
         Buffer.add_char buf (Char.chr v);
 
         scan_string buf start lexbuf
       )
-# 521 "bsb/bsb_json.ml"
+# 521 "ext/ext_json.ml"
 
   | 6 ->
 let
-# 207 "bsb/bsb_json.mll"
+# 207 "ext/ext_json.mll"
              c
-# 527 "bsb/bsb_json.ml"
+# 527 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 208 "bsb/bsb_json.mll"
+# 208 "ext/ext_json.mll"
       (
         Buffer.add_char buf '\\';
         Buffer.add_char buf c;
 
         scan_string buf start lexbuf
       )
-# 536 "bsb/bsb_json.ml"
+# 536 "ext/ext_json.ml"
 
   | 7 ->
-# 215 "bsb/bsb_json.mll"
+# 215 "ext/ext_json.mll"
       (
         update_loc lexbuf 0;
         Buffer.add_char buf lf;
 
         scan_string buf start lexbuf
       )
-# 546 "bsb/bsb_json.ml"
+# 546 "ext/ext_json.ml"
 
   | 8 ->
-# 222 "bsb/bsb_json.mll"
+# 222 "ext/ext_json.mll"
       (
         let ofs = lexbuf.lex_start_pos in
         let len = lexbuf.lex_curr_pos - ofs in
@@ -6107,21 +6173,21 @@ let
 
         scan_string buf start lexbuf
       )
-# 557 "bsb/bsb_json.ml"
+# 557 "ext/ext_json.ml"
 
   | 9 ->
-# 230 "bsb/bsb_json.mll"
+# 230 "ext/ext_json.mll"
       (
         error lexbuf Unterminated_string
       )
-# 564 "bsb/bsb_json.ml"
+# 564 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state
 
 ;;
 
-# 234 "bsb/bsb_json.mll"
+# 234 "ext/ext_json.mll"
  
 
 type js_array =
@@ -6283,7 +6349,7 @@ let query path (json : t ) =
       end
   in aux [] path json
 
-# 733 "bsb/bsb_json.ml"
+# 733 "ext/ext_json.ml"
 
 end
 module Ounit_json_tests
@@ -7787,10 +7853,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -8007,13 +8070,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -8022,7 +8081,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
@@ -10338,7 +10397,7 @@ module Ounit_string_tests
 = struct
 #1 "ounit_string_tests.ml"
 let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
+     (>:::)) = OUnit.((>::),(>:::))
 
 let (=~) = OUnit.assert_equal    
 
@@ -10346,56 +10405,106 @@ let (=~) = OUnit.assert_equal
 
 
 let suites = 
-    __FILE__ >::: 
-    [
-        __LOC__ >:: begin fun _ ->
-            OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
-        end;
+  __FILE__ >::: 
+  [
+    __LOC__ >:: begin fun _ ->
+      OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            Ext_string.rindex_neg "hello" 'h' =~ 0 ;
-            Ext_string.rindex_neg "hello" 'e' =~ 1 ;
-            Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-            Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-            Ext_string.rindex_neg "hello" 'o' =~ 4 ;
-        end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.rindex_neg "hello" 'h' =~ 0 ;
+      Ext_string.rindex_neg "hello" 'e' =~ 1 ;
+      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
+      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
+      Ext_string.rindex_neg "hello" 'o' =~ 4 ;
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
-        end;
+    __LOC__ >:: begin fun _ -> 
+      OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool __LOC__
-            (Ext_string.for_all_range "xABc"~start:1
-            ~finish:3 (function 'A' .. 'Z' -> true | _ -> false));
-            OUnit.assert_bool __LOC__
-            (not (Ext_string.for_all_range "xABc"~start:1
-            ~finish:4 (function 'A' .. 'Z' -> true | _ -> false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:2 (function 'A' .. 'Z' -> true | _ -> false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:1 (function 'A' .. 'Z' -> true | _ -> false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:0 (function 'A' .. 'Z' -> true | _ -> false)));
-        end;
+    __LOC__ >:: begin fun _ -> 
+      OUnit.assert_bool __LOC__
+        (Ext_string.for_all_range "xABc"~start:1
+           ~finish:2 (function 'A' .. 'Z' -> true | _ -> false));
+      OUnit.assert_bool __LOC__
+        (not (Ext_string.for_all_range "xABc"~start:1
+                ~finish:3(function 'A' .. 'Z' -> true | _ -> false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:2 (function 'A' .. 'Z' -> true | _ -> false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:1 (function 'A' .. 'Z' -> true | _ -> false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:0 (function 'A' .. 'Z' -> true | _ -> false)));    
+      OUnit.assert_raise_any       
+        (fun _ ->  (Ext_string.for_all_range "xABc"~start:1
+             ~finish:4 (function 'A' .. 'Z' -> true | _ -> false)));    
+    
+    end;
 
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool __LOC__ @@
-             List.for_all Ext_string.is_valid_source_name
-            ["x.ml"; "x.mli"; "x.re"; "x.rei"; "x.mll"; 
-            "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
-            "ax.ml"];
-            OUnit.assert_bool __LOC__ @@ not @@
-                List.exists Ext_string.is_valid_source_name
-                [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
-                "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
-                ".#hello.ml"; ".#hello.rei"
-                ]
-        end
-    ]
+    __LOC__ >:: begin fun _ -> 
+      OUnit.assert_bool __LOC__ @@
+      List.for_all Ext_string.is_valid_source_name
+        ["x.ml"; "x.mli"; "x.re"; "x.rei"; "x.mll"; 
+         "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
+         "ax.ml"];
+      OUnit.assert_bool __LOC__ @@ not @@
+      List.exists Ext_string.is_valid_source_name
+        [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
+         "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
+         ".#hello.ml"; ".#hello.rei"; "a-.ml"; "a-b.ml"; "-a-.ml"
+         ; "-.ml"
+        ]
+    end;
+    __LOC__ >:: begin fun _ -> 
+        Ext_string.find ~sub:"hello" "xx hello xx" =~ 3 ;
+        Ext_string.rfind ~sub:"hello" "xx hello xx" =~ 3 ;
+        Ext_string.find ~sub:"hello" "xx hello hello xx" =~ 3 ;
+        Ext_string.rfind ~sub:"hello" "xx hello hello xx" =~ 9 ;
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.trim " \t\n" =~ "";
+      Ext_string.trim " \t\nb" =~ "b";
+      Ext_string.trim "b \t\n" =~ "b";
+      Ext_string.trim "\t\n b \t\n" =~ "b";            
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.starts_with "ab" "a" =~ true;
+      Ext_string.starts_with "ab" "" =~ true;
+      Ext_string.starts_with "abb" "abb" =~ true;
+      Ext_string.starts_with "abb" "abbc" =~ false;
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.ends_with_then_chop "xx.ml"  ".ml" =~ Some "xx";
+      Ext_string.ends_with_then_chop "xx.ml" ".mll" =~ None
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.starts_with_and_number "js_fn_mk_01" ~offset:0 "js_fn_mk_" =~ 1 ;
+      Ext_string.starts_with_and_number "js_fn_run_02" ~offset:0 "js_fn_mk_" =~ -1 ;
+      Ext_string.starts_with_and_number "js_fn_mk_03" ~offset:6 "mk_" =~ 3 ;
+      Ext_string.starts_with_and_number "js_fn_mk_04" ~offset:6 "run_" =~ -1;
+      Ext_string.starts_with_and_number "js_fn_run_04" ~offset:6 "run_" =~ 4;
+      Ext_string.(starts_with_and_number "js_fn_run_04" ~offset:6 "run_" = 3) =~ false 
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.for_all (function '_' -> true | _ -> false)
+        "____" =~ true;
+      Ext_string.for_all (function '_' -> true | _ -> false)
+        "___-" =~ false;
+      Ext_string.for_all (function '_' -> true | _ -> false)        
+        "" =~ true
+    end;
+    __LOC__ >:: begin fun _ -> 
+        Ext_string.tail_from "ghsogh" 1 =~ "hsogh";
+        Ext_string.tail_from "ghsogh" 0 =~ "ghsogh"
+    end;
+    __LOC__ >:: begin fun _ -> 
+        Ext_string.digits_of_str "11_js" ~offset:0 2 =~ 11 
+    end
+  ]
 end
 module Ext_topsort : sig 
 #1 "ext_topsort.mli"
diff --git a/jscomp/bin/bsb.ml b/jscomp/bin/bsb.ml
index c5a5eff707..e1a24c438c 100644
--- a/jscomp/bin/bsb.ml
+++ b/jscomp/bin/bsb.ml
@@ -477,6 +477,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -509,15 +511,15 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -536,11 +538,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -566,27 +573,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -606,16 +632,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -632,7 +662,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -643,18 +673,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -664,11 +694,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -754,11 +785,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -766,21 +799,28 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
+
 end
 module Literals : sig 
 #1 "literals.mli"
@@ -1086,10 +1126,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -1306,13 +1343,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -1321,7 +1354,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
@@ -2968,7 +3001,7 @@ val query : path -> t ->  status
 
 end = struct
 #1 "ext_json.ml"
-# 1 "bsb/bsb_json.mll"
+# 1 "ext/ext_json.mll"
  
 type error =
   | Illegal_character of char
@@ -3085,7 +3118,7 @@ let hex_code c1 c2 =
 
 let lf = '\010'
 
-# 119 "bsb/bsb_json.ml"
+# 119 "ext/ext_json.ml"
 let __ocaml_lex_tables = {
   Lexing.lex_base = 
    "\000\000\239\255\240\255\241\255\000\000\025\000\011\000\244\255\
@@ -3273,80 +3306,80 @@ let rec lex_json buf lexbuf =
 and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 137 "bsb/bsb_json.mll"
+# 137 "ext/ext_json.mll"
           ( lex_json buf lexbuf)
-# 309 "bsb/bsb_json.ml"
+# 309 "ext/ext_json.ml"
 
   | 1 ->
-# 138 "bsb/bsb_json.mll"
+# 138 "ext/ext_json.mll"
                    ( 
     update_loc lexbuf 0;
     lex_json buf  lexbuf
   )
-# 317 "bsb/bsb_json.ml"
+# 317 "ext/ext_json.ml"
 
   | 2 ->
-# 142 "bsb/bsb_json.mll"
+# 142 "ext/ext_json.mll"
                 ( comment buf lexbuf)
-# 322 "bsb/bsb_json.ml"
+# 322 "ext/ext_json.ml"
 
   | 3 ->
-# 143 "bsb/bsb_json.mll"
+# 143 "ext/ext_json.mll"
          ( True)
-# 327 "bsb/bsb_json.ml"
+# 327 "ext/ext_json.ml"
 
   | 4 ->
-# 144 "bsb/bsb_json.mll"
+# 144 "ext/ext_json.mll"
           (False)
-# 332 "bsb/bsb_json.ml"
+# 332 "ext/ext_json.ml"
 
   | 5 ->
-# 145 "bsb/bsb_json.mll"
+# 145 "ext/ext_json.mll"
          (Null)
-# 337 "bsb/bsb_json.ml"
+# 337 "ext/ext_json.ml"
 
   | 6 ->
-# 146 "bsb/bsb_json.mll"
+# 146 "ext/ext_json.mll"
        (Lbracket)
-# 342 "bsb/bsb_json.ml"
+# 342 "ext/ext_json.ml"
 
   | 7 ->
-# 147 "bsb/bsb_json.mll"
+# 147 "ext/ext_json.mll"
        (Rbracket)
-# 347 "bsb/bsb_json.ml"
+# 347 "ext/ext_json.ml"
 
   | 8 ->
-# 148 "bsb/bsb_json.mll"
+# 148 "ext/ext_json.mll"
        (Lbrace)
-# 352 "bsb/bsb_json.ml"
+# 352 "ext/ext_json.ml"
 
   | 9 ->
-# 149 "bsb/bsb_json.mll"
+# 149 "ext/ext_json.mll"
        (Rbrace)
-# 357 "bsb/bsb_json.ml"
+# 357 "ext/ext_json.ml"
 
   | 10 ->
-# 150 "bsb/bsb_json.mll"
+# 150 "ext/ext_json.mll"
        (Comma)
-# 362 "bsb/bsb_json.ml"
+# 362 "ext/ext_json.ml"
 
   | 11 ->
-# 151 "bsb/bsb_json.mll"
+# 151 "ext/ext_json.mll"
         (Colon)
-# 367 "bsb/bsb_json.ml"
+# 367 "ext/ext_json.ml"
 
   | 12 ->
-# 152 "bsb/bsb_json.mll"
+# 152 "ext/ext_json.mll"
                       (lex_json buf lexbuf)
-# 372 "bsb/bsb_json.ml"
+# 372 "ext/ext_json.ml"
 
   | 13 ->
-# 154 "bsb/bsb_json.mll"
+# 154 "ext/ext_json.mll"
          ( Number (Lexing.lexeme lexbuf))
-# 377 "bsb/bsb_json.ml"
+# 377 "ext/ext_json.ml"
 
   | 14 ->
-# 156 "bsb/bsb_json.mll"
+# 156 "ext/ext_json.mll"
       (
   let pos = Lexing.lexeme_start_p lexbuf in
   scan_string buf pos lexbuf;
@@ -3354,22 +3387,22 @@ and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
   Buffer.clear buf ;
   String content 
 )
-# 388 "bsb/bsb_json.ml"
+# 388 "ext/ext_json.ml"
 
   | 15 ->
-# 163 "bsb/bsb_json.mll"
+# 163 "ext/ext_json.mll"
        (Eof )
-# 393 "bsb/bsb_json.ml"
+# 393 "ext/ext_json.ml"
 
   | 16 ->
 let
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
        c
-# 399 "bsb/bsb_json.ml"
+# 399 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf lexbuf.Lexing.lex_start_pos in
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
           ( error lexbuf (Illegal_character c ))
-# 403 "bsb/bsb_json.ml"
+# 403 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state
@@ -3379,19 +3412,19 @@ and comment buf lexbuf =
 and __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 166 "bsb/bsb_json.mll"
+# 166 "ext/ext_json.mll"
               (lex_json buf lexbuf)
-# 415 "bsb/bsb_json.ml"
+# 415 "ext/ext_json.ml"
 
   | 1 ->
-# 167 "bsb/bsb_json.mll"
+# 167 "ext/ext_json.mll"
      (comment buf lexbuf)
-# 420 "bsb/bsb_json.ml"
+# 420 "ext/ext_json.ml"
 
   | 2 ->
-# 168 "bsb/bsb_json.mll"
+# 168 "ext/ext_json.mll"
        (error lexbuf Unterminated_comment)
-# 425 "bsb/bsb_json.ml"
+# 425 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state
@@ -3401,64 +3434,64 @@ and scan_string buf start lexbuf =
 and __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 172 "bsb/bsb_json.mll"
+# 172 "ext/ext_json.mll"
       ( () )
-# 437 "bsb/bsb_json.ml"
+# 437 "ext/ext_json.ml"
 
   | 1 ->
-# 174 "bsb/bsb_json.mll"
+# 174 "ext/ext_json.mll"
   (
         let len = lexeme_len lexbuf - 2 in
         update_loc lexbuf len;
 
         scan_string buf start lexbuf
       )
-# 447 "bsb/bsb_json.ml"
+# 447 "ext/ext_json.ml"
 
   | 2 ->
-# 181 "bsb/bsb_json.mll"
+# 181 "ext/ext_json.mll"
       (
         let len = lexeme_len lexbuf - 3 in
         update_loc lexbuf len;
         scan_string buf start lexbuf
       )
-# 456 "bsb/bsb_json.ml"
+# 456 "ext/ext_json.ml"
 
   | 3 ->
 let
-# 186 "bsb/bsb_json.mll"
+# 186 "ext/ext_json.mll"
                                                c
-# 462 "bsb/bsb_json.ml"
+# 462 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 187 "bsb/bsb_json.mll"
+# 187 "ext/ext_json.mll"
       (
         Buffer.add_char buf (char_for_backslash c);
         scan_string buf start lexbuf
       )
-# 469 "bsb/bsb_json.ml"
+# 469 "ext/ext_json.ml"
 
   | 4 ->
 let
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                  c1
-# 475 "bsb/bsb_json.ml"
+# 475 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                c2
-# 480 "bsb/bsb_json.ml"
+# 480 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                              c3
-# 485 "bsb/bsb_json.ml"
+# 485 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                                     s
-# 490 "bsb/bsb_json.ml"
+# 490 "ext/ext_json.ml"
 = Lexing.sub_lexeme lexbuf lexbuf.Lexing.lex_start_pos (lexbuf.Lexing.lex_start_pos + 4) in
-# 192 "bsb/bsb_json.mll"
+# 192 "ext/ext_json.mll"
       (
         let v = dec_code c1 c2 c3 in
         if v > 255 then
@@ -3467,55 +3500,55 @@ and
 
         scan_string buf start lexbuf
       )
-# 501 "bsb/bsb_json.ml"
+# 501 "ext/ext_json.ml"
 
   | 5 ->
 let
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                         c1
-# 507 "bsb/bsb_json.ml"
+# 507 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                                          c2
-# 512 "bsb/bsb_json.ml"
+# 512 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3) in
-# 201 "bsb/bsb_json.mll"
+# 201 "ext/ext_json.mll"
       (
         let v = hex_code c1 c2 in
         Buffer.add_char buf (Char.chr v);
 
         scan_string buf start lexbuf
       )
-# 521 "bsb/bsb_json.ml"
+# 521 "ext/ext_json.ml"
 
   | 6 ->
 let
-# 207 "bsb/bsb_json.mll"
+# 207 "ext/ext_json.mll"
              c
-# 527 "bsb/bsb_json.ml"
+# 527 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 208 "bsb/bsb_json.mll"
+# 208 "ext/ext_json.mll"
       (
         Buffer.add_char buf '\\';
         Buffer.add_char buf c;
 
         scan_string buf start lexbuf
       )
-# 536 "bsb/bsb_json.ml"
+# 536 "ext/ext_json.ml"
 
   | 7 ->
-# 215 "bsb/bsb_json.mll"
+# 215 "ext/ext_json.mll"
       (
         update_loc lexbuf 0;
         Buffer.add_char buf lf;
 
         scan_string buf start lexbuf
       )
-# 546 "bsb/bsb_json.ml"
+# 546 "ext/ext_json.ml"
 
   | 8 ->
-# 222 "bsb/bsb_json.mll"
+# 222 "ext/ext_json.mll"
       (
         let ofs = lexbuf.lex_start_pos in
         let len = lexbuf.lex_curr_pos - ofs in
@@ -3523,21 +3556,21 @@ let
 
         scan_string buf start lexbuf
       )
-# 557 "bsb/bsb_json.ml"
+# 557 "ext/ext_json.ml"
 
   | 9 ->
-# 230 "bsb/bsb_json.mll"
+# 230 "ext/ext_json.mll"
       (
         error lexbuf Unterminated_string
       )
-# 564 "bsb/bsb_json.ml"
+# 564 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state
 
 ;;
 
-# 234 "bsb/bsb_json.mll"
+# 234 "ext/ext_json.mll"
  
 
 type js_array =
@@ -3699,7 +3732,7 @@ let query path (json : t ) =
       end
   in aux [] path json
 
-# 733 "bsb/bsb_json.ml"
+# 733 "ext/ext_json.ml"
 
 end
 module Ext_list : sig 
@@ -6587,7 +6620,7 @@ let (//) = Ext_filename.combine
 *)
 let resolve_bsb_magic_file ~cwd ~desc p =
   let p_len = String.length p in 
-  let no_slash = Ext_filename.no_char p '/'  0  p_len in  
+  let no_slash = Ext_string.no_char p '/'  0  p_len in  
   if no_slash then 
     p 
   else if Filename.is_relative p &&
diff --git a/jscomp/bin/bsb_helper.ml b/jscomp/bin/bsb_helper.ml
index 7c85b5fa98..39c30862d9 100644
--- a/jscomp/bin/bsb_helper.ml
+++ b/jscomp/bin/bsb_helper.ml
@@ -443,6 +443,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -475,15 +477,15 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -502,11 +504,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -532,27 +539,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -572,16 +598,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -598,7 +628,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -609,18 +639,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -630,11 +660,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -720,11 +751,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -732,21 +765,28 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
+
 end
 module Literals : sig 
 #1 "literals.mli"
@@ -1052,10 +1092,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -1272,13 +1309,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -1287,7 +1320,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
diff --git a/jscomp/bin/bsdep.ml b/jscomp/bin/bsdep.ml
index 3bd426fe89..6a7fbd37d2 100644
--- a/jscomp/bin/bsdep.ml
+++ b/jscomp/bin/bsdep.ml
@@ -23267,6 +23267,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -23299,15 +23301,15 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -23326,11 +23328,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -23356,27 +23363,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -23396,16 +23422,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -23422,7 +23452,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -23433,18 +23463,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -23454,11 +23484,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -23544,11 +23575,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -23556,21 +23589,28 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
+
 end
 module Ast_attributes : sig 
 #1 "ast_attributes.mli"
@@ -26288,10 +26328,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -26508,13 +26545,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -26523,7 +26556,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
diff --git a/jscomp/bin/bsppx.ml b/jscomp/bin/bsppx.ml
index b3c784ddbe..4d6de58521 100644
--- a/jscomp/bin/bsppx.ml
+++ b/jscomp/bin/bsppx.ml
@@ -5116,6 +5116,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -5148,15 +5150,15 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -5175,11 +5177,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -5205,27 +5212,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -5245,16 +5271,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -5271,7 +5301,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -5282,18 +5312,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -5303,11 +5333,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -5393,11 +5424,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -5405,21 +5438,28 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
+
 end
 module Ast_attributes : sig 
 #1 "ast_attributes.mli"
@@ -8146,10 +8186,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -8366,13 +8403,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -8381,7 +8414,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
diff --git a/jscomp/bin/whole_compiler.ml b/jscomp/bin/whole_compiler.ml
index 335d4a3159..a455647d8c 100644
--- a/jscomp/bin/whole_compiler.ml
+++ b/jscomp/bin/whole_compiler.ml
@@ -21078,6 +21078,8 @@ val rindex_neg : string -> char -> int
 val rindex_opt : string -> char -> int option
 
 val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -21110,15 +21112,15 @@ end = struct
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -21137,11 +21139,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -21167,27 +21174,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -21207,16 +21233,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -21233,7 +21263,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -21244,18 +21274,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -21265,11 +21295,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -21355,11 +21386,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -21367,21 +21400,28 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
+
 end
 module Ext_filename : sig 
 #1 "ext_filename.mli"
@@ -21495,10 +21535,7 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
@@ -21715,13 +21752,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -21730,7 +21763,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
diff --git a/jscomp/bsb/bsb_default.ml b/jscomp/bsb/bsb_default.ml
index 871df5b9d5..d6581e1b7e 100644
--- a/jscomp/bsb/bsb_default.ml
+++ b/jscomp/bsb/bsb_default.ml
@@ -36,7 +36,7 @@ let (//) = Ext_filename.combine
 *)
 let resolve_bsb_magic_file ~cwd ~desc p =
   let p_len = String.length p in 
-  let no_slash = Ext_filename.no_char p '/'  0  p_len in  
+  let no_slash = Ext_string.no_char p '/'  0  p_len in  
   if no_slash then 
     p 
   else if Filename.is_relative p &&
diff --git a/jscomp/ext/ext_filename.ml b/jscomp/ext/ext_filename.ml
index 7a97c68911..cff7e3c753 100644
--- a/jscomp/ext/ext_filename.ml
+++ b/jscomp/ext/ext_filename.ml
@@ -209,13 +209,9 @@ let find_package_json_dir cwd  =
 let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
-let rec no_char x ch i  len = 
-  i >= len  || 
-  (String.unsafe_get x i <> ch && no_char x ch (i + 1)  len)
-
 let replace_backward_slash (x : string)=
   let len = String.length x in
-  if no_char x '\\' 0  len then x 
+  if Ext_string.no_char x '\\' 0  len then x 
   else  
     String.map (function 
         |'\\'-> '/'
@@ -224,7 +220,7 @@ let replace_backward_slash (x : string)=
 
 let replace_slash_backward (x : string ) = 
   let len = String.length x in 
-  if no_char x '/' 0  len then x 
+  if Ext_string.no_char x '/' 0  len then x 
   else 
     String.map (function 
         | '/' -> '\\'
diff --git a/jscomp/ext/ext_filename.mli b/jscomp/ext/ext_filename.mli
index de3cb4f2c1..c615e2853c 100644
--- a/jscomp/ext/ext_filename.mli
+++ b/jscomp/ext/ext_filename.mli
@@ -108,9 +108,6 @@ val get_extension : string -> string
 
 val replace_backward_slash : string -> string
 
-(*
-[no_slash s i len]
-*)
-val no_char : string -> char  -> int -> int  -> bool
+
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
diff --git a/jscomp/ext/ext_json.ml b/jscomp/ext/ext_json.ml
index 97f1b69f9b..8f55d18886 100644
--- a/jscomp/ext/ext_json.ml
+++ b/jscomp/ext/ext_json.ml
@@ -1,4 +1,4 @@
-# 1 "bsb/bsb_json.mll"
+# 1 "ext/ext_json.mll"
  
 type error =
   | Illegal_character of char
@@ -115,7 +115,7 @@ let hex_code c1 c2 =
 
 let lf = '\010'
 
-# 119 "bsb/bsb_json.ml"
+# 119 "ext/ext_json.ml"
 let __ocaml_lex_tables = {
   Lexing.lex_base = 
    "\000\000\239\255\240\255\241\255\000\000\025\000\011\000\244\255\
@@ -303,80 +303,80 @@ let rec lex_json buf lexbuf =
 and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 137 "bsb/bsb_json.mll"
+# 137 "ext/ext_json.mll"
           ( lex_json buf lexbuf)
-# 309 "bsb/bsb_json.ml"
+# 309 "ext/ext_json.ml"
 
   | 1 ->
-# 138 "bsb/bsb_json.mll"
+# 138 "ext/ext_json.mll"
                    ( 
     update_loc lexbuf 0;
     lex_json buf  lexbuf
   )
-# 317 "bsb/bsb_json.ml"
+# 317 "ext/ext_json.ml"
 
   | 2 ->
-# 142 "bsb/bsb_json.mll"
+# 142 "ext/ext_json.mll"
                 ( comment buf lexbuf)
-# 322 "bsb/bsb_json.ml"
+# 322 "ext/ext_json.ml"
 
   | 3 ->
-# 143 "bsb/bsb_json.mll"
+# 143 "ext/ext_json.mll"
          ( True)
-# 327 "bsb/bsb_json.ml"
+# 327 "ext/ext_json.ml"
 
   | 4 ->
-# 144 "bsb/bsb_json.mll"
+# 144 "ext/ext_json.mll"
           (False)
-# 332 "bsb/bsb_json.ml"
+# 332 "ext/ext_json.ml"
 
   | 5 ->
-# 145 "bsb/bsb_json.mll"
+# 145 "ext/ext_json.mll"
          (Null)
-# 337 "bsb/bsb_json.ml"
+# 337 "ext/ext_json.ml"
 
   | 6 ->
-# 146 "bsb/bsb_json.mll"
+# 146 "ext/ext_json.mll"
        (Lbracket)
-# 342 "bsb/bsb_json.ml"
+# 342 "ext/ext_json.ml"
 
   | 7 ->
-# 147 "bsb/bsb_json.mll"
+# 147 "ext/ext_json.mll"
        (Rbracket)
-# 347 "bsb/bsb_json.ml"
+# 347 "ext/ext_json.ml"
 
   | 8 ->
-# 148 "bsb/bsb_json.mll"
+# 148 "ext/ext_json.mll"
        (Lbrace)
-# 352 "bsb/bsb_json.ml"
+# 352 "ext/ext_json.ml"
 
   | 9 ->
-# 149 "bsb/bsb_json.mll"
+# 149 "ext/ext_json.mll"
        (Rbrace)
-# 357 "bsb/bsb_json.ml"
+# 357 "ext/ext_json.ml"
 
   | 10 ->
-# 150 "bsb/bsb_json.mll"
+# 150 "ext/ext_json.mll"
        (Comma)
-# 362 "bsb/bsb_json.ml"
+# 362 "ext/ext_json.ml"
 
   | 11 ->
-# 151 "bsb/bsb_json.mll"
+# 151 "ext/ext_json.mll"
         (Colon)
-# 367 "bsb/bsb_json.ml"
+# 367 "ext/ext_json.ml"
 
   | 12 ->
-# 152 "bsb/bsb_json.mll"
+# 152 "ext/ext_json.mll"
                       (lex_json buf lexbuf)
-# 372 "bsb/bsb_json.ml"
+# 372 "ext/ext_json.ml"
 
   | 13 ->
-# 154 "bsb/bsb_json.mll"
+# 154 "ext/ext_json.mll"
          ( Number (Lexing.lexeme lexbuf))
-# 377 "bsb/bsb_json.ml"
+# 377 "ext/ext_json.ml"
 
   | 14 ->
-# 156 "bsb/bsb_json.mll"
+# 156 "ext/ext_json.mll"
       (
   let pos = Lexing.lexeme_start_p lexbuf in
   scan_string buf pos lexbuf;
@@ -384,22 +384,22 @@ and __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state =
   Buffer.clear buf ;
   String content 
 )
-# 388 "bsb/bsb_json.ml"
+# 388 "ext/ext_json.ml"
 
   | 15 ->
-# 163 "bsb/bsb_json.mll"
+# 163 "ext/ext_json.mll"
        (Eof )
-# 393 "bsb/bsb_json.ml"
+# 393 "ext/ext_json.ml"
 
   | 16 ->
 let
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
        c
-# 399 "bsb/bsb_json.ml"
+# 399 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf lexbuf.Lexing.lex_start_pos in
-# 164 "bsb/bsb_json.mll"
+# 164 "ext/ext_json.mll"
           ( error lexbuf (Illegal_character c ))
-# 403 "bsb/bsb_json.ml"
+# 403 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_lex_json_rec buf lexbuf __ocaml_lex_state
@@ -409,19 +409,19 @@ and comment buf lexbuf =
 and __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 166 "bsb/bsb_json.mll"
+# 166 "ext/ext_json.mll"
               (lex_json buf lexbuf)
-# 415 "bsb/bsb_json.ml"
+# 415 "ext/ext_json.ml"
 
   | 1 ->
-# 167 "bsb/bsb_json.mll"
+# 167 "ext/ext_json.mll"
      (comment buf lexbuf)
-# 420 "bsb/bsb_json.ml"
+# 420 "ext/ext_json.ml"
 
   | 2 ->
-# 168 "bsb/bsb_json.mll"
+# 168 "ext/ext_json.mll"
        (error lexbuf Unterminated_comment)
-# 425 "bsb/bsb_json.ml"
+# 425 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_comment_rec buf lexbuf __ocaml_lex_state
@@ -431,64 +431,64 @@ and scan_string buf start lexbuf =
 and __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 172 "bsb/bsb_json.mll"
+# 172 "ext/ext_json.mll"
       ( () )
-# 437 "bsb/bsb_json.ml"
+# 437 "ext/ext_json.ml"
 
   | 1 ->
-# 174 "bsb/bsb_json.mll"
+# 174 "ext/ext_json.mll"
   (
         let len = lexeme_len lexbuf - 2 in
         update_loc lexbuf len;
 
         scan_string buf start lexbuf
       )
-# 447 "bsb/bsb_json.ml"
+# 447 "ext/ext_json.ml"
 
   | 2 ->
-# 181 "bsb/bsb_json.mll"
+# 181 "ext/ext_json.mll"
       (
         let len = lexeme_len lexbuf - 3 in
         update_loc lexbuf len;
         scan_string buf start lexbuf
       )
-# 456 "bsb/bsb_json.ml"
+# 456 "ext/ext_json.ml"
 
   | 3 ->
 let
-# 186 "bsb/bsb_json.mll"
+# 186 "ext/ext_json.mll"
                                                c
-# 462 "bsb/bsb_json.ml"
+# 462 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 187 "bsb/bsb_json.mll"
+# 187 "ext/ext_json.mll"
       (
         Buffer.add_char buf (char_for_backslash c);
         scan_string buf start lexbuf
       )
-# 469 "bsb/bsb_json.ml"
+# 469 "ext/ext_json.ml"
 
   | 4 ->
 let
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                  c1
-# 475 "bsb/bsb_json.ml"
+# 475 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                c2
-# 480 "bsb/bsb_json.ml"
+# 480 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                              c3
-# 485 "bsb/bsb_json.ml"
+# 485 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3)
 and
-# 191 "bsb/bsb_json.mll"
+# 191 "ext/ext_json.mll"
                                                     s
-# 490 "bsb/bsb_json.ml"
+# 490 "ext/ext_json.ml"
 = Lexing.sub_lexeme lexbuf lexbuf.Lexing.lex_start_pos (lexbuf.Lexing.lex_start_pos + 4) in
-# 192 "bsb/bsb_json.mll"
+# 192 "ext/ext_json.mll"
       (
         let v = dec_code c1 c2 c3 in
         if v > 255 then
@@ -497,55 +497,55 @@ and
 
         scan_string buf start lexbuf
       )
-# 501 "bsb/bsb_json.ml"
+# 501 "ext/ext_json.ml"
 
   | 5 ->
 let
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                         c1
-# 507 "bsb/bsb_json.ml"
+# 507 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 2)
 and
-# 200 "bsb/bsb_json.mll"
+# 200 "ext/ext_json.mll"
                                          c2
-# 512 "bsb/bsb_json.ml"
+# 512 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 3) in
-# 201 "bsb/bsb_json.mll"
+# 201 "ext/ext_json.mll"
       (
         let v = hex_code c1 c2 in
         Buffer.add_char buf (Char.chr v);
 
         scan_string buf start lexbuf
       )
-# 521 "bsb/bsb_json.ml"
+# 521 "ext/ext_json.ml"
 
   | 6 ->
 let
-# 207 "bsb/bsb_json.mll"
+# 207 "ext/ext_json.mll"
              c
-# 527 "bsb/bsb_json.ml"
+# 527 "ext/ext_json.ml"
 = Lexing.sub_lexeme_char lexbuf (lexbuf.Lexing.lex_start_pos + 1) in
-# 208 "bsb/bsb_json.mll"
+# 208 "ext/ext_json.mll"
       (
         Buffer.add_char buf '\\';
         Buffer.add_char buf c;
 
         scan_string buf start lexbuf
       )
-# 536 "bsb/bsb_json.ml"
+# 536 "ext/ext_json.ml"
 
   | 7 ->
-# 215 "bsb/bsb_json.mll"
+# 215 "ext/ext_json.mll"
       (
         update_loc lexbuf 0;
         Buffer.add_char buf lf;
 
         scan_string buf start lexbuf
       )
-# 546 "bsb/bsb_json.ml"
+# 546 "ext/ext_json.ml"
 
   | 8 ->
-# 222 "bsb/bsb_json.mll"
+# 222 "ext/ext_json.mll"
       (
         let ofs = lexbuf.lex_start_pos in
         let len = lexbuf.lex_curr_pos - ofs in
@@ -553,21 +553,21 @@ let
 
         scan_string buf start lexbuf
       )
-# 557 "bsb/bsb_json.ml"
+# 557 "ext/ext_json.ml"
 
   | 9 ->
-# 230 "bsb/bsb_json.mll"
+# 230 "ext/ext_json.mll"
       (
         error lexbuf Unterminated_string
       )
-# 564 "bsb/bsb_json.ml"
+# 564 "ext/ext_json.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_scan_string_rec buf start lexbuf __ocaml_lex_state
 
 ;;
 
-# 234 "bsb/bsb_json.mll"
+# 234 "ext/ext_json.mll"
  
 
 type js_array =
@@ -729,4 +729,4 @@ let query path (json : t ) =
       end
   in aux [] path json
 
-# 733 "bsb/bsb_json.ml"
+# 733 "ext/ext_json.ml"
diff --git a/jscomp/bsb/bsb_json.mll b/jscomp/ext/ext_json.mll
similarity index 100%
rename from jscomp/bsb/bsb_json.mll
rename to jscomp/ext/ext_json.mll
diff --git a/jscomp/ext/ext_string.ml b/jscomp/ext/ext_string.ml
index 4ea3729c2d..9481e02372 100644
--- a/jscomp/ext/ext_string.ml
+++ b/jscomp/ext/ext_string.ml
@@ -28,15 +28,15 @@
 
 
 
-
+(*
+   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
+*)
 let split_by ?(keep_empty=false) is_delim str =
   let len = String.length str in
   let rec loop acc last_pos pos =
     if pos = -1 then
       if last_pos = 0 && not keep_empty then
-        (*
-           {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-        *)
+
         acc
       else 
         String.sub str 0 last_pos :: acc
@@ -55,11 +55,16 @@ let split_by ?(keep_empty=false) is_delim str =
 let trim s = 
   let i = ref 0  in
   let j = String.length s in 
-  while !i < j &&  let u = s.[!i] in u = '\t' || u = '\n' || u = ' ' do 
+  while !i < j &&  
+        let u = String.unsafe_get s !i in 
+        u = '\t' || u = '\n' || u = ' ' 
+  do 
     incr i;
   done;
   let k = ref (j - 1)  in 
-  while !k >= !i && let u = s.[!k] in u = '\t' || u = '\n' || u = ' ' do 
+  while !k >= !i && 
+        let u = String.unsafe_get s !k in 
+        u = '\t' || u = '\n' || u = ' ' do 
     decr k ;
   done;
   String.sub s !i (!k - !i + 1)
@@ -85,27 +90,46 @@ let starts_with s beg =
   )
 
 
-
-let ends_with_index s beg = 
+(** return an index which is minus when [s] does not 
+    end with [beg]
+*)
+let ends_with_index s end_ = 
   let s_finish = String.length s - 1 in
-  let s_beg = String.length beg - 1 in
+  let s_beg = String.length end_ - 1 in
   if s_beg > s_finish then -1
   else
     let rec aux j k = 
       if k < 0 then (j + 1)
-      else if String.unsafe_get s j = String.unsafe_get beg k then 
+      else if String.unsafe_get s j = String.unsafe_get end_ k then 
         aux (j - 1) (k - 1)
       else  -1 in 
     aux s_finish s_beg
 
-let ends_with s beg = ends_with_index s beg >= 0 
-
+let ends_with s end_ = ends_with_index s end_ >= 0 
 
 let ends_with_then_chop s beg = 
   let i =  ends_with_index s beg in 
   if i >= 0 then Some (String.sub s 0 i) 
   else None
 
+let check_suffix_case = ends_with 
+let check_suffix_case_then_chop = ends_with_then_chop
+
+let check_any_suffix_case s suffixes = 
+  List.exists (fun x -> check_suffix_case s x) suffixes
+
+let check_any_suffix_case_then_chop s suffixes = 
+  let rec aux suffixes = 
+    match suffixes with 
+    | [] -> None 
+    | x::xs -> 
+      let id = ends_with_index s x in 
+      if id >= 0 then Some (String.sub s 0 id)
+      else aux xs in 
+  aux suffixes    
+
+
+
 (**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
      this version try to make it not locale senstive, this bug is fixed
      in the compiler trunk     
@@ -125,16 +149,20 @@ let escaped s =
 
 (* it is unsafe to expose such API as unsafe since 
    user can provide bad input range 
+
 *)
-let rec for_all_range s ~start:i ~finish:len p =     
-  if i >= len then true 
-  else  p (String.get s i) && 
-        for_all_range s ~start:(i + 1) ~finish:len p
+let rec unsafe_for_all_range s ~start ~finish p =     
+  start > finish ||
+  p (String.unsafe_get s start) && 
+  unsafe_for_all_range s ~start:(start + 1) ~finish p
 
+let for_all_range s ~start ~finish p = 
+  let len = String.length s in 
+  if start < 0 || finish >= len then invalid_arg "Ext_string.for_all_range"
+  else unsafe_for_all_range s ~start ~finish p 
 
-let for_all (p : char -> bool) s = 
-  let len = String.length s in
-  for_all_range s ~start:0  ~finish:len p 
+let for_all (p : char -> bool) s =   
+  unsafe_for_all_range s ~start:0  ~finish:(String.length s - 1) p 
 
 let is_empty s = String.length s = 0
 
@@ -151,7 +179,7 @@ let equal (x : string) y  = x = y
 
 
 
-let _is_sub ~sub i s j ~len =
+let unsafe_is_sub ~sub i s j ~len =
   let rec check k =
     if k = len
     then true
@@ -162,18 +190,18 @@ let _is_sub ~sub i s j ~len =
   j+len <= String.length s && check 0
 
 
-
+exception Local_exit 
 let find ?(start=0) ~sub s =
   let n = String.length sub in
-  let i = ref start in
-  let module M = struct exception Exit end  in
+  let i = ref start in  
   try
     while !i + n <= String.length s do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then
+        raise_notrace Local_exit;
       incr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 
@@ -183,11 +211,12 @@ let rfind ~sub s =
   let module M = struct exception Exit end in 
   try
     while !i >= 0 do
-      if _is_sub ~sub 0 s !i ~len:n then raise M.Exit;
+      if unsafe_is_sub ~sub 0 s !i ~len:n then 
+        raise_notrace Local_exit;
       decr i
     done;
     -1
-  with M.Exit ->
+  with Local_exit ->
     !i
 
 let tail_from s x = 
@@ -273,11 +302,13 @@ let rindex_neg s c =
 let rindex_opt s c = 
   rindex_rec_opt s (String.length s - 1) c;;
 
-let is_valid_module_file ~finish (s : string) = 
-  match s.[0] with 
+let is_valid_module_file (s : string) = 
+  let len = String.length s in 
+  len > 0 &&
+  match String.unsafe_get s 0 with 
   | 'A' .. 'Z'
   | 'a' .. 'z' -> 
-    for_all_range s ~start:1 ~finish
+    unsafe_for_all_range s ~start:1 ~finish:(len - 1)
       (fun x -> 
          match x with 
          | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> true
@@ -285,18 +316,24 @@ let is_valid_module_file ~finish (s : string) =
   | _ -> false 
 
 (** 
-  TODO: move to another module 
-  Make {!Ext_filename} not stateful
+   TODO: move to another module 
+   Make {!Ext_filename} not stateful
 *)
 let is_valid_source_name name =
-  ((Filename.check_suffix name ".ml"  
-    || Filename.check_suffix name ".re"
-   ) &&
-   (is_valid_module_file ~finish:(String.length name - 3) name)
-  )
-  || 
-  ((Filename.check_suffix name ".mli"
-    || Filename.check_suffix name ".mll"                  
-    || Filename.check_suffix name ".rei")
-   && (is_valid_module_file ~finish:(String.length name - 4 ) name )
-  )
\ No newline at end of file
+  match check_any_suffix_case_then_chop name [
+      ".ml"; 
+      ".re";
+      ".mli"; ".mll"; ".rei"
+    ] with 
+  | None -> false 
+  | Some x -> is_valid_module_file  x 
+
+
+let rec unsafe_no_char x ch i  len = 
+  i >= len  || 
+  (String.unsafe_get x i <> ch && unsafe_no_char x ch (i + 1)  len)
+
+let no_char x ch i len =
+  let str_len = String.length x in 
+  if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
+  else unsafe_no_char x ch i len 
diff --git a/jscomp/ext/ext_string.mli b/jscomp/ext/ext_string.mli
index e5eb31e866..769c95c7ea 100644
--- a/jscomp/ext/ext_string.mli
+++ b/jscomp/ext/ext_string.mli
@@ -97,4 +97,6 @@ val rindex_neg : string -> char -> int
 
 val rindex_opt : string -> char -> int option
 
-val is_valid_source_name : string -> bool
\ No newline at end of file
+val is_valid_source_name : string -> bool
+
+val no_char : string -> char -> int -> int -> bool 
\ No newline at end of file
diff --git a/jscomp/ounit/oUnit.ml b/jscomp/ounit/oUnit.ml
index 530545520c..a4f311b84e 100644
--- a/jscomp/ounit/oUnit.ml
+++ b/jscomp/ounit/oUnit.ml
@@ -291,6 +291,30 @@ let assert_raises ?msg exn (f: unit -> 'a) =
       | Some e -> 
           assert_equal ?msg ~printer:pexn exn e
 
+
+let assert_raise_any ?msg (f: unit -> 'a) = 
+  let pexn = 
+    Printexc.to_string 
+  in
+  let get_error_string () =
+    let str = 
+      Format.sprintf 
+        "expected exception , but no exception was raised." 
+        
+    in
+      match msg with
+        | None -> 
+            assert_failure str
+              
+        | Some s -> 
+            assert_failure (s^"\n"^str)
+  in    
+    match raises f with
+      | None -> 
+          assert_failure (get_error_string ())
+
+      | Some exn -> 
+          assert_bool (pexn exn) true
 (* Compare floats up to a given relative error *)
 let cmp_float ?(epsilon = 0.00001) a b =
   abs_float (a -. b) <= epsilon *. (abs_float a) ||
diff --git a/jscomp/ounit/oUnit.mli b/jscomp/ounit/oUnit.mli
index e10d339493..639609ea65 100644
--- a/jscomp/ounit/oUnit.mli
+++ b/jscomp/ounit/oUnit.mli
@@ -87,6 +87,8 @@ val assert_equal :
     @raise Failure description *)
 val assert_raises : ?msg:string -> exn -> (unit -> 'a) -> unit
 
+val assert_raise_any : ?msg:string ->  (unit -> 'a) -> unit
+
 (** {2 Skipping tests } 
   
    In certain condition test can be written but there is no point running it, because they
diff --git a/jscomp/ounit_tests/ounit_string_tests.ml b/jscomp/ounit_tests/ounit_string_tests.ml
index 410bcb051f..7b2dfd7ffc 100644
--- a/jscomp/ounit_tests/ounit_string_tests.ml
+++ b/jscomp/ounit_tests/ounit_string_tests.ml
@@ -1,5 +1,5 @@
 let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
+     (>:::)) = OUnit.((>::),(>:::))
 
 let (=~) = OUnit.assert_equal    
 
@@ -7,53 +7,103 @@ let (=~) = OUnit.assert_equal
 
 
 let suites = 
-    __FILE__ >::: 
-    [
-        __LOC__ >:: begin fun _ ->
-            OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
-        end;
-
-        __LOC__ >:: begin fun _ -> 
-            Ext_string.rindex_neg "hello" 'h' =~ 0 ;
-            Ext_string.rindex_neg "hello" 'e' =~ 1 ;
-            Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-            Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-            Ext_string.rindex_neg "hello" 'o' =~ 4 ;
-        end;
-
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
-        end;
-
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool __LOC__
-            (Ext_string.for_all_range "xABc"~start:1
-            ~finish:3 (function 'A' .. 'Z' -> true | _ -> false));
-            OUnit.assert_bool __LOC__
-            (not (Ext_string.for_all_range "xABc"~start:1
-            ~finish:4 (function 'A' .. 'Z' -> true | _ -> false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:2 (function 'A' .. 'Z' -> true | _ -> false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:1 (function 'A' .. 'Z' -> true | _ -> false)));
-            OUnit.assert_bool __LOC__
-            ( (Ext_string.for_all_range "xABc"~start:1
-            ~finish:0 (function 'A' .. 'Z' -> true | _ -> false)));
-        end;
-
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool __LOC__ @@
-             List.for_all Ext_string.is_valid_source_name
-            ["x.ml"; "x.mli"; "x.re"; "x.rei"; "x.mll"; 
-            "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
-            "ax.ml"];
-            OUnit.assert_bool __LOC__ @@ not @@
-                List.exists Ext_string.is_valid_source_name
-                [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
-                "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
-                ".#hello.ml"; ".#hello.rei"
-                ]
-        end
-    ]
\ No newline at end of file
+  __FILE__ >::: 
+  [
+    __LOC__ >:: begin fun _ ->
+      OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
+    end;
+
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.rindex_neg "hello" 'h' =~ 0 ;
+      Ext_string.rindex_neg "hello" 'e' =~ 1 ;
+      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
+      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
+      Ext_string.rindex_neg "hello" 'o' =~ 4 ;
+    end;
+
+    __LOC__ >:: begin fun _ -> 
+      OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
+    end;
+
+    __LOC__ >:: begin fun _ -> 
+      OUnit.assert_bool __LOC__
+        (Ext_string.for_all_range "xABc"~start:1
+           ~finish:2 (function 'A' .. 'Z' -> true | _ -> false));
+      OUnit.assert_bool __LOC__
+        (not (Ext_string.for_all_range "xABc"~start:1
+                ~finish:3(function 'A' .. 'Z' -> true | _ -> false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:2 (function 'A' .. 'Z' -> true | _ -> false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:1 (function 'A' .. 'Z' -> true | _ -> false)));
+      OUnit.assert_bool __LOC__
+        ( (Ext_string.for_all_range "xABc"~start:1
+             ~finish:0 (function 'A' .. 'Z' -> true | _ -> false)));    
+      OUnit.assert_raise_any       
+        (fun _ ->  (Ext_string.for_all_range "xABc"~start:1
+             ~finish:4 (function 'A' .. 'Z' -> true | _ -> false)));    
+    
+    end;
+
+    __LOC__ >:: begin fun _ -> 
+      OUnit.assert_bool __LOC__ @@
+      List.for_all Ext_string.is_valid_source_name
+        ["x.ml"; "x.mli"; "x.re"; "x.rei"; "x.mll"; 
+         "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
+         "ax.ml"];
+      OUnit.assert_bool __LOC__ @@ not @@
+      List.exists Ext_string.is_valid_source_name
+        [".re"; ".rei";"..re"; "..rei"; "..ml"; ".mll~"; 
+         "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
+         ".#hello.ml"; ".#hello.rei"; "a-.ml"; "a-b.ml"; "-a-.ml"
+         ; "-.ml"
+        ]
+    end;
+    __LOC__ >:: begin fun _ -> 
+        Ext_string.find ~sub:"hello" "xx hello xx" =~ 3 ;
+        Ext_string.rfind ~sub:"hello" "xx hello xx" =~ 3 ;
+        Ext_string.find ~sub:"hello" "xx hello hello xx" =~ 3 ;
+        Ext_string.rfind ~sub:"hello" "xx hello hello xx" =~ 9 ;
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.trim " \t\n" =~ "";
+      Ext_string.trim " \t\nb" =~ "b";
+      Ext_string.trim "b \t\n" =~ "b";
+      Ext_string.trim "\t\n b \t\n" =~ "b";            
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.starts_with "ab" "a" =~ true;
+      Ext_string.starts_with "ab" "" =~ true;
+      Ext_string.starts_with "abb" "abb" =~ true;
+      Ext_string.starts_with "abb" "abbc" =~ false;
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.ends_with_then_chop "xx.ml"  ".ml" =~ Some "xx";
+      Ext_string.ends_with_then_chop "xx.ml" ".mll" =~ None
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.starts_with_and_number "js_fn_mk_01" ~offset:0 "js_fn_mk_" =~ 1 ;
+      Ext_string.starts_with_and_number "js_fn_run_02" ~offset:0 "js_fn_mk_" =~ -1 ;
+      Ext_string.starts_with_and_number "js_fn_mk_03" ~offset:6 "mk_" =~ 3 ;
+      Ext_string.starts_with_and_number "js_fn_mk_04" ~offset:6 "run_" =~ -1;
+      Ext_string.starts_with_and_number "js_fn_run_04" ~offset:6 "run_" =~ 4;
+      Ext_string.(starts_with_and_number "js_fn_run_04" ~offset:6 "run_" = 3) =~ false 
+    end;
+    __LOC__ >:: begin fun _ -> 
+      Ext_string.for_all (function '_' -> true | _ -> false)
+        "____" =~ true;
+      Ext_string.for_all (function '_' -> true | _ -> false)
+        "___-" =~ false;
+      Ext_string.for_all (function '_' -> true | _ -> false)        
+        "" =~ true
+    end;
+    __LOC__ >:: begin fun _ -> 
+        Ext_string.tail_from "ghsogh" 1 =~ "hsogh";
+        Ext_string.tail_from "ghsogh" 0 =~ "ghsogh"
+    end;
+    __LOC__ >:: begin fun _ -> 
+        Ext_string.digits_of_str "11_js" ~offset:0 2 =~ 11 
+    end
+  ]
\ No newline at end of file
diff --git a/jscomp/test/.depend b/jscomp/test/.depend
index b61ac0aab7..85c32faa56 100644
--- a/jscomp/test/.depend
+++ b/jscomp/test/.depend
@@ -138,9 +138,8 @@ ext_pervasives.cmj : ../stdlib/string.cmj ../stdlib/printf.cmj \
     ../stdlib/obj.cmj ../stdlib/list.cmj ../stdlib/int32.cmj \
     ../stdlib/format.cmj ../stdlib/char.cmj ../stdlib/array.cmj \
     ../stdlib/arg.cmj ext_pervasives.cmi
-ext_string.cmj : ../stdlib/string.cmj ../stdlib/list.cmj \
-    ../stdlib/filename.cmj ext_bytes.cmj ../stdlib/char.cmj \
-    ../stdlib/bytes.cmj
+ext_string.cmj : ../stdlib/string.cmj ../stdlib/list.cmj ext_bytes.cmj \
+    ../stdlib/char.cmj ../stdlib/bytes.cmj
 ext_sys.cmj : ../stdlib/sys.cmj ext_sys.cmi
 extensible_variant_test.cmj : mt.cmj
 external_ppx.cmj :
diff --git a/jscomp/test/ext_filename.js b/jscomp/test/ext_filename.js
index 84cc97298c..b019193cfe 100644
--- a/jscomp/test/ext_filename.js
+++ b/jscomp/test/ext_filename.js
@@ -275,26 +275,9 @@ var package_dir = Block.__(246, [function () {
       return find_root_filename(cwd$1, Literals.bsconfig_json);
     }]);
 
-function no_char(x, ch, _i, len) {
-  while(true) {
-    var i = _i;
-    if (i >= len) {
-      return /* true */1;
-    }
-    else if (x.charCodeAt(i) !== ch) {
-      _i = i + 1 | 0;
-      continue ;
-      
-    }
-    else {
-      return /* false */0;
-    }
-  };
-}
-
 function replace_backward_slash(x) {
   var len = x.length;
-  if (no_char(x, /* "\\" */92, 0, len)) {
+  if (Ext_string.no_char(x, /* "\\" */92, 0, len)) {
     return x;
   }
   else {
@@ -311,7 +294,7 @@ function replace_backward_slash(x) {
 
 function replace_slash_backward(x) {
   var len = x.length;
-  if (no_char(x, /* "/" */47, 0, len)) {
+  if (Ext_string.no_char(x, /* "/" */47, 0, len)) {
     return x;
   }
   else {
@@ -511,7 +494,6 @@ exports.node_relative_path           = node_relative_path;
 exports.find_root_filename           = find_root_filename;
 exports.find_package_json_dir        = find_package_json_dir;
 exports.package_dir                  = package_dir;
-exports.no_char                      = no_char;
 exports.replace_backward_slash       = replace_backward_slash;
 exports.replace_slash_backward       = replace_slash_backward;
 exports.module_name_of_file          = module_name_of_file;
diff --git a/jscomp/test/ext_string.js b/jscomp/test/ext_string.js
index 7983269203..797c356895 100644
--- a/jscomp/test/ext_string.js
+++ b/jscomp/test/ext_string.js
@@ -1,8 +1,7 @@
 'use strict';
 
-var Bytes                   = require("../../lib/js/bytes");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions");
-var Filename                = require("../../lib/js/filename");
+var Bytes                   = require("../../lib/js/bytes");
 var Caml_exceptions         = require("../../lib/js/caml_exceptions");
 var Caml_int32              = require("../../lib/js/caml_int32");
 var Curry                   = require("../../lib/js/curry");
@@ -64,14 +63,14 @@ function trim(s) {
   var i = 0;
   var j = s.length;
   while(function () {
-        var u = Caml_string.get(s, i);
+        var u = s.charCodeAt(i);
         return +(i < j && (u === /* "\t" */9 || u === /* "\n" */10 || u === /* " " */32));
       }()) {
     i = i + 1 | 0;
   };
   var k = j - 1 | 0;
   while(function () {
-        var u = Caml_string.get(s, k);
+        var u = s.charCodeAt(k);
         return +(k >= i && (u === /* "\t" */9 || u === /* "\n" */10 || u === /* " " */32));
       }()) {
     k = k - 1 | 0;
@@ -116,9 +115,9 @@ function starts_with(s, beg) {
   }
 }
 
-function ends_with_index(s, beg) {
+function ends_with_index(s, end_) {
   var s_finish = s.length - 1 | 0;
-  var s_beg = beg.length - 1 | 0;
+  var s_beg = end_.length - 1 | 0;
   if (s_beg > s_finish) {
     return -1;
   }
@@ -131,7 +130,7 @@ function ends_with_index(s, beg) {
       if (k < 0) {
         return j + 1 | 0;
       }
-      else if (s[j] === beg[k]) {
+      else if (s[j] === end_[k]) {
         _k = k - 1 | 0;
         _j = j - 1 | 0;
         continue ;
@@ -144,8 +143,8 @@ function ends_with_index(s, beg) {
   }
 }
 
-function ends_with(s, beg) {
-  return +(ends_with_index(s, beg) >= 0);
+function ends_with(s, end_) {
+  return +(ends_with_index(s, end_) >= 0);
 }
 
 function ends_with_then_chop(s, beg) {
@@ -158,6 +157,33 @@ function ends_with_then_chop(s, beg) {
   }
 }
 
+function check_any_suffix_case(s, suffixes) {
+  return List.exists(function (x) {
+              return ends_with(s, x);
+            }, suffixes);
+}
+
+function check_any_suffix_case_then_chop(s, suffixes) {
+  var _suffixes = suffixes;
+  while(true) {
+    var suffixes$1 = _suffixes;
+    if (suffixes$1) {
+      var id = ends_with_index(s, suffixes$1[0]);
+      if (id >= 0) {
+        return /* Some */[$$String.sub(s, 0, id)];
+      }
+      else {
+        _suffixes = suffixes$1[1];
+        continue ;
+        
+      }
+    }
+    else {
+      return /* None */0;
+    }
+  };
+}
+
 function escaped(s) {
   var needs_escape = function (_i) {
     while(true) {
@@ -202,14 +228,14 @@ function escaped(s) {
   }
 }
 
-function for_all_range(s, _i, len, p) {
+function unsafe_for_all_range(s, _start, finish, p) {
   while(true) {
-    var i = _i;
-    if (i >= len) {
+    var start = _start;
+    if (start > finish) {
       return /* true */1;
     }
-    else if (Curry._1(p, Caml_string.get(s, i))) {
-      _i = i + 1 | 0;
+    else if (Curry._1(p, s.charCodeAt(start))) {
+      _start = start + 1 | 0;
       continue ;
       
     }
@@ -219,9 +245,21 @@ function for_all_range(s, _i, len, p) {
   };
 }
 
-function for_all(p, s) {
+function for_all_range(s, start, finish, p) {
   var len = s.length;
-  return for_all_range(s, 0, len, p);
+  if (start < 0 || finish >= len) {
+    throw [
+          Caml_builtin_exceptions.invalid_argument,
+          "Ext_string.for_all_range"
+        ];
+  }
+  else {
+    return unsafe_for_all_range(s, start, finish, p);
+  }
+}
+
+function for_all(p, s) {
+  return unsafe_for_all_range(s, 0, s.length - 1 | 0, p);
 }
 
 function is_empty(s) {
@@ -237,7 +275,7 @@ function repeat(n, s) {
   return Bytes.to_string(res);
 }
 
-function _is_sub(sub, i, s, j, len) {
+function unsafe_is_sub(sub, i, s, j, len) {
   if ((j + len | 0) <= s.length) {
     var _k = 0;
     while(true) {
@@ -260,22 +298,23 @@ function _is_sub(sub, i, s, j, len) {
   }
 }
 
+var Local_exit = Caml_exceptions.create("Ext_string.Local_exit");
+
 function find($staropt$star, sub, s) {
   var start = $staropt$star ? $staropt$star[0] : 0;
   var n = sub.length;
   var i = start;
-  var Exit = Caml_exceptions.create("Exit");
   try {
     while((i + n | 0) <= s.length) {
-      if (_is_sub(sub, 0, s, i, n)) {
-        throw Exit;
+      if (unsafe_is_sub(sub, 0, s, i, n)) {
+        throw Local_exit;
       }
       i = i + 1 | 0;
     };
     return -1;
   }
   catch (exn){
-    if (exn === Exit) {
+    if (exn === Local_exit) {
       return i;
     }
     else {
@@ -287,18 +326,17 @@ function find($staropt$star, sub, s) {
 function rfind(sub, s) {
   var n = sub.length;
   var i = s.length - n | 0;
-  var Exit = Caml_exceptions.create("Exit");
   try {
     while(i >= 0) {
-      if (_is_sub(sub, 0, s, i, n)) {
-        throw Exit;
+      if (unsafe_is_sub(sub, 0, s, i, n)) {
+        throw Local_exit;
       }
       i = i - 1 | 0;
     };
     return -1;
   }
   catch (exn){
-    if (exn === Exit) {
+    if (exn === Local_exit) {
       return i;
     }
     else {
@@ -431,98 +469,159 @@ function rindex_opt(s, c) {
   return rindex_rec_opt(s, s.length - 1 | 0, c);
 }
 
-function is_valid_module_file(finish, s) {
-  var match = Caml_string.get(s, 0);
-  var exit = 0;
-  if (match >= 91) {
-    if (match > 122 || match < 97) {
-      return /* false */0;
+function is_valid_module_file(s) {
+  var len = s.length;
+  if (len > 0) {
+    var match = s.charCodeAt(0);
+    var exit = 0;
+    if (match >= 91) {
+      if (match > 122 || match < 97) {
+        return /* false */0;
+      }
+      else {
+        exit = 1;
+      }
     }
-    else {
+    else if (match >= 65) {
       exit = 1;
     }
-  }
-  else if (match >= 65) {
-    exit = 1;
-  }
-  else {
-    return /* false */0;
-  }
-  if (exit === 1) {
-    return for_all_range(s, 1, finish, function (x) {
-                if (x >= 65) {
-                  var switcher = x - 91 | 0;
-                  if (switcher > 5 || switcher < 0) {
-                    if (switcher >= 32) {
+    else {
+      return /* false */0;
+    }
+    if (exit === 1) {
+      return unsafe_for_all_range(s, 1, len - 1 | 0, function (x) {
+                  if (x >= 65) {
+                    var switcher = x - 91 | 0;
+                    if (switcher > 5 || switcher < 0) {
+                      if (switcher >= 32) {
+                        return /* false */0;
+                      }
+                      else {
+                        return /* true */1;
+                      }
+                    }
+                    else if (switcher !== 4) {
                       return /* false */0;
                     }
                     else {
                       return /* true */1;
                     }
                   }
-                  else if (switcher !== 4) {
-                    return /* false */0;
-                  }
-                  else {
-                    return /* true */1;
+                  else if (x >= 48) {
+                    if (x >= 58) {
+                      return /* false */0;
+                    }
+                    else {
+                      return /* true */1;
+                    }
                   }
-                }
-                else if (x >= 48) {
-                  if (x >= 58) {
+                  else if (x !== 39) {
                     return /* false */0;
                   }
                   else {
                     return /* true */1;
                   }
-                }
-                else if (x !== 39) {
-                  return /* false */0;
-                }
-                else {
-                  return /* true */1;
-                }
-              });
+                });
+    }
+    
+  }
+  else {
+    return /* false */0;
   }
-  
 }
 
 function is_valid_source_name(name) {
-  if ((Curry._2(Filename.check_suffix, name, ".ml") || Curry._2(Filename.check_suffix, name, ".re")) && is_valid_module_file(name.length - 3 | 0, name)) {
-    return /* true */1;
-  }
-  else if (Curry._2(Filename.check_suffix, name, ".mli") || Curry._2(Filename.check_suffix, name, ".mll") || Curry._2(Filename.check_suffix, name, ".rei")) {
-    return is_valid_module_file(name.length - 4 | 0, name);
+  var match = check_any_suffix_case_then_chop(name, /* :: */[
+        ".ml",
+        /* :: */[
+          ".re",
+          /* :: */[
+            ".mli",
+            /* :: */[
+              ".mll",
+              /* :: */[
+                ".rei",
+                /* [] */0
+              ]
+            ]
+          ]
+        ]
+      ]);
+  if (match) {
+    return is_valid_module_file(match[0]);
   }
   else {
     return /* false */0;
   }
 }
 
-exports.split_by                  = split_by;
-exports.trim                      = trim;
-exports.split                     = split;
-exports.quick_split_by_ws         = quick_split_by_ws;
-exports.starts_with               = starts_with;
-exports.ends_with_index           = ends_with_index;
-exports.ends_with                 = ends_with;
-exports.ends_with_then_chop       = ends_with_then_chop;
-exports.escaped                   = escaped;
-exports.for_all_range             = for_all_range;
-exports.for_all                   = for_all;
-exports.is_empty                  = is_empty;
-exports.repeat                    = repeat;
-exports._is_sub                   = _is_sub;
-exports.find                      = find;
-exports.rfind                     = rfind;
-exports.tail_from                 = tail_from;
-exports.digits_of_str             = digits_of_str;
-exports.starts_with_and_number    = starts_with_and_number;
-exports.equal                     = equal;
-exports.unsafe_concat_with_length = unsafe_concat_with_length;
-exports.rindex_rec                = rindex_rec;
-exports.rindex_rec_opt            = rindex_rec_opt;
-exports.rindex_neg                = rindex_neg;
-exports.rindex_opt                = rindex_opt;
-exports.is_valid_module_file      = is_valid_module_file;
-exports.is_valid_source_name      = is_valid_source_name;
-/* Filename Not a pure module */
+function unsafe_no_char(x, ch, _i, len) {
+  while(true) {
+    var i = _i;
+    if (i >= len) {
+      return /* true */1;
+    }
+    else if (x.charCodeAt(i) !== ch) {
+      _i = i + 1 | 0;
+      continue ;
+      
+    }
+    else {
+      return /* false */0;
+    }
+  };
+}
+
+function no_char(x, ch, i, len) {
+  var str_len = x.length;
+  if (i < 0 || i >= str_len || len >= str_len) {
+    throw [
+          Caml_builtin_exceptions.invalid_argument,
+          "Ext_string.no_char"
+        ];
+  }
+  else {
+    return unsafe_no_char(x, ch, i, len);
+  }
+}
+
+var check_suffix_case = ends_with;
+
+var check_suffix_case_then_chop = ends_with_then_chop;
+
+exports.split_by                        = split_by;
+exports.trim                            = trim;
+exports.split                           = split;
+exports.quick_split_by_ws               = quick_split_by_ws;
+exports.starts_with                     = starts_with;
+exports.ends_with_index                 = ends_with_index;
+exports.ends_with                       = ends_with;
+exports.ends_with_then_chop             = ends_with_then_chop;
+exports.check_suffix_case               = check_suffix_case;
+exports.check_suffix_case_then_chop     = check_suffix_case_then_chop;
+exports.check_any_suffix_case           = check_any_suffix_case;
+exports.check_any_suffix_case_then_chop = check_any_suffix_case_then_chop;
+exports.escaped                         = escaped;
+exports.unsafe_for_all_range            = unsafe_for_all_range;
+exports.for_all_range                   = for_all_range;
+exports.for_all                         = for_all;
+exports.is_empty                        = is_empty;
+exports.repeat                          = repeat;
+exports.unsafe_is_sub                   = unsafe_is_sub;
+exports.Local_exit                      = Local_exit;
+exports.find                            = find;
+exports.rfind                           = rfind;
+exports.tail_from                       = tail_from;
+exports.digits_of_str                   = digits_of_str;
+exports.starts_with_and_number          = starts_with_and_number;
+exports.equal                           = equal;
+exports.unsafe_concat_with_length       = unsafe_concat_with_length;
+exports.rindex_rec                      = rindex_rec;
+exports.rindex_rec_opt                  = rindex_rec_opt;
+exports.rindex_neg                      = rindex_neg;
+exports.rindex_opt                      = rindex_opt;
+exports.is_valid_module_file            = is_valid_module_file;
+exports.is_valid_source_name            = is_valid_source_name;
+exports.unsafe_no_char                  = unsafe_no_char;
+exports.no_char                         = no_char;
+/* No side effect */