feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Recursive definition of CPlusPlus::QualifiedNameId.

Browse Source 
Done-with: Erik Verbruggen
This commit is contained in:
Roberto Raggi
2010-07-12 13:41:54 +02:00
parent 94264617bf
commit adfdb51660
17 changed files with 166 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/cplusplus/Control.cpp
View File

@@ -177,11 +177,10 @@ template <> struct Compare<QualifiedNameId>
{
bool operator()(const QualifiedNameId &name, const QualifiedNameId &otherName) const
{
if (name.isGlobal() == otherName.isGlobal())
return std::lexicographical_compare(name.firstName(), name.lastName(),
otherName.firstName(), otherName.lastName());
if (name.base() == otherName.base())
return name.name() < otherName.name();
return name.isGlobal() < otherName.isGlobal();
return name.base() < otherName.base();
}
};
@@ -285,10 +284,9 @@ public:
return conversionNameIds.intern(ConversionNameId(type));
}
template <typename _Iterator>
const QualifiedNameId *findOrInsertQualifiedNameId(_Iterator first, _Iterator last, bool isGlobal)
const QualifiedNameId *findOrInsertQualifiedNameId(const Name *base, const Name *name)
{
return qualifiedNameIds.intern(QualifiedNameId(first, last, isGlobal));
return qualifiedNameIds.intern(QualifiedNameId(base, name));
}
template <typename _Iterator>
@@ -641,11 +639,9 @@ const OperatorNameId *Control::operatorNameId(int kind)
const ConversionNameId *Control::conversionNameId(const FullySpecifiedType &type)
{ return d->findOrInsertConversionNameId(type); }
const QualifiedNameId *Control::qualifiedNameId(const Name *const *names,
unsigned nameCount,
bool isGlobal)
const QualifiedNameId *Control::qualifiedNameId(const Name *base, const Name *name)
{
return d->findOrInsertQualifiedNameId(names, names + nameCount, isGlobal);
return d->findOrInsertQualifiedNameId(base, name);
}
const SelectorNameId *Control::selectorNameId(const Name *const *names,