tweak and remove unused code

Author: bobzhang

jscomp/bsb/bsb_parse_sources.ml

@@ -112,23 +112,23 @@ let extract_input_output (edge : Ext_json_types.t) : string list * string list =
   (match Ext_array.find_and_split content 
           (fun x () -> match x with Str { str =":"} -> true | _ -> false )
           () with 
-  | `No_split -> error ()
-  | `Split (  output, input) -> 
-    (Ext_array.to_list_map (fun (x : Ext_json_types.t) -> 
+  | No_split -> error ()
+  | Split (  output, input) -> 
+    (Ext_array.to_list_map output (fun x -> 
         match x with
         | Str {str = ":"} -> 
           error ()
         | Str {str } ->           
           Some str 
-        | _ -> None) output
+        | _ -> None) 
     ,
-    Ext_array.to_list_map (fun (x : Ext_json_types.t) -> 
+    Ext_array.to_list_map input (fun x -> 
         match x with
         | Str {str = ":"} -> 
           error () 
         | Str {str} -> 
           Some str (* More rigirous error checking: It would trigger a ninja syntax error *)
-        | _ -> None) input))
+        | _ -> None) ))
     | _ -> error ()    
 type json_map = Ext_json_types.t Map_string.t
 

jscomp/ext/ext_array.ml

@@ -112,7 +112,7 @@ let rec tolist_aux a f  i res =
        | Some v -> v :: res
        | None -> res) 
 
-let to_list_map f a = 
+let to_list_map a f  = 
   tolist_aux a f (Array.length a - 1) []
 
 let to_list_map_acc a acc f = 
@@ -187,13 +187,7 @@ let rfind_with_index arr cmp v =
     else aux (i - 1) in 
   aux (len - 1)
 
-type 'a split = [ `No_split | `Split of 'a array * 'a array ]
-let rfind_and_split arr cmp v : _ split = 
-  let i = rfind_with_index arr cmp v in 
-  if  i < 0 then 
-    `No_split 
-  else 
-    `Split (Array.sub arr 0 i , Array.sub arr  (i + 1 ) (Array.length arr - i - 1 ))
+type 'a split = No_split | Split of  'a array *  'a array 
 
 
 let find_with_index arr cmp v = 
@@ -207,9 +201,9 @@ let find_with_index arr cmp v =
 let find_and_split arr cmp v : _ split = 
   let i = find_with_index arr cmp v in 
   if i < 0 then 
-    `No_split
+    No_split
   else
-    `Split (Array.sub arr 0 i, Array.sub arr (i + 1 ) (Array.length arr - i - 1))        
+    Split (Array.sub arr 0 i, Array.sub arr (i + 1 ) (Array.length arr - i - 1))
 
 (** TODO: available since 4.03, use {!Array.exists} *)
 

jscomp/ext/ext_array.mli

@@ -49,7 +49,8 @@ val to_list_f :
   ('a -> 'b) -> 
   'b list 
 
-val to_list_map : ('a -> 'b option) -> 'a array -> 'b list 
+val to_list_map : 
+'a array -> ('a -> 'b option) -> 'b list 
 
 val to_list_map_acc : 
   'a array -> 
@@ -65,12 +66,9 @@ val of_list_map :
 val rfind_with_index : 'a array -> ('a -> 'b -> bool) -> 'b -> int
 
 
-type 'a split = [ `No_split | `Split of 'a array * 'a array ]
 
-val rfind_and_split : 
-  'a array ->
-  ('a -> 'b -> bool) ->
-  'b -> 'a split
+type 'a split = No_split | Split of  'a array *  'a array 
+
 
 val find_and_split : 
   'a array ->

jscomp/ounit_tests/ounit_array_tests.ml

@@ -14,22 +14,22 @@ let suites =
      __LOC__ >:: begin fun _ ->
         Ext_array.find_and_split 
             [|"a"; "b";"c"|]
-            Ext_string.equal "--" =~ `No_split
+            Ext_string.equal "--" =~ No_split
      end;
     __LOC__ >:: begin fun _ ->
         Ext_array.find_and_split 
             [|"a"; "b";"c";"--"|]
-            Ext_string.equal "--" =~ `Split ([|"a";"b";"c"|],[||])
+            Ext_string.equal "--" =~ Split( [|"a";"b";"c"|], [||])
      end;
      __LOC__ >:: begin fun _ ->
         Ext_array.find_and_split 
             [|"--"; "a"; "b";"c";"--"|]
-            Ext_string.equal "--" =~ `Split ([||], [|"a";"b";"c";"--"|])
+            Ext_string.equal "--" =~ Split ([||], [|"a";"b";"c";"--"|])
      end;
     __LOC__ >:: begin fun _ ->
         Ext_array.find_and_split 
             [| "u"; "g"; "--"; "a"; "b";"c";"--"|]
-            Ext_string.equal "--" =~ `Split ([|"u";"g"|], [|"a";"b";"c";"--"|])
+            Ext_string.equal "--" =~ Split ([|"u";"g"|], [|"a";"b";"c";"--"|])
      end;
     __LOC__ >:: begin fun _ ->
         Ext_array.reverse [|1;2|] =~ [|2;1|];