parent
c5ebf26f9f
commit
e442bc47b1
|
@ -2039,9 +2039,9 @@ void CheckOther::checkDuplicateExpression()
|
||||||
|
|
||||||
void CheckOther::oppositeExpressionError(const Token *tok1, const Token *tok2, const std::string &op, ErrorPath errors)
|
void CheckOther::oppositeExpressionError(const Token *tok1, const Token *tok2, const std::string &op, ErrorPath errors)
|
||||||
{
|
{
|
||||||
if(tok1)
|
if (tok1)
|
||||||
errors.emplace_back(tok1, "");
|
errors.emplace_back(tok1, "");
|
||||||
if(tok2)
|
if (tok2)
|
||||||
errors.emplace_back(tok2, "");
|
errors.emplace_back(tok2, "");
|
||||||
|
|
||||||
reportError(errors, Severity::style, "oppositeExpression", "Opposite expression on both sides of \'" + op + "\'.\n"
|
reportError(errors, Severity::style, "oppositeExpression", "Opposite expression on both sides of \'" + op + "\'.\n"
|
||||||
|
|
|
@ -51,9 +51,9 @@ static bool isAcceptedErrorIdChar(char c)
|
||||||
case '_':
|
case '_':
|
||||||
case '-':
|
case '-':
|
||||||
case '.':
|
case '.':
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return std::isalnum(c);
|
return std::isalnum(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3207,10 +3207,10 @@ const Function * Function::getOverridenFunctionRecursive(const ::Type* baseType,
|
||||||
|
|
||||||
// check for matching cv-ref qualifiers
|
// check for matching cv-ref qualifiers
|
||||||
match = match
|
match = match
|
||||||
&& isConst() == func->isConst()
|
&& isConst() == func->isConst()
|
||||||
&& isVolatile() == func->isVolatile()
|
&& isVolatile() == func->isVolatile()
|
||||||
&& hasRvalRefQualifier() == func->hasRvalRefQualifier()
|
&& hasRvalRefQualifier() == func->hasRvalRefQualifier()
|
||||||
&& hasLvalRefQualifier() == func->hasLvalRefQualifier();
|
&& hasLvalRefQualifier() == func->hasLvalRefQualifier();
|
||||||
|
|
||||||
// it's a match
|
// it's a match
|
||||||
if (match) {
|
if (match) {
|
||||||
|
|
|
@ -674,12 +674,12 @@ void Tokenizer::simplifyTypedef()
|
||||||
typeEnd = tokOffset;
|
typeEnd = tokOffset;
|
||||||
tokOffset = tokOffset->next();
|
tokOffset = tokOffset->next();
|
||||||
|
|
||||||
while(Token::Match(tokOffset, "%type%") &&
|
while (Token::Match(tokOffset, "%type%") &&
|
||||||
(tokOffset->isStandardType() || Token::Match(tokOffset, "unsigned|signed")) ) {
|
(tokOffset->isStandardType() || Token::Match(tokOffset, "unsigned|signed"))) {
|
||||||
typeEnd = tokOffset;
|
typeEnd = tokOffset;
|
||||||
tokOffset = tokOffset->next();
|
tokOffset = tokOffset->next();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool atEnd = false;
|
bool atEnd = false;
|
||||||
while (!atEnd) {
|
while (!atEnd) {
|
||||||
if (tokOffset && tokOffset->str() == "::") {
|
if (tokOffset && tokOffset->str() == "::") {
|
||||||
|
|
Loading…
Reference in New Issue