[clang-format] Improve detection of Objective-C block types
authorBen Hamilton <benhamilton@google.com>
Mon, 12 Mar 2018 15:42:40 +0000 (15:42 +0000)
committerBen Hamilton <benhamilton@google.com>
Mon, 12 Mar 2018 15:42:40 +0000 (15:42 +0000)
commit788a2227b7bcbff8384fe0b96e4bd66bfa11ccf1
tree01e0b8735f503c1be3dc8c069408387a8ca3c811
parentb060ad870f4e3770e4d5b2ca149c59669f8d56b8
[clang-format] Improve detection of Objective-C block types

Summary:
Previously, clang-format would detect the following as an
Objective-C block type:

  FOO(^);

when it actually must be a C or C++ macro dealing with an XOR
statement or an XOR operator overload.

According to the Clang Block Language Spec:

https://clang.llvm.org/docs/BlockLanguageSpec.html

block types are of the form:

  int (^)(char, float)

and block variables of block type are of the form:

  void (^blockReturningVoidWithVoidArgument)(void);
  int (^blockReturningIntWithIntAndCharArguments)(int, char);
  void (^arrayOfTenBlocksReturningVoidWithIntArgument[10])(int);

This tightens up the detection so we don't unnecessarily detect
C macros which pass in the XOR operator.

Depends On D43904

Test Plan: New tests added. Ran tests with:
  make -j12 FormatTests &&
  ./tools/clang/unittests/Format/FormatTests

Reviewers: krasimir, jolesiak, djasper

Reviewed By: djasper

Subscribers: djasper, cfe-commits, klimek

Differential Revision: https://reviews.llvm.org/D43906

llvm-svn: 327285
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp
clang/unittests/Format/FormatTestObjC.cpp