Merge pull request diffblue#143 from NathanJPhillips/cleanup/minor-changes

Implemented requested rename

Author: NathanJPhillips

src/goto-analyzer/taint_set.cpp

@@ -23,13 +23,13 @@ taint_sett taint_sett::map_conditional(
 }
 
 template<class maptype, class keytype>
-void assert_has_keys(const maptype& m,
-  const std::vector<keytype>& expected, const char* detail)
+void throw_if_keyset_differs(const maptype &m,
+  const std::vector<keytype> &expected, const char *detail)
 {
   std::vector<keytype> keys;
-  for(const auto& keyval : m)
+  for(const auto &keyval : m)
     keys.push_back(keyval.first);
-  std::sort(keys.begin(),keys.end());
+  std::sort(keys.begin(), keys.end());
   if(keys != expected)
     throw detail;
 }
@@ -40,7 +40,7 @@ taint_sett taint_sett::from_json(const jsont& js)
   assert(js.is_object());
   const auto& js_object=static_cast<const json_objectt&>(js);
   // Check required keys are provided
-  assert_has_keys(js.object,
+  throw_if_keyset_differs(js.object,
     std::vector<std::string>({ "is_bottom", "is_top", "taints" }),
     "JSON object is not an taint_sett");
   // Get the array of taint variables