snapshot

Author: bobzhang

lib/4.06.1/bsb.ml

@@ -98,7 +98,10 @@ val reverse_in_place : 'a array -> unit
 val reverse : 'a array -> 'a array 
 val reverse_of_list : 'a list -> 'a array
 
-val filter : ('a -> bool) -> 'a array -> 'a array
+val filter : 
+  'a array -> 
+  ('a -> bool) ->   
+  'a array
 
 val filter_map : 
 'a array -> 
@@ -241,7 +244,7 @@ let reverse_of_list =  function
       | hd::tl -> Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
-let filter f a =
+let filter a f =
   let arr_len = Array.length a in
   let rec aux acc i =
     if i = arr_len 

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -1284,7 +1284,10 @@ val reverse_in_place : 'a array -> unit
 val reverse : 'a array -> 'a array 
 val reverse_of_list : 'a list -> 'a array
 
-val filter : ('a -> bool) -> 'a array -> 'a array
+val filter : 
+  'a array -> 
+  ('a -> bool) ->   
+  'a array
 
 val filter_map : 
 'a array -> 
@@ -1427,7 +1430,7 @@ let reverse_of_list =  function
       | hd::tl -> Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
-let filter f a =
+let filter a f =
   let arr_len = Array.length a in
   let rec aux acc i =
     if i = arr_len 

lib/4.06.1/unstable/bspack.ml

@@ -6603,7 +6603,10 @@ val reverse_in_place : 'a array -> unit
 val reverse : 'a array -> 'a array 
 val reverse_of_list : 'a list -> 'a array
 
-val filter : ('a -> bool) -> 'a array -> 'a array
+val filter : 
+  'a array -> 
+  ('a -> bool) ->   
+  'a array
 
 val filter_map : 
 'a array -> 
@@ -6746,7 +6749,7 @@ let reverse_of_list =  function
       | hd::tl -> Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
-let filter f a =
+let filter a f =
   let arr_len = Array.length a in
   let rec aux acc i =
     if i = arr_len 

lib/4.06.1/unstable/js_compiler.ml

@@ -17997,7 +17997,10 @@ val reverse_in_place : 'a array -> unit
 val reverse : 'a array -> 'a array 
 val reverse_of_list : 'a list -> 'a array
 
-val filter : ('a -> bool) -> 'a array -> 'a array
+val filter : 
+  'a array -> 
+  ('a -> bool) ->   
+  'a array
 
 val filter_map : 
 'a array -> 
@@ -18140,7 +18143,7 @@ let reverse_of_list =  function
       | hd::tl -> Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
-let filter f a =
+let filter a f =
   let arr_len = Array.length a in
   let rec aux acc i =
     if i = arr_len 
@@ -75703,12 +75706,31 @@ let report_error ppf errs =
   fprintf ppf "@[<v>%a%a@]" print_errs errs include_err err
 
 
+let better_candidate_loc (x : error list) = 
+    match x with 
+    | [ (_,_,Interface_mismatch _); (_,_,descr)]
+      ->
+        begin match descr with 
+        | Value_descriptions (_,d1,_) -> Some d1.val_loc
+        | Type_declarations (_,tdcl1,_,_) ->
+          Some tdcl1.type_loc
+        | Missing_field (_,loc,_) -> Some loc  
+        | _ -> None
+        end
+    | _ -> None    
+
 (* We could do a better job to split the individual error items
    as sub-messages of the main interface mismatch on the whole unit. *)
 let () =
   Location.register_error_of_exn
     (function
-      | Error err -> Some (Location.error_of_printer_file report_error err)
+      | Error err -> 
+        begin match better_candidate_loc err with 
+        | None -> 
+          Some (Location.error_of_printer_file report_error err)
+        | Some loc -> 
+          Some (Location.error_of_printer loc report_error err)  
+        end
       | _ -> None
     )
 

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -17997,7 +17997,10 @@ val reverse_in_place : 'a array -> unit
 val reverse : 'a array -> 'a array 
 val reverse_of_list : 'a list -> 'a array
 
-val filter : ('a -> bool) -> 'a array -> 'a array
+val filter : 
+  'a array -> 
+  ('a -> bool) ->   
+  'a array
 
 val filter_map : 
 'a array -> 
@@ -18140,7 +18143,7 @@ let reverse_of_list =  function
       | hd::tl -> Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
-let filter f a =
+let filter a f =
   let arr_len = Array.length a in
   let rec aux acc i =
     if i = arr_len 
@@ -75703,12 +75706,31 @@ let report_error ppf errs =
   fprintf ppf "@[<v>%a%a@]" print_errs errs include_err err
 
 
+let better_candidate_loc (x : error list) = 
+    match x with 
+    | [ (_,_,Interface_mismatch _); (_,_,descr)]
+      ->
+        begin match descr with 
+        | Value_descriptions (_,d1,_) -> Some d1.val_loc
+        | Type_declarations (_,tdcl1,_,_) ->
+          Some tdcl1.type_loc
+        | Missing_field (_,loc,_) -> Some loc  
+        | _ -> None
+        end
+    | _ -> None    
+
 (* We could do a better job to split the individual error items
    as sub-messages of the main interface mismatch on the whole unit. *)
 let () =
   Location.register_error_of_exn
     (function
-      | Error err -> Some (Location.error_of_printer_file report_error err)
+      | Error err -> 
+        begin match better_candidate_loc err with 
+        | None -> 
+          Some (Location.error_of_printer_file report_error err)
+        | Some loc -> 
+          Some (Location.error_of_printer loc report_error err)  
+        end
       | _ -> None
     )
 

lib/4.06.1/whole_compiler.ml

@@ -5499,7 +5499,10 @@ val reverse_in_place : 'a array -> unit
 val reverse : 'a array -> 'a array 
 val reverse_of_list : 'a list -> 'a array
 
-val filter : ('a -> bool) -> 'a array -> 'a array
+val filter : 
+  'a array -> 
+  ('a -> bool) ->   
+  'a array
 
 val filter_map : 
 'a array -> 
@@ -5642,7 +5645,7 @@ let reverse_of_list =  function
       | hd::tl -> Array.unsafe_set a (len - i - 2) hd; fill (i+1) tl in
     fill 0 tl
 
-let filter f a =
+let filter a f =
   let arr_len = Array.length a in
   let rec aux acc i =
     if i = arr_len