Improve identification of c-style casts.
A ")" before any of "=", "{" or ";" won't be a cast. This fixes issues
with the formatting of unnamed parameters.
Before: void f(int *){}
After: void f(int *) {}
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172349 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 5ace0f8..765d16f 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1045,9 +1045,6 @@
verifyFormat("A<int **> a;");
verifyFormat("A<int *, int *> a;");
verifyFormat("A<int **, int **> a;");
- verifyFormat("Type *A = static_cast<Type *>(P);");
- verifyFormat("Type *A = (Type *)P;");
- verifyFormat("Type *A = (vector<Type *, int *>)P;");
verifyFormat(
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
@@ -1062,6 +1059,25 @@
verifyGoogleFormat("int a = b ? *c : *d;");
}
+TEST_F(FormatTest, FormatsCasts) {
+ verifyFormat("Type *A = static_cast<Type *>(P);");
+ verifyFormat("Type *A = (Type *)P;");
+ verifyFormat("Type *A = (vector<Type *, int *>)P;");
+ verifyFormat("int a = (int)(2.0f);");
+
+ // FIXME: These also need to be identified.
+ verifyFormat("int a = (int) 2.0f;");
+ verifyFormat("int a = (int) * b;");
+
+ // These are not casts.
+ verifyFormat("void f(int *) {}");
+ verifyFormat("void f(int *);");
+ verifyFormat("void f(int *) = 0;");
+ verifyFormat("void f(SmallVector<int>) {}");
+ verifyFormat("void f(SmallVector<int>);");
+ verifyFormat("void f(SmallVector<int>) = 0;");
+}
+
TEST_F(FormatTest, FormatsFunctionTypes) {
// FIXME: Determine the cases that need a space after the return type and fix.
verifyFormat("A<bool()> a;");