commit 0bdc6434fa0fea933b6ab566eff751afdba40a2a
author Alexander Kornienko <alexfh@google.com> Thu Jul 04 14:47:51 2013 +0000
committer Alexander Kornienko <alexfh@google.com> Thu Jul 04 14:47:51 2013 +0000
tree 2faa137a1566a6bc4c7aff258efeaba9b8783587
parent 08e81f09bba9a4da8bb5bcdc1c1e29285eb85682

Fixed typo: NoneComment -> NonComment, no other changes.


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

lib/Format/TokenAnnotator.cpp

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 806c805..418025a 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -105,9 +105,9 @@
       // '*' has to be a binary operator but determineStarAmpUsage() will
       // categorize it as an unary operator, so set the right type here.
       if (LookForDecls && CurrentToken->Next) {
-        FormatToken *Prev = CurrentToken->getPreviousNoneComment();
+        FormatToken *Prev = CurrentToken->getPreviousNonComment();
         if (Prev) {
-          FormatToken *PrevPrev = Prev->getPreviousNoneComment();
+          FormatToken *PrevPrev = Prev->getPreviousNonComment();
           FormatToken *Next = CurrentToken->Next;
           if (PrevPrev && PrevPrev->is(tok::identifier) &&
               Prev->isOneOf(tok::star, tok::amp, tok::ampamp) &&
@@ -157,7 +157,7 @@
     // ')' or ']'), it could be the start of an Objective-C method
     // expression, or it could the the start of an Objective-C array literal.
     FormatToken *Left = CurrentToken->Previous;
-    FormatToken *Parent = Left->getPreviousNoneComment();
+    FormatToken *Parent = Left->getPreviousNonComment();
     bool StartsObjCMethodExpr =
         Contexts.back().CanBeExpression &&
         (!Parent || Parent->isOneOf(tok::colon, tok::l_square, tok::l_paren,
@@ -216,7 +216,7 @@
       ScopedContextCreator ContextCreator(*this, tok::l_brace, 1);
       FormatToken *Left = CurrentToken->Previous;
 
-      FormatToken *Parent = Left->getPreviousNoneComment();
+      FormatToken *Parent = Left->getPreviousNonComment();
       bool StartsObjCDictLiteral = Parent && Parent->is(tok::at);
       if (StartsObjCDictLiteral) {
         Contexts.back().ColonIsObjCDictLiteral = true;
@@ -608,7 +608,7 @@
       } else if (Current.is(tok::r_paren)) {
         FormatToken *LeftOfParens = NULL;
         if (Current.MatchingParen)
-          LeftOfParens = Current.MatchingParen->getPreviousNoneComment();
+          LeftOfParens = Current.MatchingParen->getPreviousNonComment();
         bool IsCast = false;
         bool ParensAreEmpty = Current.Previous == Current.MatchingParen;
         bool ParensAreType = !Current.Previous ||
@@ -652,7 +652,7 @@
           break;
         }
       } else if (Current.is(tok::period)) {
-        FormatToken *PreviousNoComment = Current.getPreviousNoneComment();
+        FormatToken *PreviousNoComment = Current.getPreviousNonComment();
         if (PreviousNoComment &&
             PreviousNoComment->isOneOf(tok::comma, tok::l_brace))
           Current.Type = TT_DesignatedInitializerPeriod;
@@ -689,11 +689,11 @@
 
   /// \brief Return the type of the given token assuming it is * or &.
   TokenType determineStarAmpUsage(const FormatToken &Tok, bool IsExpression) {
-    const FormatToken *PrevToken = Tok.getPreviousNoneComment();
+    const FormatToken *PrevToken = Tok.getPreviousNonComment();
     if (PrevToken == NULL)
       return TT_UnaryOperator;
 
-    const FormatToken *NextToken = Tok.getNextNoneComment();
+    const FormatToken *NextToken = Tok.getNextNonComment();
     if (NextToken == NULL)
       return TT_Unknown;
 
@@ -725,7 +725,7 @@
   }
 
   TokenType determinePlusMinusCaretUsage(const FormatToken &Tok) {
-    const FormatToken *PrevToken = Tok.getPreviousNoneComment();
+    const FormatToken *PrevToken = Tok.getPreviousNonComment();
     if (PrevToken == NULL || PrevToken->Type == TT_CastRParen)
       return TT_UnaryOperator;
 
@@ -745,7 +745,7 @@
 
   /// \brief Determine whether ++/-- are pre- or post-increments/-decrements.
   TokenType determineIncrementUsage(const FormatToken &Tok) {
-    const FormatToken *PrevToken = Tok.getPreviousNoneComment();
+    const FormatToken *PrevToken = Tok.getPreviousNonComment();
     if (PrevToken == NULL || PrevToken->Type == TT_CastRParen)
       return TT_UnaryOperator;
     if (PrevToken->isOneOf(tok::r_paren, tok::r_square, tok::identifier))
@@ -940,8 +940,8 @@
                Current->is(tok::string_literal) &&
                Current->Previous->isNot(tok::lessless) &&
                Current->Previous->Type != TT_InlineASMColon &&
-               Current->getNextNoneComment() &&
-               Current->getNextNoneComment()->is(tok::string_literal)) {
+               Current->getNextNonComment() &&
+               Current->getNextNonComment()->is(tok::string_literal)) {
       Current->MustBreakBefore = true;
     } else {
       Current->MustBreakBefore = false;
@@ -1138,7 +1138,7 @@
     return !Left.isOneOf(tok::l_paren, tok::l_square, tok::at) &&
            (Left.isNot(tok::colon) || Left.Type != TT_ObjCMethodExpr);
   if (Left.isOneOf(tok::identifier, tok::greater, tok::r_square) &&
-      Right.is(tok::l_brace) && Right.getNextNoneComment())
+      Right.is(tok::l_brace) && Right.getNextNonComment())
     return false;
   if (Left.is(tok::period) || Right.is(tok::period))
     return false;
@@ -1174,7 +1174,7 @@
     return false;
   if (Tok.is(tok::colon))
     return !Line.First->isOneOf(tok::kw_case, tok::kw_default) &&
-           Tok.getNextNoneComment() != NULL && Tok.Type != TT_ObjCMethodExpr;
+           Tok.getNextNonComment() != NULL && Tok.Type != TT_ObjCMethodExpr;
   if (Tok.Previous->Type == TT_UnaryOperator ||
       Tok.Previous->Type == TT_CastRParen)
     return false;