maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Fix cast detection on "this". 

Before:
  auto x = (X) this;

After:
  auto x = (X)this;

This fixes llvm.org/PR27198.

llvm-svn: 265385
This commit is contained in:
Daniel Jasper 2016-04-05 11:46:06 +00:00
parent c253f8b06b
commit 94b1bdf91a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1172,9 +1172,9 @@ private:
if (!LeftOfParens) if (!LeftOfParens)
return false; return false;
// If the following token is an identifier, this is a cast. All cases where // If the following token is an identifier or 'this', this is a cast. All
// this can be something else are handled above. // cases where this can be something else are handled above.
if (Tok.Next->is(tok::identifier)) if (Tok.Next->isOneOf(tok::identifier, tok::kw_this))
return true; return true;
if (!Tok.Next->Next) if (!Tok.Next->Next)

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

@ -5984,6 +5984,7 @@ TEST_F(FormatTest, FormatsCasts) {
verifyFormat("my_int a = (my_int)(my_int)-1;"); verifyFormat("my_int a = (my_int)(my_int)-1;");
verifyFormat("my_int a = (ns::my_int)-2;"); verifyFormat("my_int a = (ns::my_int)-2;");
verifyFormat("case (my_int)ONE:"); verifyFormat("case (my_int)ONE:");
verifyFormat("auto x = (X)this;");
// FIXME: single value wrapped with paren will be treated as cast. // FIXME: single value wrapped with paren will be treated as cast.
verifyFormat("void f(int i = (kValue)*kMask) {}"); verifyFormat("void f(int i = (kValue)*kMask) {}");