commit a4396865d01f4bf544f22eefb14b87ca53ae8930
author Daniel Jasper <djasper@google.com> Mon Dec 10 18:59:13 2012 +0000
committer Daniel Jasper <djasper@google.com> Mon Dec 10 18:59:13 2012 +0000
tree 26ae218e86fb46b92e6ad28f06579c67f5805020
parent 66859ae0f64f1ead5579d9fb798927cd204f989b

Addi formatting tests for pointer template parameters.

Fix spacing before ",".

llvm-svn: 169746

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 7f1131c..e8faa12a 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -689,6 +689,8 @@
   }
 
   bool spaceRequiredBetween(Token Left, Token Right) {
+    if (Right.is(tok::r_paren) || Right.is(tok::semi) || Right.is(tok::comma))
+      return false;
     if (Left.is(tok::kw_template) && Right.is(tok::less))
       return true;
     if (Left.is(tok::arrow) || Right.is(tok::arrow))
@@ -725,8 +727,6 @@
       return false;
     if (Left.is(tok::hash))
       return false;
-    if (Right.is(tok::r_paren) || Right.is(tok::semi) || Right.is(tok::comma))
-      return false;
     if (Right.is(tok::l_paren)) {
       return !Left.isAnyIdentifier() || isIfForOrWhile(Left);
     }