cmDefinitions: Cleanups and optimizations
In cmDefinitions:
- sort methods in source code by static or not static
- use `std::unordered_set<cm::string_view>` instead of `std::set<std::string>`
for duplications tests.
diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 42e70d6..cc38d84 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -2,8 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmDefinitions.h"
+#include "cm_string_view.hxx"
+
#include <assert.h>
-#include <set>
+#include <functional>
+#include <unordered_set>
#include <utility>
cmDefinitions::Def cmDefinitions::NoDef;
@@ -14,7 +17,7 @@
{
assert(begin != end);
{
- MapType::iterator it = begin->Map.find(key);
+ auto it = begin->Map.find(key);
if (it != begin->Map.end()) {
it->second.Used = true;
return it->second;
@@ -56,6 +59,46 @@
return false;
}
+cmDefinitions cmDefinitions::MakeClosure(StackIter begin, StackIter end)
+{
+ cmDefinitions closure;
+ std::unordered_set<cm::string_view> undefined;
+ for (StackIter it = begin; it != end; ++it) {
+ // Consider local definitions.
+ for (auto const& mi : it->Map) {
+ // Use this key if it is not already set or unset.
+ if (closure.Map.find(mi.first) == closure.Map.end() &&
+ undefined.find(mi.first) == undefined.end()) {
+ if (mi.second.Exists) {
+ closure.Map.insert(mi);
+ } else {
+ undefined.emplace(mi.first);
+ }
+ }
+ }
+ }
+ return closure;
+}
+
+std::vector<std::string> cmDefinitions::ClosureKeys(StackIter begin,
+ StackIter end)
+{
+ std::vector<std::string> defined;
+ std::unordered_set<cm::string_view> bound;
+
+ for (StackIter it = begin; it != end; ++it) {
+ defined.reserve(defined.size() + it->Map.size());
+ for (auto const& mi : it->Map) {
+ // Use this key if it is not already set or unset.
+ if (bound.emplace(mi.first).second && mi.second.Exists) {
+ defined.push_back(mi.first);
+ }
+ }
+ }
+
+ return defined;
+}
+
void cmDefinitions::Set(const std::string& key, cm::string_view value)
{
this->Map[key] = Def(value);
@@ -78,43 +121,3 @@
}
return keys;
}
-
-cmDefinitions cmDefinitions::MakeClosure(StackIter begin, StackIter end)
-{
- cmDefinitions closure;
- std::set<std::string> undefined;
- for (StackIter it = begin; it != end; ++it) {
- // Consider local definitions.
- for (auto const& mi : it->Map) {
- // Use this key if it is not already set or unset.
- if (closure.Map.find(mi.first) == closure.Map.end() &&
- undefined.find(mi.first) == undefined.end()) {
- if (mi.second.Exists) {
- closure.Map.insert(mi);
- } else {
- undefined.insert(mi.first);
- }
- }
- }
- }
- return closure;
-}
-
-std::vector<std::string> cmDefinitions::ClosureKeys(StackIter begin,
- StackIter end)
-{
- std::vector<std::string> defined;
- std::set<std::string> bound;
-
- for (StackIter it = begin; it != end; ++it) {
- defined.reserve(defined.size() + it->Map.size());
- for (auto const& mi : it->Map) {
- // Use this key if it is not already set or unset.
- if (bound.insert(mi.first).second && mi.second.Exists) {
- defined.push_back(mi.first);
- }
- }
- }
-
- return defined;
-}
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index 4d8810a..787471a 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -25,6 +25,8 @@
typedef cmLinkedTree<cmDefinitions>::iterator StackIter;
public:
+ // -- Static member functions
+
static const std::string* Get(const std::string& key, StackIter begin,
StackIter end);
@@ -32,18 +34,21 @@
static bool HasKey(const std::string& key, StackIter begin, StackIter end);
+ static std::vector<std::string> ClosureKeys(StackIter begin, StackIter end);
+
+ static cmDefinitions MakeClosure(StackIter begin, StackIter end);
+
+ // -- Member functions
+
/** Set a value associated with a key. */
void Set(const std::string& key, cm::string_view value);
/** Unset a definition. */
void Unset(const std::string& key);
+ /** List of unused keys. */
std::vector<std::string> UnusedKeys() const;
- static std::vector<std::string> ClosureKeys(StackIter begin, StackIter end);
-
- static cmDefinitions MakeClosure(StackIter begin, StackIter end);
-
private:
/** String with existence boolean. */
struct Def
@@ -61,8 +66,7 @@
};
static Def NoDef;
- typedef std::unordered_map<std::string, Def> MapType;
- MapType Map;
+ std::unordered_map<std::string, Def> Map;
static Def const& GetInternal(const std::string& key, StackIter begin,
StackIter end, bool raise);
