Merge pull request #7439 from thomasspriggs/tas/api_piml_refactor

Refactor `api_session_implementationt` to reduce forward declarations

Author: thomasspriggs

src/libcprover-cpp/api.cpp

@@ -19,24 +19,23 @@
 
 extern configt config;
 
-api_sessiont::api_sessiont()
-  : message_handler(
-      util_make_unique<null_message_handlert>(null_message_handlert{})),
-    options(util_make_unique<optionst>(optionst{}))
+struct api_session_implementationt
+{
+  std::unique_ptr<goto_modelt> model;
+  std::unique_ptr<message_handlert> message_handler;
+  std::unique_ptr<optionst> options;
+};
+
+api_sessiont::api_sessiont() : api_sessiont{api_optionst::create()}
 {
-  // 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);
 }
 
 api_sessiont::api_sessiont(const api_optionst &options)
-  : message_handler(
-      util_make_unique<null_message_handlert>(null_message_handlert{})),
-    options(options.to_engine_options())
+  : implementation{util_make_unique<api_session_implementationt>()}
 {
+  implementation->message_handler =
+    util_make_unique<null_message_handlert>(null_message_handlert{});
+  implementation->options = options.to_engine_options();
   // Needed to initialise the language options correctly
   cmdlinet cmdline;
   // config is global in config.cpp
@@ -49,6 +48,6 @@ api_sessiont::~api_sessiont() = default;
 
 void api_sessiont::load_model_from_files(const std::vector<std::string> &files)
 {
-  model = util_make_unique<goto_modelt>(
-    initialize_goto_model(files, *message_handler, *options));
+  implementation->model = util_make_unique<goto_modelt>(initialize_goto_model(
+    files, *implementation->message_handler, *implementation->options));
 }

src/libcprover-cpp/api.h

@@ -8,8 +8,7 @@
 #include <vector>
 
 // Forward declaration of API dependencies
-class goto_modelt;
-class message_handlert;
+struct api_session_implementationt;
 
 // There has been a design decision to allow users to include all of
 // the API headers by just including `api.h`, so we want to have an
@@ -34,9 +33,7 @@ struct api_sessiont
   void load_model_from_files(const std::vector<std::string> &files);
 
 private:
-  std::unique_ptr<goto_modelt> model;
-  std::unique_ptr<message_handlert> message_handler;
-  std::unique_ptr<optionst> options;
+  std::unique_ptr<api_session_implementationt> implementation;
 };
 
 #endif