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

C++ function signature: Preserve trailing non-cv specifiers.

Browse Source 
Like __attribute__((...)).

Task-number: QTCREATORBUG-6620
Change-Id: I8cf9f1743cf107a9ef858206de138ca9771bbdf0
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-11-28 09:26:27 +01:00
parent fd19e94e35
commit d92862d0b1
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -928,21 +928,43 @@ Utils::ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targ
cvString += QLatin1Char(' ');
cvString += QLatin1String("volatile");
}
const int rparenEnd = targetFile->endOf(targetFunctionDeclarator->rparen_token);
if (targetFunctionDeclarator->cv_qualifier_list) {
const int cvEnd = targetFile->endOf(targetFunctionDeclarator->cv_qualifier_list->lastToken() - 1);
// if the qualifies changed, replace
if (!cvString.isEmpty()) {
changes.replace(targetFile->startOf(targetFunctionDeclarator->cv_qualifier_list->firstToken()),
cvEnd, cvString);
} else {
// remove
changes.remove(rparenEnd, cvEnd);
}
} else {
// otherwise add
// if the target function is neither const or volatile, just add the new specifiers after the closing ')'
if (!targetFunction->isConst() && !targetFunction->isVolatile()) {
cvString.prepend(QLatin1Char(' '));
changes.insert(rparenEnd, cvString);
changes.insert(targetFile->endOf(targetFunctionDeclarator->rparen_token), cvString);
}
// modify/remove existing specifiers
else {
SimpleSpecifierAST *constSpecifier = 0;
SimpleSpecifierAST *volatileSpecifier = 0;
for (SpecifierListAST *it = targetFunctionDeclarator->cv_qualifier_list; it; it = it->next) {
if (SimpleSpecifierAST *simple = it->value->asSimpleSpecifier()) {
unsigned kind = targetFile->tokenAt(simple->specifier_token).kind();
if (kind == T_CONST)
constSpecifier = simple;
else if (kind == T_VOLATILE)
volatileSpecifier = simple;
}
}
// if there are both, we just need to remove
if (constSpecifier && volatileSpecifier) {
if (!newFunction->isConst())
changes.remove(targetFile->endOf(constSpecifier->specifier_token - 1), targetFile->endOf(constSpecifier));
if (!newFunction->isVolatile())
changes.remove(targetFile->endOf(volatileSpecifier->specifier_token - 1), targetFile->endOf(volatileSpecifier));
}
// otherwise adjust, remove or extend the one existing specifier
else {
SimpleSpecifierAST *specifier = constSpecifier ? constSpecifier : volatileSpecifier;
QTC_ASSERT(specifier, return changes);
if (!newFunction->isConst() && !newFunction->isVolatile()) {
changes.remove(targetFile->endOf(specifier->specifier_token - 1), targetFile->endOf(specifier));
} else {
changes.replace(targetFile->range(specifier), cvString);
}
}
}
}