diff options
| author | Daniel Jasper <djasper@google.com> | 2014-04-08 13:07:41 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-04-08 13:07:41 +0000 |
| commit | 139d4a3875a2a2d92b96f895498c99796fba9e95 (patch) | |
| tree | ba162d6d24b1d31d8ff1b1ba62789e97b0c27469 /clang/lib | |
| parent | d74cf40386ac321fca0aed6404647667d2ef00f7 (diff) | |
| download | bcm5719-llvm-139d4a3875a2a2d92b96f895498c99796fba9e95.tar.gz bcm5719-llvm-139d4a3875a2a2d92b96f895498c99796fba9e95.zip | |
clang-format: Correctly understand arrays of pointers.
Before:
A<int * []> a;
After:
A<int *[]> a;
This fixes llvm.org/PR19360.
llvm-svn: 205761
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 0034235c32d..f890af33deb 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -245,7 +245,7 @@ private: StartsObjCMethodExpr = false; Left->Type = TT_Unknown; } - if (StartsObjCMethodExpr) { + if (StartsObjCMethodExpr && CurrentToken->Previous != Left) { CurrentToken->Type = TT_ObjCMethodExpr; // determineStarAmpUsage() thinks that '*' '[' is allocating an // array of pointers, but if '[' starts a selector then '*' is a |
