kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmDefinitions: Centralize knowledge of iterator type. 

Currently we process a list of definitions, but that will change.
This commit is contained in:
Stephen Kelly 2015-05-16 05:33:25 +02:00
parent 7872201bf6
commit 98c5c90361
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmDefinitions.cxx
View File

@ -18,32 +18,29 @@ cmDefinitions::Def cmDefinitions::NoDef;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmDefinitions::Def const& cmDefinitions::GetInternal( cmDefinitions::Def const& cmDefinitions::GetInternal(
const std::string& key, const std::string& key, StackIter begin, StackIter end)
std::list<cmDefinitions>::reverse_iterator rbegin,
std::list<cmDefinitions>::reverse_iterator rend)
{ {
assert(rbegin != rend); assert(begin != end);
MapType::const_iterator i = rbegin->Map.find(key); MapType::const_iterator i = begin->Map.find(key);
if (i != rbegin->Map.end()) if (i != begin->Map.end())
{ {
return i->second; return i->second;
} }
std::list<cmDefinitions>::reverse_iterator rit = rbegin; StackIter it = begin;
++rit; ++it;
if (rit == rend) if (it == end)
{ {
return cmDefinitions::NoDef; return cmDefinitions::NoDef;
} }
Def const& def = cmDefinitions::GetInternal(key, rit, rend); Def const& def = cmDefinitions::GetInternal(key, it, end);
return rbegin->Map.insert(MapType::value_type(key, def)).first->second; return begin->Map.insert(MapType::value_type(key, def)).first->second;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmDefinitions::Get(const std::string& key, const char* cmDefinitions::Get(const std::string& key,
std::list<cmDefinitions>::reverse_iterator rbegin, StackIter begin, StackIter end)
std::list<cmDefinitions>::reverse_iterator rend)
{ {
Def const& def = cmDefinitions::GetInternal(key, rbegin, rend); Def const& def = cmDefinitions::GetInternal(key, begin, end);
return def.Exists? def.c_str() : 0; return def.Exists? def.c_str() : 0;
} }
@ -77,14 +74,12 @@ std::vector<std::string> cmDefinitions::LocalKeys() const
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmDefinitions cmDefinitions::MakeClosure( cmDefinitions cmDefinitions::MakeClosure(StackConstIter begin,
std::list<cmDefinitions>::const_reverse_iterator rbegin, StackConstIter end)
std::list<cmDefinitions>::const_reverse_iterator rend)
{ {
cmDefinitions closure; cmDefinitions closure;
std::set<std::string> undefined; std::set<std::string> undefined;
for (std::list<cmDefinitions>::const_reverse_iterator it = rbegin; for (StackConstIter it = begin; it != end; ++it)
it != rend; ++it)
{ {
// Consider local definitions. // Consider local definitions.
for(MapType::const_iterator mi = it->Map.begin(); for(MapType::const_iterator mi = it->Map.begin();

12
Source/cmDefinitions.h
View File

@ -28,12 +28,13 @@
*/ */
class cmDefinitions class cmDefinitions
{ {
typedef std::list<cmDefinitions>::reverse_iterator StackIter;
typedef std::list<cmDefinitions>::const_reverse_iterator StackConstIter;
public: public:
/** Get the value associated with a key; null if none. /** Get the value associated with a key; null if none.
Store the result locally if it came from a parent. */ Store the result locally if it came from a parent. */
static const char* Get(const std::string& key, static const char* Get(const std::string& key,
std::list<cmDefinitions>::reverse_iterator rbegin, StackIter begin, StackIter end);
std::list<cmDefinitions>::reverse_iterator rend);
/** Set (or unset if null) a value associated with a key. */ /** Set (or unset if null) a value associated with a key. */
void Set(const std::string& key, const char* value); void Set(const std::string& key, const char* value);
@ -46,9 +47,7 @@ public:
std::vector<std::string> std::vector<std::string>
ClosureKeys(std::set<std::string>& bound) const; ClosureKeys(std::set<std::string>& bound) const;
static cmDefinitions MakeClosure( static cmDefinitions MakeClosure(StackConstIter begin, StackConstIter end);
std::list<cmDefinitions>::const_reverse_iterator rbegin,
std::list<cmDefinitions>::const_reverse_iterator rend);
private: private:
// String with existence boolean. // String with existence boolean.
@ -74,8 +73,7 @@ private:
MapType Map; MapType Map;
static Def const& GetInternal(const std::string& key, static Def const& GetInternal(const std::string& key,
std::list<cmDefinitions>::reverse_iterator rbegin, StackIter begin, StackIter end);
std::list<cmDefinitions>::reverse_iterator rend);
}; };
#endif #endif