Refactor global state init into its own function

Author: NlightNFotis

cpp_api/api.cpp

@@ -1,24 +1,36 @@
+#include <ansi-c/ansi_c_language.h>
+
 #include <goto-programs/goto_model.h>
 #include <goto-programs/initialize_goto_model.h>
 
+#include <langapi/mode.h>
+
+#include <util/cmdline.h>
 #include <util/message.h>
 #include <util/options.h>
 
 #include "api.h"
 
 api_depst api_deps;
+extern configt config;
 
-// Initialise API dependencies
 void initialize_api() {
-    // Initialise a null-message handler (we don't print anything yet)
+    // Initialise a null-message handler (we don't print anything in the API)
     api_deps.msg_handler = new null_message_handlert();
     // Initialise default options
     api_deps.opts = new optionst();
+    // Needed to initialise the language options correctly
+    cmdlinet cmdline;
+    // config is global in config.cpp
+    config.set(cmdline);
+    // Initialise C language mode
+    register_language(new_ansi_c_language);
 }
 
 goto_modelt load_model_from_files(
     const std::vector<std::string> &files,
     const optionst &options)
 {
+    // This could be nested inside a try/catch, but for now let's leave it alone.
     return initialize_goto_model(files, *api_deps.msg_handler, options);
 }

cpp_api/api.h

@@ -4,14 +4,21 @@
 
 #include <util/message.h>
 #include <util/options.h>
+#include <util/config.h>
 
+// A struct containing the API dependencies (some of them, at least)
 struct api_depst {
     message_handlert *msg_handler;
     optionst *opts;
 };
 
+/// Initialise API dependencies
 void initialize_api();
 
+/// Load a goto_model from a given vector of filenames.
+/// \param files: A vector<string> containing the filenames to be loaded
+/// \param options: An options object, to be passed on to analysis or transformation
+///   passes. 
 goto_modelt load_model_from_files(
     const std::vector<std::string> &files,
     const optionst &options);