Encapsulate lazy_goto_modelt::goto_functions

Author: NathanJPhillips

src/goto-programs/goto_model.h

@@ -63,6 +63,8 @@ class goto_modelt
     goto_functions=std::move(other.goto_functions);
     return *this;
   }
+
+  void unload(const irep_idt &name) { goto_functions.unload(name); }
 };
 
 #endif // CPROVER_GOTO_PROGRAMS_GOTO_MODEL_H

src/goto-programs/lazy_goto_model.cpp

@@ -100,7 +100,7 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
         throw 0;
       }
 
-      language_filet &lf=language_files.add_file(filename);
+      language_filet &lf=add_language_file(filename);
       lf.language=get_language_from_filename(filename);
 
       if(lf.language==nullptr)

src/goto-programs/lazy_goto_model.h

@@ -71,6 +71,8 @@ class lazy_goto_modelt
   /// Eagerly loads all functions from the symbol table.
   void load_all_functions() const;
 
+  void unload(const irep_idt &name) const { goto_functions.unload(name); }
+
   language_filet &add_language_file(const std::string &filename)
   {
     return language_files.add_file(filename);
@@ -96,9 +98,9 @@ class lazy_goto_modelt
 public:
   /// Reference to symbol_table in the internal goto_model
   symbol_tablet &symbol_table;
-  const lazy_goto_functions_mapt<goto_programt> goto_functions;
 
 private:
+  const lazy_goto_functions_mapt<goto_programt> goto_functions;
   language_filest language_files;
 
   // Function/module processing functions

src/goto-programs/rebuild_goto_start_function.cpp

@@ -62,7 +62,7 @@ bool rebuild_goto_start_function_baset<goto_modelt>::operator()()
   // Remove the function from the goto functions so it is copied back in
   // from the symbol table during goto_convert
   if(!return_code)
-    goto_model.goto_functions.unload(goto_functionst::entry_point());
+    goto_model.unload(goto_functionst::entry_point());
 
   return return_code;
 }