refactoring

Author: bobzhang

jscomp/bsb/bsb_ninja_targets.ml

@@ -23,7 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
+let oc_list xs  oc = 
+  Ext_list.iter xs (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
 
 let output_build
     ?(order_only_deps=[])
@@ -35,24 +36,24 @@ let output_build
     oc =
   let rule = Bsb_ninja_rule.get_name rule  oc in (* Trigger building if not used *)
   output_string oc "o";
-  Ext_list.iter outputs (fun s -> output_string oc Ext_string.single_space ; output_string oc s  );
+  oc_list outputs oc;
   if implicit_outputs <> [] then begin 
     output_string oc " |";
-    Ext_list.iter implicit_outputs (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
+    oc_list implicit_outputs oc 
   end;
   output_string oc " : ";
   output_string oc rule;
-  Ext_list.iter inputs (fun s ->   output_string oc Ext_string.single_space ; output_string oc s);
+  oc_list inputs oc;
   if implicit_deps <> [] then 
     begin
-      output_string oc " | ";
-      Ext_list.iter implicit_deps (fun s -> output_string oc Ext_string.single_space; output_string oc s )
+      output_string oc " |";
+      oc_list implicit_deps oc 
     end
   ;
   if order_only_deps <> [] then
     begin
       output_string oc " ||";                
-      Ext_list.iter order_only_deps (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
+      oc_list order_only_deps oc 
     end
   ;
   output_string oc "\n"
@@ -62,12 +63,11 @@ let phony ?(order_only_deps=[]) ~inputs ~output oc =
   output_string oc output ;
   output_string oc " : ";
   output_string oc "phony";
-  output_string oc Ext_string.single_space;
-  Ext_list.iter inputs  (fun s ->   output_string oc Ext_string.single_space ; output_string oc s);
+  oc_list inputs oc;
   if order_only_deps <> [] then 
     begin
-      output_string oc " || ";                
-      Ext_list.iter order_only_deps (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
+      output_string oc " ||";                
+      oc_list order_only_deps oc 
     end;
   output_string oc "\n"
 

lib/4.06.1/bsb.ml

@@ -13431,7 +13431,8 @@ end = struct
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
+let oc_list xs  oc = 
+  Ext_list.iter xs (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
 
 let output_build
     ?(order_only_deps=[])
@@ -13443,24 +13444,24 @@ let output_build
     oc =
   let rule = Bsb_ninja_rule.get_name rule  oc in (* Trigger building if not used *)
   output_string oc "o";
-  Ext_list.iter outputs (fun s -> output_string oc Ext_string.single_space ; output_string oc s  );
+  oc_list outputs oc;
   if implicit_outputs <> [] then begin 
     output_string oc " |";
-    Ext_list.iter implicit_outputs (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
+    oc_list implicit_outputs oc 
   end;
   output_string oc " : ";
   output_string oc rule;
-  Ext_list.iter inputs (fun s ->   output_string oc Ext_string.single_space ; output_string oc s);
+  oc_list inputs oc;
   if implicit_deps <> [] then 
     begin
-      output_string oc " | ";
-      Ext_list.iter implicit_deps (fun s -> output_string oc Ext_string.single_space; output_string oc s )
+      output_string oc " |";
+      oc_list implicit_deps oc 
     end
   ;
   if order_only_deps <> [] then
     begin
       output_string oc " ||";                
-      Ext_list.iter order_only_deps (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
+      oc_list order_only_deps oc 
     end
   ;
   output_string oc "\n"
@@ -13470,12 +13471,11 @@ let phony ?(order_only_deps=[]) ~inputs ~output oc =
   output_string oc output ;
   output_string oc " : ";
   output_string oc "phony";
-  output_string oc Ext_string.single_space;
-  Ext_list.iter inputs  (fun s ->   output_string oc Ext_string.single_space ; output_string oc s);
+  oc_list inputs oc;
   if order_only_deps <> [] then 
     begin
-      output_string oc " || ";                
-      Ext_list.iter order_only_deps (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
+      output_string oc " ||";                
+      oc_list order_only_deps oc 
     end;
   output_string oc "\n"