final clean up

Author: bobzhang

jscomp/bin/all_ounit_tests.i.ml

@@ -75,7 +75,7 @@ open OUnitTypes
 
 (** Most simple heuristic, just pick the first test. *)
 let simple state =
-  (* 118 *) List.hd state.tests_planned
+  (* 119 *) List.hd state.tests_planned
 
 end
 module OUnitUtils
@@ -98,22 +98,22 @@ let is_success =
 let is_failure = 
   function
     | RFailure _ -> (* 0 *) true
-    | RSuccess _ | RError _  | RSkip _ | RTodo _ -> (* 236 *) false
+    | RSuccess _ | RError _  | RSkip _ | RTodo _ -> (* 238 *) false
 
 let is_error = 
   function 
     | RError _ -> (* 0 *) true
-    | RSuccess _ | RFailure _ | RSkip _ | RTodo _ -> (* 236 *) false
+    | RSuccess _ | RFailure _ | RSkip _ | RTodo _ -> (* 238 *) false
 
 let is_skip = 
   function
     | RSkip _ -> (* 0 *) true
-    | RSuccess _ | RFailure _ | RError _  | RTodo _ -> (* 236 *) false
+    | RSuccess _ | RFailure _ | RError _  | RTodo _ -> (* 238 *) false
 
 let is_todo = 
   function
     | RTodo _ -> (* 0 *) true
-    | RSuccess _ | RFailure _ | RError _  | RSkip _ -> (* 236 *) false
+    | RSuccess _ | RFailure _ | RError _  | RSkip _ -> (* 238 *) false
 
 let result_flavour = 
   function
@@ -145,7 +145,7 @@ let rec was_successful =
     | [] -> (* 3 *) true
     | RSuccess _::t 
     | RSkip _::t -> 
-        (* 354 *) was_successful t
+        (* 357 *) was_successful t
 
     | RFailure _::_
     | RError _::_ 
@@ -155,22 +155,22 @@ let rec was_successful =
 let string_of_node = 
   function
     | ListItem n -> 
-        (* 472 *) string_of_int n
+        (* 476 *) string_of_int n
     | Label s -> 
-        (* 708 *) s
+        (* 714 *) s
 
 (* Return the number of available tests *)
 let rec test_case_count = 
   function
-    | TestCase _ -> (* 118 *) 1 
-    | TestLabel (_, t) -> (* 139 *) test_case_count t
+    | TestCase _ -> (* 119 *) 1 
+    | TestLabel (_, t) -> (* 140 *) test_case_count t
     | TestList l -> 
         (* 21 *) List.fold_left 
-          (fun c t -> (* 138 *) c + test_case_count t) 
+          (fun c t -> (* 139 *) c + test_case_count t) 
           0 l
 
 let string_of_path path =
-  (* 236 *) String.concat ":" (List.rev_map string_of_node path)
+  (* 238 *) String.concat ":" (List.rev_map string_of_node path)
 
 let buff_format_printf f = 
   (* 0 *) let buff = Buffer.create 13 in
@@ -194,12 +194,12 @@ let mapi f l =
 
 let fold_lefti f accu l =
   (* 21 *) let rec rfold_lefti cnt accup l = 
-    (* 159 *) match l with
+    (* 160 *) match l with
       | [] -> 
           (* 21 *) accup
 
       | h::t -> 
-          (* 138 *) rfold_lefti (cnt + 1) (f accup h cnt) t
+          (* 139 *) rfold_lefti (cnt + 1) (f accup h cnt) t
   in
     rfold_lefti 0 accu l
 
@@ -217,7 +217,7 @@ open OUnitUtils
 type event_type = GlobalEvent of global_event | TestEvent of test_event
 
 let format_event verbose event_type =
-  (* 710 *) match event_type with
+  (* 716 *) match event_type with
     | GlobalEvent e ->
         (* 2 *) begin
           match e with 
@@ -276,31 +276,31 @@ let format_event verbose event_type =
         end
 
     | TestEvent e ->
-        (* 708 *) begin
+        (* 714 *) begin
           let string_of_result = 
             if verbose then
-              (* 354 *) function
-                | RSuccess _      -> (* 118 *) "ok\n"
+              (* 357 *) function
+                | RSuccess _      -> (* 119 *) "ok\n"
                 | RFailure (_, _) -> (* 0 *) "FAIL\n"
                 | RError (_, _)   -> (* 0 *) "ERROR\n"
                 | RSkip (_, _)    -> (* 0 *) "SKIP\n"
                 | RTodo (_, _)    -> (* 0 *) "TODO\n"
             else
-              (* 354 *) function
-                | RSuccess _      -> (* 118 *) "."
+              (* 357 *) function
+                | RSuccess _      -> (* 119 *) "."
                 | RFailure (_, _) -> (* 0 *) "F"
                 | RError (_, _)   -> (* 0 *) "E"
                 | RSkip (_, _)    -> (* 0 *) "S"
                 | RTodo (_, _)    -> (* 0 *) "T"
           in
             if verbose then
-              (* 354 *) match e with 
+              (* 357 *) match e with 
                 | EStart p -> 
-                    (* 118 *) Printf.sprintf "%s start\n" (string_of_path p)
+                    (* 119 *) Printf.sprintf "%s start\n" (string_of_path p)
                 | EEnd p -> 
-                    (* 118 *) Printf.sprintf "%s end\n" (string_of_path p)
+                    (* 119 *) Printf.sprintf "%s end\n" (string_of_path p)
                 | EResult result -> 
-                    (* 118 *) string_of_result result
+                    (* 119 *) string_of_result result
                 | ELog (lvl, str) ->
                     (* 0 *) let prefix = 
                       match lvl with 
@@ -312,21 +312,21 @@ let format_event verbose event_type =
                 | ELogRaw str ->
                     (* 0 *) str
             else 
-              (* 354 *) match e with 
-                | EStart _ | EEnd _ | ELog _ | ELogRaw _ -> (* 236 *) ""
-                | EResult result -> (* 118 *) string_of_result result
+              (* 357 *) match e with 
+                | EStart _ | EEnd _ | ELog _ | ELogRaw _ -> (* 238 *) ""
+                | EResult result -> (* 119 *) string_of_result result
         end
 
 let file_logger fn =
   (* 1 *) let chn = open_out fn in
     (fun ev ->
-       (* 355 *) output_string chn (format_event true ev);
+       (* 358 *) output_string chn (format_event true ev);
        flush chn),
     (fun () -> (* 1 *) close_out chn)
 
 let std_logger verbose =
   (* 1 *) (fun ev -> 
-     (* 355 *) print_string (format_event verbose ev);
+     (* 358 *) print_string (format_event verbose ev);
      flush stdout),
   (fun () -> (* 1 *) ())
 
@@ -343,7 +343,7 @@ let create output_file_opt verbose (log,close) =
           (* 0 *) null_logger
   in
     (fun ev ->
-       (* 355 *) std_log ev; file_log ev; log ev),
+       (* 358 *) std_log ev; file_log ev; log ev),
     (fun () ->
        (* 1 *) std_close (); file_close (); close ())
 
@@ -705,7 +705,7 @@ let assert_failure msg =
   (* 0 *) failwith ("OUnit: " ^ msg)
 
 let assert_bool msg b =
-  (* 2005362 *) if not b then (* 0 *) assert_failure msg
+  (* 2005363 *) if not b then (* 0 *) assert_failure msg
 
 let assert_string str =
   (* 0 *) if not (str = "") then (* 0 *) assert_failure str
@@ -951,7 +951,7 @@ let (@?) = assert_bool
 
 (* Some shorthands which allows easy test construction *)
 let (>:) s t = (* 0 *) TestLabel(s, t)             (* infix *)
-let (>::) s f = (* 118 *) TestLabel(s, TestCase(f))  (* infix *)
+let (>::) s f = (* 119 *) TestLabel(s, TestCase(f))  (* infix *)
 let (>:::) s l = (* 21 *) TestLabel(s, TestList(l)) (* infix *)
 
 (* Utility function to manipulate test *)
@@ -1087,7 +1087,7 @@ 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 =
-    (* 118 *) try 
+    (* 119 *) try 
       f ();
       RSuccess path
     with
@@ -1106,22 +1106,22 @@ let perform_test report test =
   let rec flatten_test path acc = 
     function
       | TestCase(f) -> 
-          (* 118 *) (path, f) :: acc
+          (* 119 *) (path, f) :: acc
 
       | TestList (tests) ->
           (* 21 *) fold_lefti 
             (fun acc t cnt -> 
-               (* 138 *) flatten_test 
+               (* 139 *) flatten_test 
                  ((ListItem cnt)::path) 
                  acc t)
             acc tests
 
       | TestLabel (label, t) -> 
-          (* 139 *) flatten_test ((Label label)::path) acc t
+          (* 140 *) flatten_test ((Label label)::path) acc t
   in
   let test_cases = List.rev (flatten_test [] [] test) in
   let runner (path, f) = 
-    (* 118 *) let result = 
+    (* 119 *) let result = 
       report (EStart path);
       run_test_case f path 
     in
@@ -1130,18 +1130,18 @@ let perform_test report test =
       result
   in
   let rec iter state = 
-    (* 119 *) match state.tests_planned with 
+    (* 120 *) match state.tests_planned with 
       | [] ->
           (* 1 *) state.results
       | _ ->
-          (* 118 *) let (path, f) = !global_chooser state in            
+          (* 119 *) let (path, f) = !global_chooser state in            
           let result = runner (path, f) in
             iter 
               {
                 results = result :: state.results;
                 tests_planned = 
                   List.filter 
-                    (fun (path', _) -> (* 7021 *) path <> path') state.tests_planned
+                    (fun (path', _) -> (* 7140 *) path <> path') state.tests_planned
               }
   in
     iter {results = []; tests_planned = test_cases}
@@ -1171,7 +1171,7 @@ let run_test_tt ?verbose test =
     time_fun 
       perform_test 
       (fun ev ->
-         (* 354 *) log (OUnitLogger.TestEvent ev))
+         (* 357 *) log (OUnitLogger.TestEvent ev))
       test 
   in
 
@@ -1894,33 +1894,33 @@ let equal (x : string) y  = (* 0 *) x = y
 
 
 let unsafe_is_sub ~sub i s j ~len =
-  (* 589 *) let rec check k =
-    (* 753 *) if k = len
-    then (* 33 *) true
+  (* 681 *) let rec check k =
+    (* 864 *) if k = len
+    then (* 34 *) true
     else 
-      (* 720 *) String.unsafe_get sub (i+k) = 
+      (* 830 *) 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 =
-  (* 39 *) let n = String.length sub in
+  (* 40 *) let n = String.length sub in
   let s_len = String.length s in 
   let i = ref start in  
   try
     while !i + n <= s_len do
-      (* 581 *) if unsafe_is_sub ~sub 0 s !i ~len:n then
-        (* 31 *) raise_notrace Local_exit;
+      (* 673 *) if unsafe_is_sub ~sub 0 s !i ~len:n then
+        (* 32 *) raise_notrace Local_exit;
       incr i
     done;
     -1
   with Local_exit ->
-    (* 31 *) !i
+    (* 32 *) !i
 
 let contain_substring s sub = 
-  (* 9 *) find s ~sub >= 0 
+  (* 10 *) find s ~sub >= 0 
 
 (** TODO: optimize 
   avoid nonterminating when string is empty 
@@ -3528,7 +3528,7 @@ let rec safe_dup fd =
   end
 
 let safe_close fd =
-  (* 18 *) try Unix.close fd with Unix.Unix_error(_,_,_) -> (* 0 *) ()
+  (* 20 *) try Unix.close fd with Unix.Unix_error(_,_,_) -> (* 0 *) ()
 
 
 type output = {
@@ -3538,7 +3538,7 @@ type output = {
 }
 
 let perform command args = 
-  (* 9 *) let new_fd_in, new_fd_out = Unix.pipe () in 
+  (* 10 *) let new_fd_in, new_fd_out = Unix.pipe () in 
   let err_fd_in, err_fd_out = Unix.pipe () in 
   match Unix.fork () with 
   | 0 -> 
@@ -3557,28 +3557,28 @@ let perform command args =
        when all the descriptiors on a pipe's output are closed, a call to 
        [write] on its input kills the writing process (EPIPE).
     *)
-    (* 9 *) safe_close new_fd_out ; 
+    (* 10 *) safe_close new_fd_out ; 
     safe_close err_fd_out ; 
     let in_chan = Unix.in_channel_of_descr new_fd_in in 
     let err_in_chan = Unix.in_channel_of_descr err_fd_in in 
     let buf = Buffer.create 1024 in 
     let err_buf = Buffer.create 1024 in 
     (try 
        while true do 
-         (* 67 *) Buffer.add_string buf (input_line in_chan );             
+         (* 68 *) Buffer.add_string buf (input_line in_chan );             
          Buffer.add_char buf '\n'
        done;
      with
-       End_of_file -> (* 9 *) ()) ; 
+       End_of_file -> (* 10 *) ()) ; 
     (try 
        while true do 
-         (* 106 *) Buffer.add_string err_buf (input_line err_in_chan );
+         (* 109 *) Buffer.add_string err_buf (input_line err_in_chan );
          Buffer.add_char err_buf '\n'
        done;
      with
-       End_of_file -> (* 9 *) ()) ; 
+       End_of_file -> (* 10 *) ()) ; 
     let exit_code = match snd @@ Unix.waitpid [] pid with 
-      | Unix.WEXITED exit_code -> (* 9 *) exit_code 
+      | Unix.WEXITED exit_code -> (* 10 *) exit_code 
       | Unix.WSIGNALED _signal_number 
       | Unix.WSTOPPED _signal_number  -> (* 0 *) 127 in 
     {
@@ -3589,7 +3589,7 @@ let perform command args =
 
 
 let perform_bsc args = 
-  (* 9 *) perform bsc_exe 
+  (* 10 *) perform bsc_exe 
     (Array.append 
        [|bsc_exe ; 
          "-bs-package-name" ; "bs-platform"; 
@@ -3606,7 +3606,7 @@ let perform_bsc args =
        |] args)
 
 let bsc_eval str = 
-  (* 6 *) perform_bsc [|"-bs-eval"; str|]        
+  (* 7 *) perform_bsc [|"-bs-eval"; str|]        
 
   let debug_output o = 
   (* 0 *) Printf.printf "\nexit_code:%d\nstdout:%s\nstderr:%s\n"
@@ -3751,10 +3751,22 @@ external err :
     external err : 
    ?hi_should_error:([`a of int | `b of string ] [@bs.string]) ->         
    unit -> _ = "" [@@bs.obj]
+        |} in
+        OUnit.assert_bool __LOC__
+            (Ext_string.contain_substring output.stderr "hi_should_error")        
+        end;
+        __LOC__ >:: begin fun _ -> 
+        (* 1 *) let output = bsc_eval {|
+    external err : 
+   ?hi_should_error:([`a of int | `b of string ] [@bs.string]) ->         
+   unit -> unit = "" [@@bs.val]
         |} in
         OUnit.assert_bool __LOC__
             (Ext_string.contain_substring output.stderr "hi_should_error")        
         end
+
+        
+
     ]
 end
 module Ext_util : sig