diff options
| author | Daniel Jasper <djasper@google.com> | 2013-01-16 07:19:28 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-01-16 07:19:28 +0000 |
| commit | 6b825c2e1e691deca41c6f979164b5d20c203593 (patch) | |
| tree | ccb818774f46425cf6d916eba13cd30a2a5e3263 /lib/Format/Format.cpp | |
| parent | 55b08e769f05987942c307fde8eb168df01e504f (diff) | |
Never merge < and ::, as it produces different tokens.
Before: vector<::Type> t;
After: vector< ::Type> t;
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172601 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
| -rw-r--r-- | lib/Format/Format.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 9477f5e014..939038e2a5 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1176,6 +1176,10 @@ private: Right.is(tok::l_paren) || Right.is(tok::l_brace) || Right.is(tok::kw_true) || Right.is(tok::kw_false))) return false; + if (Left.is(tok::coloncolon)) + return false; + if (Right.is(tok::coloncolon)) + return Left.isNot(tok::identifier) && Left.isNot(tok::greater); if (Left.is(tok::less) || Right.is(tok::greater) || Right.is(tok::less)) return false; if (Right.is(tok::amp) || Right.is(tok::star)) @@ -1191,10 +1195,6 @@ private: return false; if (Right.is(tok::l_square) && Right.Type != TT_ObjCMethodExpr) return false; - if (Left.is(tok::coloncolon) || - (Right.is(tok::coloncolon) && - (Left.is(tok::identifier) || Left.is(tok::greater)))) - return false; if (Left.is(tok::period) || Right.is(tok::period)) return false; if (Left.is(tok::colon)) |