commit 91d35a5e225c592a885ca993ce5628228ff26a49
author Daniel Marjamaki <daniel.marjamaki@evidente.se> Tue Jun 23 12:45:14 2015 +0000
committer Daniel Marjamaki <daniel.marjamaki@evidente.se> Tue Jun 23 12:45:14 2015 +0000
tree e94405c8cd0b8911cf8439955165b1b597c0eee1
parent bfcbfd56af0df7f925e8201156ba3c9e00fefba2

[clang-tidy] Fix false positives in misc-macro-parentheses checker

llvm-svn: 240399

clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp

diff --git a/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp b/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp
index 1649d3f..7d5aca4 100644
--- a/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp
@@ -148,7 +148,7 @@
       continue;
 
     // Argument is a struct member.
-    if (Prev.isOneOf(tok::period, tok::arrow))
+    if (Prev.isOneOf(tok::period, tok::arrow, tok::coloncolon))
       continue;
 
     // String concatenation.
@@ -169,8 +169,8 @@
         TI + 2 != MI->tokens_end() && (TI + 2)->is(tok::r_paren))
       continue;
 
-    // Assignment.
-    if (Prev.is(tok::equal) && Next.is(tok::semi))
+    // Assignment/return, i.e. '=x;' or 'return x;'.
+    if (Prev.isOneOf(tok::equal, tok::kw_return) && Next.is(tok::semi))
       continue;
 
     Check->diag(Tok.getLocation(), "macro argument should be enclosed in "