Move some of the tool state to an api initialisation function

Author: NlightNFotis

cpp_api/api.cpp

@@ -2,11 +2,23 @@
 #include <goto-programs/initialize_goto_model.h>
 
 #include <util/message.h>
+#include <util/options.h>
+
+#include "api.h"
+
+api_depst api_deps;
+
+// Initialise API dependencies
+void initialize_api() {
+    // Initialise a null-message handler (we don't print anything yet)
+    api_deps.msg_handler = new null_message_handlert();
+    // Initialise default options
+    api_deps.opts = new optionst();
+}
 
 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);
+    return initialize_goto_model(files, *api_deps.msg_handler, options);
 }

cpp_api/api.h

@@ -2,6 +2,16 @@
 
 #include <goto-programs/goto_model.h>
 
+#include <util/message.h>
+#include <util/options.h>
+
+struct api_depst {
+    message_handlert *msg_handler;
+    optionst *opts;
+};
+
+void initialize_api();
+
 goto_modelt load_model_from_files(
     const std::vector<std::string> &files,
     const optionst &options);

cpp_api/call_bmc.cpp

@@ -12,10 +12,11 @@
 #include <util/config.h>
 #include <util/cmdline.h>
 #include <util/message.h>
-#include <util/options.h>
 
 #include "api.h"
 
+extern api_depst api_deps;
+
 int main(int argc, char *argv[])
 {
     try {
@@ -24,10 +25,6 @@ int main(int argc, char *argv[])
         // Convert argv to vector of strings for initialize_goto_model
         std::vector<std::string> arguments(argv + 1, argv + argc);
 
-        // Initialise a null-message handler (we don't print anything yet)
-        null_message_handlert null_msg_hnd;
-        // Default options
-        optionst opts;
         // Needed to initialise the language options correctly
         cmdlinet cmdline;
 
@@ -37,7 +34,7 @@ int main(int argc, char *argv[])
         // Initialise C language mode
         register_language(new_ansi_c_language);
 
-        auto model = load_model_from_files(arguments, opts);
+        auto model = load_model_from_files(arguments, *api_deps.opts);
 
         std::cout << "Successfully initialised goto_model" << std::endl;
         return 0;