Isolate goto_model loading to its own function in a file dedicated to API

Author: NlightNFotis

cpp_api/CMakeLists.txt

@@ -1,5 +1,5 @@
 
 
-add_executable(bmc_api call_bmc.cpp)
+add_executable(bmc_api call_bmc.cpp api.cpp)
 
 target_link_libraries(bmc_api goto-programs util langapi ansi-c)

cpp_api/api.cpp

@@ -0,0 +1,12 @@
+#include <goto-programs/goto_model.h>
+#include <goto-programs/initialize_goto_model.h>
+
+#include <util/message.h>
+
+goto_modelt load_model_from_files(
+    const std::vector<std::string> &files,
+    const optionst &options)
+{
+    null_message_handlert null_msg_hnd;
+    return initialize_goto_model(files, null_msg_hnd, options);
+}

cpp_api/api.h

@@ -0,0 +1,7 @@
+#include <vector>
+
+#include <goto-programs/goto_model.h>
+
+goto_modelt load_model_from_files(
+    const std::vector<std::string> &files,
+    const optionst &options);

cpp_api/call_bmc.cpp

@@ -14,6 +14,8 @@
 #include <util/message.h>
 #include <util/options.h>
 
+#include "api.h"
+
 int main(int argc, char *argv[])
 {
     try {
@@ -35,13 +37,7 @@ int main(int argc, char *argv[])
         // Initialise C language mode
         register_language(new_ansi_c_language);
 
-        std::cout << "[DEBUG] arguments is ";
-        for (auto opt : arguments) {
-            std::cout << "   [] " << opt << std::endl;
-        }
-
-        // Assume that argv[] is a list of files passed
-        goto_modelt model = initialize_goto_model(arguments, null_msg_hnd, opts);
+        auto model = load_model_from_files(arguments, opts);
 
         std::cout << "Successfully initialised goto_model" << std::endl;
         return 0;