Merge pull request diffblue#94 from diffblue/nathan/feature/virtual_map-const_iterator

Nathan/feature/virtual map const iterator

Author: NathanJPhillips

src/taint-slicer/search_for_rule_applications.cpp

@@ -20,14 +20,12 @@ explicit propagation rules were applied.
 #include <vector>
 
 void taint_search_for_rule_applications(
-  const taint_summaryt::dbt * const orig_summaries,
+  const taint_summaryt::dbt * const summaries,
   taint_map_from_rules_to_their_application_sitest &result)
 {
-  taint_summaryt::dbt * const summaries=
-    const_cast<taint_summaryt::dbt *>(orig_summaries);
-  for(auto it=summaries->begin(); it!=summaries->end(); ++it)
+  for(taint_summaryt::dbt::const_reference summary : *summaries)
   {
-    for(const auto &iit_props : it->second->get_transition_props())
+    for(const auto &iit_props : summary.second->get_transition_props())
     {
       switch(iit_props.second.get_applied_transition_type())
       {
@@ -36,8 +34,8 @@ void taint_search_for_rule_applications(
       case taint_transition_property_typet::APPLICATION_OF_SINK_RULE:
       case
         taint_transition_property_typet::CONDITIONAL_APPLICATION_OF_SINK_RULE:
-        result[iit_props.second.get_rule_id()][as_string(it->first)].push_back(
-          iit_props.first);
+        result[iit_props.second.get_rule_id()][as_string(summary.first)]
+          .push_back(iit_props.first);
         break;
       default:
         break;

src/util/json_map_serializer.h

@@ -135,7 +135,7 @@ class json_map_serializert:public map_serializert<keyt, valuet>
     This function checks the existence on disc of each item in the map.
 
   \*******************************************************************/
-  virtual std::size_t size() override
+  virtual std::size_t size() const override
   {
     return boost::size(keys());
   }
@@ -156,7 +156,7 @@ class json_map_serializert:public map_serializert<keyt, valuet>
     This function checks the existence on disc of each item in the map.
 
   \*******************************************************************/
-  virtual typename json_map_serializert::keys_ranget keys() override
+  virtual typename json_map_serializert::keys_ranget keys() const override
   {
     // For a key to be in the set it must exist both in the index and on disc
     return index.left
@@ -183,7 +183,7 @@ class json_map_serializert:public map_serializert<keyt, valuet>
     Checks whether a given key exists in the map.
 
   \*******************************************************************/
-  virtual bool contains(const keyt &key) override
+  virtual bool contains(const keyt &key) const override
   {
     return index_contains(key) && fileutl_file_exists(get_existing_path(key));
   }
@@ -202,7 +202,7 @@ class json_map_serializert:public map_serializert<keyt, valuet>
     Gets the value corresponding to a given key.
 
   \*******************************************************************/
-  virtual valuet at(const keyt &key) override
+  virtual valuet at(const keyt &key) const override
   {
     if(!index_contains(key))
       throw std::out_of_range("Element not found in map");
@@ -322,12 +322,12 @@ class json_map_serializert:public map_serializert<keyt, valuet>
   }
 
 private:
-  bool index_contains(const keyt &key)
+  bool index_contains(const keyt &key) const
   {
     return index.left.count(key) != 0;
   }
 
-  std::string get_existing_path(const keyt &key)
+  std::string get_existing_path(const keyt &key) const
   {
     return get_path_for_filename(index.left.at(key));
   }
@@ -339,7 +339,7 @@ class json_map_serializert:public map_serializert<keyt, valuet>
     return uniqueness == 0 ? base : base + '_' + std::to_string(uniqueness);
   }
 
-  std::string get_path_for_filename(const std::string &file_name)
+  std::string get_path_for_filename(const std::string &file_name) const
   {
     return concat_dir_file(base_folder, file_name + suffix);
   }

src/util/map_serializer.h

@@ -31,6 +31,23 @@ template<typename keyt, typename valuet>
 class map_serializert
 {
 public:
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef keyt key_type;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef valuet mapped_type;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef std::pair<const keyt, valuet> value_type;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef value_type & reference;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef const value_type & const_reference;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef value_type * pointer;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef const value_type * const_pointer;
+  // NOLINTNEXTLINE(readability/identifiers)  - name matches those used in STL
+  typedef std::size_t size_type;
+
   // The type of ranges of map keys
   typedef
     boost::any_range<
@@ -56,7 +73,7 @@ class map_serializert
     Returns the size of the map.
 
   \*******************************************************************/
-  virtual std::size_t size()=0;
+  virtual size_type size() const=0;
 
   /*******************************************************************\
 
@@ -71,7 +88,7 @@ class map_serializert
     Returns all the keys in the map, which could be large.
 
   \*******************************************************************/
-  virtual keys_ranget keys()=0;
+  virtual keys_ranget keys() const=0;
 
   /*******************************************************************\
 
@@ -87,7 +104,7 @@ class map_serializert
     Checks whether a given key exists in the map.
 
   \*******************************************************************/
-  virtual bool contains(const keyt &key)=0;
+  virtual bool contains(const keyt &key) const=0;
 
   /*******************************************************************\
 
@@ -103,7 +120,7 @@ class map_serializert
     Gets the value corresponding to a given key.
 
   \*******************************************************************/
-  virtual valuet at(const keyt &key)=0;
+  virtual valuet at(const keyt &key) const=0;
 
   /*******************************************************************\