[REFACTOR] Move parse_options.cpp and cmdline.cpp under src/cli_utils/.

CMakeLists.txt

@@ -219,6 +219,7 @@ cprover_default_properties(
     big-int
     cbmc
     cbmc-lib
+    cli-utils
     cpp
     cprover-api-cpp
     cprover

jbmc/src/janalyzer/CMakeLists.txt

@@ -10,6 +10,7 @@ generic_includes(janalyzer-lib)
 target_link_libraries(janalyzer-lib
     ansi-c
     java_bytecode
+    cli-utils
     linking
     big-int
     goto-analyzer-lib

jbmc/src/janalyzer/janalyzer_parse_options.h

@@ -100,15 +100,14 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H
 #define CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 
-#include <langapi/language.h>
-
 #include <goto-programs/show_goto_functions.h>
 #include <goto-programs/show_properties.h>
 
+#include <cli-utils/parse_options.h>
 #include <java_bytecode/java_bytecode_language.h>
+#include <langapi/language.h>
 
 class abstract_goto_modelt;
 class ai_baset;

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -6,14 +6,9 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "java_bytecode_convert_class.h"
 #include "java_bytecode_language.h"
 
-#include <fstream>
-#include <string>
-
-#include <linking/static_lifetime_init.h>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/expr_iterator.h>
 #include <util/invariant.h>
@@ -23,14 +18,16 @@ Author: Daniel Kroening, [email protected]
 #include <util/suffix.h>
 #include <util/symbol_table_builder.h>
 
-#include <json/json_parser.h>
-
 #include <goto-programs/class_hierarchy.h>
 
+#include <cli-utils/cmdline.h>
+#include <json/json_parser.h>
+#include <linking/static_lifetime_init.h>
+
 #include "ci_lazy_methods.h"
 #include "create_array_with_type_intrinsic.h"
+#include "expr2java.h"
 #include "java_bytecode_concurrency_instrumentation.h"
-#include "java_bytecode_convert_class.h"
 #include "java_bytecode_convert_method.h"
 #include "java_bytecode_instrument.h"
 #include "java_bytecode_internal_additions.h"
@@ -44,10 +41,11 @@ Author: Daniel Kroening, [email protected]
 #include "java_utils.h"
 #include "lambda_synthesis.h"
 #include "lift_clinit_calls.h"
-
-#include "expr2java.h"
 #include "load_method_by_regex.h"
 
+#include <fstream>
+#include <string>
+
 /// Parse options that are java bytecode specific.
 /// \param cmd: Command line
 /// \param [out] options: The options object that will be updated.

jbmc/src/java_bytecode/java_object_factory_parameters.cpp

@@ -8,10 +8,11 @@ Author: Daniel Poetzl
 
 #include "java_object_factory_parameters.h"
 
-#include <util/cmdline.h>
 #include <util/exception_utils.h>
 #include <util/options.h>
 
+#include <cli-utils/cmdline.h>
+
 void java_object_factory_parameterst::set(const optionst &options)
 {
   object_factory_parameterst::set(options);

jbmc/src/jbmc/CMakeLists.txt

@@ -11,6 +11,7 @@ target_link_libraries(jbmc-lib
     ansi-c
     big-int
     cbmc-lib
+    cli-utils
     goto-checker
     goto-instrument-lib
     goto-programs

jbmc/src/jbmc/jbmc_parse_options.h

@@ -12,25 +12,21 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_JBMC_JBMC_PARSE_OPTIONS_H
 #define CPROVER_JBMC_JBMC_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
 
-#include <langapi/language.h>
-
-#include <goto-checker/bmc_util.h>
-
 #include <goto-programs/class_hierarchy.h>
 #include <goto-programs/goto_trace.h>
 #include <goto-programs/show_properties.h>
 
-#include <solvers/strings/string_refinement.h>
-
+#include <cli-utils/parse_options.h>
+#include <goto-checker/bmc_util.h>
 #include <java_bytecode/java_bytecode_language.h>
 #include <java_bytecode/java_trace_validation.h>
-
 #include <json/json_interface.h>
+#include <langapi/language.h>
+#include <solvers/strings/string_refinement.h>
 #include <xmllang/xml_interface.h>
 
 class goto_functiont;

jbmc/src/jdiff/CMakeLists.txt

@@ -10,6 +10,7 @@ generic_includes(jdiff-lib)
 target_link_libraries(jdiff-lib
     ansi-c
     linking
+    cli-utils
     big-int
     pointer-analysis
     goto-diff-lib

jbmc/src/jdiff/jdiff_parse_options.h

@@ -12,12 +12,12 @@ Author: Peter Schrammel
 #ifndef CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H
 #define CPROVER_JDIFF_JDIFF_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 
 #include <goto-programs/show_goto_functions.h>
 #include <goto-programs/show_properties.h>
 
+#include <cli-utils/parse_options.h>
 #include <goto-instrument/cover.h>
 
 class goto_modelt;

src/CMakeLists.txt

@@ -107,6 +107,7 @@ add_subdirectory(linking)
 add_subdirectory(pointer-analysis)
 add_subdirectory(solvers)
 add_subdirectory(statement-list)
+add_subdirectory(cli-utils)
 add_subdirectory(util)
 
 add_subdirectory(cbmc)

src/cbmc/CMakeLists.txt

@@ -12,6 +12,7 @@ target_link_libraries(cbmc-lib
     ansi-c
     assembler
     big-int
+    cli-utils
     cpp
     goto-checker
     goto-instrument-lib

src/cbmc/cbmc_parse_options.h

@@ -12,7 +12,6 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_CBMC_CBMC_PARSE_OPTIONS_H
 #define CPROVER_CBMC_CBMC_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
@@ -22,6 +21,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <ansi-c/ansi_c_language.h>
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/parse_options.h>
 #include <goto-checker/bmc_util.h>
 #include <goto-instrument/cover.h>
 #include <json/json_interface.h>

src/cli-utils/CMakeLists.txt

@@ -0,0 +1,10 @@
+file(GLOB_RECURSE sources "*.cpp" "*.h")
+
+add_library(cli-utils
+  ${sources})
+
+add_dependencies(cli-utils util)
+
+generic_includes(cli-utils)
+
+target_link_libraries(cli-utils util)

src/util/cmdline.h → src/cli-utils/cmdline.h

@@ -15,7 +15,7 @@ Author: Daniel Kroening, [email protected]
 #include <string>
 #include <vector>
 
-#include "optional.h"
+#include <util/optional.h>
 
 class cmdlinet
 {

src/util/parse_options.h → src/cli-utils/parse_options.h

@@ -13,8 +13,8 @@ Author: Daniel Kroening, [email protected]
 #include <string>
 
 #include "cmdline.h"
-#include "message.h"
-#include "ui_message.h"
+#include "util/message.h"
+#include "util/ui_message.h"
 
 class parse_options_baset
 {

src/cprover/CMakeLists.txt

@@ -13,6 +13,7 @@ target_link_libraries(cprover-lib
     assembler
     big-int
     cpp
+    cli-utils
     goto-checker
     goto-instrument-lib
     goto-programs

src/cprover/cprover_parse_options.cpp

@@ -16,11 +16,12 @@ Author: Daniel Kroening, [email protected]
 #include <util/exit_codes.h>
 #include <util/help_formatter.h>
 #include <util/options.h>
-#include <util/parse_options.h>
 #include <util/signal_catcher.h>
 #include <util/ui_message.h>
 #include <util/version.h>
 
+#include <cli-utils/parse_options.h>
+
 #ifdef _WIN32
 #  include <util/unicode.h>
 #endif

src/crangler/CMakeLists.txt

@@ -17,6 +17,7 @@ target_link_libraries(crangler-lib
     big-int
     util
     json
+    cli-utils
 )
 
 # Executable

src/crangler/crangler_parse_options.h

@@ -12,7 +12,7 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_CRANGLER_CRANGLER_PARSE_OPTIONS_H
 #define CPROVER_CRANGLER_CRANGLER_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
+#include <cli-utils/parse_options.h>
 
 class crangler_parse_optionst : public parse_options_baset
 {

src/goto-analyzer/CMakeLists.txt

@@ -10,6 +10,7 @@ generic_includes(goto-analyzer-lib)
 target_link_libraries(goto-analyzer-lib
     ansi-c
     cpp
+    cli-utils
     linking
     big-int
     goto-checker

src/goto-analyzer/goto_analyzer_parse_options.h

@@ -89,7 +89,6 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H
 #define CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H
 
-#include <util/parse_options.h>
 #include <util/timestamper.h>
 #include <util/ui_message.h>
 #include <util/validation_interface.h>
@@ -100,6 +99,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <analyses/variable-sensitivity/variable_sensitivity_domain.h>
 #include <ansi-c/goto_check_c.h>
+#include <cli-utils/parse_options.h>
 #include <langapi/language.h>
 
 class optionst;

src/goto-cc/CMakeLists.txt

@@ -11,6 +11,7 @@ target_link_libraries(goto-cc-lib
     big-int
     goto-programs
     util
+    cli-utils
     json
     linking
     ansi-c

src/goto-cc/as_mode.cpp

@@ -19,14 +19,15 @@ Author: Michael Tautschnig
 #include <sysexits.h>
 #endif
 
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/get_base_name.h>
 #include <util/run.h>
 #include <util/tempdir.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "compile.h"
 #include "goto_cc_cmdline.h"
 #include "hybrid_binary.h"

src/goto-cc/compile.cpp

@@ -13,11 +13,6 @@ Date: June 2006
 
 #include "compile.h"
 
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/get_base_name.h>
@@ -28,6 +23,12 @@ Date: June 2006
 #include <util/tempfile.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
+#include <cstring>
+#include <fstream>
+#include <iostream>
+
 #ifdef _MSC_VER
 #  include <util/unicode.h>
 #endif

src/goto-cc/gcc_mode.cpp

@@ -19,7 +19,6 @@ Author: CM Wintersteiger, 2006
 #include <sysexits.h>
 #endif
 
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/get_base_name.h>
@@ -30,6 +29,8 @@ Author: CM Wintersteiger, 2006
 #include <util/tempdir.h>
 #include <util/version.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "compile.h"
 #include "goto_cc_cmdline.h"
 #include "hybrid_binary.h"

src/goto-cc/goto_cc_cmdline.h

@@ -14,7 +14,7 @@ Date:   April 2010
 #ifndef CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H
 #define CPROVER_GOTO_CC_GOTO_CC_CMDLINE_H
 
-#include <util/cmdline.h>
+#include <cli-utils/cmdline.h>
 
 class goto_cc_cmdlinet:public cmdlinet
 {

src/goto-cc/goto_cc_mode.cpp

@@ -23,9 +23,10 @@ Author: CM Wintersteiger, 2006
 
 #include <util/exception_utils.h>
 #include <util/message.h>
-#include <util/parse_options.h>
 #include <util/version.h>
 
+#include <cli-utils/parse_options.h>
+
 #include "goto_cc_cmdline.h"
 
 /// constructor

src/goto-cc/ld_mode.cpp

@@ -19,21 +19,22 @@ Author: CM Wintersteiger, 2006
 #include <sysexits.h>
 #endif
 
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-#include <util/cmdline.h>
 #include <util/config.h>
 #include <util/file_util.h>
 #include <util/invariant.h>
 #include <util/run.h>
 
+#include <cli-utils/cmdline.h>
+
 #include "compile.h"
 #include "goto_cc_cmdline.h"
 #include "hybrid_binary.h"
 #include "linker_script_merge.h"
 
+#include <cstring>
+#include <fstream>
+#include <iostream>
+
 static std::string
 linker_name(const cmdlinet &cmdline, const std::string &base_name)
 {