Encapsulate maps in language_filest

Author: NathanJPhillips

src/goto-cc/compile.cpp

@@ -483,14 +483,7 @@ bool compilet::parse(const std::string &file_name)
 
   languagep->set_message_handler(get_message_handler());
 
-  language_filet language_file;
-
-  std::pair<language_filest::file_mapt::iterator, bool>
-  res=language_files.file_map.insert(
-    std::pair<std::string, language_filet>(file_name, language_file));
-
-  language_filet &lf=res.first->second;
-  lf.filename=file_name;
+  language_filet &lf=language_files.add_file(file_name);
   lf.language=std::move(languagep);
 
   if(mode==PREPROCESS_ONLY)
@@ -640,7 +633,7 @@ bool compilet::parse_source(const std::string &file_name)
     return true;
 
   // so we remove it from the list afterwards
-  language_files.file_map.erase(file_name);
+  language_files.remove_file(file_name);
   return false;
 }
 

src/goto-programs/initialize_goto_model.cpp

@@ -72,13 +72,7 @@ goto_modelt initialize_goto_model(
         throw 0;
       }
 
-      std::pair<language_filest::file_mapt::iterator, bool>
-        result=language_files.file_map.insert(
-          std::pair<std::string, language_filet>(filename, language_filet()));
-
-      language_filet &lf=result.first->second;
-
-      lf.filename=filename;
+      language_filet &lf=language_files.add_file(filename);
       lf.language=get_language_from_filename(filename);
 
       if(lf.language==nullptr)

src/goto-programs/lazy_goto_functions_map.h

@@ -83,25 +83,6 @@ class lazy_goto_functions_mapt final
   {
   }
 
-  /// Gets the number of functions in the map.
-  /// \return The number of functions in the map.
-  size_type size() const
-  {
-    return language_files.lazy_method_map.size();
-  }
-
-  /// Returns whether the map contains any mappings.
-  /// \return Whether the map contains any mappings.
-  bool empty() const { return language_files.lazy_method_map.empty(); }
-
-  /// Checks whether a given function exists in the map.
-  /// \param name: The name of the function to search for.
-  /// \return True if the map contains the given function.
-  bool contains(const key_type &name) const
-  {
-    return language_files.lazy_method_map.count(name)!=0;
-  }
-
   /// Gets the body for a given function.
   /// \param name: The name of the function to search for.
   /// \return The function body corresponding to the given function.

src/goto-programs/lazy_goto_model.cpp

@@ -100,12 +100,7 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
         throw 0;
       }
 
-      std::pair<language_filest::file_mapt::iterator, bool> result =
-        language_files.file_map.emplace(filename, language_filet());
-
-      language_filet &lf=result.first->second;
-
-      lf.filename=filename;
+      language_filet &lf=language_files.add_file(filename);
       lf.language=get_language_from_filename(filename);
 
       if(lf.language==nullptr)

src/langapi/language_ui.cpp

@@ -58,13 +58,7 @@ bool language_uit::parse(const std::string &filename)
     return true;
   }
 
-  std::pair<language_filest::file_mapt::iterator, bool>
-    result=language_files.file_map.insert(
-      std::pair<std::string, language_filet>(filename, language_filet()));
-
-  language_filet &lf=result.first->second;
-
-  lf.filename=filename;
+  language_filet &lf=language_files.add_file(filename);
   lf.language=get_language_from_filename(filename);
 
   if(lf.language==nullptr)

src/util/language_file.cpp

@@ -25,7 +25,10 @@ language_filet::language_filet(const language_filet &rhs):
 /// destructor in the source file, where the full definition is availible.
 language_filet::~language_filet()=default;
 
-language_filet::language_filet()=default;
+language_filet::language_filet(const std::string &filename)
+  : filename(filename)
+{
+}
 
 void language_filet::get_modules()
 {

src/util/language_file.h

@@ -18,9 +18,9 @@ Author: Daniel Kroening, [email protected]
 
 #include "message.h"
 #include "symbol_table.h"
+#include "language.h"
 
 class language_filet;
-class languaget;
 
 class language_modulet final
 {
@@ -51,29 +51,52 @@ class language_filet final
     const irep_idt &id,
     symbol_tablet &symbol_table);
 
-  language_filet();
+  explicit language_filet(const std::string &filename);
   language_filet(const language_filet &rhs);
 
   ~language_filet();
 };
 
 class language_filest:public messaget
 {
-public:
+private:
   typedef std::map<std::string, language_filet> file_mapt;
   file_mapt file_map;
 
-  // Contains pointers into file_mapt!
   typedef std::map<std::string, language_modulet> module_mapt;
   module_mapt module_map;
 
-  // Contains pointers into filemapt!
+  // Contains pointers into file_map!
   // This is safe-ish as long as this is std::map.
   typedef std::map<irep_idt, language_filet *> lazy_method_mapt;
   lazy_method_mapt lazy_method_map;
 
+public:
+  language_filet &add_file(const std::string &filename)
+  {
+    language_filet language_file(filename);
+    return file_map.emplace(filename, std::move(language_file)).first->second;
+  }
+
+  void remove_file(const std::string &filename)
+  {
+    // Clear relevant entries from lazy_method_map
+    language_filet *language_file = &file_map.at(filename);
+    id_sett files_methods;
+    for(const std::pair<irep_idt, language_filet *> &method : lazy_method_map)
+    {
+      if(method.second == language_file)
+        files_methods.insert(method.first);
+    }
+    for(const irep_idt &method_name : files_methods)
+      lazy_method_map.erase(method_name);
+
+    file_map.erase(filename);
+  }
+
   void clear_files()
   {
+    lazy_method_map.clear();
     file_map.clear();
   }