Author: mprobst Date: Sun May 29 09:41:02 2016 New Revision: 271183 URL: http://llvm.org/viewvc/llvm-project?rev=271183&view=rev Log: clang-format: [JS] FormatToken.startsSequence/endsSequence.
Refactors AnnotatedLine.startsWith/endsWith by extracting the core functionality into FormatToken.startsSequence/endsSequence. This allows checking tokens within the pointered linked list structure with a lookahead, automatically ignoring comments, which is useful in many places (e.g. see subsequent commit). Modified: cfe/trunk/lib/Format/FormatToken.h cfe/trunk/lib/Format/TokenAnnotator.h Modified: cfe/trunk/lib/Format/FormatToken.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/FormatToken.h?rev=271183&r1=271182&r2=271183&view=diff ============================================================================== --- cfe/trunk/lib/Format/FormatToken.h (original) +++ cfe/trunk/lib/Format/FormatToken.h Sun May 29 09:41:02 2016 @@ -297,6 +297,20 @@ struct FormatToken { } template <typename T> bool isNot(T Kind) const { return !is(Kind); } + /// \c true if this token starts a sequence with the given tokens in order, + /// following the ``Next`` pointers, ignoring comments. + template <typename A, typename... Ts> + bool startsSequence(A K1, Ts... Tokens) const { + return startsSequenceInternal(K1, Tokens...); + } + + /// \c true if this token ends a sequence with the given tokens in order, + /// following the ``Previous`` pointers, ignoring comments. + template <typename A, typename... Ts> + bool endsSequence(A K1, Ts... Tokens) const { + return endsSequenceInternal(K1, Tokens...); + } + bool isStringLiteral() const { return tok::isStringLiteral(Tok.getKind()); } bool isObjCAtKeyword(tok::ObjCKeywordKind Kind) const { @@ -429,6 +443,34 @@ private: // Disallow copying. FormatToken(const FormatToken &) = delete; void operator=(const FormatToken &) = delete; + + template <typename A, typename... Ts> + bool startsSequenceInternal(A K1, Ts... Tokens) const { + if (is(tok::comment) && Next) + return Next->startsSequenceInternal(K1, Tokens...); + return is(K1) && Next && Next->startsSequenceInternal(Tokens...); + } + + template <typename A> + bool startsSequenceInternal(A K1) const { + if (is(tok::comment) && Next) + return Next->startsSequenceInternal(K1); + return is(K1); + } + + template <typename A, typename... Ts> + bool endsSequenceInternal(A K1) const { + if (is(tok::comment) && Previous) + return Previous->endsSequenceInternal(K1); + return is(K1); + } + + template <typename A, typename... Ts> + bool endsSequenceInternal(A K1, Ts... Tokens) const { + if (is(tok::comment) && Previous) + return Previous->endsSequenceInternal(K1, Tokens...); + return is(K1) && Previous && Previous->endsSequenceInternal(Tokens...); + } }; class ContinuationIndenter; Modified: cfe/trunk/lib/Format/TokenAnnotator.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.h?rev=271183&r1=271182&r2=271183&view=diff ============================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.h (original) +++ cfe/trunk/lib/Format/TokenAnnotator.h Sun May 29 09:41:02 2016 @@ -83,7 +83,7 @@ public: /// \c true if this line starts with the given tokens in order, ignoring /// comments. template <typename... Ts> bool startsWith(Ts... Tokens) const { - return startsWithInternal(First, Tokens...); + return First && First->startsSequence(Tokens...); } /// \c true if this line ends with the given tokens in reversed order, @@ -91,7 +91,7 @@ public: /// For example, given tokens [T1, T2, T3, ...], the function returns true if /// this line is like "... T3 T2 T1". template <typename... Ts> bool endsWith(Ts... Tokens) const { - return endsWithInternal(Last, Tokens...); + return Last && Last->endsSequence(Tokens...); } /// \c true if this line looks like a function definition instead of a @@ -130,44 +130,6 @@ private: // Disallow copying. AnnotatedLine(const AnnotatedLine &) = delete; void operator=(const AnnotatedLine &) = delete; - - template <typename A, typename... Ts> - bool startsWithInternal(const FormatToken *Tok, A K1) const { - // Even though we skip comments in the outer `startWithInternal` function, - // this loop is still necessary if it is invoked by the public interface - // `startsWith`. - while (Tok && Tok->is(tok::comment)) - Tok = Tok->Next; - return Tok && Tok->is(K1); - } - - template <typename A, typename... Ts> - bool startsWithInternal(const FormatToken *Tok, A K1, Ts... Tokens) const { - // Skip comments before calling `startsWithInternal(Tok, K1)` so that the - // second call to `startsWithInternal` takes the correct `Tok->Next`, which - // should be the next token of the token checked in the first call. - while (Tok && Tok->is(tok::comment)) - Tok = Tok->Next; - return Tok && startsWithInternal(Tok, K1) && - startsWithInternal(Tok->Next, Tokens...); - } - - template <typename A, typename... Ts> - bool endsWithInternal(const FormatToken *Tok, A K1) const { - // See the comments above in `startsWithInternal(Tok, K1)`. - while (Tok && Tok->is(tok::comment)) - Tok = Tok->Previous; - return Tok && Tok->is(K1); - } - - template <typename A, typename... Ts> - bool endsWithInternal(const FormatToken *Tok, A K1, Ts... Tokens) const { - // See the comments above in `startsWithInternal(Tok, K1, Tokens)`. - while (Tok && Tok->is(tok::comment)) - Tok = Tok->Previous; - return Tok && endsWithInternal(Tok, K1) && - endsWithInternal(Tok->Previous, Tokens...); - } }; /// \brief Determines extra information about the tokens comprising an _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits