move aggressive slicer options into macro

NathanJPhillips · Jul 24, 2018 · ea085d3 · ea085d3
1 parent aa4848d
commit ea085d3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/goto-instrument/aggressive_slicer.h b/src/goto-instrument/aggressive_slicer.h
@@ -97,4 +97,14 @@ class aggressive_slicert
   void get_all_functions_containing_properties();
 };
 
+// clang-format off
+#define OPT_AGGRESSIVE_SLICER \
+    "(aggressive-slice)" \
+    "(aggressive-slice-call-depth):" \
+    "(aggressive-slice-preserve-function):" \
+    "(aggressive-slice-preserve-functions-containing):" \
+    "(aggressive-slice-preserve-all-direct-paths)"
+
+// clang-format on
+
 #endif /* CPROVER_GOTO_INSTRUMENT_AGGRESSIVE_SLICER_H  */
diff --git a/src/goto-instrument/goto_instrument_parse_options.cpp b/src/goto-instrument/goto_instrument_parse_options.cpp
@@ -68,7 +68,6 @@ Author: Daniel Kroening, [email protected]
 #include <cpp/cprover_library.h>
 
 #include "accelerate/accelerate.h"
-#include "aggressive_slicer.h"
 #include "alignment_checks.h"
 #include "branch.h"
 #include "call_sequences.h"

diff --git a/src/goto-instrument/goto_instrument_parse_options.h b/src/goto-instrument/goto_instrument_parse_options.h
@@ -26,6 +26,7 @@ Author: Daniel Kroening, [email protected]
 #include <analyses/goto_check.h>
 
 #include <goto-programs/generate_function_bodies.h>
+#include "aggressive_slicer.h"
 
 #include "count_eloc.h"
 
@@ -90,11 +91,7 @@ Author: Daniel Kroening, [email protected]
   "(show-threaded)(list-calls-args)" \
   "(undefined-function-is-assume-false)" \
   "(remove-function-body):"\
-  "(aggressive-slice)" \
-  "(aggressive-slice-call-depth):" \
-  "(aggressive-slice-preserve-function):" \
-  "(aggressive-slice-preserve-functions-containing):" \
-  "(aggressive-slice-preserve-all-direct-paths)" \
+  OPT_AGGRESSIVE_SLICER \
   OPT_FLUSH \
   "(splice-call):" \
   OPT_REMOVE_CALLS_NO_BODY \