[Config] pull some options out of the big group of debug

Summary:
It seems these were put there even though there is no inter-dependency
with any of the other options.

Reviewed By: skcho

Differential Revision: D21686739

fbshipit-source-id: 6578f55c2

infer/man/man1/infer-full.txt

@@ -1173,7 +1173,7 @@ INTERNAL OPTIONS
            ../source/File.java
 
        --biabduction-models-mode
-           Activates: Mode for analyzing the biabduction models (Conversely:
+           Activates: Analysis of the biabduction models (Conversely:
            --no-biabduction-models-mode)
 
        --bo-field-depth-limit-reset
@@ -1862,7 +1862,8 @@ INTERNAL OPTIONS
            (Conversely: --no-write-html)
 
        --write-html-whitelist-regex +string
-           whitelist files that will have its html debug output printed
+           Whitelist files that will have their html debug output printed
+           when --html is true.
 
        --write-html-whitelist-regex-reset
            Set --write-html-whitelist-regex to the empty list.

infer/src/base/Config.ml

@@ -649,6 +649,22 @@ and array_level =
 |}
 
 
+and biabduction_models_mode =
+  CLOpt.mk_bool ~long:"biabduction-models-mode" "Analysis of the biabduction models"
+
+
+and bo_field_depth_limit =
+  CLOpt.mk_int_opt ~long:"bo-field-depth-limit"
+    ~in_help:InferCommand.[(Analyze, manual_buffer_overrun)]
+    "Limit of field depth of abstract location in buffer-overrun checker"
+
+
+and bo_service_handler_request =
+  CLOpt.mk_bool ~long:"bo-service-handler-request"
+    ~in_help:InferCommand.[(Analyze, manual_buffer_overrun)]
+    "[EXPERIMENTAL] Use taint flow of service handler requests in buffer overflow checking."
+
+
 and bootclasspath =
   CLOpt.mk_string_opt ~long:"bootclasspath"
     ~in_help:InferCommand.[(Capture, manual_java)]
@@ -956,10 +972,7 @@ and custom_symbols =
     "Specify named lists of symbols available to rules"
 
 
-and ( biabduction_models_mode
-    , bo_debug
-    , bo_field_depth_limit
-    , bo_service_handler_request
+and ( bo_debug
     , deduplicate
     , developer_mode
     , debug
@@ -980,27 +993,15 @@ and ( biabduction_models_mode
     , reports_include_ml_loc
     , trace_error
     , write_html
-    , write_html_whitelist_regex
     , write_dotty ) =
   let all_generic_manuals =
     List.filter_map InferCommand.all_commands ~f:(fun cmd ->
         if InferCommand.equal Explore cmd then None else Some (cmd, manual_generic) )
   in
-  let biabduction_models_mode =
-    CLOpt.mk_bool_group ~long:"biabduction-models-mode" "Mode for analyzing the biabduction models"
-      [] []
-  and bo_debug =
+  let bo_debug =
     CLOpt.mk_int ~default:0 ~long:"bo-debug"
       ~in_help:InferCommand.[(Analyze, manual_buffer_overrun)]
       "Debug level for buffer-overrun checker (0-4)"
-  and bo_field_depth_limit =
-    CLOpt.mk_int_opt ~long:"bo-field-depth-limit"
-      ~in_help:InferCommand.[(Analyze, manual_buffer_overrun)]
-      "Limit of field depth of abstract location in buffer-overrun checker"
-  and bo_service_handler_request =
-    CLOpt.mk_bool ~long:"bo-service-handler-request"
-      ~in_help:InferCommand.[(Analyze, manual_buffer_overrun)]
-      "[EXPERIMENTAL] Use taint flow of service handler requests in buffer overflow checking."
   and deduplicate =
     CLOpt.mk_bool ~long:"deduplicate" ~default:true
       ~in_help:
@@ -1045,9 +1046,6 @@ and ( biabduction_models_mode
     CLOpt.mk_bool ~long:"trace-error" "Detailed tracing information during error explanation"
   and write_html =
     CLOpt.mk_bool ~long:"write-html" "Produce hmtl debug output in the results directory"
-  and write_html_whitelist_regex =
-    CLOpt.mk_string_list ~long:"write-html-whitelist-regex"
-      "whitelist files that will have its html debug output printed"
   and write_dotty =
     CLOpt.mk_bool ~long:"write-dotty" "Produce dotty files for specs in the results directory"
   in
@@ -1123,10 +1121,7 @@ and ( biabduction_models_mode
         debug )
       [debug; developer_mode] [default_linters; keep_going]
   in
-  ( biabduction_models_mode
-  , bo_debug
-  , bo_field_depth_limit
-  , bo_service_handler_request
+  ( bo_debug
   , deduplicate
   , developer_mode
   , debug
@@ -1147,7 +1142,6 @@ and ( biabduction_models_mode
   , reports_include_ml_loc
   , trace_error
   , write_html
-  , write_html_whitelist_regex
   , write_dotty )
 
 
@@ -2312,6 +2306,11 @@ and worklist_mode =
   var
 
 
+and write_html_whitelist_regex =
+  CLOpt.mk_string_list ~long:"write-html-whitelist-regex"
+    "Whitelist files that will have their html debug output printed when $(b,--html) is true."
+
+
 and xcode_developer_dir =
   CLOpt.mk_path_opt ~long:"xcode-developer-dir"
     ~in_help:InferCommand.[(Capture, manual_buck)]