rename command line options for aggressive slicer

Author: polgreen

regression/goto-instrument/aggressive_slicer4/test.desc

@@ -1,6 +1,6 @@
 CORE
 main.c
---aggressive-slice --preserve-function B
+--aggressive-slice --aggressive-slice-preserve-function B
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/goto-instrument/aggressive_slicer5/test.desc

@@ -1,6 +1,6 @@
 CORE
 main.c
---aggressive-slice --property D.assertion.1 --preserve-all-direct-paths
+--aggressive-slice --property D.assertion.1 --aggressive-slice-preserve-all-direct-paths
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/goto-instrument/aggressive_slicer6/test.desc

@@ -1,6 +1,6 @@
 CORE
 main.c
---aggressive-slice --call-depth 1
+--aggressive-slice --aggressive-slice-call-depth 1
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -1474,24 +1474,24 @@ void goto_instrument_parse_optionst::instrument_goto_program()
     status() << "Performing an aggressive slice" << eom;
     aggressive_slicert aggressive_slicer(goto_model, get_message_handler());
 
-    if(cmdline.isset("call-depth"))
+    if(cmdline.isset("aggressive-slice-call-depth"))
       aggressive_slicer.call_depth =
-        safe_string2unsigned(cmdline.get_value("call-depth"));
+        safe_string2unsigned(cmdline.get_value("aggressive-slice-call-depth"));
 
-    if(cmdline.isset("preserve-function"))
+    if(cmdline.isset("aggressive-slice-preserve-function"))
       aggressive_slicer.preserve_functions(
-        cmdline.get_values("preserve-function"));
+        cmdline.get_values("aggressive-slice-preserve-function"));
 
     if(cmdline.isset("property"))
       aggressive_slicer.user_specified_properties =
         cmdline.get_values("property");
 
-    if(cmdline.isset("preserve-functions-containing"))
+    if(cmdline.isset("aggressive-slice-preserve-functions-containing"))
       aggressive_slicer.name_snippets =
-        cmdline.get_values("preserve-functions-containing");
+        cmdline.get_values("aggressive-slice-preserve-functions-containing");
 
     aggressive_slicer.preserve_all_direct_paths =
-      cmdline.isset("preserve-all-direct-paths");
+      cmdline.isset("aggressive-slice-preserve-all-direct-paths");
 
     aggressive_slicer.doit();
 
@@ -1607,14 +1607,18 @@ void goto_instrument_parse_optionst::help()
     " --full-slice                 slice away instructions that don't affect assertions\n" // NOLINT(*)
     " --property id                slice with respect to specific property only\n" // NOLINT(*)
     " --slice-global-inits         slice away initializations of unused global variables\n" // NOLINT(*)
-    " --aggressive-slice           remove bodies of any functions not on the shortest path between\n" // NOLINT(*)
+    " --aggressive-slice-aggressive-slice \n"
+    "                              remove bodies of any functions not on the shortest path between\n" // NOLINT(*)
     "                              the start function and the function containing the property(s)\n" // NOLINT(*)
-    " --call-depth <n>             used with aggressive-slice, preserves all functions within <n> function calls\n" // NOLINT(*)
+    " --aggressive-slice-call-depth <n> \n"
+    "                              used with aggressive-slice, preserves all functions within <n> function calls\n" // NOLINT(*)
     "                              of the functions on the shortest path\n"
-    " --preserve-function <f>      force the aggressive slicer to preserve function <f>\n" // NOLINT(*)
-    " --preserve-function containing <f>\n"
+    " --aggressive-slice-preserve-function <f> \n"
+    "                              force the aggressive slicer to preserve function <f>\n" // NOLINT(*)
+    " --aggressive-slice-preserve-function containing <f>\n"
     "                              force the aggressive slicer to preserve all functions with names containing <f>\n" // NOLINT(*)
-    "--preserve-all-direct-paths   force aggressive slicer to preserve all direct paths\n" // NOLINT(*)
+    "--aggressive-slice-preserve-all-direct-paths \n"
+    "                              force aggressive slicer to preserve all direct paths\n" // NOLINT(*)
     "\n"
     "Further transformations:\n"
     " --constant-propagator        propagate constants and simplify expressions\n" // NOLINT(*)

src/goto-instrument/goto_instrument_parse_options.h

@@ -91,10 +91,10 @@ Author: Daniel Kroening, [email protected]
   "(undefined-function-is-assume-false)" \
   "(remove-function-body):"\
   "(aggressive-slice)" \
-  "(call-depth):" \
-  "(preserve-function):" \
-  "(preserve-functions-containing):" \
-  "(preserve-all-direct-paths)" \
+  "(aggressive-slice-call-depth):" \
+  "(aggressive-slice-preserve-function):" \
+  "(aggressive-slice-preserve-functions-containing):" \
+  "(aggressive-slice-preserve-all-direct-paths)" \
   OPT_FLUSH \
   "(splice-call):" \
   OPT_REMOVE_CALLS_NO_BODY \