private:
void determineTokenTypes() {
+ bool EqualEncountered = false;
for (int i = 0, e = Line.Tokens.size(); i != e; ++i) {
TokenAnnotation &Annotation = Annotations[i];
const FormatToken &Tok = Line.Tokens[i];
+ if (Tok.Tok.is(tok::equal))
+ EqualEncountered = true;
+
if (Tok.Tok.is(tok::star) || Tok.Tok.is(tok::amp))
- Annotation.Type = determineStarAmpUsage(i);
+ Annotation.Type = determineStarAmpUsage(i, EqualEncountered);
else if (isUnaryOperator(i))
Annotation.Type = TokenAnnotation::TT_UnaryOperator;
else if (isBinaryOperator(Line.Tokens[i]))
switch (Tok.Tok.getKind()) {
case tok::equal:
case tok::equalequal:
+ case tok::exclaimequal:
case tok::star:
//case tok::amp:
case tok::plus:
}
}
- TokenAnnotation::TokenType determineStarAmpUsage(unsigned Index) {
+ TokenAnnotation::TokenType determineStarAmpUsage(unsigned Index,
+ bool EqualEncountered) {
if (Index == Annotations.size())
return TokenAnnotation::TT_Unknown;
Line.Tokens[Index + 1].Tok.isLiteral())
return TokenAnnotation::TT_BinaryOperator;
+ // It is very unlikely that we are going to find a pointer or reference type
+ // definition on the RHS of an assignment.
+ if (EqualEncountered)
+ return TokenAnnotation::TT_BinaryOperator;
+
return TokenAnnotation::TT_PointerOrReference;
}
verifyFormat("f(-1, -2, -3);");
verifyFormat("a[-1] = 5;");
verifyFormat("int a = 5 + -2;");
+ verifyFormat("if (i == -1) {\n}");
+ verifyFormat("if (i != -1) {\n}");
+ verifyFormat("if (i > -1) {\n}");
+ verifyFormat("if (i < -1) {\n}");
}
TEST_F(FormatTest, UndestandsOverloadedOperators) {
verifyFormat("f(*a);");
verifyFormat("int a = b * 10;");
verifyFormat("int a = 10 * b;");
- // verifyFormat("int a = b * c;");
+ verifyFormat("int a = b * c;");
verifyFormat("int a = *b;");
- // verifyFormat("int a = *b * c;");
- // verifyFormat("int a = b * *c;");
+ verifyFormat("int a = *b * c;");
+ verifyFormat("int a = b * *c;");
}
TEST_F(FormatTest, HandlesIncludeDirectives) {