replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't recognize unnamed pointer parameters as casts. 

This fixes llvm.org/PR15061.

Before: virtual void f(int *)const;
After:  virtual void f(int *) const;
llvm-svn: 175960
This commit is contained in:
Daniel Jasper 2013-02-23 08:07:18 +00:00
parent af5ba0ed8c
commit ba0bda9739
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Format/TokenAnnotator.cpp
View File

@ -602,7 +602,8 @@ private:
!Current.Children.empty() && (Current.Children[0].is(tok::equal) ||
Current.Children[0].is(tok::semi) ||
Current.Children[0].is(tok::l_brace));
if (ParensNotExpr && !ParensCouldEndDecl)
if (ParensNotExpr && !ParensCouldEndDecl &&
Contexts.back().IsExpression)
// FIXME: We need to get smarter and understand more cases of casts.
Current.Type = TT_CastRParen;
} else if (Current.is(tok::at) && Current.Children.size()) {

15
clang/unittests/Format/FormatTest.cpp
View File

@ -1728,10 +1728,12 @@ TEST_F(FormatTest, UndestandsOverloadedOperators) {
}
TEST_F(FormatTest, UnderstandsNewAndDelete) {
verifyFormat("A *a = new A;");
verifyFormat("A *a = new (placement) A;");
verifyFormat("delete a;");
verifyFormat("delete (A *)a;");
verifyFormat("void f() {\n"
" A *a = new A;\n"
" A *a = new (placement) A;\n"
" delete a;\n"
" delete (A *)a;\n"
"}");
}
TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) {
@ -1895,6 +1897,11 @@ TEST_F(FormatTest, FormatsCasts) {
verifyFormat("void f(int i = (kA * kB) & kMask) {}");
verifyFormat("int a = sizeof(int) * b;");
verifyFormat("int a = alignof(int) * b;");
// These are not casts, but at some point were confused with casts.
verifyFormat("virtual void foo(int *) override;");
verifyFormat("virtual void foo(char &) const;");
verifyFormat("virtual void foo(int *a, char *) const;");
}
TEST_F(FormatTest, FormatsFunctionTypes) {