minor simplifications.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61637 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index 5da39bae07d3263e365ce8ec567e943152df10a3..b0ce072a415aba704de10ab7fb27635fc87d6734 100644 (file)
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -33,28 +33,28 @@ bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS) {
   assert(getLang().CPlusPlus &&
          "Call sites of this function should be guarded by checking for C++.");
 
-  if (Tok.isNot(tok::coloncolon)     &&
-      Tok.isNot(tok::annot_cxxscope) &&
-      (Tok.isNot(tok::identifier) || NextToken().isNot(tok::coloncolon)))
-    return false;
-
-  // ::new and ::delete aren't nested-name-specifiers, so parsing the :: as
-  // a scope specifier only makes things more complicated.
-  if (Tok.is(tok::coloncolon) && (NextToken().is(tok::kw_new) ||
-                                  NextToken().is(tok::kw_delete)))
-    return false;
-
   if (Tok.is(tok::annot_cxxscope)) {
     SS.setScopeRep(Tok.getAnnotationValue());
     SS.setRange(Tok.getAnnotationRange());
     ConsumeToken();
     return true;
   }
+  
+  if (Tok.isNot(tok::coloncolon) &&
+      (Tok.isNot(tok::identifier) || NextToken().isNot(tok::coloncolon)))
+    return false;
+
+  // ::new and ::delete aren't nested-name-specifiers, so parsing the :: as
+  // a scope specifier only makes things more complicated.
+  if (Tok.is(tok::coloncolon)) {
+    Token Next = NextToken();
+    if (Next.is(tok::kw_new) || Next.is(tok::kw_delete))
+      return false;
+  }
 
   SS.setBeginLoc(Tok.getLocation());
 
   // '::'
-
   if (Tok.is(tok::coloncolon)) {
     // Global scope.
     SourceLocation CCLoc = ConsumeToken();
@@ -67,18 +67,16 @@ bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS) {
   //   namespace-name '::'
   //   nested-name-specifier identifier '::'
   //   nested-name-specifier 'template'[opt] simple-template-id '::' [TODO]
-
   while (Tok.is(tok::identifier) && NextToken().is(tok::coloncolon)) {
     IdentifierInfo *II = Tok.getIdentifierInfo();
     SourceLocation IdLoc = ConsumeToken();
-    assert(Tok.is(tok::coloncolon) &&
-           "NextToken() not working properly!");
+    assert(Tok.is(tok::coloncolon) && "NextToken() not working properly!");
     SourceLocation CCLoc = ConsumeToken();
     if (SS.isInvalid())
       continue;
 
     SS.setScopeRep(
-         Actions.ActOnCXXNestedNameSpecifier(CurScope, SS, IdLoc, CCLoc, *II) );
+         Actions.ActOnCXXNestedNameSpecifier(CurScope, SS, IdLoc, CCLoc, *II));
     SS.setEndLoc(CCLoc);
   }