[PATCH] D64632: [clang-format] Don't detect call to ObjC class method as C++11 attribute specifier
Ben Hamilton via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Jul 16 14:29:44 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL366267: [clang-format] Don't detect call to ObjC class method as C++11 attributeā¦ (authored by benhamilton, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D64632?vs=209777&id=210182#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D64632/new/
https://reviews.llvm.org/D64632
Files:
cfe/trunk/lib/Format/TokenAnnotator.cpp
cfe/trunk/unittests/Format/FormatTest.cpp
Index: cfe/trunk/lib/Format/TokenAnnotator.cpp
===================================================================
--- cfe/trunk/lib/Format/TokenAnnotator.cpp
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp
@@ -388,6 +388,10 @@
bool isCpp11AttributeSpecifier(const FormatToken &Tok) {
if (!Style.isCpp() || !Tok.startsSequence(tok::l_square, tok::l_square))
return false;
+ // The first square bracket is part of an ObjC array literal
+ if (Tok.Previous && Tok.Previous->is(tok::at)) {
+ return false;
+ }
const FormatToken *AttrTok = Tok.Next->Next;
if (!AttrTok)
return false;
@@ -400,7 +404,7 @@
while (AttrTok && !AttrTok->startsSequence(tok::r_square, tok::r_square)) {
// ObjC message send. We assume nobody will use : in a C++11 attribute
// specifier parameter, although this is technically valid:
- // [[foo(:)]]
+ // [[foo(:)]].
if (AttrTok->is(tok::colon) ||
AttrTok->startsSequence(tok::identifier, tok::identifier) ||
AttrTok->startsSequence(tok::r_paren, tok::identifier))
Index: cfe/trunk/unittests/Format/FormatTest.cpp
===================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp
+++ cfe/trunk/unittests/Format/FormatTest.cpp
@@ -7027,6 +7027,12 @@
// On the other hand, we still need to correctly find array subscripts.
verifyFormat("int a = std::vector<int>{1, 2, 3}[0];");
+ // Make sure that we do not mistake Objective-C method inside array literals
+ // as attributes, even if those method names are also keywords.
+ verifyFormat("@[ [foo bar] ];");
+ verifyFormat("@[ [NSArray class] ];");
+ verifyFormat("@[ [foo enum] ];");
+
// Make sure we do not parse attributes as lambda introducers.
FormatStyle MultiLineFunctions = getLLVMStyle();
MultiLineFunctions.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64632.210182.patch
Type: text/x-patch
Size: 1916 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190716/e769e46f/attachment.bin>
More information about the cfe-commits
mailing list