add optional arguments to simplify. things

Author: bobzhang

jscomp/bsb/bsb_arg.ml

@@ -100,7 +100,7 @@
    raise (Bad (Ext_buffer.contents b))
 
 
- let parse_exn  ~usage ~argv ~start ?(finish=Array.length argv) (speclist : t) anonfun = 
+ let parse_exn  ~usage ~argv ?(start=1) ?(finish=Array.length argv) (speclist : t) anonfun = 
    let current = ref start in 
    let rev_list = ref [] in 
    while !current < finish do

jscomp/bsb/bsb_arg.mli

@@ -44,7 +44,7 @@ type anon_fun = rev_args:string list -> unit
 val parse_exn :
   usage:string -> 
   argv:string array -> 
-  start:int ->
+  ?start:int ->
   ?finish:int ->
   (key * spec * doc) list -> 
   anon_fun  -> unit

jscomp/main/bsb_main.ml

@@ -197,14 +197,14 @@ let () =
 
     | argv -> 
       begin
-        match Ext_array.find_and_split argv Ext_string.equal separator with
-        | `No_split
-          ->
+        let i =  Ext_array.rfind_with_index
+          argv Ext_string.equal separator in 
+        if i < 0 then 
           begin
             Bsb_arg.parse_exn 
             ~usage
             ~argv 
-            ~start:1
+
             bsb_main_flags 
             handle_anonymous_arg            
             ;
@@ -245,14 +245,18 @@ let () =
                    install_target config_opt
                  end)
           end
-        | `Split (bsb_args,ninja_args)
-          -> (* -make-world all dependencies fall into this category *)
+        else
+           (* -make-world all dependencies fall into this category *)
           begin
             Bsb_arg.parse_exn 
             ~usage
-            ~argv:bsb_args 
-            ~start:1
+            ~argv:argv
+            ~finish:i
             bsb_main_flags handle_anonymous_arg  ;
+            let ninja_args = Array.sub argv (i + 1) (Array.length argv - i - 1) in 
+            match ninja_args with 
+            | [|"-h"|] -> ninja_command_exit ninja_args
+            | _ ->  
             let config_opt = 
               (Bsb_ninja_regen.regenerate_ninja 
                 ~toplevel_package_specs:None 

lib/4.06.1/bsb.ml

@@ -1717,7 +1717,7 @@ type anon_fun = rev_args:string list -> unit
 val parse_exn :
   usage:string -> 
   argv:string array -> 
-  start:int ->
+  ?start:int ->
   ?finish:int ->
   (key * spec * doc) list -> 
   anon_fun  -> unit
@@ -1825,7 +1825,7 @@ end = struct
    raise (Bad (Ext_buffer.contents b))
 
 
- let parse_exn  ~usage ~argv ~start ?(finish=Array.length argv) (speclist : t) anonfun = 
+ let parse_exn  ~usage ~argv ?(start=1) ?(finish=Array.length argv) (speclist : t) anonfun = 
    let current = ref start in 
    let rev_list = ref [] in 
    while !current < finish do
@@ -16979,14 +16979,14 @@ let () =
 
     | argv -> 
       begin
-        match Ext_array.find_and_split argv Ext_string.equal separator with
-        | `No_split
-          ->
+        let i =  Ext_array.rfind_with_index
+          argv Ext_string.equal separator in 
+        if i < 0 then 
           begin
             Bsb_arg.parse_exn 
             ~usage
             ~argv 
-            ~start:1
+
             bsb_main_flags 
             handle_anonymous_arg            
             ;
@@ -17027,14 +17027,18 @@ let () =
                    install_target config_opt
                  end)
           end
-        | `Split (bsb_args,ninja_args)
-          -> (* -make-world all dependencies fall into this category *)
+        else
+           (* -make-world all dependencies fall into this category *)
           begin
             Bsb_arg.parse_exn 
             ~usage
-            ~argv:bsb_args 
-            ~start:1
+            ~argv:argv
+            ~finish:i
             bsb_main_flags handle_anonymous_arg  ;
+            let ninja_args = Array.sub argv (i + 1) (Array.length argv - i - 1) in 
+            match ninja_args with 
+            | [|"-h"|] -> ninja_command_exit ninja_args
+            | _ ->  
             let config_opt = 
               (Bsb_ninja_regen.regenerate_ninja 
                 ~toplevel_package_specs:None 

lib/4.06.1/unstable/bsb_native.ml

@@ -1717,7 +1717,7 @@ type anon_fun = rev_args:string list -> unit
 val parse_exn :
   usage:string -> 
   argv:string array -> 
-  start:int ->
+  ?start:int ->
   ?finish:int ->
   (key * spec * doc) list -> 
   anon_fun  -> unit
@@ -1825,7 +1825,7 @@ end = struct
    raise (Bad (Ext_buffer.contents b))
 
 
- let parse_exn  ~usage ~argv ~start ?(finish=Array.length argv) (speclist : t) anonfun = 
+ let parse_exn  ~usage ~argv ?(start=1) ?(finish=Array.length argv) (speclist : t) anonfun = 
    let current = ref start in 
    let rev_list = ref [] in 
    while !current < finish do
@@ -17154,14 +17154,14 @@ let () =
 
     | argv -> 
       begin
-        match Ext_array.find_and_split argv Ext_string.equal separator with
-        | `No_split
-          ->
+        let i =  Ext_array.rfind_with_index
+          argv Ext_string.equal separator in 
+        if i < 0 then 
           begin
             Bsb_arg.parse_exn 
             ~usage
             ~argv 
-            ~start:1
+
             bsb_main_flags 
             handle_anonymous_arg            
             ;
@@ -17202,14 +17202,18 @@ let () =
                    install_target config_opt
                  end)
           end
-        | `Split (bsb_args,ninja_args)
-          -> (* -make-world all dependencies fall into this category *)
+        else
+           (* -make-world all dependencies fall into this category *)
           begin
             Bsb_arg.parse_exn 
             ~usage
-            ~argv:bsb_args 
-            ~start:1
+            ~argv:argv
+            ~finish:i
             bsb_main_flags handle_anonymous_arg  ;
+            let ninja_args = Array.sub argv (i + 1) (Array.length argv - i - 1) in 
+            match ninja_args with 
+            | [|"-h"|] -> ninja_command_exit ninja_args
+            | _ ->  
             let config_opt = 
               (Bsb_ninja_regen.regenerate_ninja 
                 ~toplevel_package_specs:None