r209092 - Format the two RecursiveASTVisitors
Daniel Jasper
djasper at google.com
Mon May 19 00:15:26 PDT 2014
On Sun, May 18, 2014 at 8:38 PM, Alp Toker <alp at nuanti.com> wrote:
> Author: alp
> Date: Sun May 18 13:38:19 2014
> New Revision: 209092
>
> URL: http://llvm.org/viewvc/llvm-project?rev=209092&view=rev
> Log:
> Format the two RecursiveASTVisitors
>
> Apply current ToT clang-format on the two RAVs to reduce delta and help
> identify differences between the two.
>
> We lose a little pretty formatting in the headers but that's the price to
> pay
> so we can diff these two files effectively and look to a future where we
> don't
> have to maintain two copies of this code.
>
> Formatting and whitespace only.
>
> Modified:
> cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h
> cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
>
> Modified: cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h?rev=209092&r1=209091&r2=209092&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h (original)
> +++ cfe/trunk/include/clang/AST/DataRecursiveASTVisitor.h Sun May 18
> 13:38:19 2014
> @@ -38,34 +38,24 @@
> // using them is responsible for defining macro OPERATOR().
>
> // All unary operators.
> -#define UNARYOP_LIST() \
> - OPERATOR(PostInc) OPERATOR(PostDec) \
> - OPERATOR(PreInc) OPERATOR(PreDec) \
> - OPERATOR(AddrOf) OPERATOR(Deref) \
> - OPERATOR(Plus) OPERATOR(Minus) \
> - OPERATOR(Not) OPERATOR(LNot) \
> - OPERATOR(Real) OPERATOR(Imag) \
> - OPERATOR(Extension)
> +#define UNARYOP_LIST()
> \
> + OPERATOR(PostInc) OPERATOR(PostDec) OPERATOR(PreInc) OPERATOR(PreDec)
> \
> + OPERATOR(AddrOf) OPERATOR(Deref) OPERATOR(Plus) OPERATOR(Minus)
> \
> + OPERATOR(Not) OPERATOR(LNot) OPERATOR(Real) OPERATOR(Imag)
> \
> + OPERATOR(Extension)
>
If you put them one per line, clang-format understands that these are macro
invocations and leaves them one per line. Might be more readable.
> // All binary operators (excluding compound assign operators).
> -#define BINOP_LIST() \
> - OPERATOR(PtrMemD) OPERATOR(PtrMemI) \
> - OPERATOR(Mul) OPERATOR(Div) OPERATOR(Rem) \
> - OPERATOR(Add) OPERATOR(Sub) OPERATOR(Shl) \
> - OPERATOR(Shr) \
> - \
> - OPERATOR(LT) OPERATOR(GT) OPERATOR(LE) \
> - OPERATOR(GE) OPERATOR(EQ) OPERATOR(NE) \
> - OPERATOR(And) OPERATOR(Xor) OPERATOR(Or) \
> - OPERATOR(LAnd) OPERATOR(LOr) \
> - \
> - OPERATOR(Assign) \
> - OPERATOR(Comma)
> +#define BINOP_LIST()
> \
> + OPERATOR(PtrMemD) OPERATOR(PtrMemI) OPERATOR(Mul) OPERATOR(Div)
> \
> + OPERATOR(Rem) OPERATOR(Add) OPERATOR(Sub) OPERATOR(Shl)
> OPERATOR(Shr) \
> + OPERATOR(LT) OPERATOR(GT) OPERATOR(LE) OPERATOR(GE) OPERATOR(EQ)
> \
> + OPERATOR(NE) OPERATOR(And) OPERATOR(Xor) OPERATOR(Or)
> OPERATOR(LAnd) \
> + OPERATOR(LOr) OPERATOR(Assign) OPERATOR(Comma)
>
> // All compound assign operators.
> -#define CAO_LIST() \
> - OPERATOR(Mul) OPERATOR(Div) OPERATOR(Rem) OPERATOR(Add) OPERATOR(Sub) \
> - OPERATOR(Shl) OPERATOR(Shr) OPERATOR(And) OPERATOR(Or) OPERATOR(Xor)
> +#define CAO_LIST()
> \
> + OPERATOR(Mul) OPERATOR(Div) OPERATOR(Rem) OPERATOR(Add) OPERATOR(Sub)
> \
> + OPERATOR(Shl) OPERATOR(Shr) OPERATOR(And) OPERATOR(Or) OPERATOR(Xor)
>
> namespace clang {
>
> @@ -77,8 +67,11 @@ namespace clang {
> // invokes CALL_EXPR, which must be a method call, on the derived
> // object (s.t. a user of RecursiveASTVisitor can override the method
> // in CALL_EXPR).
> -#define TRY_TO(CALL_EXPR) \
> - do { if (!getDerived().CALL_EXPR) return false; } while (0)
> +#define TRY_TO(CALL_EXPR)
> \
> + do {
> \
> + if (!getDerived().CALL_EXPR)
> \
> + return false;
> \
> + } while (0)
>
> /// \brief A class that does preorder depth-first traversal on the
> /// entire Clang AST and visits each node.
> @@ -144,11 +137,10 @@ namespace clang {
> /// to return true, in which case all known implicit and explicit
> /// instantiations will be visited at the same time as the pattern
> /// from which they were produced.
> -template<typename Derived>
> -class RecursiveASTVisitor {
> +template <typename Derived> class RecursiveASTVisitor {
> public:
> /// \brief Return a reference to the derived class.
> - Derived &getDerived() { return *static_cast<Derived*>(this); }
> + Derived &getDerived() { return *static_cast<Derived *>(this); }
>
> /// \brief Return whether this visitor should recurse into
> /// template instantiations.
> @@ -255,114 +247,111 @@ public:
> // \brief Visit an attribute.
> bool VisitAttr(Attr *A) { return true; }
>
> - // Declare Traverse* and empty Visit* for all Attr classes.
> +// Declare Traverse* and empty Visit* for all Attr classes.
> #define ATTR_VISITOR_DECLS_ONLY
> #include "clang/AST/AttrVisitor.inc"
> #undef ATTR_VISITOR_DECLS_ONLY
>
> - // ---- Methods on Stmts ----
> +// ---- Methods on Stmts ----
>
> - // Declare Traverse*() for all concrete Stmt classes.
> +// Declare Traverse*() for all concrete Stmt classes.
> #define ABSTRACT_STMT(STMT)
> -#define STMT(CLASS, PARENT) \
> - bool Traverse##CLASS(CLASS *S);
> +#define STMT(CLASS, PARENT) bool Traverse##CLASS(CLASS *S);
> #include "clang/AST/StmtNodes.inc"
> // The above header #undefs ABSTRACT_STMT and STMT upon exit.
>
> // Define WalkUpFrom*() and empty Visit*() for all Stmt classes.
> bool WalkUpFromStmt(Stmt *S) { return getDerived().VisitStmt(S); }
> bool VisitStmt(Stmt *S) { return true; }
> -#define STMT(CLASS, PARENT) \
> - bool WalkUpFrom##CLASS(CLASS *S) { \
> - TRY_TO(WalkUpFrom##PARENT(S)); \
> - TRY_TO(Visit##CLASS(S)); \
> - return true; \
> - } \
> +#define STMT(CLASS, PARENT)
> \
> + bool WalkUpFrom##CLASS(CLASS *S) {
> \
> + TRY_TO(WalkUpFrom##PARENT(S));
> \
> + TRY_TO(Visit##CLASS(S));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS(CLASS *S) { return true; }
> #include "clang/AST/StmtNodes.inc"
>
> - // Define Traverse*(), WalkUpFrom*(), and Visit*() for unary
> - // operator methods. Unary operators are not classes in themselves
> - // (they're all opcodes in UnaryOperator) but do have visitors.
> -#define OPERATOR(NAME) \
> - bool TraverseUnary##NAME(UnaryOperator *S) { \
> - TRY_TO(WalkUpFromUnary##NAME(S)); \
> - StmtQueueAction StmtQueue(*this); \
> - StmtQueue.queue(S->getSubExpr()); \
> - return true; \
> - } \
> - bool WalkUpFromUnary##NAME(UnaryOperator *S) { \
> - TRY_TO(WalkUpFromUnaryOperator(S)); \
> - TRY_TO(VisitUnary##NAME(S)); \
> - return true; \
> - } \
> +// Define Traverse*(), WalkUpFrom*(), and Visit*() for unary
> +// operator methods. Unary operators are not classes in themselves
> +// (they're all opcodes in UnaryOperator) but do have visitors.
> +#define OPERATOR(NAME)
> \
> + bool TraverseUnary##NAME(UnaryOperator *S) {
> \
> + TRY_TO(WalkUpFromUnary##NAME(S));
> \
> + StmtQueueAction StmtQueue(*this);
> \
> + StmtQueue.queue(S->getSubExpr());
> \
> + return true;
> \
> + }
> \
> + bool WalkUpFromUnary##NAME(UnaryOperator *S) {
> \
> + TRY_TO(WalkUpFromUnaryOperator(S));
> \
> + TRY_TO(VisitUnary##NAME(S));
> \
> + return true;
> \
> + }
> \
> bool VisitUnary##NAME(UnaryOperator *S) { return true; }
>
> UNARYOP_LIST()
> #undef OPERATOR
>
> - // Define Traverse*(), WalkUpFrom*(), and Visit*() for binary
> - // operator methods. Binary operators are not classes in themselves
> - // (they're all opcodes in BinaryOperator) but do have visitors.
> -#define GENERAL_BINOP_FALLBACK(NAME, BINOP_TYPE) \
> - bool TraverseBin##NAME(BINOP_TYPE *S) { \
> - TRY_TO(WalkUpFromBin##NAME(S)); \
> - StmtQueueAction StmtQueue(*this); \
> - StmtQueue.queue(S->getLHS()); \
> - StmtQueue.queue(S->getRHS()); \
> - return true; \
> - } \
> - bool WalkUpFromBin##NAME(BINOP_TYPE *S) { \
> - TRY_TO(WalkUpFrom##BINOP_TYPE(S)); \
> - TRY_TO(VisitBin##NAME(S)); \
> - return true; \
> - } \
> +// Define Traverse*(), WalkUpFrom*(), and Visit*() for binary
> +// operator methods. Binary operators are not classes in themselves
> +// (they're all opcodes in BinaryOperator) but do have visitors.
> +#define GENERAL_BINOP_FALLBACK(NAME, BINOP_TYPE)
> \
> + bool TraverseBin##NAME(BINOP_TYPE *S) {
> \
> + TRY_TO(WalkUpFromBin##NAME(S));
> \
> + StmtQueueAction StmtQueue(*this);
> \
> + StmtQueue.queue(S->getLHS());
> \
> + StmtQueue.queue(S->getRHS());
> \
> + return true;
> \
> + }
> \
> + bool WalkUpFromBin##NAME(BINOP_TYPE *S) {
> \
> + TRY_TO(WalkUpFrom##BINOP_TYPE(S));
> \
> + TRY_TO(VisitBin##NAME(S));
> \
> + return true;
> \
> + }
> \
> bool VisitBin##NAME(BINOP_TYPE *S) { return true; }
>
> #define OPERATOR(NAME) GENERAL_BINOP_FALLBACK(NAME, BinaryOperator)
> BINOP_LIST()
> #undef OPERATOR
>
> - // Define Traverse*(), WalkUpFrom*(), and Visit*() for compound
> - // assignment methods. Compound assignment operators are not
> - // classes in themselves (they're all opcodes in
> - // CompoundAssignOperator) but do have visitors.
> -#define OPERATOR(NAME) \
> +// Define Traverse*(), WalkUpFrom*(), and Visit*() for compound
> +// assignment methods. Compound assignment operators are not
> +// classes in themselves (they're all opcodes in
> +// CompoundAssignOperator) but do have visitors.
> +#define OPERATOR(NAME)
> \
> GENERAL_BINOP_FALLBACK(NAME##Assign, CompoundAssignOperator)
>
> CAO_LIST()
> #undef OPERATOR
> #undef GENERAL_BINOP_FALLBACK
>
> - // ---- Methods on Types ----
> - // FIXME: revamp to take TypeLoc's rather than Types.
> +// ---- Methods on Types ----
> +// FIXME: revamp to take TypeLoc's rather than Types.
>
> - // Declare Traverse*() for all concrete Type classes.
> +// Declare Traverse*() for all concrete Type classes.
> #define ABSTRACT_TYPE(CLASS, BASE)
> -#define TYPE(CLASS, BASE) \
> - bool Traverse##CLASS##Type(CLASS##Type *T);
> +#define TYPE(CLASS, BASE) bool Traverse##CLASS##Type(CLASS##Type *T);
> #include "clang/AST/TypeNodes.def"
> // The above header #undefs ABSTRACT_TYPE and TYPE upon exit.
>
> // Define WalkUpFrom*() and empty Visit*() for all Type classes.
> bool WalkUpFromType(Type *T) { return getDerived().VisitType(T); }
> bool VisitType(Type *T) { return true; }
> -#define TYPE(CLASS, BASE) \
> - bool WalkUpFrom##CLASS##Type(CLASS##Type *T) { \
> - TRY_TO(WalkUpFrom##BASE(T)); \
> - TRY_TO(Visit##CLASS##Type(T)); \
> - return true; \
> - } \
> +#define TYPE(CLASS, BASE)
> \
> + bool WalkUpFrom##CLASS##Type(CLASS##Type *T) {
> \
> + TRY_TO(WalkUpFrom##BASE(T));
> \
> + TRY_TO(Visit##CLASS##Type(T));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS##Type(CLASS##Type *T) { return true; }
> #include "clang/AST/TypeNodes.def"
>
> - // ---- Methods on TypeLocs ----
> - // FIXME: this currently just calls the matching Type methods
> +// ---- Methods on TypeLocs ----
> +// FIXME: this currently just calls the matching Type methods
>
> - // Declare Traverse*() for all concrete Type classes.
> +// Declare Traverse*() for all concrete Type classes.
> #define ABSTRACT_TYPELOC(CLASS, BASE)
> -#define TYPELOC(CLASS, BASE) \
> - bool Traverse##CLASS##TypeLoc(CLASS##TypeLoc TL);
> +#define TYPELOC(CLASS, BASE) bool Traverse##CLASS##TypeLoc(CLASS##TypeLoc
> TL);
> #include "clang/AST/TypeLocNodes.def"
> // The above header #undefs ABSTRACT_TYPELOC and TYPELOC upon exit.
>
> @@ -381,34 +370,33 @@ public:
> }
> bool VisitUnqualTypeLoc(UnqualTypeLoc TL) { return true; }
>
> - // Note that BASE includes trailing 'Type' which CLASS doesn't.
> -#define TYPE(CLASS, BASE) \
> - bool WalkUpFrom##CLASS##TypeLoc(CLASS##TypeLoc TL) { \
> - TRY_TO(WalkUpFrom##BASE##Loc(TL)); \
> - TRY_TO(Visit##CLASS##TypeLoc(TL)); \
> - return true; \
> - } \
> +// Note that BASE includes trailing 'Type' which CLASS doesn't.
> +#define TYPE(CLASS, BASE)
> \
> + bool WalkUpFrom##CLASS##TypeLoc(CLASS##TypeLoc TL) {
> \
> + TRY_TO(WalkUpFrom##BASE##Loc(TL));
> \
> + TRY_TO(Visit##CLASS##TypeLoc(TL));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS##TypeLoc(CLASS##TypeLoc TL) { return true; }
> #include "clang/AST/TypeNodes.def"
>
> - // ---- Methods on Decls ----
> +// ---- Methods on Decls ----
>
> - // Declare Traverse*() for all concrete Decl classes.
> +// Declare Traverse*() for all concrete Decl classes.
> #define ABSTRACT_DECL(DECL)
> -#define DECL(CLASS, BASE) \
> - bool Traverse##CLASS##Decl(CLASS##Decl *D);
> +#define DECL(CLASS, BASE) bool Traverse##CLASS##Decl(CLASS##Decl *D);
> #include "clang/AST/DeclNodes.inc"
> // The above header #undefs ABSTRACT_DECL and DECL upon exit.
>
> // Define WalkUpFrom*() and empty Visit*() for all Decl classes.
> bool WalkUpFromDecl(Decl *D) { return getDerived().VisitDecl(D); }
> bool VisitDecl(Decl *D) { return true; }
> -#define DECL(CLASS, BASE) \
> - bool WalkUpFrom##CLASS##Decl(CLASS##Decl *D) { \
> - TRY_TO(WalkUpFrom##BASE(D)); \
> - TRY_TO(Visit##CLASS##Decl(D)); \
> - return true; \
> - } \
> +#define DECL(CLASS, BASE)
> \
> + bool WalkUpFrom##CLASS##Decl(CLASS##Decl *D) {
> \
> + TRY_TO(WalkUpFrom##BASE(D));
> \
> + TRY_TO(Visit##CLASS##Decl(D));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS##Decl(CLASS##Decl *D) { return true; }
> #include "clang/AST/DeclNodes.inc"
>
> @@ -417,7 +405,7 @@ private:
> bool TraverseTemplateParameterListHelper(TemplateParameterList *TPL);
> bool TraverseClassInstantiations(ClassTemplateDecl *D);
> bool TraverseVariableInstantiations(VarTemplateDecl *D);
> - bool TraverseFunctionInstantiations(FunctionTemplateDecl *D) ;
> + bool TraverseFunctionInstantiations(FunctionTemplateDecl *D);
> bool TraverseTemplateArgumentLocsHelper(const TemplateArgumentLoc *TAL,
> unsigned Count);
> bool TraverseArrayTypeLocHelper(ArrayTypeLoc TL);
> @@ -429,27 +417,24 @@ private:
> bool TraverseVarHelper(VarDecl *D);
> bool TraverseOMPClause(OMPClause *C);
> bool TraverseOMPExecutableDirective(OMPExecutableDirective *S);
> -#define OPENMP_CLAUSE(Name, Class) \
> - bool Visit##Class(Class *C);
> +#define OPENMP_CLAUSE(Name, Class) bool Visit##Class(Class *C);
> #include "clang/Basic/OpenMPKinds.def"
> /// \brief Process clauses with list of variables.
> - template <typename T>
> - void VisitOMPClauseList(T *Node);
> + template <typename T> void VisitOMPClauseList(T *Node);
>
> typedef SmallVector<Stmt *, 16> StmtsTy;
> typedef SmallVector<StmtsTy *, 4> QueuesTy;
> -
> +
> QueuesTy Queues;
>
> class NewQueueRAII {
> RecursiveASTVisitor &RAV;
> +
> public:
> NewQueueRAII(StmtsTy &queue, RecursiveASTVisitor &RAV) : RAV(RAV) {
> RAV.Queues.push_back(&queue);
> }
> - ~NewQueueRAII() {
> - RAV.Queues.pop_back();
> - }
> + ~NewQueueRAII() { RAV.Queues.pop_back(); }
> };
>
> StmtsTy &getCurrentQueue() {
> @@ -460,20 +445,19 @@ private:
> public:
> class StmtQueueAction {
> StmtsTy &CurrQueue;
> +
> public:
> explicit StmtQueueAction(RecursiveASTVisitor &RAV)
> - : CurrQueue(RAV.getCurrentQueue()) { }
> + : CurrQueue(RAV.getCurrentQueue()) {}
>
> - void queue(Stmt *S) {
> - CurrQueue.push_back(S);
> - }
> + void queue(Stmt *S) { CurrQueue.push_back(S); }
> };
> };
>
> -#define DISPATCH(NAME, CLASS, VAR) \
> - return getDerived().Traverse##NAME(static_cast<CLASS*>(VAR))
> +#define DISPATCH(NAME, CLASS, VAR)
> \
> + return getDerived().Traverse##NAME(static_cast<CLASS *>(VAR))
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseStmt(Stmt *S) {
> if (!S)
> return true;
> @@ -489,84 +473,89 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> StmtsToEnqueu.clear();
>
> -#define DISPATCH_STMT(NAME, CLASS, VAR) \
> - TRY_TO(Traverse##NAME(static_cast<CLASS*>(VAR))); break
> +#define DISPATCH_STMT(NAME, CLASS, VAR)
> \
> + TRY_TO(Traverse##NAME(static_cast<CLASS *>(VAR)));
> \
> + break
>
> // If we have a binary expr, dispatch to the subcode of the binop. A
> smart
> // optimizer (e.g. LLVM) will fold this comparison into the switch
> stmt
> // below.
> if (BinaryOperator *BinOp = dyn_cast<BinaryOperator>(S)) {
> switch (BinOp->getOpcode()) {
> -#define OPERATOR(NAME) \
> - case BO_##NAME: DISPATCH_STMT(Bin##NAME, BinaryOperator, S);
> -
> - BINOP_LIST()
> +#define OPERATOR(NAME)
> \
> + case BO_##NAME:
> \
> + DISPATCH_STMT(Bin##NAME, BinaryOperator, S);
> +
> + BINOP_LIST()
> #undef OPERATOR
> #undef BINOP_LIST
> -
> -#define OPERATOR(NAME) \
> - case BO_##NAME##Assign: \
> - DISPATCH_STMT(Bin##NAME##Assign, CompoundAssignOperator, S);
> -
> - CAO_LIST()
> +
> +#define OPERATOR(NAME)
> \
> + case BO_##NAME##Assign:
> \
> + DISPATCH_STMT(Bin##NAME##Assign, CompoundAssignOperator, S);
> +
> + CAO_LIST()
> #undef OPERATOR
> #undef CAO_LIST
> }
> } else if (UnaryOperator *UnOp = dyn_cast<UnaryOperator>(S)) {
> switch (UnOp->getOpcode()) {
> -#define OPERATOR(NAME) \
> - case UO_##NAME: DISPATCH_STMT(Unary##NAME, UnaryOperator, S);
> -
> - UNARYOP_LIST()
> +#define OPERATOR(NAME)
> \
> + case UO_##NAME:
> \
> + DISPATCH_STMT(Unary##NAME, UnaryOperator, S);
> +
> + UNARYOP_LIST()
> #undef OPERATOR
> #undef UNARYOP_LIST
> }
> } else {
> -
> +
> // Top switch stmt: dispatch to TraverseFooStmt for each concrete
> FooStmt.
> switch (S->getStmtClass()) {
> - case Stmt::NoStmtClass: break;
> + case Stmt::NoStmtClass:
> + break;
> #define ABSTRACT_STMT(STMT)
> -#define STMT(CLASS, PARENT) \
> - case Stmt::CLASS##Class: DISPATCH_STMT(CLASS, CLASS, S);
> +#define STMT(CLASS, PARENT)
> \
> + case Stmt::CLASS##Class:
> \
> + DISPATCH_STMT(CLASS, CLASS, S);
> #include "clang/AST/StmtNodes.inc"
> }
> }
>
> - for (SmallVectorImpl<Stmt *>::reverse_iterator
> - RI = StmtsToEnqueu.rbegin(),
> - RE = StmtsToEnqueu.rend(); RI != RE; ++RI)
> + for (SmallVectorImpl<Stmt *>::reverse_iterator RI =
> StmtsToEnqueu.rbegin(),
> + RE =
> StmtsToEnqueu.rend();
> + RI != RE; ++RI)
> Queue.push_back(*RI);
> }
>
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseType(QualType T) {
> if (T.isNull())
> return true;
>
> switch (T->getTypeClass()) {
> #define ABSTRACT_TYPE(CLASS, BASE)
> -#define TYPE(CLASS, BASE) \
> - case Type::CLASS: DISPATCH(CLASS##Type, CLASS##Type, \
> - const_cast<Type*>(T.getTypePtr()));
> +#define TYPE(CLASS, BASE)
> \
> + case Type::CLASS:
> \
> + DISPATCH(CLASS##Type, CLASS##Type, const_cast<Type
> *>(T.getTypePtr()));
> #include "clang/AST/TypeNodes.def"
> }
>
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTypeLoc(TypeLoc TL) {
> if (TL.isNull())
> return true;
>
> switch (TL.getTypeLocClass()) {
> #define ABSTRACT_TYPELOC(CLASS, BASE)
> -#define TYPELOC(CLASS, BASE) \
> - case TypeLoc::CLASS: \
> +#define TYPELOC(CLASS, BASE)
> \
> + case TypeLoc::CLASS:
> \
> return
> getDerived().Traverse##CLASS##TypeLoc(TL.castAs<CLASS##TypeLoc>());
> #include "clang/AST/TypeLocNodes.def"
> }
> @@ -574,13 +563,12 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -
> // Define the Traverse*Attr(Attr* A) methods
> #define VISITORCLASS RecursiveASTVisitor
> #include "clang/AST/AttrVisitor.inc"
> #undef VISITORCLASS
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseDecl(Decl *D) {
> if (!D)
> return true;
> @@ -593,10 +581,10 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> switch (D->getKind()) {
> #define ABSTRACT_DECL(DECL)
> -#define DECL(CLASS, BASE) \
> - case Decl::CLASS: \
> - if
> (!getDerived().Traverse##CLASS##Decl(static_cast<CLASS##Decl*>(D))) \
> - return false; \
> +#define DECL(CLASS, BASE)
> \
> + case Decl::CLASS:
> \
> + if (!getDerived().Traverse##CLASS##Decl(static_cast<CLASS##Decl
> *>(D))) \
> + return false;
> \
> break;
> #include "clang/AST/DeclNodes.inc"
> }
> @@ -611,9 +599,9 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> #undef DISPATCH
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseNestedNameSpecifier(
> - NestedNameSpecifier
> *NNS) {
> + NestedNameSpecifier *NNS) {
> if (!NNS)
> return true;
>
> @@ -635,14 +623,14 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseNestedNameSpecifierLoc(
> - NestedNameSpecifierLoc
> NNS) {
> + NestedNameSpecifierLoc NNS) {
> if (!NNS)
> return true;
>
> - if (NestedNameSpecifierLoc Prefix = NNS.getPrefix())
> - TRY_TO(TraverseNestedNameSpecifierLoc(Prefix));
> + if (NestedNameSpecifierLoc Prefix = NNS.getPrefix())
> + TRY_TO(TraverseNestedNameSpecifierLoc(Prefix));
>
> switch (NNS.getNestedNameSpecifier()->getKind()) {
> case NestedNameSpecifier::Identifier:
> @@ -660,9 +648,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseDeclarationNameInfo(
> - DeclarationNameInfo
> NameInfo) {
> + DeclarationNameInfo NameInfo) {
> switch (NameInfo.getName().getNameKind()) {
> case DeclarationName::CXXConstructorName:
> case DeclarationName::CXXDestructorName:
> @@ -685,7 +673,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateName(TemplateName
> Template) {
> if (DependentTemplateName *DTN = Template.getAsDependentTemplateName())
> TRY_TO(TraverseNestedNameSpecifier(DTN->getQualifier()));
> @@ -695,9 +683,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArgument(
> - const TemplateArgument
> &Arg) {
> + const TemplateArgument &Arg) {
> switch (Arg.getKind()) {
> case TemplateArgument::Null:
> case TemplateArgument::Declaration:
> @@ -711,7 +699,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> case TemplateArgument::Template:
> case TemplateArgument::TemplateExpansion:
> return getDerived().TraverseTemplateName(
> -
> Arg.getAsTemplateOrTemplatePattern());
> + Arg.getAsTemplateOrTemplatePattern());
>
> case TemplateArgument::Expression:
> return getDerived().TraverseStmt(Arg.getAsExpr());
> @@ -726,9 +714,9 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> // FIXME: no template name location?
> // FIXME: no source locations for a template argument pack?
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArgumentLoc(
> - const TemplateArgumentLoc
> &ArgLoc) {
> + const TemplateArgumentLoc &ArgLoc) {
> const TemplateArgument &Arg = ArgLoc.getArgument();
>
> switch (Arg.getKind()) {
> @@ -750,9 +738,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> case TemplateArgument::TemplateExpansion:
> if (ArgLoc.getTemplateQualifierLoc())
> TRY_TO(getDerived().TraverseNestedNameSpecifierLoc(
> -
> ArgLoc.getTemplateQualifierLoc()));
> + ArgLoc.getTemplateQualifierLoc()));
> return getDerived().TraverseTemplateName(
> -
> Arg.getAsTemplateOrTemplatePattern());
> + Arg.getAsTemplateOrTemplatePattern());
>
> case TemplateArgument::Expression:
> return getDerived().TraverseStmt(ArgLoc.getSourceExpression());
> @@ -765,10 +753,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArguments(
> - const TemplateArgument
> *Args,
> - unsigned
> NumArgs) {
> + const TemplateArgument *Args, unsigned NumArgs) {
> for (unsigned I = 0; I != NumArgs; ++I) {
> TRY_TO(TraverseTemplateArgument(Args[I]));
> }
> @@ -776,9 +763,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseConstructorInitializer(
> - CXXCtorInitializer
> *Init) {
> + CXXCtorInitializer *Init) {
> if (TypeSourceInfo *TInfo = Init->getTypeSourceInfo())
> TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
>
> @@ -795,81 +782,64 @@ bool RecursiveASTVisitor<Derived>::Trave
> // ----------------- Type traversal -----------------
>
> // This macro makes available a variable T, the passed-in type.
> -#define DEF_TRAVERSE_TYPE(TYPE, CODE) \
> - template<typename Derived> \
> - bool RecursiveASTVisitor<Derived>::Traverse##TYPE (TYPE *T) { \
> - TRY_TO(WalkUpFrom##TYPE (T)); \
> - { CODE; } \
> - return true; \
> - }
> -
> -DEF_TRAVERSE_TYPE(BuiltinType, { })
> -
> -DEF_TRAVERSE_TYPE(ComplexType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(PointerType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(BlockPointerType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(LValueReferenceType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(RValueReferenceType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> +#define DEF_TRAVERSE_TYPE(TYPE, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##TYPE(TYPE *T) {
> \
> + TRY_TO(WalkUpFrom##TYPE(T));
> \
> + { CODE; }
> \
> + return true;
> \
> + }
> +
> +DEF_TRAVERSE_TYPE(BuiltinType, {})
> +
> +DEF_TRAVERSE_TYPE(ComplexType, {
> TRY_TO(TraverseType(T->getElementType())); })
> +
> +DEF_TRAVERSE_TYPE(PointerType, {
> TRY_TO(TraverseType(T->getPointeeType())); })
> +
> +DEF_TRAVERSE_TYPE(BlockPointerType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
> +
> +DEF_TRAVERSE_TYPE(LValueReferenceType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
> +
> +DEF_TRAVERSE_TYPE(RValueReferenceType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
>
> DEF_TRAVERSE_TYPE(MemberPointerType, {
> - TRY_TO(TraverseType(QualType(T->getClass(), 0)));
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(DecayedType, {
> - TRY_TO(TraverseType(T->getOriginalType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(AdjustedType, {
> - TRY_TO(TraverseType(T->getOriginalType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(ConstantArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(IncompleteArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> + TRY_TO(TraverseType(QualType(T->getClass(), 0)));
> + TRY_TO(TraverseType(T->getPointeeType()));
> +})
> +
> +DEF_TRAVERSE_TYPE(DecayedType, {
> TRY_TO(TraverseType(T->getOriginalType())); })
> +
> +DEF_TRAVERSE_TYPE(AdjustedType, {
> TRY_TO(TraverseType(T->getOriginalType())); })
> +
> +DEF_TRAVERSE_TYPE(ConstantArrayType,
> + { TRY_TO(TraverseType(T->getElementType())); })
> +
> +DEF_TRAVERSE_TYPE(IncompleteArrayType,
> + { TRY_TO(TraverseType(T->getElementType())); })
>
> DEF_TRAVERSE_TYPE(VariableArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - TRY_TO(TraverseStmt(T->getSizeExpr()));
> - })
> + TRY_TO(TraverseType(T->getElementType()));
> + TRY_TO(TraverseStmt(T->getSizeExpr()));
> +})
>
> DEF_TRAVERSE_TYPE(DependentSizedArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - if (T->getSizeExpr())
> - TRY_TO(TraverseStmt(T->getSizeExpr()));
> - })
> + TRY_TO(TraverseType(T->getElementType()));
> + if (T->getSizeExpr())
> + TRY_TO(TraverseStmt(T->getSizeExpr()));
> +})
>
> DEF_TRAVERSE_TYPE(DependentSizedExtVectorType, {
> - if (T->getSizeExpr())
> - TRY_TO(TraverseStmt(T->getSizeExpr()));
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(VectorType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(ExtVectorType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> + if (T->getSizeExpr())
> + TRY_TO(TraverseStmt(T->getSizeExpr()));
> + TRY_TO(TraverseType(T->getElementType()));
> +})
> +
> +DEF_TRAVERSE_TYPE(VectorType, {
> TRY_TO(TraverseType(T->getElementType())); })
> +
> +DEF_TRAVERSE_TYPE(ExtVectorType, {
> TRY_TO(TraverseType(T->getElementType())); })
>
> DEF_TRAVERSE_TYPE(FunctionNoProtoType,
> { TRY_TO(TraverseType(T->getReturnType())); })
> @@ -886,87 +856,72 @@ DEF_TRAVERSE_TYPE(FunctionProtoType, {
> }
> })
>
> -DEF_TRAVERSE_TYPE(UnresolvedUsingType, { })
> -DEF_TRAVERSE_TYPE(TypedefType, { })
> +DEF_TRAVERSE_TYPE(UnresolvedUsingType, {})
> +DEF_TRAVERSE_TYPE(TypedefType, {})
> +
> +DEF_TRAVERSE_TYPE(TypeOfExprType,
> + { TRY_TO(TraverseStmt(T->getUnderlyingExpr())); })
>
> -DEF_TRAVERSE_TYPE(TypeOfExprType, {
> - TRY_TO(TraverseStmt(T->getUnderlyingExpr()));
> - })
> -
> -DEF_TRAVERSE_TYPE(TypeOfType, {
> - TRY_TO(TraverseType(T->getUnderlyingType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(DecltypeType, {
> - TRY_TO(TraverseStmt(T->getUnderlyingExpr()));
> - })
> +DEF_TRAVERSE_TYPE(TypeOfType, {
> TRY_TO(TraverseType(T->getUnderlyingType())); })
> +
> +DEF_TRAVERSE_TYPE(DecltypeType,
> + { TRY_TO(TraverseStmt(T->getUnderlyingExpr())); })
>
> DEF_TRAVERSE_TYPE(UnaryTransformType, {
> - TRY_TO(TraverseType(T->getBaseType()));
> - TRY_TO(TraverseType(T->getUnderlyingType()));
> - })
> + TRY_TO(TraverseType(T->getBaseType()));
> + TRY_TO(TraverseType(T->getUnderlyingType()));
> +})
> +
> +DEF_TRAVERSE_TYPE(AutoType, { TRY_TO(TraverseType(T->getDeducedType()));
> })
>
> -DEF_TRAVERSE_TYPE(AutoType, {
> - TRY_TO(TraverseType(T->getDeducedType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(RecordType, { })
> -DEF_TRAVERSE_TYPE(EnumType, { })
> -DEF_TRAVERSE_TYPE(TemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPE(SubstTemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPE(SubstTemplateTypeParmPackType, { })
> +DEF_TRAVERSE_TYPE(RecordType, {})
> +DEF_TRAVERSE_TYPE(EnumType, {})
> +DEF_TRAVERSE_TYPE(TemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPE(SubstTemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPE(SubstTemplateTypeParmPackType, {})
>
> DEF_TRAVERSE_TYPE(TemplateSpecializationType, {
> - TRY_TO(TraverseTemplateName(T->getTemplateName()));
> - TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> - })
> -
> -DEF_TRAVERSE_TYPE(InjectedClassNameType, { })
> -
> -DEF_TRAVERSE_TYPE(AttributedType, {
> - TRY_TO(TraverseType(T->getModifiedType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(ParenType, {
> - TRY_TO(TraverseType(T->getInnerType()));
> - })
> + TRY_TO(TraverseTemplateName(T->getTemplateName()));
> + TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> +})
>
> -DEF_TRAVERSE_TYPE(ElaboratedType, {
> - if (T->getQualifier()) {
> - TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> - }
> - TRY_TO(TraverseType(T->getNamedType()));
> - })
> +DEF_TRAVERSE_TYPE(InjectedClassNameType, {})
>
> -DEF_TRAVERSE_TYPE(DependentNameType, {
> +DEF_TRAVERSE_TYPE(AttributedType,
> + { TRY_TO(TraverseType(T->getModifiedType())); })
> +
> +DEF_TRAVERSE_TYPE(ParenType, { TRY_TO(TraverseType(T->getInnerType())); })
> +
> +DEF_TRAVERSE_TYPE(ElaboratedType, {
> + if (T->getQualifier()) {
> TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> - })
> + }
> + TRY_TO(TraverseType(T->getNamedType()));
> +})
> +
> +DEF_TRAVERSE_TYPE(DependentNameType,
> + {
> TRY_TO(TraverseNestedNameSpecifier(T->getQualifier())); })
>
> DEF_TRAVERSE_TYPE(DependentTemplateSpecializationType, {
> - TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> - TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> - })
> + TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> + TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> +})
>
> -DEF_TRAVERSE_TYPE(PackExpansionType, {
> - TRY_TO(TraverseType(T->getPattern()));
> - })
> +DEF_TRAVERSE_TYPE(PackExpansionType, {
> TRY_TO(TraverseType(T->getPattern())); })
>
> -DEF_TRAVERSE_TYPE(ObjCInterfaceType, { })
> +DEF_TRAVERSE_TYPE(ObjCInterfaceType, {})
>
> DEF_TRAVERSE_TYPE(ObjCObjectType, {
> - // We have to watch out here because an ObjCInterfaceType's base
> - // type is itself.
> - if (T->getBaseType().getTypePtr() != T)
> - TRY_TO(TraverseType(T->getBaseType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(ObjCObjectPointerType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(AtomicType, {
> - TRY_TO(TraverseType(T->getValueType()));
> - })
> + // We have to watch out here because an ObjCInterfaceType's base
> + // type is itself.
> + if (T->getBaseType().getTypePtr() != T)
> + TRY_TO(TraverseType(T->getBaseType()));
> +})
> +
> +DEF_TRAVERSE_TYPE(ObjCObjectPointerType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
> +
> +DEF_TRAVERSE_TYPE(AtomicType, { TRY_TO(TraverseType(T->getValueType()));
> })
>
> #undef DEF_TRAVERSE_TYPE
>
> @@ -977,19 +932,19 @@ DEF_TRAVERSE_TYPE(AtomicType, {
> // in addition to WalkUpFrom* for the TypeLoc itself, such that existing
> // clients that override the WalkUpFrom*Type() and/or Visit*Type() methods
> // continue to work.
> -#define DEF_TRAVERSE_TYPELOC(TYPE, CODE) \
> - template<typename Derived> \
> - bool RecursiveASTVisitor<Derived>::Traverse##TYPE##Loc(TYPE##Loc TL) { \
> - if (getDerived().shouldWalkTypesOfTypeLocs()) \
> - TRY_TO(WalkUpFrom##TYPE(const_cast<TYPE*>(TL.getTypePtr()))); \
> - TRY_TO(WalkUpFrom##TYPE##Loc(TL)); \
> - { CODE; } \
> - return true; \
> +#define DEF_TRAVERSE_TYPELOC(TYPE, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##TYPE##Loc(TYPE##Loc TL) {
> \
> + if (getDerived().shouldWalkTypesOfTypeLocs())
> \
> + TRY_TO(WalkUpFrom##TYPE(const_cast<TYPE *>(TL.getTypePtr())));
> \
> + TRY_TO(WalkUpFrom##TYPE##Loc(TL));
> \
> + { CODE; }
> \
> + return true;
> \
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseQualifiedTypeLoc(
> - QualifiedTypeLoc TL) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::TraverseQualifiedTypeLoc(QualifiedTypeLoc
> TL) {
> // Move this over to the 'main' typeloc tree. Note that this is a
> // move -- we pretend that we were really looking at the unqualified
> // typeloc all along -- rather than a recursion, so we don't follow
> @@ -1008,46 +963,40 @@ bool RecursiveASTVisitor<Derived>::Trave
> return TraverseTypeLoc(TL.getUnqualifiedLoc());
> }
>
> -DEF_TRAVERSE_TYPELOC(BuiltinType, { })
> +DEF_TRAVERSE_TYPELOC(BuiltinType, {})
>
> // FIXME: ComplexTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(ComplexType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(PointerType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(BlockPointerType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(LValueReferenceType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(RValueReferenceType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(PointerType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
> +
> +DEF_TRAVERSE_TYPELOC(BlockPointerType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
> +
> +DEF_TRAVERSE_TYPELOC(LValueReferenceType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
> +
> +DEF_TRAVERSE_TYPELOC(RValueReferenceType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
>
> // FIXME: location of base class?
> // We traverse this in the type case as well, but how is it not reached
> through
> // the pointee type?
> DEF_TRAVERSE_TYPELOC(MemberPointerType, {
> - TRY_TO(TraverseType(QualType(TL.getTypePtr()->getClass(), 0)));
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(DecayedType, {
> - TRY_TO(TraverseTypeLoc(TL.getOriginalLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(AdjustedType, {
> - TRY_TO(TraverseTypeLoc(TL.getOriginalLoc()));
> - })
> + TRY_TO(TraverseType(QualType(TL.getTypePtr()->getClass(), 0)));
> + TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> +})
> +
> +DEF_TRAVERSE_TYPELOC(DecayedType,
> + { TRY_TO(TraverseTypeLoc(TL.getOriginalLoc())); })
>
> -template<typename Derived>
> +DEF_TRAVERSE_TYPELOC(AdjustedType,
> + { TRY_TO(TraverseTypeLoc(TL.getOriginalLoc())); })
> +
> +template <typename Derived>
> bool
> RecursiveASTVisitor<Derived>::TraverseArrayTypeLocHelper(ArrayTypeLoc TL) {
> // This isn't available for ArrayType, but is for the ArrayTypeLoc.
> TRY_TO(TraverseStmt(TL.getSizeExpr()));
> @@ -1055,156 +1004,147 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_TYPELOC(ConstantArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> DEF_TRAVERSE_TYPELOC(IncompleteArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> DEF_TRAVERSE_TYPELOC(VariableArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> DEF_TRAVERSE_TYPELOC(DependentSizedArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> // FIXME: order? why not size expr first?
> // FIXME: base VectorTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(DependentSizedExtVectorType, {
> - if (TL.getTypePtr()->getSizeExpr())
> - TRY_TO(TraverseStmt(TL.getTypePtr()->getSizeExpr()));
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + if (TL.getTypePtr()->getSizeExpr())
> + TRY_TO(TraverseStmt(TL.getTypePtr()->getSizeExpr()));
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> // FIXME: VectorTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(VectorType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> // FIXME: size and attributes
> // FIXME: base VectorTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(ExtVectorType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(FunctionNoProtoType, {
> - TRY_TO(TraverseTypeLoc(TL.getReturnLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(FunctionNoProtoType,
> + { TRY_TO(TraverseTypeLoc(TL.getReturnLoc())); })
>
> // FIXME: location of exception specifications (attributes?)
> DEF_TRAVERSE_TYPELOC(FunctionProtoType, {
> - TRY_TO(TraverseTypeLoc(TL.getReturnLoc()));
> + TRY_TO(TraverseTypeLoc(TL.getReturnLoc()));
>
> - const FunctionProtoType *T = TL.getTypePtr();
> + const FunctionProtoType *T = TL.getTypePtr();
>
> - for (unsigned I = 0, E = TL.getNumParams(); I != E; ++I) {
> - if (TL.getParam(I)) {
> - TRY_TO(TraverseDecl(TL.getParam(I)));
> - } else if (I < T->getNumParams()) {
> - TRY_TO(TraverseType(T->getParamType(I)));
> - }
> + for (unsigned I = 0, E = TL.getNumParams(); I != E; ++I) {
> + if (TL.getParam(I)) {
> + TRY_TO(TraverseDecl(TL.getParam(I)));
> + } else if (I < T->getNumParams()) {
> + TRY_TO(TraverseType(T->getParamType(I)));
> }
> + }
>
> - for (const auto &E : T->exceptions()) {
> - TRY_TO(TraverseType(E));
> - }
> - })
> + for (const auto &E : T->exceptions()) {
> + TRY_TO(TraverseType(E));
> + }
> +})
>
> -DEF_TRAVERSE_TYPELOC(UnresolvedUsingType, { })
> -DEF_TRAVERSE_TYPELOC(TypedefType, { })
> +DEF_TRAVERSE_TYPELOC(UnresolvedUsingType, {})
> +DEF_TRAVERSE_TYPELOC(TypedefType, {})
>
> -DEF_TRAVERSE_TYPELOC(TypeOfExprType, {
> - TRY_TO(TraverseStmt(TL.getUnderlyingExpr()));
> - })
> +DEF_TRAVERSE_TYPELOC(TypeOfExprType,
> + { TRY_TO(TraverseStmt(TL.getUnderlyingExpr())); })
>
> DEF_TRAVERSE_TYPELOC(TypeOfType, {
> - TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> +})
>
> // FIXME: location of underlying expr
> DEF_TRAVERSE_TYPELOC(DecltypeType, {
> - TRY_TO(TraverseStmt(TL.getTypePtr()->getUnderlyingExpr()));
> - })
> + TRY_TO(TraverseStmt(TL.getTypePtr()->getUnderlyingExpr()));
> +})
>
> DEF_TRAVERSE_TYPELOC(UnaryTransformType, {
> - TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_TYPELOC(AutoType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getDeducedType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getDeducedType()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(RecordType, { })
> -DEF_TRAVERSE_TYPELOC(EnumType, { })
> -DEF_TRAVERSE_TYPELOC(TemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmPackType, { })
> +DEF_TRAVERSE_TYPELOC(RecordType, {})
> +DEF_TRAVERSE_TYPELOC(EnumType, {})
> +DEF_TRAVERSE_TYPELOC(TemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmPackType, {})
>
> // FIXME: use the loc for the template name?
> DEF_TRAVERSE_TYPELOC(TemplateSpecializationType, {
> - TRY_TO(TraverseTemplateName(TL.getTypePtr()->getTemplateName()));
> - for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> - TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> - }
> - })
> + TRY_TO(TraverseTemplateName(TL.getTypePtr()->getTemplateName()));
> + for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> + TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> + }
> +})
>
> -DEF_TRAVERSE_TYPELOC(InjectedClassNameType, { })
> +DEF_TRAVERSE_TYPELOC(InjectedClassNameType, {})
>
> -DEF_TRAVERSE_TYPELOC(ParenType, {
> - TRY_TO(TraverseTypeLoc(TL.getInnerLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(ParenType, {
> TRY_TO(TraverseTypeLoc(TL.getInnerLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(AttributedType, {
> - TRY_TO(TraverseTypeLoc(TL.getModifiedLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(AttributedType,
> + { TRY_TO(TraverseTypeLoc(TL.getModifiedLoc())); })
>
> DEF_TRAVERSE_TYPELOC(ElaboratedType, {
> - if (TL.getQualifierLoc()) {
> - TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> - }
> - TRY_TO(TraverseTypeLoc(TL.getNamedTypeLoc()));
> - })
> + if (TL.getQualifierLoc()) {
> + TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> + }
> + TRY_TO(TraverseTypeLoc(TL.getNamedTypeLoc()));
> +})
>
> DEF_TRAVERSE_TYPELOC(DependentNameType, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> +})
>
> DEF_TRAVERSE_TYPELOC(DependentTemplateSpecializationType, {
> - if (TL.getQualifierLoc()) {
> - TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> - }
> + if (TL.getQualifierLoc()) {
> + TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> + }
>
> - for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> - TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> - }
> - })
> + for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> + TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> + }
> +})
>
> -DEF_TRAVERSE_TYPELOC(PackExpansionType, {
> - TRY_TO(TraverseTypeLoc(TL.getPatternLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(PackExpansionType,
> + { TRY_TO(TraverseTypeLoc(TL.getPatternLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(ObjCInterfaceType, { })
> +DEF_TRAVERSE_TYPELOC(ObjCInterfaceType, {})
>
> DEF_TRAVERSE_TYPELOC(ObjCObjectType, {
> - // We have to watch out here because an ObjCInterfaceType's base
> - // type is itself.
> - if (TL.getTypePtr()->getBaseType().getTypePtr() != TL.getTypePtr())
> - TRY_TO(TraverseTypeLoc(TL.getBaseLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(ObjCObjectPointerType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> -
> -DEF_TRAVERSE_TYPELOC(AtomicType, {
> - TRY_TO(TraverseTypeLoc(TL.getValueLoc()));
> - })
> + // We have to watch out here because an ObjCInterfaceType's base
> + // type is itself.
> + if (TL.getTypePtr()->getBaseType().getTypePtr() != TL.getTypePtr())
> + TRY_TO(TraverseTypeLoc(TL.getBaseLoc()));
> +})
> +
> +DEF_TRAVERSE_TYPELOC(ObjCObjectPointerType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
> +
> +DEF_TRAVERSE_TYPELOC(AtomicType, {
> TRY_TO(TraverseTypeLoc(TL.getValueLoc())); })
>
> #undef DEF_TRAVERSE_TYPELOC
>
> @@ -1215,7 +1155,7 @@ DEF_TRAVERSE_TYPELOC(AtomicType, {
> // Therefore each Traverse* only needs to worry about children other
> // than those.
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseDeclContextHelper(DeclContext
> *DC) {
> if (!DC)
> return true;
> @@ -1231,131 +1171,121 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> // This macro makes available a variable D, the passed-in decl.
> -#define DEF_TRAVERSE_DECL(DECL, CODE) \
> -template<typename Derived> \
> -bool RecursiveASTVisitor<Derived>::Traverse##DECL (DECL *D) { \
> - TRY_TO(WalkUpFrom##DECL (D)); \
> - { CODE; } \
> - TRY_TO(TraverseDeclContextHelper(dyn_cast<DeclContext>(D))); \
> - return true; \
> -}
> +#define DEF_TRAVERSE_DECL(DECL, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##DECL(DECL *D) {
> \
> + TRY_TO(WalkUpFrom##DECL(D));
> \
> + { CODE; }
> \
> + TRY_TO(TraverseDeclContextHelper(dyn_cast<DeclContext>(D)));
> \
> + return true;
> \
> + }
>
> -DEF_TRAVERSE_DECL(AccessSpecDecl, { })
> +DEF_TRAVERSE_DECL(AccessSpecDecl, {})
>
> DEF_TRAVERSE_DECL(BlockDecl, {
> - if (TypeSourceInfo *TInfo = D->getSignatureAsWritten())
> - TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> - TRY_TO(TraverseStmt(D->getBody()));
> - // This return statement makes sure the traversal of nodes in
> - // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> - // is skipped - don't remove it.
> - return true;
> - })
> + if (TypeSourceInfo *TInfo = D->getSignatureAsWritten())
> + TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> + TRY_TO(TraverseStmt(D->getBody()));
> + // This return statement makes sure the traversal of nodes in
> + // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> + // is skipped - don't remove it.
> + return true;
> +})
>
> DEF_TRAVERSE_DECL(CapturedDecl, {
> - TRY_TO(TraverseStmt(D->getBody()));
> - // This return statement makes sure the traversal of nodes in
> - // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> - // is skipped - don't remove it.
> - return true;
> - })
> + TRY_TO(TraverseStmt(D->getBody()));
> + // This return statement makes sure the traversal of nodes in
> + // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> + // is skipped - don't remove it.
> + return true;
> +})
>
> -DEF_TRAVERSE_DECL(EmptyDecl, { })
> +DEF_TRAVERSE_DECL(EmptyDecl, {})
>
> -DEF_TRAVERSE_DECL(FileScopeAsmDecl, {
> - TRY_TO(TraverseStmt(D->getAsmString()));
> - })
> +DEF_TRAVERSE_DECL(FileScopeAsmDecl,
> + { TRY_TO(TraverseStmt(D->getAsmString())); })
>
> -DEF_TRAVERSE_DECL(ImportDecl, { })
> +DEF_TRAVERSE_DECL(ImportDecl, {})
>
> DEF_TRAVERSE_DECL(FriendDecl, {
> - // Friend is either decl or a type.
> - if (D->getFriendType())
> - TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> - else
> - TRY_TO(TraverseDecl(D->getFriendDecl()));
> - })
> + // Friend is either decl or a type.
> + if (D->getFriendType())
> + TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> + else
> + TRY_TO(TraverseDecl(D->getFriendDecl()));
> +})
>
> DEF_TRAVERSE_DECL(FriendTemplateDecl, {
> - if (D->getFriendType())
> - TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> - else
> - TRY_TO(TraverseDecl(D->getFriendDecl()));
> - for (unsigned I = 0, E = D->getNumTemplateParameters(); I < E; ++I) {
> - TemplateParameterList *TPL = D->getTemplateParameterList(I);
> - for (TemplateParameterList::iterator ITPL = TPL->begin(),
> - ETPL = TPL->end();
> - ITPL != ETPL; ++ITPL) {
> - TRY_TO(TraverseDecl(*ITPL));
> - }
> + if (D->getFriendType())
> + TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> + else
> + TRY_TO(TraverseDecl(D->getFriendDecl()));
> + for (unsigned I = 0, E = D->getNumTemplateParameters(); I < E; ++I) {
> + TemplateParameterList *TPL = D->getTemplateParameterList(I);
> + for (TemplateParameterList::iterator ITPL = TPL->begin(), ETPL =
> TPL->end();
> + ITPL != ETPL; ++ITPL) {
> + TRY_TO(TraverseDecl(*ITPL));
> }
> - })
> + }
> +})
>
> -DEF_TRAVERSE_DECL(ClassScopeFunctionSpecializationDecl, {
> - TRY_TO(TraverseDecl(D->getSpecialization()));
> - })
> +DEF_TRAVERSE_DECL(ClassScopeFunctionSpecializationDecl,
> + { TRY_TO(TraverseDecl(D->getSpecialization())); })
>
> -DEF_TRAVERSE_DECL(LinkageSpecDecl, { })
> +DEF_TRAVERSE_DECL(LinkageSpecDecl, {})
>
> -DEF_TRAVERSE_DECL(ObjCPropertyImplDecl, {
> - // FIXME: implement this
> - })
> +DEF_TRAVERSE_DECL(ObjCPropertyImplDecl, {// FIXME: implement this
> + })
>
> DEF_TRAVERSE_DECL(StaticAssertDecl, {
> - TRY_TO(TraverseStmt(D->getAssertExpr()));
> - TRY_TO(TraverseStmt(D->getMessage()));
> - })
> -
> -DEF_TRAVERSE_DECL(TranslationUnitDecl, {
> - // Code in an unnamed namespace shows up automatically in
> - // decls_begin()/decls_end(). Thus we don't need to recurse on
> - // D->getAnonymousNamespace().
> - })
> + TRY_TO(TraverseStmt(D->getAssertExpr()));
> + TRY_TO(TraverseStmt(D->getMessage()));
> +})
>
> -DEF_TRAVERSE_DECL(NamespaceAliasDecl, {
> - // We shouldn't traverse an aliased namespace, since it will be
> - // defined (and, therefore, traversed) somewhere else.
> - //
> - // This return statement makes sure the traversal of nodes in
> - // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> - // is skipped - don't remove it.
> - return true;
> - })
> +DEF_TRAVERSE_DECL(
> + TranslationUnitDecl,
> + {// Code in an unnamed namespace shows up automatically in
> + // decls_begin()/decls_end(). Thus we don't need to recurse on
> + // D->getAnonymousNamespace().
> + })
>
> -DEF_TRAVERSE_DECL(LabelDecl, {
> - // There is no code in a LabelDecl.
> +DEF_TRAVERSE_DECL(NamespaceAliasDecl, {
> + // We shouldn't traverse an aliased namespace, since it will be
> + // defined (and, therefore, traversed) somewhere else.
> + //
> + // This return statement makes sure the traversal of nodes in
> + // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> + // is skipped - don't remove it.
> + return true;
> })
>
> +DEF_TRAVERSE_DECL(LabelDecl, {// There is no code in a LabelDecl.
> + })
>
> -DEF_TRAVERSE_DECL(NamespaceDecl, {
> - // Code in an unnamed namespace shows up automatically in
> - // decls_begin()/decls_end(). Thus we don't need to recurse on
> - // D->getAnonymousNamespace().
> - })
> +DEF_TRAVERSE_DECL(
> + NamespaceDecl,
> + {// Code in an unnamed namespace shows up automatically in
> + // decls_begin()/decls_end(). Thus we don't need to recurse on
> + // D->getAnonymousNamespace().
> + })
>
> -DEF_TRAVERSE_DECL(ObjCCompatibleAliasDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCCompatibleAliasDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCCategoryDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCCategoryDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCCategoryImplDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCCategoryImplDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCImplementationDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCImplementationDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCInterfaceDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCInterfaceDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCProtocolDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCProtocolDecl, {// FIXME: implement
> + })
>
> DEF_TRAVERSE_DECL(ObjCMethodDecl, {
> if (D->getReturnTypeSourceInfo()) {
> @@ -1371,29 +1301,28 @@ DEF_TRAVERSE_DECL(ObjCMethodDecl, {
> return true;
> })
>
> -DEF_TRAVERSE_DECL(ObjCPropertyDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCPropertyDecl, {// FIXME: implement
> + })
>
> DEF_TRAVERSE_DECL(UsingDecl, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> +})
>
> DEF_TRAVERSE_DECL(UsingDirectiveDecl, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> +})
>
> -DEF_TRAVERSE_DECL(UsingShadowDecl, { })
> +DEF_TRAVERSE_DECL(UsingShadowDecl, {})
>
> DEF_TRAVERSE_DECL(OMPThreadPrivateDecl, {
> - for (auto *I : D->varlists()) {
> - TRY_TO(TraverseStmt(I));
> - }
> - })
> + for (auto *I : D->varlists()) {
> + TRY_TO(TraverseStmt(I));
> + }
> +})
>
> // A helper method for TemplateDecl's children.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateParameterListHelper(
> TemplateParameterList *TPL) {
> if (TPL) {
> @@ -1407,7 +1336,7 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> // A helper method for traversing the implicit instantiations of a
> // class template.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseClassInstantiations(
> ClassTemplateDecl *D) {
> for (auto *SD : D->specializations()) {
> @@ -1416,8 +1345,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> if (cast<CXXRecordDecl>(RD)->isInjectedClassName())
> continue;
>
> - switch (cast<ClassTemplateSpecializationDecl>(RD)->
> - getSpecializationKind()) {
> + switch (
> +
> cast<ClassTemplateSpecializationDecl>(RD)->getSpecializationKind()) {
> // Visit the implicit instantiations with the requested pattern.
> case TSK_Undeclared:
> case TSK_ImplicitInstantiation:
> @@ -1439,24 +1368,24 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_DECL(ClassTemplateDecl, {
> - CXXRecordDecl* TempDecl = D->getTemplatedDecl();
> - TRY_TO(TraverseDecl(TempDecl));
> -
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> -
> - // By default, we do not traverse the instantiations of
> - // class templates since they do not appear in the user code. The
> - // following code optionally traverses them.
> - //
> - // We only traverse the class instantiations when we see the canonical
> - // declaration of the template, to ensure we only visit them once.
> - if (getDerived().shouldVisitTemplateInstantiations() &&
> - D == D->getCanonicalDecl())
> - TRY_TO(TraverseClassInstantiations(D));
> -
> - // Note that getInstantiatedFromMemberTemplate() is just a link
> - // from a template instantiation back to the template from which
> - // it was instantiated, and thus should not be traversed.
> - })
> + CXXRecordDecl *TempDecl = D->getTemplatedDecl();
> + TRY_TO(TraverseDecl(TempDecl));
> + TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> +
> + // By default, we do not traverse the instantiations of
> + // class templates since they do not appear in the user code. The
> + // following code optionally traverses them.
> + //
> + // We only traverse the class instantiations when we see the canonical
> + // declaration of the template, to ensure we only visit them once.
> + if (getDerived().shouldVisitTemplateInstantiations() &&
> + D == D->getCanonicalDecl())
> + TRY_TO(TraverseClassInstantiations(D));
> +
> + // Note that getInstantiatedFromMemberTemplate() is just a link
> + // from a template instantiation back to the template from which
> + // it was instantiated, and thus should not be traversed.
> +})
>
> // A helper method for traversing the implicit instantiations of a
> // class template.
> @@ -1465,8 +1394,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> VarTemplateDecl *D) {
> for (auto *SD : D->specializations()) {
> for (auto *RD : SD->redecls()) {
> - switch (cast<VarTemplateSpecializationDecl>(RD)->
> - getSpecializationKind()) {
> + switch (
> +
> cast<VarTemplateSpecializationDecl>(RD)->getSpecializationKind()) {
> // Visit the implicit instantiations with the requested pattern.
> case TSK_Undeclared:
> case TSK_ImplicitInstantiation:
> @@ -1487,9 +1416,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -DEF_TRAVERSE_DECL(
> - VarTemplateDecl,
> - {
> +DEF_TRAVERSE_DECL(VarTemplateDecl, {
> VarDecl *TempDecl = D->getTemplatedDecl();
> TRY_TO(TraverseDecl(TempDecl));
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> @@ -1504,14 +1431,14 @@ DEF_TRAVERSE_DECL(
> D == D->getCanonicalDecl())
> TRY_TO(TraverseVariableInstantiations(D));
>
> - // Note that getInstantiatedFromMemberTemplate() is just a link
> - // from a template instantiation back to the template from which
> - // it was instantiated, and thus should not be traversed.
> + // Note that getInstantiatedFromMemberTemplate() is just a link
> + // from a template instantiation back to the template from which
> + // it was instantiated, and thus should not be traversed.
> })
>
> // A helper method for traversing the instantiations of a
> // function while skipping its specializations.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseFunctionInstantiations(
> FunctionTemplateDecl *D) {
> for (auto *FD : D->specializations()) {
> @@ -1541,80 +1468,78 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_DECL(FunctionTemplateDecl, {
> - TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> -
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> + TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> + TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
>
> - // By default, we do not traverse the instantiations of
> - // function templates since they do not appear in the user code. The
> - // following code optionally traverses them.
> - //
> - // We only traverse the function instantiations when we see the
> canonical
> - // declaration of the template, to ensure we only visit them once.
> - if (getDerived().shouldVisitTemplateInstantiations() &&
> - D == D->getCanonicalDecl())
> - TRY_TO(TraverseFunctionInstantiations(D));
> - })
> + // By default, we do not traverse the instantiations of
> + // function templates since they do not appear in the user code. The
> + // following code optionally traverses them.
> + //
> + // We only traverse the function instantiations when we see the
> canonical
> + // declaration of the template, to ensure we only visit them once.
> + if (getDerived().shouldVisitTemplateInstantiations() &&
> + D == D->getCanonicalDecl())
> + TRY_TO(TraverseFunctionInstantiations(D));
> +})
>
> DEF_TRAVERSE_DECL(TemplateTemplateParmDecl, {
> - // D is the "T" in something like
> - // template <template <typename> class T> class container { };
> - TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> - if (D->hasDefaultArgument()) {
> - TRY_TO(TraverseTemplateArgumentLoc(D->getDefaultArgument()));
> - }
> -
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> - })
> + // D is the "T" in something like
> + // template <template <typename> class T> class container { };
> + TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> + if (D->hasDefaultArgument()) {
> + TRY_TO(TraverseTemplateArgumentLoc(D->getDefaultArgument()));
> + }
> + TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> +})
>
> DEF_TRAVERSE_DECL(TemplateTypeParmDecl, {
> - // D is the "T" in something like "template<typename T> class vector;"
> - if (D->getTypeForDecl())
> - TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
> - if (D->hasDefaultArgument())
> - TRY_TO(TraverseTypeLoc(D->getDefaultArgumentInfo()->getTypeLoc()));
> - })
> + // D is the "T" in something like "template<typename T> class vector;"
> + if (D->getTypeForDecl())
> + TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
> + if (D->hasDefaultArgument())
> + TRY_TO(TraverseTypeLoc(D->getDefaultArgumentInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_DECL(TypedefDecl, {
> - TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> - // We shouldn't traverse D->getTypeForDecl(); it's a result of
> - // declaring the typedef, not something that was written in the
> - // source.
> - })
> + TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> + // We shouldn't traverse D->getTypeForDecl(); it's a result of
> + // declaring the typedef, not something that was written in the
> + // source.
> +})
>
> DEF_TRAVERSE_DECL(TypeAliasDecl, {
> - TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> - // We shouldn't traverse D->getTypeForDecl(); it's a result of
> - // declaring the type alias, not something that was written in the
> - // source.
> - })
> + TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> + // We shouldn't traverse D->getTypeForDecl(); it's a result of
> + // declaring the type alias, not something that was written in the
> + // source.
> +})
>
> DEF_TRAVERSE_DECL(TypeAliasTemplateDecl, {
> - TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> -
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> - })
> + TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> + TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> +})
>
> DEF_TRAVERSE_DECL(UnresolvedUsingTypenameDecl, {
> - // A dependent using declaration which was marked with 'typename'.
> - // template<class T> class A : public B<T> { using typename
> B<T>::foo; };
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - // We shouldn't traverse D->getTypeForDecl(); it's a result of
> - // declaring the type, not something that was written in the
> - // source.
> - })
> + // A dependent using declaration which was marked with 'typename'.
> + // template<class T> class A : public B<T> { using typename
> B<T>::foo; };
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + // We shouldn't traverse D->getTypeForDecl(); it's a result of
> + // declaring the type, not something that was written in the
> + // source.
> +})
>
> DEF_TRAVERSE_DECL(EnumDecl, {
> - if (D->getTypeForDecl())
> - TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
> -
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - // The enumerators are already traversed by
> - // decls_begin()/decls_end().
> - })
> + if (D->getTypeForDecl())
> + TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
>
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + // The enumerators are already traversed by
> + // decls_begin()/decls_end().
> +})
>
> // Helper methods for RecordDecl and its children.
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseRecordHelper(
> - RecordDecl *D) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::TraverseRecordHelper(RecordDecl *D) {
> // We shouldn't traverse D->getTypeForDecl(); it's a result of
> // declaring the type, not something that was written in the source.
>
> @@ -1622,9 +1547,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseCXXRecordHelper(
> - CXXRecordDecl *D) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::TraverseCXXRecordHelper(CXXRecordDecl
> *D) {
> if (!TraverseRecordHelper(D))
> return false;
> if (D->isCompleteDefinition()) {
> @@ -1637,34 +1561,30 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -DEF_TRAVERSE_DECL(RecordDecl, {
> - TRY_TO(TraverseRecordHelper(D));
> - })
> -
> -DEF_TRAVERSE_DECL(CXXRecordDecl, {
> - TRY_TO(TraverseCXXRecordHelper(D));
> - })
> +DEF_TRAVERSE_DECL(RecordDecl, { TRY_TO(TraverseRecordHelper(D)); })
> +
> +DEF_TRAVERSE_DECL(CXXRecordDecl, { TRY_TO(TraverseCXXRecordHelper(D)); })
>
> DEF_TRAVERSE_DECL(ClassTemplateSpecializationDecl, {
> - // For implicit instantiations ("set<int> x;"), we don't want to
> - // recurse at all, since the instatiated class isn't written in
> - // the source code anywhere. (Note the instatiated *type* --
> - // set<int> -- is written, and will still get a callback of
> - // TemplateSpecializationType). For explicit instantiations
> - // ("template set<int>;"), we do need a callback, since this
> - // is the only callback that's made for this instantiation.
> - // We use getTypeAsWritten() to distinguish.
> - if (TypeSourceInfo *TSI = D->getTypeAsWritten())
> - TRY_TO(TraverseTypeLoc(TSI->getTypeLoc()));
> -
> - if (!getDerived().shouldVisitTemplateInstantiations() &&
> - D->getTemplateSpecializationKind() != TSK_ExplicitSpecialization)
> - // Returning from here skips traversing the
> - // declaration context of the ClassTemplateSpecializationDecl
> - // (embedded in the DEF_TRAVERSE_DECL() macro)
> - // which contains the instantiated members of the class.
> - return true;
> - })
> + // For implicit instantiations ("set<int> x;"), we don't want to
> + // recurse at all, since the instatiated class isn't written in
> + // the source code anywhere. (Note the instatiated *type* --
> + // set<int> -- is written, and will still get a callback of
> + // TemplateSpecializationType). For explicit instantiations
> + // ("template set<int>;"), we do need a callback, since this
> + // is the only callback that's made for this instantiation.
> + // We use getTypeAsWritten() to distinguish.
> + if (TypeSourceInfo *TSI = D->getTypeAsWritten())
> + TRY_TO(TraverseTypeLoc(TSI->getTypeLoc()));
> +
> + if (!getDerived().shouldVisitTemplateInstantiations() &&
> + D->getTemplateSpecializationKind() != TSK_ExplicitSpecialization)
> + // Returning from here skips traversing the
> + // declaration context of the ClassTemplateSpecializationDecl
> + // (embedded in the DEF_TRAVERSE_DECL() macro)
> + // which contains the instantiated members of the class.
> + return true;
> +})
>
> template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArgumentLocsHelper(
> @@ -1676,40 +1596,38 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_DECL(ClassTemplatePartialSpecializationDecl, {
> - // The partial specialization.
> - if (TemplateParameterList *TPL = D->getTemplateParameters()) {
> - for (TemplateParameterList::iterator I = TPL->begin(), E =
> TPL->end();
> - I != E; ++I) {
> - TRY_TO(TraverseDecl(*I));
> - }
> + // The partial specialization.
> + if (TemplateParameterList *TPL = D->getTemplateParameters()) {
> + for (TemplateParameterList::iterator I = TPL->begin(), E = TPL->end();
> + I != E; ++I) {
> + TRY_TO(TraverseDecl(*I));
> }
> - // The args that remains unspecialized.
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - D->getTemplateArgsAsWritten()->getTemplateArgs(),
> - D->getTemplateArgsAsWritten()->NumTemplateArgs));
> + }
> + // The args that remains unspecialized.
> + TRY_TO(TraverseTemplateArgumentLocsHelper(
> + D->getTemplateArgsAsWritten()->getTemplateArgs(),
> + D->getTemplateArgsAsWritten()->NumTemplateArgs));
>
> - // Don't need the ClassTemplatePartialSpecializationHelper, even
> - // though that's our parent class -- we already visit all the
> - // template args here.
> - TRY_TO(TraverseCXXRecordHelper(D));
> -
> - // Instantiations will have been visited with the primary template.
> - })
> -
> -DEF_TRAVERSE_DECL(EnumConstantDecl, {
> - TRY_TO(TraverseStmt(D->getInitExpr()));
> - })
> + // Don't need the ClassTemplatePartialSpecializationHelper, even
> + // though that's our parent class -- we already visit all the
> + // template args here.
> + TRY_TO(TraverseCXXRecordHelper(D));
> +
> + // Instantiations will have been visited with the primary template.
> +})
> +
> +DEF_TRAVERSE_DECL(EnumConstantDecl, {
> TRY_TO(TraverseStmt(D->getInitExpr())); })
>
> DEF_TRAVERSE_DECL(UnresolvedUsingValueDecl, {
> - // Like UnresolvedUsingTypenameDecl, but without the 'typename':
> - // template <class T> Class A : public Base<T> { using
> Base<T>::foo; };
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> - })
> + // Like UnresolvedUsingTypenameDecl, but without the 'typename':
> + // template <class T> Class A : public Base<T> { using Base<T>::foo;
> };
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> +})
>
> DEF_TRAVERSE_DECL(IndirectFieldDecl, {})
>
> -template<typename Derived>
> +template <typename Derived>
> bool
> RecursiveASTVisitor<Derived>::TraverseDeclaratorHelper(DeclaratorDecl *D) {
> TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> if (D->getTypeSourceInfo())
> @@ -1720,32 +1638,30 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_DECL(FieldDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->isBitField())
> - TRY_TO(TraverseStmt(D->getBitWidth()));
> - else if (D->hasInClassInitializer())
> - TRY_TO(TraverseStmt(D->getInClassInitializer()));
> - })
> -
> -DEF_TRAVERSE_DECL(MSPropertyDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - })
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->isBitField())
> + TRY_TO(TraverseStmt(D->getBitWidth()));
> + else if (D->hasInClassInitializer())
> + TRY_TO(TraverseStmt(D->getInClassInitializer()));
> +})
> +
> +DEF_TRAVERSE_DECL(MSPropertyDecl, { TRY_TO(TraverseDeclaratorHelper(D));
> })
>
> DEF_TRAVERSE_DECL(ObjCAtDefsFieldDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->isBitField())
> - TRY_TO(TraverseStmt(D->getBitWidth()));
> - // FIXME: implement the rest.
> - })
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->isBitField())
> + TRY_TO(TraverseStmt(D->getBitWidth()));
> + // FIXME: implement the rest.
> +})
>
> DEF_TRAVERSE_DECL(ObjCIvarDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->isBitField())
> - TRY_TO(TraverseStmt(D->getBitWidth()));
> - // FIXME: implement the rest.
> - })
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->isBitField())
> + TRY_TO(TraverseStmt(D->getBitWidth()));
> + // FIXME: implement the rest.
> +})
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseFunctionHelper(FunctionDecl
> *D) {
> TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> @@ -1756,13 +1672,13 @@ bool RecursiveASTVisitor<Derived>::Trave
> // the function args, but both are handled by the FunctionTypeLoc
> // above, so we have to choose one side. I've decided to do before.
> if (const FunctionTemplateSpecializationInfo *FTSI =
> - D->getTemplateSpecializationInfo()) {
> + D->getTemplateSpecializationInfo()) {
> if (FTSI->getTemplateSpecializationKind() != TSK_Undeclared &&
> FTSI->getTemplateSpecializationKind() !=
> TSK_ImplicitInstantiation) {
> // A specialization might not have explicit template arguments if
> it has
> // a templated return type and concrete arguments.
> if (const ASTTemplateArgumentListInfo *TALI =
> - FTSI->TemplateArgumentsAsWritten) {
> + FTSI->TemplateArgumentsAsWritten) {
> TRY_TO(TraverseTemplateArgumentLocsHelper(TALI->getTemplateArgs(),
> TALI->NumTemplateArgs));
> }
> @@ -1783,44 +1699,44 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> if (D->isThisDeclarationADefinition()) {
> - TRY_TO(TraverseStmt(D->getBody())); // Function body.
> + TRY_TO(TraverseStmt(D->getBody())); // Function body.
> }
> return true;
> }
>
> DEF_TRAVERSE_DECL(FunctionDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> DEF_TRAVERSE_DECL(CXXMethodDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> DEF_TRAVERSE_DECL(CXXConstructorDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> // CXXConversionDecl is the declaration of a type conversion operator.
> // It's not a cast expression.
> DEF_TRAVERSE_DECL(CXXConversionDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> DEF_TRAVERSE_DECL(CXXDestructorDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseVarHelper(VarDecl *D) {
> TRY_TO(TraverseDeclaratorHelper(D));
> // Default params are taken care of when we traverse the ParmVarDecl.
> @@ -1829,9 +1745,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -DEF_TRAVERSE_DECL(VarDecl, {
> - TRY_TO(TraverseVarHelper(D));
> - })
> +DEF_TRAVERSE_DECL(VarDecl, { TRY_TO(TraverseVarHelper(D)); })
>
> DEF_TRAVERSE_DECL(VarTemplateSpecializationDecl, {
> // For implicit instantiations, we don't want to
> @@ -1848,8 +1762,7 @@ DEF_TRAVERSE_DECL(VarTemplateSpecializat
> return true;
> })
>
> -DEF_TRAVERSE_DECL(VarTemplatePartialSpecializationDecl,
> - {
> +DEF_TRAVERSE_DECL(VarTemplatePartialSpecializationDecl, {
> // The partial specialization.
> if (TemplateParameterList *TPL = D->getTemplateParameters()) {
> for (TemplateParameterList::iterator I = TPL->begin(), E = TPL->end();
> @@ -1859,41 +1772,37 @@ DEF_TRAVERSE_DECL(VarTemplatePartialSpec
> }
> // The args that remains unspecialized.
> TRY_TO(TraverseTemplateArgumentLocsHelper(
> - D->getTemplateArgsAsWritten()->getTemplateArgs(),
> - D->getTemplateArgsAsWritten()->NumTemplateArgs));
> + D->getTemplateArgsAsWritten()->getTemplateArgs(),
> + D->getTemplateArgsAsWritten()->NumTemplateArgs));
>
> // Don't need the VarTemplatePartialSpecializationHelper, even
> // though that's our parent class -- we already visit all the
> // template args here.
> TRY_TO(TraverseVarHelper(D));
>
> - // Instantiations will have been visited with the
> primary
> - // template.
> + // Instantiations will have been visited with the primary
> + // template.
> })
>
> -DEF_TRAVERSE_DECL(ImplicitParamDecl, {
> - TRY_TO(TraverseVarHelper(D));
> - })
> +DEF_TRAVERSE_DECL(ImplicitParamDecl, { TRY_TO(TraverseVarHelper(D)); })
>
> DEF_TRAVERSE_DECL(NonTypeTemplateParmDecl, {
> - // A non-type template parameter, e.g. "S" in template<int S> class
> Foo ...
> - TRY_TO(TraverseDeclaratorHelper(D));
> - TRY_TO(TraverseStmt(D->getDefaultArgument()));
> - })
> + // A non-type template parameter, e.g. "S" in template<int S> class Foo
> ...
> + TRY_TO(TraverseDeclaratorHelper(D));
> + TRY_TO(TraverseStmt(D->getDefaultArgument()));
> +})
>
> DEF_TRAVERSE_DECL(ParmVarDecl, {
> - TRY_TO(TraverseVarHelper(D));
> + TRY_TO(TraverseVarHelper(D));
>
> - if (D->hasDefaultArg() &&
> - D->hasUninstantiatedDefaultArg() &&
> - !D->hasUnparsedDefaultArg())
> - TRY_TO(TraverseStmt(D->getUninstantiatedDefaultArg()));
> -
> - if (D->hasDefaultArg() &&
> - !D->hasUninstantiatedDefaultArg() &&
> - !D->hasUnparsedDefaultArg())
> - TRY_TO(TraverseStmt(D->getDefaultArg()));
> - })
> + if (D->hasDefaultArg() && D->hasUninstantiatedDefaultArg() &&
> + !D->hasUnparsedDefaultArg())
> + TRY_TO(TraverseStmt(D->getUninstantiatedDefaultArg()));
> +
> + if (D->hasDefaultArg() && !D->hasUninstantiatedDefaultArg() &&
> + !D->hasUnparsedDefaultArg())
> + TRY_TO(TraverseStmt(D->getDefaultArg()));
> +})
>
> #undef DEF_TRAVERSE_DECL
>
> @@ -1907,155 +1816,156 @@ DEF_TRAVERSE_DECL(ParmVarDecl, {
> // http://clang.llvm.org/doxygen/Stmt_8cpp_source.html
>
> // This macro makes available a variable S, the passed-in stmt.
> -#define DEF_TRAVERSE_STMT(STMT, CODE) \
> -template<typename Derived> \
> -bool RecursiveASTVisitor<Derived>::Traverse##STMT (STMT *S) { \
> - TRY_TO(WalkUpFrom##STMT(S)); \
> - StmtQueueAction StmtQueue(*this); \
> - { CODE; } \
> - for (Stmt::child_range range = S->children(); range; ++range) { \
> - StmtQueue.queue(*range); \
> - } \
> - return true; \
> -}
> +#define DEF_TRAVERSE_STMT(STMT, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##STMT(STMT *S) {
> \
> + TRY_TO(WalkUpFrom##STMT(S));
> \
> + StmtQueueAction StmtQueue(*this);
> \
> + { CODE; }
> \
> + for (Stmt::child_range range = S->children(); range; ++range) {
> \
> + StmtQueue.queue(*range);
> \
> + }
> \
> + return true;
> \
> + }
>
> DEF_TRAVERSE_STMT(GCCAsmStmt, {
> - StmtQueue.queue(S->getAsmString());
> - for (unsigned I = 0, E = S->getNumInputs(); I < E; ++I) {
> - StmtQueue.queue(S->getInputConstraintLiteral(I));
> - }
> - for (unsigned I = 0, E = S->getNumOutputs(); I < E; ++I) {
> - StmtQueue.queue(S->getOutputConstraintLiteral(I));
> - }
> - for (unsigned I = 0, E = S->getNumClobbers(); I < E; ++I) {
> - StmtQueue.queue(S->getClobberStringLiteral(I));
> - }
> - // children() iterates over inputExpr and outputExpr.
> - })
> + StmtQueue.queue(S->getAsmString());
> + for (unsigned I = 0, E = S->getNumInputs(); I < E; ++I) {
> + StmtQueue.queue(S->getInputConstraintLiteral(I));
> + }
> + for (unsigned I = 0, E = S->getNumOutputs(); I < E; ++I) {
> + StmtQueue.queue(S->getOutputConstraintLiteral(I));
> + }
> + for (unsigned I = 0, E = S->getNumClobbers(); I < E; ++I) {
> + StmtQueue.queue(S->getClobberStringLiteral(I));
> + }
> + // children() iterates over inputExpr and outputExpr.
> +})
>
> -DEF_TRAVERSE_STMT(MSAsmStmt, {
> - // FIXME: MS Asm doesn't currently parse Constraints, Clobbers, etc.
> Once
> - // added this needs to be implemented.
> - })
> +DEF_TRAVERSE_STMT(
> + MSAsmStmt,
> + {// FIXME: MS Asm doesn't currently parse Constraints, Clobbers, etc.
> Once
> + // added this needs to be implemented.
> + })
>
> DEF_TRAVERSE_STMT(CXXCatchStmt, {
> - TRY_TO(TraverseDecl(S->getExceptionDecl()));
> - // children() iterates over the handler block.
> - })
> + TRY_TO(TraverseDecl(S->getExceptionDecl()));
> + // children() iterates over the handler block.
> +})
>
> DEF_TRAVERSE_STMT(DeclStmt, {
> - for (auto *I : S->decls()) {
> - TRY_TO(TraverseDecl(I));
> - }
> - // Suppress the default iteration over children() by
> - // returning. Here's why: A DeclStmt looks like 'type var [=
> - // initializer]'. The decls above already traverse over the
> - // initializers, so we don't have to do it again (which
> - // children() would do).
> - return true;
> - })
> -
> + for (auto *I : S->decls()) {
> + TRY_TO(TraverseDecl(I));
> + }
> + // Suppress the default iteration over children() by
> + // returning. Here's why: A DeclStmt looks like 'type var [=
> + // initializer]'. The decls above already traverse over the
> + // initializers, so we don't have to do it again (which
> + // children() would do).
> + return true;
> +})
>
> // These non-expr stmts (most of them), do not need any action except
> // iterating over the children.
> -DEF_TRAVERSE_STMT(BreakStmt, { })
> -DEF_TRAVERSE_STMT(CXXTryStmt, { })
> -DEF_TRAVERSE_STMT(CaseStmt, { })
> -DEF_TRAVERSE_STMT(CompoundStmt, { })
> -DEF_TRAVERSE_STMT(ContinueStmt, { })
> -DEF_TRAVERSE_STMT(DefaultStmt, { })
> -DEF_TRAVERSE_STMT(DoStmt, { })
> -DEF_TRAVERSE_STMT(ForStmt, { })
> -DEF_TRAVERSE_STMT(GotoStmt, { })
> -DEF_TRAVERSE_STMT(IfStmt, { })
> -DEF_TRAVERSE_STMT(IndirectGotoStmt, { })
> -DEF_TRAVERSE_STMT(LabelStmt, { })
> -DEF_TRAVERSE_STMT(AttributedStmt, { })
> -DEF_TRAVERSE_STMT(NullStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtCatchStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtFinallyStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtSynchronizedStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtThrowStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtTryStmt, { })
> -DEF_TRAVERSE_STMT(ObjCForCollectionStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAutoreleasePoolStmt, { })
> -DEF_TRAVERSE_STMT(CXXForRangeStmt, { })
> +DEF_TRAVERSE_STMT(BreakStmt, {})
> +DEF_TRAVERSE_STMT(CXXTryStmt, {})
> +DEF_TRAVERSE_STMT(CaseStmt, {})
> +DEF_TRAVERSE_STMT(CompoundStmt, {})
> +DEF_TRAVERSE_STMT(ContinueStmt, {})
> +DEF_TRAVERSE_STMT(DefaultStmt, {})
> +DEF_TRAVERSE_STMT(DoStmt, {})
> +DEF_TRAVERSE_STMT(ForStmt, {})
> +DEF_TRAVERSE_STMT(GotoStmt, {})
> +DEF_TRAVERSE_STMT(IfStmt, {})
> +DEF_TRAVERSE_STMT(IndirectGotoStmt, {})
> +DEF_TRAVERSE_STMT(LabelStmt, {})
> +DEF_TRAVERSE_STMT(AttributedStmt, {})
> +DEF_TRAVERSE_STMT(NullStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtCatchStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtFinallyStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtSynchronizedStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtThrowStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtTryStmt, {})
> +DEF_TRAVERSE_STMT(ObjCForCollectionStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAutoreleasePoolStmt, {})
> +DEF_TRAVERSE_STMT(CXXForRangeStmt, {})
> DEF_TRAVERSE_STMT(MSDependentExistsStmt, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> })
> -DEF_TRAVERSE_STMT(ReturnStmt, { })
> -DEF_TRAVERSE_STMT(SwitchStmt, { })
> -DEF_TRAVERSE_STMT(WhileStmt, { })
> +DEF_TRAVERSE_STMT(ReturnStmt, {})
> +DEF_TRAVERSE_STMT(SwitchStmt, {})
> +DEF_TRAVERSE_STMT(WhileStmt, {})
>
> DEF_TRAVERSE_STMT(CXXDependentScopeMemberExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> - if (S->hasExplicitTemplateArgs()) {
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getTemplateArgs(), S->getNumTemplateArgs()));
> - }
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> + if (S->hasExplicitTemplateArgs()) {
> + TRY_TO(TraverseTemplateArgumentLocsHelper(S->getTemplateArgs(),
> + S->getNumTemplateArgs()));
> + }
> +})
>
> DEF_TRAVERSE_STMT(DeclRefExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getTemplateArgs(), S->getNumTemplateArgs()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> + TRY_TO(TraverseTemplateArgumentLocsHelper(S->getTemplateArgs(),
> + S->getNumTemplateArgs()));
> +})
>
> DEF_TRAVERSE_STMT(DependentScopeDeclRefExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> - if (S->hasExplicitTemplateArgs()) {
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getExplicitTemplateArgs().getTemplateArgs(),
> - S->getNumTemplateArgs()));
> - }
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> + if (S->hasExplicitTemplateArgs()) {
> + TRY_TO(TraverseTemplateArgumentLocsHelper(
> + S->getExplicitTemplateArgs().getTemplateArgs(),
> + S->getNumTemplateArgs()));
> + }
> +})
>
> DEF_TRAVERSE_STMT(MemberExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getTemplateArgs(), S->getNumTemplateArgs()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> + TRY_TO(TraverseTemplateArgumentLocsHelper(S->getTemplateArgs(),
> + S->getNumTemplateArgs()));
> +})
>
> -DEF_TRAVERSE_STMT(ImplicitCastExpr, {
> - // We don't traverse the cast type, as it's not written in the
> - // source code.
> - })
> +DEF_TRAVERSE_STMT(
> + ImplicitCastExpr,
> + {// We don't traverse the cast type, as it's not written in the
> + // source code.
> + })
>
> DEF_TRAVERSE_STMT(CStyleCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXFunctionalCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXConstCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXDynamicCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXReinterpretCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXStaticCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> // InitListExpr is a tricky one, because we want to do all our work on
> // the syntactic form of the listexpr, but this method takes the
> // semantic form by default. We can't use the macro helper because it
> // calls WalkUp*() on the semantic form, before our code can convert
> // to the syntactic form.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseInitListExpr(InitListExpr *S) {
> if (InitListExpr *Syn = S->getSyntacticForm())
> S = Syn;
> @@ -2071,9 +1981,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> // GenericSelectionExpr is a special case because the types and
> expressions
> // are interleaved. We also need to watch out for null types (default
> // generic associations).
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::
> -TraverseGenericSelectionExpr(GenericSelectionExpr *S) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::TraverseGenericSelectionExpr(
> + GenericSelectionExpr *S) {
> TRY_TO(WalkUpFromGenericSelectionExpr(S));
> StmtQueueAction StmtQueue(*this);
> StmtQueue.queue(S->getControllingExpr());
> @@ -2087,14 +1997,15 @@ TraverseGenericSelectionExpr(GenericSele
>
> // PseudoObjectExpr is a special case because of the wierdness with
> // syntactic expressions and opaque values.
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::
> -TraversePseudoObjectExpr(PseudoObjectExpr *S) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::TraversePseudoObjectExpr(PseudoObjectExpr
> *S) {
> TRY_TO(WalkUpFromPseudoObjectExpr(S));
> StmtQueueAction StmtQueue(*this);
> StmtQueue.queue(S->getSyntacticForm());
> - for (PseudoObjectExpr::semantics_iterator
> - i = S->semantics_begin(), e = S->semantics_end(); i != e; ++i) {
> + for (PseudoObjectExpr::semantics_iterator i = S->semantics_begin(),
> + e = S->semantics_end();
> + i != e; ++i) {
> Expr *sub = *i;
> if (OpaqueValueExpr *OVE = dyn_cast<OpaqueValueExpr>(sub))
> sub = OVE->getSourceExpr();
> @@ -2104,44 +2015,44 @@ TraversePseudoObjectExpr(PseudoObjectExp
> }
>
> DEF_TRAVERSE_STMT(CXXScalarValueInitExpr, {
> - // This is called for code like 'return T()' where T is a built-in
> - // (i.e. non-class) type.
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // This is called for code like 'return T()' where T is a built-in
> + // (i.e. non-class) type.
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXNewExpr, {
> // The child-iterator will pick up the other arguments.
> TRY_TO(TraverseTypeLoc(S->getAllocatedTypeSourceInfo()->getTypeLoc()));
> - })
> +})
>
> DEF_TRAVERSE_STMT(OffsetOfExpr, {
> - // The child-iterator will pick up the expression representing
> - // the field.
> - // FIMXE: for code like offsetof(Foo, a.b.c), should we get
> - // making a MemberExpr callbacks for Foo.a, Foo.a.b, and Foo.a.b.c?
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the expression representing
> + // the field.
> + // FIMXE: for code like offsetof(Foo, a.b.c), should we get
> + // making a MemberExpr callbacks for Foo.a, Foo.a.b, and Foo.a.b.c?
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(UnaryExprOrTypeTraitExpr, {
> - // The child-iterator will pick up the arg if it's an expression,
> - // but not if it's a type.
> - if (S->isArgumentType())
> - TRY_TO(TraverseTypeLoc(S->getArgumentTypeInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the arg if it's an expression,
> + // but not if it's a type.
> + if (S->isArgumentType())
> + TRY_TO(TraverseTypeLoc(S->getArgumentTypeInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXTypeidExpr, {
> - // The child-iterator will pick up the arg if it's an expression,
> - // but not if it's a type.
> - if (S->isTypeOperand())
> -
> TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the arg if it's an expression,
> + // but not if it's a type.
> + if (S->isTypeOperand())
> + TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXUuidofExpr, {
> - // The child-iterator will pick up the arg if it's an expression,
> - // but not if it's a type.
> - if (S->isTypeOperand())
> -
> TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the arg if it's an expression,
> + // but not if it's a type.
> + if (S->isTypeOperand())
> + TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(TypeTraitExpr, {
> for (unsigned I = 0, N = S->getNumArgs(); I != N; ++I)
> @@ -2149,30 +2060,29 @@ DEF_TRAVERSE_STMT(TypeTraitExpr, {
> })
>
> DEF_TRAVERSE_STMT(ArrayTypeTraitExpr, {
> - TRY_TO(TraverseTypeLoc(S->getQueriedTypeSourceInfo()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getQueriedTypeSourceInfo()->getTypeLoc()));
> +})
>
> -DEF_TRAVERSE_STMT(ExpressionTraitExpr, {
> - StmtQueue.queue(S->getQueriedExpression());
> - })
> +DEF_TRAVERSE_STMT(ExpressionTraitExpr,
> + { StmtQueue.queue(S->getQueriedExpression()); })
>
> DEF_TRAVERSE_STMT(VAArgExpr, {
> - // The child-iterator will pick up the expression argument.
> - TRY_TO(TraverseTypeLoc(S->getWrittenTypeInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the expression argument.
> + TRY_TO(TraverseTypeLoc(S->getWrittenTypeInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXTemporaryObjectExpr, {
> - // This is called for code like 'return T()' where T is a class type.
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // This is called for code like 'return T()' where T is a class type.
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> -// Walk only the visible parts of lambda expressions.
> -template<typename Derived>
> +// Walk only the visible parts of lambda expressions.
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseLambdaExpr(LambdaExpr *S) {
> TRY_TO(WalkUpFromLambdaExpr(S));
>
> for (LambdaExpr::capture_iterator C = S->explicit_capture_begin(),
> - CEnd = S->explicit_capture_end();
> + CEnd = S->explicit_capture_end();
> C != CEnd; ++C) {
> TRY_TO(TraverseLambdaCapture(*C));
> }
> @@ -2190,7 +2100,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
> } else {
> TRY_TO(TraverseTypeLoc(Proto.getReturnLoc()));
> - }
> + }
> }
> }
>
> @@ -2200,34 +2110,34 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_STMT(CXXUnresolvedConstructExpr, {
> - // This is called for code like 'T()', where T is a template argument.
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // This is called for code like 'T()', where T is a template argument.
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> // These expressions all might take explicit template arguments.
> // We traverse those if so. FIXME: implement these.
> -DEF_TRAVERSE_STMT(CXXConstructExpr, { })
> -DEF_TRAVERSE_STMT(CallExpr, { })
> -DEF_TRAVERSE_STMT(CXXMemberCallExpr, { })
> +DEF_TRAVERSE_STMT(CXXConstructExpr, {})
> +DEF_TRAVERSE_STMT(CallExpr, {})
> +DEF_TRAVERSE_STMT(CXXMemberCallExpr, {})
>
> // These exprs (most of them), do not need any action except iterating
> // over the children.
> -DEF_TRAVERSE_STMT(AddrLabelExpr, { })
> -DEF_TRAVERSE_STMT(ArraySubscriptExpr, { })
> +DEF_TRAVERSE_STMT(AddrLabelExpr, {})
> +DEF_TRAVERSE_STMT(ArraySubscriptExpr, {})
> DEF_TRAVERSE_STMT(BlockExpr, {
> TRY_TO(TraverseDecl(S->getBlockDecl()));
> return true; // no child statements to loop through.
> })
> -DEF_TRAVERSE_STMT(ChooseExpr, { })
> -DEF_TRAVERSE_STMT(CompoundLiteralExpr, { })
> -DEF_TRAVERSE_STMT(CXXBindTemporaryExpr, { })
> -DEF_TRAVERSE_STMT(CXXBoolLiteralExpr, { })
> -DEF_TRAVERSE_STMT(CXXDefaultArgExpr, { })
> -DEF_TRAVERSE_STMT(CXXDefaultInitExpr, { })
> -DEF_TRAVERSE_STMT(CXXDeleteExpr, { })
> -DEF_TRAVERSE_STMT(ExprWithCleanups, { })
> -DEF_TRAVERSE_STMT(CXXNullPtrLiteralExpr, { })
> -DEF_TRAVERSE_STMT(CXXStdInitializerListExpr, { })
> +DEF_TRAVERSE_STMT(ChooseExpr, {})
> +DEF_TRAVERSE_STMT(CompoundLiteralExpr, {})
> +DEF_TRAVERSE_STMT(CXXBindTemporaryExpr, {})
> +DEF_TRAVERSE_STMT(CXXBoolLiteralExpr, {})
> +DEF_TRAVERSE_STMT(CXXDefaultArgExpr, {})
> +DEF_TRAVERSE_STMT(CXXDefaultInitExpr, {})
> +DEF_TRAVERSE_STMT(CXXDeleteExpr, {})
> +DEF_TRAVERSE_STMT(ExprWithCleanups, {})
> +DEF_TRAVERSE_STMT(CXXNullPtrLiteralExpr, {})
> +DEF_TRAVERSE_STMT(CXXStdInitializerListExpr, {})
> DEF_TRAVERSE_STMT(CXXPseudoDestructorExpr, {
> TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> if (TypeSourceInfo *ScopeInfo = S->getScopeTypeInfo())
> @@ -2235,38 +2145,38 @@ DEF_TRAVERSE_STMT(CXXPseudoDestructorExp
> if (TypeSourceInfo *DestroyedTypeInfo = S->getDestroyedTypeInfo())
> TRY_TO(TraverseTypeLoc(DestroyedTypeInfo->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(CXXThisExpr, { })
> -DEF_TRAVERSE_STMT(CXXThrowExpr, { })
> -DEF_TRAVERSE_STMT(UserDefinedLiteral, { })
> -DEF_TRAVERSE_STMT(DesignatedInitExpr, { })
> -DEF_TRAVERSE_STMT(ExtVectorElementExpr, { })
> -DEF_TRAVERSE_STMT(GNUNullExpr, { })
> -DEF_TRAVERSE_STMT(ImplicitValueInitExpr, { })
> -DEF_TRAVERSE_STMT(ObjCBoolLiteralExpr, { })
> +DEF_TRAVERSE_STMT(CXXThisExpr, {})
> +DEF_TRAVERSE_STMT(CXXThrowExpr, {})
> +DEF_TRAVERSE_STMT(UserDefinedLiteral, {})
> +DEF_TRAVERSE_STMT(DesignatedInitExpr, {})
> +DEF_TRAVERSE_STMT(ExtVectorElementExpr, {})
> +DEF_TRAVERSE_STMT(GNUNullExpr, {})
> +DEF_TRAVERSE_STMT(ImplicitValueInitExpr, {})
> +DEF_TRAVERSE_STMT(ObjCBoolLiteralExpr, {})
> DEF_TRAVERSE_STMT(ObjCEncodeExpr, {
> if (TypeSourceInfo *TInfo = S->getEncodedTypeSourceInfo())
> TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(ObjCIsaExpr, { })
> -DEF_TRAVERSE_STMT(ObjCIvarRefExpr, { })
> +DEF_TRAVERSE_STMT(ObjCIsaExpr, {})
> +DEF_TRAVERSE_STMT(ObjCIvarRefExpr, {})
> DEF_TRAVERSE_STMT(ObjCMessageExpr, {
> if (TypeSourceInfo *TInfo = S->getClassReceiverTypeInfo())
> TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(ObjCPropertyRefExpr, { })
> -DEF_TRAVERSE_STMT(ObjCSubscriptRefExpr, { })
> -DEF_TRAVERSE_STMT(ObjCProtocolExpr, { })
> -DEF_TRAVERSE_STMT(ObjCSelectorExpr, { })
> -DEF_TRAVERSE_STMT(ObjCIndirectCopyRestoreExpr, { })
> +DEF_TRAVERSE_STMT(ObjCPropertyRefExpr, {})
> +DEF_TRAVERSE_STMT(ObjCSubscriptRefExpr, {})
> +DEF_TRAVERSE_STMT(ObjCProtocolExpr, {})
> +DEF_TRAVERSE_STMT(ObjCSelectorExpr, {})
> +DEF_TRAVERSE_STMT(ObjCIndirectCopyRestoreExpr, {})
> DEF_TRAVERSE_STMT(ObjCBridgedCastExpr, {
> TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(ParenExpr, { })
> -DEF_TRAVERSE_STMT(ParenListExpr, { })
> -DEF_TRAVERSE_STMT(PredefinedExpr, { })
> -DEF_TRAVERSE_STMT(ShuffleVectorExpr, { })
> -DEF_TRAVERSE_STMT(ConvertVectorExpr, { })
> -DEF_TRAVERSE_STMT(StmtExpr, { })
> +DEF_TRAVERSE_STMT(ParenExpr, {})
> +DEF_TRAVERSE_STMT(ParenListExpr, {})
> +DEF_TRAVERSE_STMT(PredefinedExpr, {})
> +DEF_TRAVERSE_STMT(ShuffleVectorExpr, {})
> +DEF_TRAVERSE_STMT(ConvertVectorExpr, {})
> +DEF_TRAVERSE_STMT(StmtExpr, {})
> DEF_TRAVERSE_STMT(UnresolvedLookupExpr, {
> TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> if (S->hasExplicitTemplateArgs()) {
> @@ -2286,144 +2196,145 @@ DEF_TRAVERSE_STMT(UnresolvedMemberExpr,
> DEF_TRAVERSE_STMT(MSPropertyRefExpr, {})
> DEF_TRAVERSE_STMT(SEHTryStmt, {})
> DEF_TRAVERSE_STMT(SEHExceptStmt, {})
> -DEF_TRAVERSE_STMT(SEHFinallyStmt,{})
> -DEF_TRAVERSE_STMT(CapturedStmt, {
> - TRY_TO(TraverseDecl(S->getCapturedDecl()));
> -})
> +DEF_TRAVERSE_STMT(SEHFinallyStmt, {})
> +DEF_TRAVERSE_STMT(CapturedStmt, {
> TRY_TO(TraverseDecl(S->getCapturedDecl())); })
>
> -DEF_TRAVERSE_STMT(CXXOperatorCallExpr, { })
> -DEF_TRAVERSE_STMT(OpaqueValueExpr, { })
> -DEF_TRAVERSE_STMT(CUDAKernelCallExpr, { })
> +DEF_TRAVERSE_STMT(CXXOperatorCallExpr, {})
> +DEF_TRAVERSE_STMT(OpaqueValueExpr, {})
> +DEF_TRAVERSE_STMT(CUDAKernelCallExpr, {})
>
> // These operators (all of them) do not need any action except
> // iterating over the children.
> -DEF_TRAVERSE_STMT(BinaryConditionalOperator, { })
> -DEF_TRAVERSE_STMT(ConditionalOperator, { })
> -DEF_TRAVERSE_STMT(UnaryOperator, { })
> -DEF_TRAVERSE_STMT(BinaryOperator, { })
> -DEF_TRAVERSE_STMT(CompoundAssignOperator, { })
> -DEF_TRAVERSE_STMT(CXXNoexceptExpr, { })
> -DEF_TRAVERSE_STMT(PackExpansionExpr, { })
> -DEF_TRAVERSE_STMT(SizeOfPackExpr, { })
> -DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmPackExpr, { })
> -DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmExpr, { })
> -DEF_TRAVERSE_STMT(FunctionParmPackExpr, { })
> -DEF_TRAVERSE_STMT(MaterializeTemporaryExpr, { })
> -DEF_TRAVERSE_STMT(AtomicExpr, { })
> +DEF_TRAVERSE_STMT(BinaryConditionalOperator, {})
> +DEF_TRAVERSE_STMT(ConditionalOperator, {})
> +DEF_TRAVERSE_STMT(UnaryOperator, {})
> +DEF_TRAVERSE_STMT(BinaryOperator, {})
> +DEF_TRAVERSE_STMT(CompoundAssignOperator, {})
> +DEF_TRAVERSE_STMT(CXXNoexceptExpr, {})
> +DEF_TRAVERSE_STMT(PackExpansionExpr, {})
> +DEF_TRAVERSE_STMT(SizeOfPackExpr, {})
> +DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmPackExpr, {})
> +DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmExpr, {})
> +DEF_TRAVERSE_STMT(FunctionParmPackExpr, {})
> +DEF_TRAVERSE_STMT(MaterializeTemporaryExpr, {})
> +DEF_TRAVERSE_STMT(AtomicExpr, {})
>
> // These literals (all of them) do not need any action.
> -DEF_TRAVERSE_STMT(IntegerLiteral, { })
> -DEF_TRAVERSE_STMT(CharacterLiteral, { })
> -DEF_TRAVERSE_STMT(FloatingLiteral, { })
> -DEF_TRAVERSE_STMT(ImaginaryLiteral, { })
> -DEF_TRAVERSE_STMT(StringLiteral, { })
> -DEF_TRAVERSE_STMT(ObjCStringLiteral, { })
> -DEF_TRAVERSE_STMT(ObjCBoxedExpr, { })
> -DEF_TRAVERSE_STMT(ObjCArrayLiteral, { })
> -DEF_TRAVERSE_STMT(ObjCDictionaryLiteral, { })
> -
> +DEF_TRAVERSE_STMT(IntegerLiteral, {})
> +DEF_TRAVERSE_STMT(CharacterLiteral, {})
> +DEF_TRAVERSE_STMT(FloatingLiteral, {})
> +DEF_TRAVERSE_STMT(ImaginaryLiteral, {})
> +DEF_TRAVERSE_STMT(StringLiteral, {})
> +DEF_TRAVERSE_STMT(ObjCStringLiteral, {})
> +DEF_TRAVERSE_STMT(ObjCBoxedExpr, {})
> +DEF_TRAVERSE_STMT(ObjCArrayLiteral, {})
> +DEF_TRAVERSE_STMT(ObjCDictionaryLiteral, {})
> +
> // Traverse OpenCL: AsType, Convert.
> -DEF_TRAVERSE_STMT(AsTypeExpr, { })
> +DEF_TRAVERSE_STMT(AsTypeExpr, {})
>
> // OpenMP directives.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseOMPExecutableDirective(
> - OMPExecutableDirective *S)
> {
> + OMPExecutableDirective *S) {
> ArrayRef<OMPClause *> Clauses = S->clauses();
> for (ArrayRef<OMPClause *>::iterator I = Clauses.begin(), E =
> Clauses.end();
> I != E; ++I)
> - if (!TraverseOMPClause(*I)) return false;
> + if (!TraverseOMPClause(*I))
> + return false;
> return true;
> }
>
> DEF_TRAVERSE_STMT(OMPParallelDirective, {
> - if (!TraverseOMPExecutableDirective(S)) return false;
> + if (!TraverseOMPExecutableDirective(S))
> + return false;
> })
>
> DEF_TRAVERSE_STMT(OMPSimdDirective, {
> - if (!TraverseOMPExecutableDirective(S)) return false;
> + if (!TraverseOMPExecutableDirective(S))
> + return false;
> })
>
> // OpenMP clauses.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {
> - if (!C) return true;
> + if (!C)
> + return true;
> switch (C->getClauseKind()) {
> -#define OPENMP_CLAUSE(Name, Class) \
> - case OMPC_##Name: \
> - return getDerived().Visit##Class(static_cast<Class*>(C));
> +#define OPENMP_CLAUSE(Name, Class)
> \
> + case OMPC_##Name:
> \
> + return getDerived().Visit##Class(static_cast<Class *>(C));
> #include "clang/Basic/OpenMPKinds.def"
> - default: break;
> + default:
> + break;
> }
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPIfClause(OMPIfClause *C) {
> TraverseStmt(C->getCondition());
> return true;
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::VisitOMPNumThreadsClause(
> - OMPNumThreadsClause
> *C) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::VisitOMPNumThreadsClause(OMPNumThreadsClause
> *C) {
> TraverseStmt(C->getNumThreads());
> return true;
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::VisitOMPSafelenClause(
> - OMPSafelenClause *C) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::VisitOMPSafelenClause(OMPSafelenClause
> *C) {
> TraverseStmt(C->getSafelen());
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPDefaultClause(OMPDefaultClause
> *C) {
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool
> RecursiveASTVisitor<Derived>::VisitOMPProcBindClause(OMPProcBindClause
> *C) {
> return true;
> }
>
> -template<typename Derived>
> -template<typename T>
> +template <typename Derived>
> +template <typename T>
> void RecursiveASTVisitor<Derived>::VisitOMPClauseList(T *Node) {
> for (auto *I : Node->varlists())
> TraverseStmt(I);
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPPrivateClause(OMPPrivateClause
> *C) {
> VisitOMPClauseList(C);
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPFirstprivateClause(
> - OMPFirstprivateClause
> *C) {
> + OMPFirstprivateClause *C) {
> VisitOMPClauseList(C);
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPSharedClause(OMPSharedClause
> *C) {
> VisitOMPClauseList(C);
> return true;
> }
>
> -template<typename Derived>
> -bool
> -RecursiveASTVisitor<Derived>::VisitOMPLinearClause(OMPLinearClause *C) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::VisitOMPLinearClause(OMPLinearClause
> *C) {
> VisitOMPClauseList(C);
> TraverseStmt(C->getStep());
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPCopyinClause(OMPCopyinClause
> *C) {
> VisitOMPClauseList(C);
> return true;
>
> Modified: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=209092&r1=209091&r2=209092&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)
> +++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Sun May 18 13:38:19
> 2014
> @@ -38,34 +38,24 @@
> // using them is responsible for defining macro OPERATOR().
>
> // All unary operators.
> -#define UNARYOP_LIST() \
> - OPERATOR(PostInc) OPERATOR(PostDec) \
> - OPERATOR(PreInc) OPERATOR(PreDec) \
> - OPERATOR(AddrOf) OPERATOR(Deref) \
> - OPERATOR(Plus) OPERATOR(Minus) \
> - OPERATOR(Not) OPERATOR(LNot) \
> - OPERATOR(Real) OPERATOR(Imag) \
> - OPERATOR(Extension)
> +#define UNARYOP_LIST()
> \
> + OPERATOR(PostInc) OPERATOR(PostDec) OPERATOR(PreInc) OPERATOR(PreDec)
> \
> + OPERATOR(AddrOf) OPERATOR(Deref) OPERATOR(Plus) OPERATOR(Minus)
> \
> + OPERATOR(Not) OPERATOR(LNot) OPERATOR(Real) OPERATOR(Imag)
> \
> + OPERATOR(Extension)
>
> // All binary operators (excluding compound assign operators).
> -#define BINOP_LIST() \
> - OPERATOR(PtrMemD) OPERATOR(PtrMemI) \
> - OPERATOR(Mul) OPERATOR(Div) OPERATOR(Rem) \
> - OPERATOR(Add) OPERATOR(Sub) OPERATOR(Shl) \
> - OPERATOR(Shr) \
> - \
> - OPERATOR(LT) OPERATOR(GT) OPERATOR(LE) \
> - OPERATOR(GE) OPERATOR(EQ) OPERATOR(NE) \
> - OPERATOR(And) OPERATOR(Xor) OPERATOR(Or) \
> - OPERATOR(LAnd) OPERATOR(LOr) \
> - \
> - OPERATOR(Assign) \
> - OPERATOR(Comma)
> +#define BINOP_LIST()
> \
> + OPERATOR(PtrMemD) OPERATOR(PtrMemI) OPERATOR(Mul) OPERATOR(Div)
> \
> + OPERATOR(Rem) OPERATOR(Add) OPERATOR(Sub) OPERATOR(Shl)
> OPERATOR(Shr) \
> + OPERATOR(LT) OPERATOR(GT) OPERATOR(LE) OPERATOR(GE) OPERATOR(EQ)
> \
> + OPERATOR(NE) OPERATOR(And) OPERATOR(Xor) OPERATOR(Or)
> OPERATOR(LAnd) \
> + OPERATOR(LOr) OPERATOR(Assign) OPERATOR(Comma)
>
> // All compound assign operators.
> -#define CAO_LIST() \
> - OPERATOR(Mul) OPERATOR(Div) OPERATOR(Rem) OPERATOR(Add) OPERATOR(Sub) \
> - OPERATOR(Shl) OPERATOR(Shr) OPERATOR(And) OPERATOR(Or) OPERATOR(Xor)
> +#define CAO_LIST()
> \
> + OPERATOR(Mul) OPERATOR(Div) OPERATOR(Rem) OPERATOR(Add) OPERATOR(Sub)
> \
> + OPERATOR(Shl) OPERATOR(Shr) OPERATOR(And) OPERATOR(Or) OPERATOR(Xor)
>
> namespace clang {
>
> @@ -73,8 +63,11 @@ namespace clang {
> // invokes CALL_EXPR, which must be a method call, on the derived
> // object (s.t. a user of RecursiveASTVisitor can override the method
> // in CALL_EXPR).
> -#define TRY_TO(CALL_EXPR) \
> - do { if (!getDerived().CALL_EXPR) return false; } while (0)
> +#define TRY_TO(CALL_EXPR)
> \
> + do {
> \
> + if (!getDerived().CALL_EXPR)
> \
> + return false;
> \
> + } while (0)
>
> /// \brief A class that does preorder depth-first traversal on the
> /// entire Clang AST and visits each node.
> @@ -137,11 +130,10 @@ namespace clang {
> /// to return true, in which case all known implicit and explicit
> /// instantiations will be visited at the same time as the pattern
> /// from which they were produced.
> -template<typename Derived>
> -class RecursiveASTVisitor {
> +template <typename Derived> class RecursiveASTVisitor {
> public:
> /// \brief Return a reference to the derived class.
> - Derived &getDerived() { return *static_cast<Derived*>(this); }
> + Derived &getDerived() { return *static_cast<Derived *>(this); }
>
> /// \brief Return whether this visitor should recurse into
> /// template instantiations.
> @@ -267,112 +259,109 @@ public:
> // \brief Visit an attribute.
> bool VisitAttr(Attr *A) { return true; }
>
> - // Declare Traverse* and empty Visit* for all Attr classes.
> +// Declare Traverse* and empty Visit* for all Attr classes.
> #define ATTR_VISITOR_DECLS_ONLY
> #include "clang/AST/AttrVisitor.inc"
> #undef ATTR_VISITOR_DECLS_ONLY
>
> - // ---- Methods on Stmts ----
> +// ---- Methods on Stmts ----
>
> - // Declare Traverse*() for all concrete Stmt classes.
> +// Declare Traverse*() for all concrete Stmt classes.
> #define ABSTRACT_STMT(STMT)
> -#define STMT(CLASS, PARENT) \
> - bool Traverse##CLASS(CLASS *S);
> +#define STMT(CLASS, PARENT) bool Traverse##CLASS(CLASS *S);
> #include "clang/AST/StmtNodes.inc"
> // The above header #undefs ABSTRACT_STMT and STMT upon exit.
>
> // Define WalkUpFrom*() and empty Visit*() for all Stmt classes.
> bool WalkUpFromStmt(Stmt *S) { return getDerived().VisitStmt(S); }
> bool VisitStmt(Stmt *S) { return true; }
> -#define STMT(CLASS, PARENT) \
> - bool WalkUpFrom##CLASS(CLASS *S) { \
> - TRY_TO(WalkUpFrom##PARENT(S)); \
> - TRY_TO(Visit##CLASS(S)); \
> - return true; \
> - } \
> +#define STMT(CLASS, PARENT)
> \
> + bool WalkUpFrom##CLASS(CLASS *S) {
> \
> + TRY_TO(WalkUpFrom##PARENT(S));
> \
> + TRY_TO(Visit##CLASS(S));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS(CLASS *S) { return true; }
> #include "clang/AST/StmtNodes.inc"
>
> - // Define Traverse*(), WalkUpFrom*(), and Visit*() for unary
> - // operator methods. Unary operators are not classes in themselves
> - // (they're all opcodes in UnaryOperator) but do have visitors.
> -#define OPERATOR(NAME) \
> - bool TraverseUnary##NAME(UnaryOperator *S) { \
> - TRY_TO(WalkUpFromUnary##NAME(S)); \
> - TRY_TO(TraverseStmt(S->getSubExpr())); \
> - return true; \
> - } \
> - bool WalkUpFromUnary##NAME(UnaryOperator *S) { \
> - TRY_TO(WalkUpFromUnaryOperator(S)); \
> - TRY_TO(VisitUnary##NAME(S)); \
> - return true; \
> - } \
> +// Define Traverse*(), WalkUpFrom*(), and Visit*() for unary
> +// operator methods. Unary operators are not classes in themselves
> +// (they're all opcodes in UnaryOperator) but do have visitors.
> +#define OPERATOR(NAME)
> \
> + bool TraverseUnary##NAME(UnaryOperator *S) {
> \
> + TRY_TO(WalkUpFromUnary##NAME(S));
> \
> + TRY_TO(TraverseStmt(S->getSubExpr()));
> \
> + return true;
> \
> + }
> \
> + bool WalkUpFromUnary##NAME(UnaryOperator *S) {
> \
> + TRY_TO(WalkUpFromUnaryOperator(S));
> \
> + TRY_TO(VisitUnary##NAME(S));
> \
> + return true;
> \
> + }
> \
> bool VisitUnary##NAME(UnaryOperator *S) { return true; }
>
> UNARYOP_LIST()
> #undef OPERATOR
>
> - // Define Traverse*(), WalkUpFrom*(), and Visit*() for binary
> - // operator methods. Binary operators are not classes in themselves
> - // (they're all opcodes in BinaryOperator) but do have visitors.
> -#define GENERAL_BINOP_FALLBACK(NAME, BINOP_TYPE) \
> - bool TraverseBin##NAME(BINOP_TYPE *S) { \
> - TRY_TO(WalkUpFromBin##NAME(S)); \
> - TRY_TO(TraverseStmt(S->getLHS())); \
> - TRY_TO(TraverseStmt(S->getRHS())); \
> - return true; \
> - } \
> - bool WalkUpFromBin##NAME(BINOP_TYPE *S) { \
> - TRY_TO(WalkUpFrom##BINOP_TYPE(S)); \
> - TRY_TO(VisitBin##NAME(S)); \
> - return true; \
> - } \
> +// Define Traverse*(), WalkUpFrom*(), and Visit*() for binary
> +// operator methods. Binary operators are not classes in themselves
> +// (they're all opcodes in BinaryOperator) but do have visitors.
> +#define GENERAL_BINOP_FALLBACK(NAME, BINOP_TYPE)
> \
> + bool TraverseBin##NAME(BINOP_TYPE *S) {
> \
> + TRY_TO(WalkUpFromBin##NAME(S));
> \
> + TRY_TO(TraverseStmt(S->getLHS()));
> \
> + TRY_TO(TraverseStmt(S->getRHS()));
> \
> + return true;
> \
> + }
> \
> + bool WalkUpFromBin##NAME(BINOP_TYPE *S) {
> \
> + TRY_TO(WalkUpFrom##BINOP_TYPE(S));
> \
> + TRY_TO(VisitBin##NAME(S));
> \
> + return true;
> \
> + }
> \
> bool VisitBin##NAME(BINOP_TYPE *S) { return true; }
>
> #define OPERATOR(NAME) GENERAL_BINOP_FALLBACK(NAME, BinaryOperator)
> BINOP_LIST()
> #undef OPERATOR
>
> - // Define Traverse*(), WalkUpFrom*(), and Visit*() for compound
> - // assignment methods. Compound assignment operators are not
> - // classes in themselves (they're all opcodes in
> - // CompoundAssignOperator) but do have visitors.
> -#define OPERATOR(NAME) \
> +// Define Traverse*(), WalkUpFrom*(), and Visit*() for compound
> +// assignment methods. Compound assignment operators are not
> +// classes in themselves (they're all opcodes in
> +// CompoundAssignOperator) but do have visitors.
> +#define OPERATOR(NAME)
> \
> GENERAL_BINOP_FALLBACK(NAME##Assign, CompoundAssignOperator)
>
> CAO_LIST()
> #undef OPERATOR
> #undef GENERAL_BINOP_FALLBACK
>
> - // ---- Methods on Types ----
> - // FIXME: revamp to take TypeLoc's rather than Types.
> +// ---- Methods on Types ----
> +// FIXME: revamp to take TypeLoc's rather than Types.
>
> - // Declare Traverse*() for all concrete Type classes.
> +// Declare Traverse*() for all concrete Type classes.
> #define ABSTRACT_TYPE(CLASS, BASE)
> -#define TYPE(CLASS, BASE) \
> - bool Traverse##CLASS##Type(CLASS##Type *T);
> +#define TYPE(CLASS, BASE) bool Traverse##CLASS##Type(CLASS##Type *T);
> #include "clang/AST/TypeNodes.def"
> // The above header #undefs ABSTRACT_TYPE and TYPE upon exit.
>
> // Define WalkUpFrom*() and empty Visit*() for all Type classes.
> bool WalkUpFromType(Type *T) { return getDerived().VisitType(T); }
> bool VisitType(Type *T) { return true; }
> -#define TYPE(CLASS, BASE) \
> - bool WalkUpFrom##CLASS##Type(CLASS##Type *T) { \
> - TRY_TO(WalkUpFrom##BASE(T)); \
> - TRY_TO(Visit##CLASS##Type(T)); \
> - return true; \
> - } \
> +#define TYPE(CLASS, BASE)
> \
> + bool WalkUpFrom##CLASS##Type(CLASS##Type *T) {
> \
> + TRY_TO(WalkUpFrom##BASE(T));
> \
> + TRY_TO(Visit##CLASS##Type(T));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS##Type(CLASS##Type *T) { return true; }
> #include "clang/AST/TypeNodes.def"
>
> - // ---- Methods on TypeLocs ----
> - // FIXME: this currently just calls the matching Type methods
> +// ---- Methods on TypeLocs ----
> +// FIXME: this currently just calls the matching Type methods
>
> - // Declare Traverse*() for all concrete TypeLoc classes.
> +// Declare Traverse*() for all concrete TypeLoc classes.
> #define ABSTRACT_TYPELOC(CLASS, BASE)
> -#define TYPELOC(CLASS, BASE) \
> - bool Traverse##CLASS##TypeLoc(CLASS##TypeLoc TL);
> +#define TYPELOC(CLASS, BASE) bool Traverse##CLASS##TypeLoc(CLASS##TypeLoc
> TL);
> #include "clang/AST/TypeLocNodes.def"
> // The above header #undefs ABSTRACT_TYPELOC and TYPELOC upon exit.
>
> @@ -391,34 +380,33 @@ public:
> }
> bool VisitUnqualTypeLoc(UnqualTypeLoc TL) { return true; }
>
> - // Note that BASE includes trailing 'Type' which CLASS doesn't.
> -#define TYPE(CLASS, BASE) \
> - bool WalkUpFrom##CLASS##TypeLoc(CLASS##TypeLoc TL) { \
> - TRY_TO(WalkUpFrom##BASE##Loc(TL)); \
> - TRY_TO(Visit##CLASS##TypeLoc(TL)); \
> - return true; \
> - } \
> +// Note that BASE includes trailing 'Type' which CLASS doesn't.
> +#define TYPE(CLASS, BASE)
> \
> + bool WalkUpFrom##CLASS##TypeLoc(CLASS##TypeLoc TL) {
> \
> + TRY_TO(WalkUpFrom##BASE##Loc(TL));
> \
> + TRY_TO(Visit##CLASS##TypeLoc(TL));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS##TypeLoc(CLASS##TypeLoc TL) { return true; }
> #include "clang/AST/TypeNodes.def"
>
> - // ---- Methods on Decls ----
> +// ---- Methods on Decls ----
>
> - // Declare Traverse*() for all concrete Decl classes.
> +// Declare Traverse*() for all concrete Decl classes.
> #define ABSTRACT_DECL(DECL)
> -#define DECL(CLASS, BASE) \
> - bool Traverse##CLASS##Decl(CLASS##Decl *D);
> +#define DECL(CLASS, BASE) bool Traverse##CLASS##Decl(CLASS##Decl *D);
> #include "clang/AST/DeclNodes.inc"
> // The above header #undefs ABSTRACT_DECL and DECL upon exit.
>
> // Define WalkUpFrom*() and empty Visit*() for all Decl classes.
> bool WalkUpFromDecl(Decl *D) { return getDerived().VisitDecl(D); }
> bool VisitDecl(Decl *D) { return true; }
> -#define DECL(CLASS, BASE) \
> - bool WalkUpFrom##CLASS##Decl(CLASS##Decl *D) { \
> - TRY_TO(WalkUpFrom##BASE(D)); \
> - TRY_TO(Visit##CLASS##Decl(D)); \
> - return true; \
> - } \
> +#define DECL(CLASS, BASE)
> \
> + bool WalkUpFrom##CLASS##Decl(CLASS##Decl *D) {
> \
> + TRY_TO(WalkUpFrom##BASE(D));
> \
> + TRY_TO(Visit##CLASS##Decl(D));
> \
> + return true;
> \
> + }
> \
> bool Visit##CLASS##Decl(CLASS##Decl *D) { return true; }
> #include "clang/AST/DeclNodes.inc"
>
> @@ -442,12 +430,10 @@ private:
> bool TraverseVarHelper(VarDecl *D);
> bool TraverseOMPClause(OMPClause *C);
> bool TraverseOMPExecutableDirective(OMPExecutableDirective *S);
> -#define OPENMP_CLAUSE(Name, Class) \
> - bool Visit##Class(Class *C);
> +#define OPENMP_CLAUSE(Name, Class) bool Visit##Class(Class *C);
> #include "clang/Basic/OpenMPKinds.def"
> /// \brief Process clauses with list of variables.
> - template <typename T>
> - void VisitOMPClauseList(T *Node);
> + template <typename T> void VisitOMPClauseList(T *Node);
>
> struct EnqueueJob {
> Stmt *S;
> @@ -459,7 +445,7 @@ private:
> bool dataTraverseNode(Stmt *S, bool &EnqueueChildren);
> };
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::dataTraverse(Stmt *S) {
>
> SmallVector<EnqueueJob, 16> Queue;
> @@ -476,7 +462,8 @@ bool RecursiveASTVisitor<Derived>::dataT
> if (getDerived().shouldUseDataRecursionFor(CurrS)) {
> if (job.StmtIt == Stmt::child_iterator()) {
> bool EnqueueChildren = true;
> - if (!dataTraverseNode(CurrS, EnqueueChildren)) return false;
> + if (!dataTraverseNode(CurrS, EnqueueChildren))
> + return false;
> if (!EnqueueChildren) {
> Queue.pop_back();
> continue;
> @@ -500,53 +487,57 @@ bool RecursiveASTVisitor<Derived>::dataT
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::dataTraverseNode(Stmt *S,
> bool
> &EnqueueChildren) {
>
> - // Dispatch to the corresponding WalkUpFrom* function only if the
> derived
> - // class didn't override Traverse* (and thus the traversal is trivial).
> -#define DISPATCH_WALK(NAME, CLASS, VAR) \
> - { \
> - bool (Derived::*DerivedFn)(CLASS*) = &Derived::Traverse##NAME; \
> - bool (Derived::*BaseFn)(CLASS*) =
> &RecursiveASTVisitor::Traverse##NAME; \
> - if (DerivedFn == BaseFn) \
> - return getDerived().WalkUpFrom##NAME(static_cast<CLASS*>(VAR)); \
> - } \
> - EnqueueChildren = false; \
> - return getDerived().Traverse##NAME(static_cast<CLASS*>(VAR));
> +// Dispatch to the corresponding WalkUpFrom* function only if the derived
> +// class didn't override Traverse* (and thus the traversal is trivial).
> +#define DISPATCH_WALK(NAME, CLASS, VAR)
> \
> + {
> \
> + bool (Derived::*DerivedFn)(CLASS *) = &Derived::Traverse##NAME;
> \
> + bool (Derived::*BaseFn)(CLASS *) =
> &RecursiveASTVisitor::Traverse##NAME; \
> + if (DerivedFn == BaseFn)
> \
> + return getDerived().WalkUpFrom##NAME(static_cast<CLASS *>(VAR));
> \
> + }
> \
> + EnqueueChildren = false;
> \
> + return getDerived().Traverse##NAME(static_cast<CLASS *>(VAR));
>
> if (BinaryOperator *BinOp = dyn_cast<BinaryOperator>(S)) {
> switch (BinOp->getOpcode()) {
> -#define OPERATOR(NAME) \
> - case BO_##NAME: DISPATCH_WALK(Bin##NAME, BinaryOperator, S);
> +#define OPERATOR(NAME)
> \
> + case BO_##NAME:
> \
> + DISPATCH_WALK(Bin##NAME, BinaryOperator, S);
>
> - BINOP_LIST()
> + BINOP_LIST()
> #undef OPERATOR
>
> -#define OPERATOR(NAME) \
> - case BO_##NAME##Assign: \
> +#define OPERATOR(NAME)
> \
> + case BO_##NAME##Assign:
> \
> DISPATCH_WALK(Bin##NAME##Assign, CompoundAssignOperator, S);
>
> - CAO_LIST()
> + CAO_LIST()
> #undef OPERATOR
> }
> } else if (UnaryOperator *UnOp = dyn_cast<UnaryOperator>(S)) {
> switch (UnOp->getOpcode()) {
> -#define OPERATOR(NAME) \
> - case UO_##NAME: DISPATCH_WALK(Unary##NAME, UnaryOperator, S);
> +#define OPERATOR(NAME)
> \
> + case UO_##NAME:
> \
> + DISPATCH_WALK(Unary##NAME, UnaryOperator, S);
>
> - UNARYOP_LIST()
> + UNARYOP_LIST()
> #undef OPERATOR
> }
> }
>
> // Top switch stmt: dispatch to TraverseFooStmt for each concrete
> FooStmt.
> switch (S->getStmtClass()) {
> - case Stmt::NoStmtClass: break;
> + case Stmt::NoStmtClass:
> + break;
> #define ABSTRACT_STMT(STMT)
> -#define STMT(CLASS, PARENT) \
> - case Stmt::CLASS##Class: DISPATCH_WALK(CLASS, CLASS, S);
> +#define STMT(CLASS, PARENT)
> \
> + case Stmt::CLASS##Class:
> \
> + DISPATCH_WALK(CLASS, CLASS, S);
> #include "clang/AST/StmtNodes.inc"
> }
>
> @@ -555,10 +546,10 @@ bool RecursiveASTVisitor<Derived>::dataT
> return true;
> }
>
> -#define DISPATCH(NAME, CLASS, VAR) \
> - return getDerived().Traverse##NAME(static_cast<CLASS*>(VAR))
> +#define DISPATCH(NAME, CLASS, VAR)
> \
> + return getDerived().Traverse##NAME(static_cast<CLASS *>(VAR))
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseStmt(Stmt *S) {
> if (!S)
> return true;
> @@ -571,27 +562,29 @@ bool RecursiveASTVisitor<Derived>::Trave
> // below.
> if (BinaryOperator *BinOp = dyn_cast<BinaryOperator>(S)) {
> switch (BinOp->getOpcode()) {
> -#define OPERATOR(NAME) \
> - case BO_##NAME: DISPATCH(Bin##NAME, BinaryOperator, S);
> +#define OPERATOR(NAME)
> \
> + case BO_##NAME:
> \
> + DISPATCH(Bin##NAME, BinaryOperator, S);
>
> - BINOP_LIST()
> + BINOP_LIST()
> #undef OPERATOR
> #undef BINOP_LIST
>
> -#define OPERATOR(NAME) \
> - case BO_##NAME##Assign: \
> - DISPATCH(Bin##NAME##Assign, CompoundAssignOperator, S);
> +#define OPERATOR(NAME)
> \
> + case BO_##NAME##Assign:
> \
> + DISPATCH(Bin##NAME##Assign, CompoundAssignOperator, S);
>
> - CAO_LIST()
> + CAO_LIST()
> #undef OPERATOR
> #undef CAO_LIST
> }
> } else if (UnaryOperator *UnOp = dyn_cast<UnaryOperator>(S)) {
> switch (UnOp->getOpcode()) {
> -#define OPERATOR(NAME) \
> - case UO_##NAME: DISPATCH(Unary##NAME, UnaryOperator, S);
> +#define OPERATOR(NAME)
> \
> + case UO_##NAME:
> \
> + DISPATCH(Unary##NAME, UnaryOperator, S);
>
> - UNARYOP_LIST()
> + UNARYOP_LIST()
> #undef OPERATOR
> #undef UNARYOP_LIST
> }
> @@ -599,41 +592,43 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> // Top switch stmt: dispatch to TraverseFooStmt for each concrete
> FooStmt.
> switch (S->getStmtClass()) {
> - case Stmt::NoStmtClass: break;
> + case Stmt::NoStmtClass:
> + break;
> #define ABSTRACT_STMT(STMT)
> -#define STMT(CLASS, PARENT) \
> - case Stmt::CLASS##Class: DISPATCH(CLASS, CLASS, S);
> +#define STMT(CLASS, PARENT)
> \
> + case Stmt::CLASS##Class:
> \
> + DISPATCH(CLASS, CLASS, S);
> #include "clang/AST/StmtNodes.inc"
> }
>
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseType(QualType T) {
> if (T.isNull())
> return true;
>
> switch (T->getTypeClass()) {
> #define ABSTRACT_TYPE(CLASS, BASE)
> -#define TYPE(CLASS, BASE) \
> - case Type::CLASS: DISPATCH(CLASS##Type, CLASS##Type, \
> - const_cast<Type*>(T.getTypePtr()));
> +#define TYPE(CLASS, BASE)
> \
> + case Type::CLASS:
> \
> + DISPATCH(CLASS##Type, CLASS##Type, const_cast<Type
> *>(T.getTypePtr()));
> #include "clang/AST/TypeNodes.def"
> }
>
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTypeLoc(TypeLoc TL) {
> if (TL.isNull())
> return true;
>
> switch (TL.getTypeLocClass()) {
> #define ABSTRACT_TYPELOC(CLASS, BASE)
> -#define TYPELOC(CLASS, BASE) \
> - case TypeLoc::CLASS: \
> +#define TYPELOC(CLASS, BASE)
> \
> + case TypeLoc::CLASS:
> \
> return
> getDerived().Traverse##CLASS##TypeLoc(TL.castAs<CLASS##TypeLoc>());
> #include "clang/AST/TypeLocNodes.def"
> }
> @@ -641,14 +636,12 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -
> // Define the Traverse*Attr(Attr* A) methods
> #define VISITORCLASS RecursiveASTVisitor
> #include "clang/AST/AttrVisitor.inc"
> #undef VISITORCLASS
>
> -
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseDecl(Decl *D) {
> if (!D)
> return true;
> @@ -660,10 +653,10 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> switch (D->getKind()) {
> #define ABSTRACT_DECL(DECL)
> -#define DECL(CLASS, BASE) \
> - case Decl::CLASS: \
> - if
> (!getDerived().Traverse##CLASS##Decl(static_cast<CLASS##Decl*>(D))) \
> - return false; \
> +#define DECL(CLASS, BASE)
> \
> + case Decl::CLASS:
> \
> + if (!getDerived().Traverse##CLASS##Decl(static_cast<CLASS##Decl
> *>(D))) \
> + return false;
> \
> break;
> #include "clang/AST/DeclNodes.inc"
> }
> @@ -678,9 +671,9 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> #undef DISPATCH
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseNestedNameSpecifier(
> - NestedNameSpecifier
> *NNS) {
> + NestedNameSpecifier *NNS) {
> if (!NNS)
> return true;
>
> @@ -702,14 +695,14 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseNestedNameSpecifierLoc(
> - NestedNameSpecifierLoc
> NNS) {
> + NestedNameSpecifierLoc NNS) {
> if (!NNS)
> return true;
>
> - if (NestedNameSpecifierLoc Prefix = NNS.getPrefix())
> - TRY_TO(TraverseNestedNameSpecifierLoc(Prefix));
> + if (NestedNameSpecifierLoc Prefix = NNS.getPrefix())
> + TRY_TO(TraverseNestedNameSpecifierLoc(Prefix));
>
> switch (NNS.getNestedNameSpecifier()->getKind()) {
> case NestedNameSpecifier::Identifier:
> @@ -727,9 +720,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseDeclarationNameInfo(
> - DeclarationNameInfo
> NameInfo) {
> + DeclarationNameInfo NameInfo) {
> switch (NameInfo.getName().getNameKind()) {
> case DeclarationName::CXXConstructorName:
> case DeclarationName::CXXDestructorName:
> @@ -752,7 +745,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateName(TemplateName
> Template) {
> if (DependentTemplateName *DTN = Template.getAsDependentTemplateName())
> TRY_TO(TraverseNestedNameSpecifier(DTN->getQualifier()));
> @@ -762,9 +755,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArgument(
> - const TemplateArgument
> &Arg) {
> + const TemplateArgument &Arg) {
> switch (Arg.getKind()) {
> case TemplateArgument::Null:
> case TemplateArgument::Declaration:
> @@ -778,7 +771,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> case TemplateArgument::Template:
> case TemplateArgument::TemplateExpansion:
> return getDerived().TraverseTemplateName(
> -
> Arg.getAsTemplateOrTemplatePattern());
> + Arg.getAsTemplateOrTemplatePattern());
>
> case TemplateArgument::Expression:
> return getDerived().TraverseStmt(Arg.getAsExpr());
> @@ -793,9 +786,9 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> // FIXME: no template name location?
> // FIXME: no source locations for a template argument pack?
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArgumentLoc(
> - const TemplateArgumentLoc
> &ArgLoc) {
> + const TemplateArgumentLoc &ArgLoc) {
> const TemplateArgument &Arg = ArgLoc.getArgument();
>
> switch (Arg.getKind()) {
> @@ -817,9 +810,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> case TemplateArgument::TemplateExpansion:
> if (ArgLoc.getTemplateQualifierLoc())
> TRY_TO(getDerived().TraverseNestedNameSpecifierLoc(
> -
> ArgLoc.getTemplateQualifierLoc()));
> + ArgLoc.getTemplateQualifierLoc()));
> return getDerived().TraverseTemplateName(
> -
> Arg.getAsTemplateOrTemplatePattern());
> + Arg.getAsTemplateOrTemplatePattern());
>
> case TemplateArgument::Expression:
> return getDerived().TraverseStmt(ArgLoc.getSourceExpression());
> @@ -832,10 +825,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateArguments(
> - const TemplateArgument
> *Args,
> - unsigned
> NumArgs) {
> + const TemplateArgument *Args, unsigned NumArgs) {
> for (unsigned I = 0; I != NumArgs; ++I) {
> TRY_TO(TraverseTemplateArgument(Args[I]));
> }
> @@ -843,9 +835,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseConstructorInitializer(
> - CXXCtorInitializer
> *Init) {
> + CXXCtorInitializer *Init) {
> if (TypeSourceInfo *TInfo = Init->getTypeSourceInfo())
> TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
>
> @@ -854,99 +846,82 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseLambdaCapture(
> - LambdaExpr *LE, const LambdaCapture *C) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::TraverseLambdaCapture(LambdaExpr *LE,
> + const LambdaCapture
> *C) {
> if (C->isInitCapture())
> TRY_TO(TraverseDecl(C->getCapturedVar()));
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseLambdaBody(LambdaExpr *LE) {
> TRY_TO(TraverseStmt(LE->getBody()));
> return true;
> }
>
> -
> // ----------------- Type traversal -----------------
>
> // This macro makes available a variable T, the passed-in type.
> -#define DEF_TRAVERSE_TYPE(TYPE, CODE) \
> - template<typename Derived> \
> - bool RecursiveASTVisitor<Derived>::Traverse##TYPE (TYPE *T) { \
> - TRY_TO(WalkUpFrom##TYPE (T)); \
> - { CODE; } \
> - return true; \
> +#define DEF_TRAVERSE_TYPE(TYPE, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##TYPE(TYPE *T) {
> \
> + TRY_TO(WalkUpFrom##TYPE(T));
> \
> + { CODE; }
> \
> + return true;
> \
> }
>
> -DEF_TRAVERSE_TYPE(BuiltinType, { })
> +DEF_TRAVERSE_TYPE(BuiltinType, {})
>
> -DEF_TRAVERSE_TYPE(ComplexType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> +DEF_TRAVERSE_TYPE(ComplexType, {
> TRY_TO(TraverseType(T->getElementType())); })
>
> -DEF_TRAVERSE_TYPE(PointerType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> +DEF_TRAVERSE_TYPE(PointerType, {
> TRY_TO(TraverseType(T->getPointeeType())); })
>
> -DEF_TRAVERSE_TYPE(BlockPointerType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> +DEF_TRAVERSE_TYPE(BlockPointerType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
>
> -DEF_TRAVERSE_TYPE(LValueReferenceType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> +DEF_TRAVERSE_TYPE(LValueReferenceType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
>
> -DEF_TRAVERSE_TYPE(RValueReferenceType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> +DEF_TRAVERSE_TYPE(RValueReferenceType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
>
> DEF_TRAVERSE_TYPE(MemberPointerType, {
> - TRY_TO(TraverseType(QualType(T->getClass(), 0)));
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> + TRY_TO(TraverseType(QualType(T->getClass(), 0)));
> + TRY_TO(TraverseType(T->getPointeeType()));
> +})
>
> -DEF_TRAVERSE_TYPE(AdjustedType, {
> - TRY_TO(TraverseType(T->getOriginalType()));
> - })
> +DEF_TRAVERSE_TYPE(AdjustedType, {
> TRY_TO(TraverseType(T->getOriginalType())); })
>
> -DEF_TRAVERSE_TYPE(DecayedType, {
> - TRY_TO(TraverseType(T->getOriginalType()));
> - })
> +DEF_TRAVERSE_TYPE(DecayedType, {
> TRY_TO(TraverseType(T->getOriginalType())); })
>
> -DEF_TRAVERSE_TYPE(ConstantArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> +DEF_TRAVERSE_TYPE(ConstantArrayType,
> + { TRY_TO(TraverseType(T->getElementType())); })
>
> -DEF_TRAVERSE_TYPE(IncompleteArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> +DEF_TRAVERSE_TYPE(IncompleteArrayType,
> + { TRY_TO(TraverseType(T->getElementType())); })
>
> DEF_TRAVERSE_TYPE(VariableArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - TRY_TO(TraverseStmt(T->getSizeExpr()));
> - })
> + TRY_TO(TraverseType(T->getElementType()));
> + TRY_TO(TraverseStmt(T->getSizeExpr()));
> +})
>
> DEF_TRAVERSE_TYPE(DependentSizedArrayType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - if (T->getSizeExpr())
> - TRY_TO(TraverseStmt(T->getSizeExpr()));
> - })
> + TRY_TO(TraverseType(T->getElementType()));
> + if (T->getSizeExpr())
> + TRY_TO(TraverseStmt(T->getSizeExpr()));
> +})
>
> DEF_TRAVERSE_TYPE(DependentSizedExtVectorType, {
> - if (T->getSizeExpr())
> - TRY_TO(TraverseStmt(T->getSizeExpr()));
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> + if (T->getSizeExpr())
> + TRY_TO(TraverseStmt(T->getSizeExpr()));
> + TRY_TO(TraverseType(T->getElementType()));
> +})
>
> -DEF_TRAVERSE_TYPE(VectorType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> +DEF_TRAVERSE_TYPE(VectorType, {
> TRY_TO(TraverseType(T->getElementType())); })
>
> -DEF_TRAVERSE_TYPE(ExtVectorType, {
> - TRY_TO(TraverseType(T->getElementType()));
> - })
> +DEF_TRAVERSE_TYPE(ExtVectorType, {
> TRY_TO(TraverseType(T->getElementType())); })
>
> DEF_TRAVERSE_TYPE(FunctionNoProtoType,
> { TRY_TO(TraverseType(T->getReturnType())); })
> @@ -963,87 +938,72 @@ DEF_TRAVERSE_TYPE(FunctionProtoType, {
> }
> })
>
> -DEF_TRAVERSE_TYPE(UnresolvedUsingType, { })
> -DEF_TRAVERSE_TYPE(TypedefType, { })
> +DEF_TRAVERSE_TYPE(UnresolvedUsingType, {})
> +DEF_TRAVERSE_TYPE(TypedefType, {})
>
> -DEF_TRAVERSE_TYPE(TypeOfExprType, {
> - TRY_TO(TraverseStmt(T->getUnderlyingExpr()));
> - })
> +DEF_TRAVERSE_TYPE(TypeOfExprType,
> + { TRY_TO(TraverseStmt(T->getUnderlyingExpr())); })
>
> -DEF_TRAVERSE_TYPE(TypeOfType, {
> - TRY_TO(TraverseType(T->getUnderlyingType()));
> - })
> +DEF_TRAVERSE_TYPE(TypeOfType, {
> TRY_TO(TraverseType(T->getUnderlyingType())); })
>
> -DEF_TRAVERSE_TYPE(DecltypeType, {
> - TRY_TO(TraverseStmt(T->getUnderlyingExpr()));
> - })
> +DEF_TRAVERSE_TYPE(DecltypeType,
> + { TRY_TO(TraverseStmt(T->getUnderlyingExpr())); })
>
> DEF_TRAVERSE_TYPE(UnaryTransformType, {
> - TRY_TO(TraverseType(T->getBaseType()));
> - TRY_TO(TraverseType(T->getUnderlyingType()));
> - })
> + TRY_TO(TraverseType(T->getBaseType()));
> + TRY_TO(TraverseType(T->getUnderlyingType()));
> +})
>
> -DEF_TRAVERSE_TYPE(AutoType, {
> - TRY_TO(TraverseType(T->getDeducedType()));
> - })
> +DEF_TRAVERSE_TYPE(AutoType, { TRY_TO(TraverseType(T->getDeducedType()));
> })
>
> -DEF_TRAVERSE_TYPE(RecordType, { })
> -DEF_TRAVERSE_TYPE(EnumType, { })
> -DEF_TRAVERSE_TYPE(TemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPE(SubstTemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPE(SubstTemplateTypeParmPackType, { })
> +DEF_TRAVERSE_TYPE(RecordType, {})
> +DEF_TRAVERSE_TYPE(EnumType, {})
> +DEF_TRAVERSE_TYPE(TemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPE(SubstTemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPE(SubstTemplateTypeParmPackType, {})
>
> DEF_TRAVERSE_TYPE(TemplateSpecializationType, {
> - TRY_TO(TraverseTemplateName(T->getTemplateName()));
> - TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> - })
> + TRY_TO(TraverseTemplateName(T->getTemplateName()));
> + TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> +})
>
> -DEF_TRAVERSE_TYPE(InjectedClassNameType, { })
> +DEF_TRAVERSE_TYPE(InjectedClassNameType, {})
>
> -DEF_TRAVERSE_TYPE(AttributedType, {
> - TRY_TO(TraverseType(T->getModifiedType()));
> - })
> +DEF_TRAVERSE_TYPE(AttributedType,
> + { TRY_TO(TraverseType(T->getModifiedType())); })
>
> -DEF_TRAVERSE_TYPE(ParenType, {
> - TRY_TO(TraverseType(T->getInnerType()));
> - })
> +DEF_TRAVERSE_TYPE(ParenType, { TRY_TO(TraverseType(T->getInnerType())); })
>
> DEF_TRAVERSE_TYPE(ElaboratedType, {
> - if (T->getQualifier()) {
> - TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> - }
> - TRY_TO(TraverseType(T->getNamedType()));
> - })
> -
> -DEF_TRAVERSE_TYPE(DependentNameType, {
> + if (T->getQualifier()) {
> TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> - })
> + }
> + TRY_TO(TraverseType(T->getNamedType()));
> +})
> +
> +DEF_TRAVERSE_TYPE(DependentNameType,
> + {
> TRY_TO(TraverseNestedNameSpecifier(T->getQualifier())); })
>
> DEF_TRAVERSE_TYPE(DependentTemplateSpecializationType, {
> - TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> - TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> - })
> + TRY_TO(TraverseNestedNameSpecifier(T->getQualifier()));
> + TRY_TO(TraverseTemplateArguments(T->getArgs(), T->getNumArgs()));
> +})
>
> -DEF_TRAVERSE_TYPE(PackExpansionType, {
> - TRY_TO(TraverseType(T->getPattern()));
> - })
> +DEF_TRAVERSE_TYPE(PackExpansionType, {
> TRY_TO(TraverseType(T->getPattern())); })
>
> -DEF_TRAVERSE_TYPE(ObjCInterfaceType, { })
> +DEF_TRAVERSE_TYPE(ObjCInterfaceType, {})
>
> DEF_TRAVERSE_TYPE(ObjCObjectType, {
> - // We have to watch out here because an ObjCInterfaceType's base
> - // type is itself.
> - if (T->getBaseType().getTypePtr() != T)
> - TRY_TO(TraverseType(T->getBaseType()));
> - })
> + // We have to watch out here because an ObjCInterfaceType's base
> + // type is itself.
> + if (T->getBaseType().getTypePtr() != T)
> + TRY_TO(TraverseType(T->getBaseType()));
> +})
>
> -DEF_TRAVERSE_TYPE(ObjCObjectPointerType, {
> - TRY_TO(TraverseType(T->getPointeeType()));
> - })
> +DEF_TRAVERSE_TYPE(ObjCObjectPointerType,
> + { TRY_TO(TraverseType(T->getPointeeType())); })
>
> -DEF_TRAVERSE_TYPE(AtomicType, {
> - TRY_TO(TraverseType(T->getValueType()));
> - })
> +DEF_TRAVERSE_TYPE(AtomicType, { TRY_TO(TraverseType(T->getValueType()));
> })
>
> #undef DEF_TRAVERSE_TYPE
>
> @@ -1054,19 +1014,19 @@ DEF_TRAVERSE_TYPE(AtomicType, {
> // in addition to WalkUpFrom* for the TypeLoc itself, such that existing
> // clients that override the WalkUpFrom*Type() and/or Visit*Type() methods
> // continue to work.
> -#define DEF_TRAVERSE_TYPELOC(TYPE, CODE) \
> - template<typename Derived> \
> - bool RecursiveASTVisitor<Derived>::Traverse##TYPE##Loc(TYPE##Loc TL) { \
> - if (getDerived().shouldWalkTypesOfTypeLocs()) \
> - TRY_TO(WalkUpFrom##TYPE(const_cast<TYPE*>(TL.getTypePtr()))); \
> - TRY_TO(WalkUpFrom##TYPE##Loc(TL)); \
> - { CODE; } \
> - return true; \
> +#define DEF_TRAVERSE_TYPELOC(TYPE, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##TYPE##Loc(TYPE##Loc TL) {
> \
> + if (getDerived().shouldWalkTypesOfTypeLocs())
> \
> + TRY_TO(WalkUpFrom##TYPE(const_cast<TYPE *>(TL.getTypePtr())));
> \
> + TRY_TO(WalkUpFrom##TYPE##Loc(TL));
> \
> + { CODE; }
> \
> + return true;
> \
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseQualifiedTypeLoc(
> - QualifiedTypeLoc TL) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::TraverseQualifiedTypeLoc(QualifiedTypeLoc
> TL) {
> // Move this over to the 'main' typeloc tree. Note that this is a
> // move -- we pretend that we were really looking at the unqualified
> // typeloc all along -- rather than a recursion, so we don't follow
> @@ -1085,46 +1045,40 @@ bool RecursiveASTVisitor<Derived>::Trave
> return TraverseTypeLoc(TL.getUnqualifiedLoc());
> }
>
> -DEF_TRAVERSE_TYPELOC(BuiltinType, { })
> +DEF_TRAVERSE_TYPELOC(BuiltinType, {})
>
> // FIXME: ComplexTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(ComplexType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(PointerType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(PointerType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(BlockPointerType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(BlockPointerType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(LValueReferenceType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(LValueReferenceType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(RValueReferenceType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(RValueReferenceType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
>
> // FIXME: location of base class?
> // We traverse this in the type case as well, but how is it not reached
> through
> // the pointee type?
> DEF_TRAVERSE_TYPELOC(MemberPointerType, {
> - TRY_TO(TraverseType(QualType(TL.getTypePtr()->getClass(), 0)));
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> + TRY_TO(TraverseType(QualType(TL.getTypePtr()->getClass(), 0)));
> + TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(AdjustedType, {
> - TRY_TO(TraverseTypeLoc(TL.getOriginalLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(AdjustedType,
> + { TRY_TO(TraverseTypeLoc(TL.getOriginalLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(DecayedType, {
> - TRY_TO(TraverseTypeLoc(TL.getOriginalLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(DecayedType,
> + { TRY_TO(TraverseTypeLoc(TL.getOriginalLoc())); })
>
> -template<typename Derived>
> +template <typename Derived>
> bool
> RecursiveASTVisitor<Derived>::TraverseArrayTypeLocHelper(ArrayTypeLoc TL) {
> // This isn't available for ArrayType, but is for the ArrayTypeLoc.
> TRY_TO(TraverseStmt(TL.getSizeExpr()));
> @@ -1132,156 +1086,147 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_TYPELOC(ConstantArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> DEF_TRAVERSE_TYPELOC(IncompleteArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> DEF_TRAVERSE_TYPELOC(VariableArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> DEF_TRAVERSE_TYPELOC(DependentSizedArrayType, {
> - TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> - return TraverseArrayTypeLocHelper(TL);
> - })
> + TRY_TO(TraverseTypeLoc(TL.getElementLoc()));
> + return TraverseArrayTypeLocHelper(TL);
> +})
>
> // FIXME: order? why not size expr first?
> // FIXME: base VectorTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(DependentSizedExtVectorType, {
> - if (TL.getTypePtr()->getSizeExpr())
> - TRY_TO(TraverseStmt(TL.getTypePtr()->getSizeExpr()));
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + if (TL.getTypePtr()->getSizeExpr())
> + TRY_TO(TraverseStmt(TL.getTypePtr()->getSizeExpr()));
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> // FIXME: VectorTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(VectorType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> // FIXME: size and attributes
> // FIXME: base VectorTypeLoc is unfinished
> DEF_TRAVERSE_TYPELOC(ExtVectorType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getElementType()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(FunctionNoProtoType, {
> - TRY_TO(TraverseTypeLoc(TL.getReturnLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(FunctionNoProtoType,
> + { TRY_TO(TraverseTypeLoc(TL.getReturnLoc())); })
>
> // FIXME: location of exception specifications (attributes?)
> DEF_TRAVERSE_TYPELOC(FunctionProtoType, {
> - TRY_TO(TraverseTypeLoc(TL.getReturnLoc()));
> + TRY_TO(TraverseTypeLoc(TL.getReturnLoc()));
>
> - const FunctionProtoType *T = TL.getTypePtr();
> + const FunctionProtoType *T = TL.getTypePtr();
>
> - for (unsigned I = 0, E = TL.getNumParams(); I != E; ++I) {
> - if (TL.getParam(I)) {
> - TRY_TO(TraverseDecl(TL.getParam(I)));
> - } else if (I < T->getNumParams()) {
> - TRY_TO(TraverseType(T->getParamType(I)));
> - }
> + for (unsigned I = 0, E = TL.getNumParams(); I != E; ++I) {
> + if (TL.getParam(I)) {
> + TRY_TO(TraverseDecl(TL.getParam(I)));
> + } else if (I < T->getNumParams()) {
> + TRY_TO(TraverseType(T->getParamType(I)));
> }
> + }
>
> - for (const auto &E : T->exceptions()) {
> - TRY_TO(TraverseType(E));
> - }
> - })
> + for (const auto &E : T->exceptions()) {
> + TRY_TO(TraverseType(E));
> + }
> +})
>
> -DEF_TRAVERSE_TYPELOC(UnresolvedUsingType, { })
> -DEF_TRAVERSE_TYPELOC(TypedefType, { })
> +DEF_TRAVERSE_TYPELOC(UnresolvedUsingType, {})
> +DEF_TRAVERSE_TYPELOC(TypedefType, {})
>
> -DEF_TRAVERSE_TYPELOC(TypeOfExprType, {
> - TRY_TO(TraverseStmt(TL.getUnderlyingExpr()));
> - })
> +DEF_TRAVERSE_TYPELOC(TypeOfExprType,
> + { TRY_TO(TraverseStmt(TL.getUnderlyingExpr())); })
>
> DEF_TRAVERSE_TYPELOC(TypeOfType, {
> - TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> +})
>
> // FIXME: location of underlying expr
> DEF_TRAVERSE_TYPELOC(DecltypeType, {
> - TRY_TO(TraverseStmt(TL.getTypePtr()->getUnderlyingExpr()));
> - })
> + TRY_TO(TraverseStmt(TL.getTypePtr()->getUnderlyingExpr()));
> +})
>
> DEF_TRAVERSE_TYPELOC(UnaryTransformType, {
> - TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(TL.getUnderlyingTInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_TYPELOC(AutoType, {
> - TRY_TO(TraverseType(TL.getTypePtr()->getDeducedType()));
> - })
> + TRY_TO(TraverseType(TL.getTypePtr()->getDeducedType()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(RecordType, { })
> -DEF_TRAVERSE_TYPELOC(EnumType, { })
> -DEF_TRAVERSE_TYPELOC(TemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmType, { })
> -DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmPackType, { })
> +DEF_TRAVERSE_TYPELOC(RecordType, {})
> +DEF_TRAVERSE_TYPELOC(EnumType, {})
> +DEF_TRAVERSE_TYPELOC(TemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmType, {})
> +DEF_TRAVERSE_TYPELOC(SubstTemplateTypeParmPackType, {})
>
> // FIXME: use the loc for the template name?
> DEF_TRAVERSE_TYPELOC(TemplateSpecializationType, {
> - TRY_TO(TraverseTemplateName(TL.getTypePtr()->getTemplateName()));
> - for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> - TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> - }
> - })
> + TRY_TO(TraverseTemplateName(TL.getTypePtr()->getTemplateName()));
> + for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> + TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> + }
> +})
>
> -DEF_TRAVERSE_TYPELOC(InjectedClassNameType, { })
> +DEF_TRAVERSE_TYPELOC(InjectedClassNameType, {})
>
> -DEF_TRAVERSE_TYPELOC(ParenType, {
> - TRY_TO(TraverseTypeLoc(TL.getInnerLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(ParenType, {
> TRY_TO(TraverseTypeLoc(TL.getInnerLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(AttributedType, {
> - TRY_TO(TraverseTypeLoc(TL.getModifiedLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(AttributedType,
> + { TRY_TO(TraverseTypeLoc(TL.getModifiedLoc())); })
>
> DEF_TRAVERSE_TYPELOC(ElaboratedType, {
> - if (TL.getQualifierLoc()) {
> - TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> - }
> - TRY_TO(TraverseTypeLoc(TL.getNamedTypeLoc()));
> - })
> + if (TL.getQualifierLoc()) {
> + TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> + }
> + TRY_TO(TraverseTypeLoc(TL.getNamedTypeLoc()));
> +})
>
> DEF_TRAVERSE_TYPELOC(DependentNameType, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> +})
>
> DEF_TRAVERSE_TYPELOC(DependentTemplateSpecializationType, {
> - if (TL.getQualifierLoc()) {
> - TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> - }
> + if (TL.getQualifierLoc()) {
> + TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));
> + }
>
> - for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> - TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> - }
> - })
> + for (unsigned I = 0, E = TL.getNumArgs(); I != E; ++I) {
> + TRY_TO(TraverseTemplateArgumentLoc(TL.getArgLoc(I)));
> + }
> +})
>
> -DEF_TRAVERSE_TYPELOC(PackExpansionType, {
> - TRY_TO(TraverseTypeLoc(TL.getPatternLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(PackExpansionType,
> + { TRY_TO(TraverseTypeLoc(TL.getPatternLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(ObjCInterfaceType, { })
> +DEF_TRAVERSE_TYPELOC(ObjCInterfaceType, {})
>
> DEF_TRAVERSE_TYPELOC(ObjCObjectType, {
> - // We have to watch out here because an ObjCInterfaceType's base
> - // type is itself.
> - if (TL.getTypePtr()->getBaseType().getTypePtr() != TL.getTypePtr())
> - TRY_TO(TraverseTypeLoc(TL.getBaseLoc()));
> - })
> + // We have to watch out here because an ObjCInterfaceType's base
> + // type is itself.
> + if (TL.getTypePtr()->getBaseType().getTypePtr() != TL.getTypePtr())
> + TRY_TO(TraverseTypeLoc(TL.getBaseLoc()));
> +})
>
> -DEF_TRAVERSE_TYPELOC(ObjCObjectPointerType, {
> - TRY_TO(TraverseTypeLoc(TL.getPointeeLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(ObjCObjectPointerType,
> + { TRY_TO(TraverseTypeLoc(TL.getPointeeLoc())); })
>
> -DEF_TRAVERSE_TYPELOC(AtomicType, {
> - TRY_TO(TraverseTypeLoc(TL.getValueLoc()));
> - })
> +DEF_TRAVERSE_TYPELOC(AtomicType, {
> TRY_TO(TraverseTypeLoc(TL.getValueLoc())); })
>
> #undef DEF_TRAVERSE_TYPELOC
>
> @@ -1292,7 +1237,7 @@ DEF_TRAVERSE_TYPELOC(AtomicType, {
> // Therefore each Traverse* only needs to worry about children other
> // than those.
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseDeclContextHelper(DeclContext
> *DC) {
> if (!DC)
> return true;
> @@ -1308,137 +1253,128 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> // This macro makes available a variable D, the passed-in decl.
> -#define DEF_TRAVERSE_DECL(DECL, CODE) \
> -template<typename Derived> \
> -bool RecursiveASTVisitor<Derived>::Traverse##DECL (DECL *D) { \
> - TRY_TO(WalkUpFrom##DECL (D)); \
> - { CODE; } \
> - TRY_TO(TraverseDeclContextHelper(dyn_cast<DeclContext>(D))); \
> - return true; \
> -}
> +#define DEF_TRAVERSE_DECL(DECL, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##DECL(DECL *D) {
> \
> + TRY_TO(WalkUpFrom##DECL(D));
> \
> + { CODE; }
> \
> + TRY_TO(TraverseDeclContextHelper(dyn_cast<DeclContext>(D)));
> \
> + return true;
> \
> + }
>
> -DEF_TRAVERSE_DECL(AccessSpecDecl, { })
> +DEF_TRAVERSE_DECL(AccessSpecDecl, {})
>
> DEF_TRAVERSE_DECL(BlockDecl, {
> - if (TypeSourceInfo *TInfo = D->getSignatureAsWritten())
> - TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> - TRY_TO(TraverseStmt(D->getBody()));
> - // This return statement makes sure the traversal of nodes in
> - // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> - // is skipped - don't remove it.
> - return true;
> - })
> + if (TypeSourceInfo *TInfo = D->getSignatureAsWritten())
> + TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> + TRY_TO(TraverseStmt(D->getBody()));
> + // This return statement makes sure the traversal of nodes in
> + // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> + // is skipped - don't remove it.
> + return true;
> +})
>
> DEF_TRAVERSE_DECL(CapturedDecl, {
> - TRY_TO(TraverseStmt(D->getBody()));
> - // This return statement makes sure the traversal of nodes in
> - // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> - // is skipped - don't remove it.
> - return true;
> - })
> + TRY_TO(TraverseStmt(D->getBody()));
> + // This return statement makes sure the traversal of nodes in
> + // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> + // is skipped - don't remove it.
> + return true;
> +})
>
> -DEF_TRAVERSE_DECL(EmptyDecl, { })
> +DEF_TRAVERSE_DECL(EmptyDecl, {})
>
> -DEF_TRAVERSE_DECL(FileScopeAsmDecl, {
> - TRY_TO(TraverseStmt(D->getAsmString()));
> - })
> +DEF_TRAVERSE_DECL(FileScopeAsmDecl,
> + { TRY_TO(TraverseStmt(D->getAsmString())); })
>
> -DEF_TRAVERSE_DECL(ImportDecl, { })
> +DEF_TRAVERSE_DECL(ImportDecl, {})
>
> DEF_TRAVERSE_DECL(FriendDecl, {
> - // Friend is either decl or a type.
> - if (D->getFriendType())
> - TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> - else
> - TRY_TO(TraverseDecl(D->getFriendDecl()));
> - })
> + // Friend is either decl or a type.
> + if (D->getFriendType())
> + TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> + else
> + TRY_TO(TraverseDecl(D->getFriendDecl()));
> +})
>
> DEF_TRAVERSE_DECL(FriendTemplateDecl, {
> - if (D->getFriendType())
> - TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> - else
> - TRY_TO(TraverseDecl(D->getFriendDecl()));
> - for (unsigned I = 0, E = D->getNumTemplateParameters(); I < E; ++I) {
> - TemplateParameterList *TPL = D->getTemplateParameterList(I);
> - for (TemplateParameterList::iterator ITPL = TPL->begin(),
> - ETPL = TPL->end();
> - ITPL != ETPL; ++ITPL) {
> - TRY_TO(TraverseDecl(*ITPL));
> - }
> + if (D->getFriendType())
> + TRY_TO(TraverseTypeLoc(D->getFriendType()->getTypeLoc()));
> + else
> + TRY_TO(TraverseDecl(D->getFriendDecl()));
> + for (unsigned I = 0, E = D->getNumTemplateParameters(); I < E; ++I) {
> + TemplateParameterList *TPL = D->getTemplateParameterList(I);
> + for (TemplateParameterList::iterator ITPL = TPL->begin(), ETPL =
> TPL->end();
> + ITPL != ETPL; ++ITPL) {
> + TRY_TO(TraverseDecl(*ITPL));
> }
> - })
> + }
> +})
>
> DEF_TRAVERSE_DECL(ClassScopeFunctionSpecializationDecl, {
> - TRY_TO(TraverseDecl(D->getSpecialization()));
> + TRY_TO(TraverseDecl(D->getSpecialization()));
>
> - if (D->hasExplicitTemplateArgs()) {
> - const TemplateArgumentListInfo& args = D->templateArgs();
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - args.getArgumentArray(), args.size()));
> - }
> - })
> + if (D->hasExplicitTemplateArgs()) {
> + const TemplateArgumentListInfo &args = D->templateArgs();
> + TRY_TO(TraverseTemplateArgumentLocsHelper(args.getArgumentArray(),
> + args.size()));
> + }
> +})
>
> -DEF_TRAVERSE_DECL(LinkageSpecDecl, { })
> +DEF_TRAVERSE_DECL(LinkageSpecDecl, {})
>
> -DEF_TRAVERSE_DECL(ObjCPropertyImplDecl, {
> - // FIXME: implement this
> - })
> +DEF_TRAVERSE_DECL(ObjCPropertyImplDecl, {// FIXME: implement this
> + })
>
> DEF_TRAVERSE_DECL(StaticAssertDecl, {
> - TRY_TO(TraverseStmt(D->getAssertExpr()));
> - TRY_TO(TraverseStmt(D->getMessage()));
> - })
> + TRY_TO(TraverseStmt(D->getAssertExpr()));
> + TRY_TO(TraverseStmt(D->getMessage()));
> +})
>
> -DEF_TRAVERSE_DECL(TranslationUnitDecl, {
> - // Code in an unnamed namespace shows up automatically in
> - // decls_begin()/decls_end(). Thus we don't need to recurse on
> - // D->getAnonymousNamespace().
> - })
> +DEF_TRAVERSE_DECL(
> + TranslationUnitDecl,
> + {// Code in an unnamed namespace shows up automatically in
> + // decls_begin()/decls_end(). Thus we don't need to recurse on
> + // D->getAnonymousNamespace().
> + })
>
> DEF_TRAVERSE_DECL(NamespaceAliasDecl, {
> - // We shouldn't traverse an aliased namespace, since it will be
> - // defined (and, therefore, traversed) somewhere else.
> - //
> - // This return statement makes sure the traversal of nodes in
> - // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> - // is skipped - don't remove it.
> - return true;
> - })
> -
> -DEF_TRAVERSE_DECL(LabelDecl, {
> - // There is no code in a LabelDecl.
> + // We shouldn't traverse an aliased namespace, since it will be
> + // defined (and, therefore, traversed) somewhere else.
> + //
> + // This return statement makes sure the traversal of nodes in
> + // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)
> + // is skipped - don't remove it.
> + return true;
> })
>
> +DEF_TRAVERSE_DECL(LabelDecl, {// There is no code in a LabelDecl.
> + })
>
> -DEF_TRAVERSE_DECL(NamespaceDecl, {
> - // Code in an unnamed namespace shows up automatically in
> - // decls_begin()/decls_end(). Thus we don't need to recurse on
> - // D->getAnonymousNamespace().
> - })
> +DEF_TRAVERSE_DECL(
> + NamespaceDecl,
> + {// Code in an unnamed namespace shows up automatically in
> + // decls_begin()/decls_end(). Thus we don't need to recurse on
> + // D->getAnonymousNamespace().
> + })
>
> -DEF_TRAVERSE_DECL(ObjCCompatibleAliasDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCCompatibleAliasDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCCategoryDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCCategoryDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCCategoryImplDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCCategoryImplDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCImplementationDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCImplementationDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCInterfaceDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCInterfaceDecl, {// FIXME: implement
> + })
>
> -DEF_TRAVERSE_DECL(ObjCProtocolDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCProtocolDecl, {// FIXME: implement
> + })
>
> DEF_TRAVERSE_DECL(ObjCMethodDecl, {
> if (D->getReturnTypeSourceInfo()) {
> @@ -1454,29 +1390,28 @@ DEF_TRAVERSE_DECL(ObjCMethodDecl, {
> return true;
> })
>
> -DEF_TRAVERSE_DECL(ObjCPropertyDecl, {
> - // FIXME: implement
> - })
> +DEF_TRAVERSE_DECL(ObjCPropertyDecl, {// FIXME: implement
> + })
>
> DEF_TRAVERSE_DECL(UsingDecl, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> +})
>
> DEF_TRAVERSE_DECL(UsingDirectiveDecl, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> +})
>
> -DEF_TRAVERSE_DECL(UsingShadowDecl, { })
> +DEF_TRAVERSE_DECL(UsingShadowDecl, {})
>
> DEF_TRAVERSE_DECL(OMPThreadPrivateDecl, {
> - for (auto *I : D->varlists()) {
> - TRY_TO(TraverseStmt(I));
> - }
> - })
> + for (auto *I : D->varlists()) {
> + TRY_TO(TraverseStmt(I));
> + }
> +})
>
> // A helper method for TemplateDecl's children.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateParameterListHelper(
> TemplateParameterList *TPL) {
> if (TPL) {
> @@ -1488,7 +1423,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations(
> ClassTemplateDecl *D) {
> for (auto *SD : D->specializations()) {
> @@ -1497,8 +1432,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> if (cast<CXXRecordDecl>(RD)->isInjectedClassName())
> continue;
>
> - switch (cast<ClassTemplateSpecializationDecl>(RD)->
> - getSpecializationKind()) {
> + switch (
> +
> cast<ClassTemplateSpecializationDecl>(RD)->getSpecializationKind()) {
> // Visit the implicit instantiations with the requested pattern.
> case TSK_Undeclared:
> case TSK_ImplicitInstantiation:
> @@ -1519,13 +1454,13 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations(
> VarTemplateDecl *D) {
> for (auto *SD : D->specializations()) {
> for (auto *RD : SD->redecls()) {
> - switch (cast<VarTemplateSpecializationDecl>(RD)->
> - getSpecializationKind()) {
> + switch (
> +
> cast<VarTemplateSpecializationDecl>(RD)->getSpecializationKind()) {
> case TSK_Undeclared:
> case TSK_ImplicitInstantiation:
> TRY_TO(TraverseDecl(RD));
> @@ -1544,7 +1479,7 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> // A helper method for traversing the instantiations of a
> // function while skipping its specializations.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseTemplateInstantiations(
> FunctionTemplateDecl *D) {
> for (auto *FD : D->specializations()) {
> @@ -1574,8 +1509,8 @@ bool RecursiveASTVisitor<Derived>::Trave
>
> // This macro unifies the traversal of class, variable and function
> // template declarations.
> -#define DEF_TRAVERSE_TMPL_DECL(TMPLDECLKIND)
> \
> -DEF_TRAVERSE_DECL(TMPLDECLKIND##TemplateDecl, {
> \
> +#define DEF_TRAVERSE_TMPL_DECL(TMPLDECLKIND)
> \
> + DEF_TRAVERSE_DECL(TMPLDECLKIND##TemplateDecl, {
> \
> TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> \
>
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters())); \
>
> \
> @@ -1599,65 +1534,63 @@ DEF_TRAVERSE_TMPL_DECL(Var)
> DEF_TRAVERSE_TMPL_DECL(Function)
>
> DEF_TRAVERSE_DECL(TemplateTemplateParmDecl, {
> - // D is the "T" in something like
> - // template <template <typename> class T> class container { };
> - TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> - if (D->hasDefaultArgument() && !D->defaultArgumentWasInherited()) {
> - TRY_TO(TraverseTemplateArgumentLoc(D->getDefaultArgument()));
> - }
> -
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> - })
> + // D is the "T" in something like
> + // template <template <typename> class T> class container { };
> + TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> + if (D->hasDefaultArgument() && !D->defaultArgumentWasInherited()) {
> + TRY_TO(TraverseTemplateArgumentLoc(D->getDefaultArgument()));
> + }
> + TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> +})
>
> DEF_TRAVERSE_DECL(TemplateTypeParmDecl, {
> - // D is the "T" in something like "template<typename T> class vector;"
> - if (D->getTypeForDecl())
> - TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
> - if (D->hasDefaultArgument() && !D->defaultArgumentWasInherited())
> - TRY_TO(TraverseTypeLoc(D->getDefaultArgumentInfo()->getTypeLoc()));
> - })
> + // D is the "T" in something like "template<typename T> class vector;"
> + if (D->getTypeForDecl())
> + TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
> + if (D->hasDefaultArgument() && !D->defaultArgumentWasInherited())
> + TRY_TO(TraverseTypeLoc(D->getDefaultArgumentInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_DECL(TypedefDecl, {
> - TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> - // We shouldn't traverse D->getTypeForDecl(); it's a result of
> - // declaring the typedef, not something that was written in the
> - // source.
> - })
> + TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> + // We shouldn't traverse D->getTypeForDecl(); it's a result of
> + // declaring the typedef, not something that was written in the
> + // source.
> +})
>
> DEF_TRAVERSE_DECL(TypeAliasDecl, {
> - TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> - // We shouldn't traverse D->getTypeForDecl(); it's a result of
> - // declaring the type alias, not something that was written in the
> - // source.
> - })
> + TRY_TO(TraverseTypeLoc(D->getTypeSourceInfo()->getTypeLoc()));
> + // We shouldn't traverse D->getTypeForDecl(); it's a result of
> + // declaring the type alias, not something that was written in the
> + // source.
> +})
>
> DEF_TRAVERSE_DECL(TypeAliasTemplateDecl, {
> - TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> -
> TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> - })
> + TRY_TO(TraverseDecl(D->getTemplatedDecl()));
> + TRY_TO(TraverseTemplateParameterListHelper(D->getTemplateParameters()));
> +})
>
> DEF_TRAVERSE_DECL(UnresolvedUsingTypenameDecl, {
> - // A dependent using declaration which was marked with 'typename'.
> - // template<class T> class A : public B<T> { using typename
> B<T>::foo; };
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - // We shouldn't traverse D->getTypeForDecl(); it's a result of
> - // declaring the type, not something that was written in the
> - // source.
> - })
> + // A dependent using declaration which was marked with 'typename'.
> + // template<class T> class A : public B<T> { using typename
> B<T>::foo; };
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + // We shouldn't traverse D->getTypeForDecl(); it's a result of
> + // declaring the type, not something that was written in the
> + // source.
> +})
>
> DEF_TRAVERSE_DECL(EnumDecl, {
> - if (D->getTypeForDecl())
> - TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
> -
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - // The enumerators are already traversed by
> - // decls_begin()/decls_end().
> - })
> + if (D->getTypeForDecl())
> + TRY_TO(TraverseType(QualType(D->getTypeForDecl(), 0)));
>
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + // The enumerators are already traversed by
> + // decls_begin()/decls_end().
> +})
>
> // Helper methods for RecordDecl and its children.
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseRecordHelper(
> - RecordDecl *D) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::TraverseRecordHelper(RecordDecl *D) {
> // We shouldn't traverse D->getTypeForDecl(); it's a result of
> // declaring the type, not something that was written in the source.
>
> @@ -1665,9 +1598,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::TraverseCXXRecordHelper(
> - CXXRecordDecl *D) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::TraverseCXXRecordHelper(CXXRecordDecl
> *D) {
> if (!TraverseRecordHelper(D))
> return false;
> if (D->isCompleteDefinition()) {
> @@ -1680,34 +1612,30 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -DEF_TRAVERSE_DECL(RecordDecl, {
> - TRY_TO(TraverseRecordHelper(D));
> - })
> +DEF_TRAVERSE_DECL(RecordDecl, { TRY_TO(TraverseRecordHelper(D)); })
>
> -DEF_TRAVERSE_DECL(CXXRecordDecl, {
> - TRY_TO(TraverseCXXRecordHelper(D));
> - })
> +DEF_TRAVERSE_DECL(CXXRecordDecl, { TRY_TO(TraverseCXXRecordHelper(D)); })
>
> -#define DEF_TRAVERSE_TMPL_SPEC_DECL(TMPLDECLKIND) \
> -DEF_TRAVERSE_DECL(TMPLDECLKIND##TemplateSpecializationDecl, {
> \
> - /* For implicit instantiations ("set<int> x;"), we don't want to
> - recurse at all, since the instatiated template isn't written in
> - the source code anywhere. (Note the instatiated *type* --
> - set<int> -- is written, and will still get a callback of
> - TemplateSpecializationType). For explicit instantiations
> - ("template set<int>;"), we do need a callback, since this
> - is the only callback that's made for this instantiation.
> - We use getTypeAsWritten() to distinguish. */
> \
> - if (TypeSourceInfo *TSI = D->getTypeAsWritten())
> \
> - TRY_TO(TraverseTypeLoc(TSI->getTypeLoc()));
> \
> -
> \
> - if (!getDerived().shouldVisitTemplateInstantiations() &&
> \
> - D->getTemplateSpecializationKind() != TSK_ExplicitSpecialization)
> \
> - /* Returning from here skips traversing the
> - declaration context of the *TemplateSpecializationDecl
> - (embedded in the DEF_TRAVERSE_DECL() macro)
> - which contains the instantiated members of the template. */
> \
> - return true;
> \
> +#define DEF_TRAVERSE_TMPL_SPEC_DECL(TMPLDECLKIND)
> \
> + DEF_TRAVERSE_DECL(TMPLDECLKIND##TemplateSpecializationDecl, {
> \
> + /* For implicit instantiations ("set<int> x;"), we don't want to
> \
> + recurse at all, since the instatiated template isn't written in
> \
> + the source code anywhere. (Note the instatiated *type* --
> \
> + set<int> -- is written, and will still get a callback of
> \
> + TemplateSpecializationType). For explicit instantiations
> \
> + ("template set<int>;"), we do need a callback, since this
> \
> + is the only callback that's made for this instantiation.
> \
> + We use getTypeAsWritten() to distinguish. */
> \
> + if (TypeSourceInfo *TSI = D->getTypeAsWritten())
> \
> + TRY_TO(TraverseTypeLoc(TSI->getTypeLoc()));
> \
> +
> \
> + if (!getDerived().shouldVisitTemplateInstantiations() &&
> \
> + D->getTemplateSpecializationKind() != TSK_ExplicitSpecialization)
> \
> + /* Returning from here skips traversing the
> \
> + declaration context of the *TemplateSpecializationDecl
> \
> + (embedded in the DEF_TRAVERSE_DECL() macro)
> \
> + which contains the instantiated members of the template. */
> \
> + return true;
> \
> })
>
> DEF_TRAVERSE_TMPL_SPEC_DECL(Class)
> @@ -1722,8 +1650,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -#define DEF_TRAVERSE_TMPL_PART_SPEC_DECL(TMPLDECLKIND, DECLKIND) \
> -DEF_TRAVERSE_DECL(TMPLDECLKIND##TemplatePartialSpecializationDecl, {
> \
> +#define DEF_TRAVERSE_TMPL_PART_SPEC_DECL(TMPLDECLKIND, DECLKIND)
> \
> + DEF_TRAVERSE_DECL(TMPLDECLKIND##TemplatePartialSpecializationDecl, {
> \
> /* The partial specialization. */
> \
> if (TemplateParameterList *TPL = D->getTemplateParameters()) {
> \
> for (TemplateParameterList::iterator I = TPL->begin(), E =
> TPL->end(); \
> @@ -1747,20 +1675,18 @@ DEF_TRAVERSE_DECL(TMPLDECLKIND##Template
> DEF_TRAVERSE_TMPL_PART_SPEC_DECL(Class, CXXRecord)
> DEF_TRAVERSE_TMPL_PART_SPEC_DECL(Var, Var)
>
> -DEF_TRAVERSE_DECL(EnumConstantDecl, {
> - TRY_TO(TraverseStmt(D->getInitExpr()));
> - })
> +DEF_TRAVERSE_DECL(EnumConstantDecl, {
> TRY_TO(TraverseStmt(D->getInitExpr())); })
>
> DEF_TRAVERSE_DECL(UnresolvedUsingValueDecl, {
> - // Like UnresolvedUsingTypenameDecl, but without the 'typename':
> - // template <class T> Class A : public Base<T> { using
> Base<T>::foo; };
> - TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> - })
> + // Like UnresolvedUsingTypenameDecl, but without the 'typename':
> + // template <class T> Class A : public Base<T> { using Base<T>::foo;
> };
> + TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> +})
>
> DEF_TRAVERSE_DECL(IndirectFieldDecl, {})
>
> -template<typename Derived>
> +template <typename Derived>
> bool
> RecursiveASTVisitor<Derived>::TraverseDeclaratorHelper(DeclaratorDecl *D) {
> TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> if (D->getTypeSourceInfo())
> @@ -1770,33 +1696,31 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -DEF_TRAVERSE_DECL(MSPropertyDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - })
> +DEF_TRAVERSE_DECL(MSPropertyDecl, { TRY_TO(TraverseDeclaratorHelper(D));
> })
>
> DEF_TRAVERSE_DECL(FieldDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->isBitField())
> - TRY_TO(TraverseStmt(D->getBitWidth()));
> - else if (D->hasInClassInitializer())
> - TRY_TO(TraverseStmt(D->getInClassInitializer()));
> - })
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->isBitField())
> + TRY_TO(TraverseStmt(D->getBitWidth()));
> + else if (D->hasInClassInitializer())
> + TRY_TO(TraverseStmt(D->getInClassInitializer()));
> +})
>
> DEF_TRAVERSE_DECL(ObjCAtDefsFieldDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->isBitField())
> - TRY_TO(TraverseStmt(D->getBitWidth()));
> - // FIXME: implement the rest.
> - })
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->isBitField())
> + TRY_TO(TraverseStmt(D->getBitWidth()));
> + // FIXME: implement the rest.
> +})
>
> DEF_TRAVERSE_DECL(ObjCIvarDecl, {
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->isBitField())
> - TRY_TO(TraverseStmt(D->getBitWidth()));
> - // FIXME: implement the rest.
> - })
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->isBitField())
> + TRY_TO(TraverseStmt(D->getBitWidth()));
> + // FIXME: implement the rest.
> +})
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseFunctionHelper(FunctionDecl
> *D) {
> TRY_TO(TraverseNestedNameSpecifierLoc(D->getQualifierLoc()));
> TRY_TO(TraverseDeclarationNameInfo(D->getNameInfo()));
> @@ -1807,13 +1731,13 @@ bool RecursiveASTVisitor<Derived>::Trave
> // the function args, but both are handled by the FunctionTypeLoc
> // above, so we have to choose one side. I've decided to do before.
> if (const FunctionTemplateSpecializationInfo *FTSI =
> - D->getTemplateSpecializationInfo()) {
> + D->getTemplateSpecializationInfo()) {
> if (FTSI->getTemplateSpecializationKind() != TSK_Undeclared &&
> FTSI->getTemplateSpecializationKind() !=
> TSK_ImplicitInstantiation) {
> // A specialization might not have explicit template arguments if
> it has
> // a templated return type and concrete arguments.
> if (const ASTTemplateArgumentListInfo *TALI =
> - FTSI->TemplateArgumentsAsWritten) {
> + FTSI->TemplateArgumentsAsWritten) {
> TRY_TO(TraverseTemplateArgumentLocsHelper(TALI->getTemplateArgs(),
> TALI->NumTemplateArgs));
> }
> @@ -1832,7 +1756,8 @@ bool RecursiveASTVisitor<Derived>::Trave
> // declarations do not have valid TypeSourceInfo, so to visit them
> // we need to traverse the declarations explicitly.
> for (FunctionDecl::param_const_iterator I = D->param_begin(),
> - E = D->param_end(); I != E;
> ++I)
> + E = D->param_end();
> + I != E; ++I)
> TRY_TO(TraverseDecl(*I));
> }
>
> @@ -1844,44 +1769,44 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> if (D->isThisDeclarationADefinition()) {
> - TRY_TO(TraverseStmt(D->getBody())); // Function body.
> + TRY_TO(TraverseStmt(D->getBody())); // Function body.
> }
> return true;
> }
>
> DEF_TRAVERSE_DECL(FunctionDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> DEF_TRAVERSE_DECL(CXXMethodDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> DEF_TRAVERSE_DECL(CXXConstructorDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> // CXXConversionDecl is the declaration of a type conversion operator.
> // It's not a cast expression.
> DEF_TRAVERSE_DECL(CXXConversionDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> DEF_TRAVERSE_DECL(CXXDestructorDecl, {
> - // We skip decls_begin/decls_end, which are already covered by
> - // TraverseFunctionHelper().
> - return TraverseFunctionHelper(D);
> - })
> + // We skip decls_begin/decls_end, which are already covered by
> + // TraverseFunctionHelper().
> + return TraverseFunctionHelper(D);
> +})
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseVarHelper(VarDecl *D) {
> TRY_TO(TraverseDeclaratorHelper(D));
> // Default params are taken care of when we traverse the ParmVarDecl.
> @@ -1891,34 +1816,28 @@ bool RecursiveASTVisitor<Derived>::Trave
> return true;
> }
>
> -DEF_TRAVERSE_DECL(VarDecl, {
> - TRY_TO(TraverseVarHelper(D));
> - })
> +DEF_TRAVERSE_DECL(VarDecl, { TRY_TO(TraverseVarHelper(D)); })
>
> -DEF_TRAVERSE_DECL(ImplicitParamDecl, {
> - TRY_TO(TraverseVarHelper(D));
> - })
> +DEF_TRAVERSE_DECL(ImplicitParamDecl, { TRY_TO(TraverseVarHelper(D)); })
>
> DEF_TRAVERSE_DECL(NonTypeTemplateParmDecl, {
> - // A non-type template parameter, e.g. "S" in template<int S> class
> Foo ...
> - TRY_TO(TraverseDeclaratorHelper(D));
> - if (D->hasDefaultArgument() && !D->defaultArgumentWasInherited())
> - TRY_TO(TraverseStmt(D->getDefaultArgument()));
> - })
> + // A non-type template parameter, e.g. "S" in template<int S> class Foo
> ...
> + TRY_TO(TraverseDeclaratorHelper(D));
> + if (D->hasDefaultArgument() && !D->defaultArgumentWasInherited())
> + TRY_TO(TraverseStmt(D->getDefaultArgument()));
> +})
>
> DEF_TRAVERSE_DECL(ParmVarDecl, {
> - TRY_TO(TraverseVarHelper(D));
> + TRY_TO(TraverseVarHelper(D));
>
> - if (D->hasDefaultArg() &&
> - D->hasUninstantiatedDefaultArg() &&
> - !D->hasUnparsedDefaultArg())
> - TRY_TO(TraverseStmt(D->getUninstantiatedDefaultArg()));
> -
> - if (D->hasDefaultArg() &&
> - !D->hasUninstantiatedDefaultArg() &&
> - !D->hasUnparsedDefaultArg())
> - TRY_TO(TraverseStmt(D->getDefaultArg()));
> - })
> + if (D->hasDefaultArg() && D->hasUninstantiatedDefaultArg() &&
> + !D->hasUnparsedDefaultArg())
> + TRY_TO(TraverseStmt(D->getUninstantiatedDefaultArg()));
> +
> + if (D->hasDefaultArg() && !D->hasUninstantiatedDefaultArg() &&
> + !D->hasUnparsedDefaultArg())
> + TRY_TO(TraverseStmt(D->getDefaultArg()));
> +})
>
> #undef DEF_TRAVERSE_DECL
>
> @@ -1932,77 +1851,77 @@ DEF_TRAVERSE_DECL(ParmVarDecl, {
> // http://clang.llvm.org/doxygen/Stmt_8cpp_source.html
>
> // This macro makes available a variable S, the passed-in stmt.
> -#define DEF_TRAVERSE_STMT(STMT, CODE) \
> -template<typename Derived> \
> -bool RecursiveASTVisitor<Derived>::Traverse##STMT (STMT *S) { \
> - TRY_TO(WalkUpFrom##STMT(S)); \
> - { CODE; } \
> - for (Stmt::child_range range = S->children(); range; ++range) { \
> - TRY_TO(TraverseStmt(*range)); \
> - } \
> - return true; \
> -}
> +#define DEF_TRAVERSE_STMT(STMT, CODE)
> \
> + template <typename Derived>
> \
> + bool RecursiveASTVisitor<Derived>::Traverse##STMT(STMT *S) {
> \
> + TRY_TO(WalkUpFrom##STMT(S));
> \
> + { CODE; }
> \
> + for (Stmt::child_range range = S->children(); range; ++range) {
> \
> + TRY_TO(TraverseStmt(*range));
> \
> + }
> \
> + return true;
> \
> + }
>
> DEF_TRAVERSE_STMT(GCCAsmStmt, {
> - TRY_TO(TraverseStmt(S->getAsmString()));
> - for (unsigned I = 0, E = S->getNumInputs(); I < E; ++I) {
> - TRY_TO(TraverseStmt(S->getInputConstraintLiteral(I)));
> - }
> - for (unsigned I = 0, E = S->getNumOutputs(); I < E; ++I) {
> - TRY_TO(TraverseStmt(S->getOutputConstraintLiteral(I)));
> - }
> - for (unsigned I = 0, E = S->getNumClobbers(); I < E; ++I) {
> - TRY_TO(TraverseStmt(S->getClobberStringLiteral(I)));
> - }
> - // children() iterates over inputExpr and outputExpr.
> - })
> + TRY_TO(TraverseStmt(S->getAsmString()));
> + for (unsigned I = 0, E = S->getNumInputs(); I < E; ++I) {
> + TRY_TO(TraverseStmt(S->getInputConstraintLiteral(I)));
> + }
> + for (unsigned I = 0, E = S->getNumOutputs(); I < E; ++I) {
> + TRY_TO(TraverseStmt(S->getOutputConstraintLiteral(I)));
> + }
> + for (unsigned I = 0, E = S->getNumClobbers(); I < E; ++I) {
> + TRY_TO(TraverseStmt(S->getClobberStringLiteral(I)));
> + }
> + // children() iterates over inputExpr and outputExpr.
> +})
>
> -DEF_TRAVERSE_STMT(MSAsmStmt, {
> - // FIXME: MS Asm doesn't currently parse Constraints, Clobbers, etc.
> Once
> - // added this needs to be implemented.
> - })
> +DEF_TRAVERSE_STMT(
> + MSAsmStmt,
> + {// FIXME: MS Asm doesn't currently parse Constraints, Clobbers, etc.
> Once
> + // added this needs to be implemented.
> + })
>
> DEF_TRAVERSE_STMT(CXXCatchStmt, {
> - TRY_TO(TraverseDecl(S->getExceptionDecl()));
> - // children() iterates over the handler block.
> - })
> + TRY_TO(TraverseDecl(S->getExceptionDecl()));
> + // children() iterates over the handler block.
> +})
>
> DEF_TRAVERSE_STMT(DeclStmt, {
> - for (auto *I : S->decls()) {
> - TRY_TO(TraverseDecl(I));
> - }
> - // Suppress the default iteration over children() by
> - // returning. Here's why: A DeclStmt looks like 'type var [=
> - // initializer]'. The decls above already traverse over the
> - // initializers, so we don't have to do it again (which
> - // children() would do).
> - return true;
> - })
> -
> + for (auto *I : S->decls()) {
> + TRY_TO(TraverseDecl(I));
> + }
> + // Suppress the default iteration over children() by
> + // returning. Here's why: A DeclStmt looks like 'type var [=
> + // initializer]'. The decls above already traverse over the
> + // initializers, so we don't have to do it again (which
> + // children() would do).
> + return true;
> +})
>
> // These non-expr stmts (most of them), do not need any action except
> // iterating over the children.
> -DEF_TRAVERSE_STMT(BreakStmt, { })
> -DEF_TRAVERSE_STMT(CXXTryStmt, { })
> -DEF_TRAVERSE_STMT(CaseStmt, { })
> -DEF_TRAVERSE_STMT(CompoundStmt, { })
> -DEF_TRAVERSE_STMT(ContinueStmt, { })
> -DEF_TRAVERSE_STMT(DefaultStmt, { })
> -DEF_TRAVERSE_STMT(DoStmt, { })
> -DEF_TRAVERSE_STMT(ForStmt, { })
> -DEF_TRAVERSE_STMT(GotoStmt, { })
> -DEF_TRAVERSE_STMT(IfStmt, { })
> -DEF_TRAVERSE_STMT(IndirectGotoStmt, { })
> -DEF_TRAVERSE_STMT(LabelStmt, { })
> -DEF_TRAVERSE_STMT(AttributedStmt, { })
> -DEF_TRAVERSE_STMT(NullStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtCatchStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtFinallyStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtSynchronizedStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtThrowStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAtTryStmt, { })
> -DEF_TRAVERSE_STMT(ObjCForCollectionStmt, { })
> -DEF_TRAVERSE_STMT(ObjCAutoreleasePoolStmt, { })
> +DEF_TRAVERSE_STMT(BreakStmt, {})
> +DEF_TRAVERSE_STMT(CXXTryStmt, {})
> +DEF_TRAVERSE_STMT(CaseStmt, {})
> +DEF_TRAVERSE_STMT(CompoundStmt, {})
> +DEF_TRAVERSE_STMT(ContinueStmt, {})
> +DEF_TRAVERSE_STMT(DefaultStmt, {})
> +DEF_TRAVERSE_STMT(DoStmt, {})
> +DEF_TRAVERSE_STMT(ForStmt, {})
> +DEF_TRAVERSE_STMT(GotoStmt, {})
> +DEF_TRAVERSE_STMT(IfStmt, {})
> +DEF_TRAVERSE_STMT(IndirectGotoStmt, {})
> +DEF_TRAVERSE_STMT(LabelStmt, {})
> +DEF_TRAVERSE_STMT(AttributedStmt, {})
> +DEF_TRAVERSE_STMT(NullStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtCatchStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtFinallyStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtSynchronizedStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtThrowStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAtTryStmt, {})
> +DEF_TRAVERSE_STMT(ObjCForCollectionStmt, {})
> +DEF_TRAVERSE_STMT(ObjCAutoreleasePoolStmt, {})
> DEF_TRAVERSE_STMT(CXXForRangeStmt, {
> if (!getDerived().shouldVisitImplicitCode()) {
> TRY_TO(TraverseStmt(S->getLoopVarStmt()));
> @@ -2013,82 +1932,82 @@ DEF_TRAVERSE_STMT(CXXForRangeStmt, {
> }
> })
> DEF_TRAVERSE_STMT(MSDependentExistsStmt, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> })
> -DEF_TRAVERSE_STMT(ReturnStmt, { })
> -DEF_TRAVERSE_STMT(SwitchStmt, { })
> -DEF_TRAVERSE_STMT(WhileStmt, { })
> -
> +DEF_TRAVERSE_STMT(ReturnStmt, {})
> +DEF_TRAVERSE_STMT(SwitchStmt, {})
> +DEF_TRAVERSE_STMT(WhileStmt, {})
>
> DEF_TRAVERSE_STMT(CXXDependentScopeMemberExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> - if (S->hasExplicitTemplateArgs()) {
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getTemplateArgs(), S->getNumTemplateArgs()));
> - }
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> + if (S->hasExplicitTemplateArgs()) {
> + TRY_TO(TraverseTemplateArgumentLocsHelper(S->getTemplateArgs(),
> + S->getNumTemplateArgs()));
> + }
> +})
>
> DEF_TRAVERSE_STMT(DeclRefExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getTemplateArgs(), S->getNumTemplateArgs()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> + TRY_TO(TraverseTemplateArgumentLocsHelper(S->getTemplateArgs(),
> + S->getNumTemplateArgs()));
> +})
>
> DEF_TRAVERSE_STMT(DependentScopeDeclRefExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> - if (S->hasExplicitTemplateArgs()) {
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getExplicitTemplateArgs().getTemplateArgs(),
> - S->getNumTemplateArgs()));
> - }
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getNameInfo()));
> + if (S->hasExplicitTemplateArgs()) {
> + TRY_TO(TraverseTemplateArgumentLocsHelper(
> + S->getExplicitTemplateArgs().getTemplateArgs(),
> + S->getNumTemplateArgs()));
> + }
> +})
>
> DEF_TRAVERSE_STMT(MemberExpr, {
> - TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> - TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> - TRY_TO(TraverseTemplateArgumentLocsHelper(
> - S->getTemplateArgs(), S->getNumTemplateArgs()));
> - })
> + TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> + TRY_TO(TraverseDeclarationNameInfo(S->getMemberNameInfo()));
> + TRY_TO(TraverseTemplateArgumentLocsHelper(S->getTemplateArgs(),
> + S->getNumTemplateArgs()));
> +})
>
> -DEF_TRAVERSE_STMT(ImplicitCastExpr, {
> - // We don't traverse the cast type, as it's not written in the
> - // source code.
> - })
> +DEF_TRAVERSE_STMT(
> + ImplicitCastExpr,
> + {// We don't traverse the cast type, as it's not written in the
> + // source code.
> + })
>
> DEF_TRAVERSE_STMT(CStyleCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXFunctionalCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXConstCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXDynamicCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXReinterpretCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXStaticCastExpr, {
> - TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> +})
>
> // InitListExpr is a tricky one, because we want to do all our work on
> // the syntactic form of the listexpr, but this method takes the
> // semantic form by default. We can't use the macro helper because it
> // calls WalkUp*() on the semantic form, before our code can convert
> // to the syntactic form.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseInitListExpr(InitListExpr *S) {
> if (InitListExpr *Syn = S->getSyntacticForm())
> S = Syn;
> @@ -2103,9 +2022,9 @@ bool RecursiveASTVisitor<Derived>::Trave
> // GenericSelectionExpr is a special case because the types and
> expressions
> // are interleaved. We also need to watch out for null types (default
> // generic associations).
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::
> -TraverseGenericSelectionExpr(GenericSelectionExpr *S) {
> +template <typename Derived>
> +bool RecursiveASTVisitor<Derived>::TraverseGenericSelectionExpr(
> + GenericSelectionExpr *S) {
> TRY_TO(WalkUpFromGenericSelectionExpr(S));
> TRY_TO(TraverseStmt(S->getControllingExpr()));
> for (unsigned i = 0; i != S->getNumAssocs(); ++i) {
> @@ -2118,13 +2037,14 @@ TraverseGenericSelectionExpr(GenericSele
>
> // PseudoObjectExpr is a special case because of the wierdness with
> // syntactic expressions and opaque values.
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::
> -TraversePseudoObjectExpr(PseudoObjectExpr *S) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::TraversePseudoObjectExpr(PseudoObjectExpr
> *S) {
> TRY_TO(WalkUpFromPseudoObjectExpr(S));
> TRY_TO(TraverseStmt(S->getSyntacticForm()));
> - for (PseudoObjectExpr::semantics_iterator
> - i = S->semantics_begin(), e = S->semantics_end(); i != e; ++i) {
> + for (PseudoObjectExpr::semantics_iterator i = S->semantics_begin(),
> + e = S->semantics_end();
> + i != e; ++i) {
> Expr *sub = *i;
> if (OpaqueValueExpr *OVE = dyn_cast<OpaqueValueExpr>(sub))
> sub = OVE->getSourceExpr();
> @@ -2134,48 +2054,48 @@ TraversePseudoObjectExpr(PseudoObjectExp
> }
>
> DEF_TRAVERSE_STMT(CXXScalarValueInitExpr, {
> - // This is called for code like 'return T()' where T is a built-in
> - // (i.e. non-class) type.
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // This is called for code like 'return T()' where T is a built-in
> + // (i.e. non-class) type.
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXNewExpr, {
> // The child-iterator will pick up the other arguments.
> TRY_TO(TraverseTypeLoc(S->getAllocatedTypeSourceInfo()->getTypeLoc()));
> - })
> +})
>
> DEF_TRAVERSE_STMT(OffsetOfExpr, {
> - // The child-iterator will pick up the expression representing
> - // the field.
> - // FIMXE: for code like offsetof(Foo, a.b.c), should we get
> - // making a MemberExpr callbacks for Foo.a, Foo.a.b, and Foo.a.b.c?
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the expression representing
> + // the field.
> + // FIMXE: for code like offsetof(Foo, a.b.c), should we get
> + // making a MemberExpr callbacks for Foo.a, Foo.a.b, and Foo.a.b.c?
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(UnaryExprOrTypeTraitExpr, {
> - // The child-iterator will pick up the arg if it's an expression,
> - // but not if it's a type.
> - if (S->isArgumentType())
> - TRY_TO(TraverseTypeLoc(S->getArgumentTypeInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the arg if it's an expression,
> + // but not if it's a type.
> + if (S->isArgumentType())
> + TRY_TO(TraverseTypeLoc(S->getArgumentTypeInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXTypeidExpr, {
> - // The child-iterator will pick up the arg if it's an expression,
> - // but not if it's a type.
> - if (S->isTypeOperand())
> -
> TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the arg if it's an expression,
> + // but not if it's a type.
> + if (S->isTypeOperand())
> + TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(MSPropertyRefExpr, {
> TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> })
>
> DEF_TRAVERSE_STMT(CXXUuidofExpr, {
> - // The child-iterator will pick up the arg if it's an expression,
> - // but not if it's a type.
> - if (S->isTypeOperand())
> -
> TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the arg if it's an expression,
> + // but not if it's a type.
> + if (S->isTypeOperand())
> + TRY_TO(TraverseTypeLoc(S->getTypeOperandSourceInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(TypeTraitExpr, {
> for (unsigned I = 0, N = S->getNumArgs(); I != N; ++I)
> @@ -2183,30 +2103,29 @@ DEF_TRAVERSE_STMT(TypeTraitExpr, {
> })
>
> DEF_TRAVERSE_STMT(ArrayTypeTraitExpr, {
> - TRY_TO(TraverseTypeLoc(S->getQueriedTypeSourceInfo()->getTypeLoc()));
> - })
> + TRY_TO(TraverseTypeLoc(S->getQueriedTypeSourceInfo()->getTypeLoc()));
> +})
>
> -DEF_TRAVERSE_STMT(ExpressionTraitExpr, {
> - TRY_TO(TraverseStmt(S->getQueriedExpression()));
> - })
> +DEF_TRAVERSE_STMT(ExpressionTraitExpr,
> + { TRY_TO(TraverseStmt(S->getQueriedExpression())); })
>
> DEF_TRAVERSE_STMT(VAArgExpr, {
> - // The child-iterator will pick up the expression argument.
> - TRY_TO(TraverseTypeLoc(S->getWrittenTypeInfo()->getTypeLoc()));
> - })
> + // The child-iterator will pick up the expression argument.
> + TRY_TO(TraverseTypeLoc(S->getWrittenTypeInfo()->getTypeLoc()));
> +})
>
> DEF_TRAVERSE_STMT(CXXTemporaryObjectExpr, {
> - // This is called for code like 'return T()' where T is a class type.
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // This is called for code like 'return T()' where T is a class type.
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> -// Walk only the visible parts of lambda expressions.
> -template<typename Derived>
> +// Walk only the visible parts of lambda expressions.
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseLambdaExpr(LambdaExpr *S) {
> TRY_TO(WalkUpFromLambdaExpr(S));
>
> for (LambdaExpr::capture_iterator C = S->explicit_capture_begin(),
> - CEnd = S->explicit_capture_end();
> + CEnd = S->explicit_capture_end();
> C != CEnd; ++C) {
> TRY_TO(TraverseLambdaCapture(S, C));
> }
> @@ -2224,7 +2143,7 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
> } else {
> TRY_TO(TraverseTypeLoc(Proto.getReturnLoc()));
> - }
> + }
> }
> }
>
> @@ -2233,36 +2152,36 @@ bool RecursiveASTVisitor<Derived>::Trave
> }
>
> DEF_TRAVERSE_STMT(CXXUnresolvedConstructExpr, {
> - // This is called for code like 'T()', where T is a template argument.
> - TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> - })
> + // This is called for code like 'T()', where T is a template argument.
> + TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> +})
>
> // These expressions all might take explicit template arguments.
> // We traverse those if so. FIXME: implement these.
> -DEF_TRAVERSE_STMT(CXXConstructExpr, { })
> -DEF_TRAVERSE_STMT(CallExpr, { })
> -DEF_TRAVERSE_STMT(CXXMemberCallExpr, { })
> +DEF_TRAVERSE_STMT(CXXConstructExpr, {})
> +DEF_TRAVERSE_STMT(CallExpr, {})
> +DEF_TRAVERSE_STMT(CXXMemberCallExpr, {})
>
> // These exprs (most of them), do not need any action except iterating
> // over the children.
> -DEF_TRAVERSE_STMT(AddrLabelExpr, { })
> -DEF_TRAVERSE_STMT(ArraySubscriptExpr, { })
> +DEF_TRAVERSE_STMT(AddrLabelExpr, {})
> +DEF_TRAVERSE_STMT(ArraySubscriptExpr, {})
> DEF_TRAVERSE_STMT(BlockExpr, {
> TRY_TO(TraverseDecl(S->getBlockDecl()));
> return true; // no child statements to loop through.
> })
> -DEF_TRAVERSE_STMT(ChooseExpr, { })
> +DEF_TRAVERSE_STMT(ChooseExpr, {})
> DEF_TRAVERSE_STMT(CompoundLiteralExpr, {
> TRY_TO(TraverseTypeLoc(S->getTypeSourceInfo()->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(CXXBindTemporaryExpr, { })
> -DEF_TRAVERSE_STMT(CXXBoolLiteralExpr, { })
> -DEF_TRAVERSE_STMT(CXXDefaultArgExpr, { })
> -DEF_TRAVERSE_STMT(CXXDefaultInitExpr, { })
> -DEF_TRAVERSE_STMT(CXXDeleteExpr, { })
> -DEF_TRAVERSE_STMT(ExprWithCleanups, { })
> -DEF_TRAVERSE_STMT(CXXNullPtrLiteralExpr, { })
> -DEF_TRAVERSE_STMT(CXXStdInitializerListExpr, { })
> +DEF_TRAVERSE_STMT(CXXBindTemporaryExpr, {})
> +DEF_TRAVERSE_STMT(CXXBoolLiteralExpr, {})
> +DEF_TRAVERSE_STMT(CXXDefaultArgExpr, {})
> +DEF_TRAVERSE_STMT(CXXDefaultInitExpr, {})
> +DEF_TRAVERSE_STMT(CXXDeleteExpr, {})
> +DEF_TRAVERSE_STMT(ExprWithCleanups, {})
> +DEF_TRAVERSE_STMT(CXXNullPtrLiteralExpr, {})
> +DEF_TRAVERSE_STMT(CXXStdInitializerListExpr, {})
> DEF_TRAVERSE_STMT(CXXPseudoDestructorExpr, {
> TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> if (TypeSourceInfo *ScopeInfo = S->getScopeTypeInfo())
> @@ -2270,38 +2189,38 @@ DEF_TRAVERSE_STMT(CXXPseudoDestructorExp
> if (TypeSourceInfo *DestroyedTypeInfo = S->getDestroyedTypeInfo())
> TRY_TO(TraverseTypeLoc(DestroyedTypeInfo->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(CXXThisExpr, { })
> -DEF_TRAVERSE_STMT(CXXThrowExpr, { })
> -DEF_TRAVERSE_STMT(UserDefinedLiteral, { })
> -DEF_TRAVERSE_STMT(DesignatedInitExpr, { })
> -DEF_TRAVERSE_STMT(ExtVectorElementExpr, { })
> -DEF_TRAVERSE_STMT(GNUNullExpr, { })
> -DEF_TRAVERSE_STMT(ImplicitValueInitExpr, { })
> -DEF_TRAVERSE_STMT(ObjCBoolLiteralExpr, { })
> +DEF_TRAVERSE_STMT(CXXThisExpr, {})
> +DEF_TRAVERSE_STMT(CXXThrowExpr, {})
> +DEF_TRAVERSE_STMT(UserDefinedLiteral, {})
> +DEF_TRAVERSE_STMT(DesignatedInitExpr, {})
> +DEF_TRAVERSE_STMT(ExtVectorElementExpr, {})
> +DEF_TRAVERSE_STMT(GNUNullExpr, {})
> +DEF_TRAVERSE_STMT(ImplicitValueInitExpr, {})
> +DEF_TRAVERSE_STMT(ObjCBoolLiteralExpr, {})
> DEF_TRAVERSE_STMT(ObjCEncodeExpr, {
> if (TypeSourceInfo *TInfo = S->getEncodedTypeSourceInfo())
> TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(ObjCIsaExpr, { })
> -DEF_TRAVERSE_STMT(ObjCIvarRefExpr, { })
> +DEF_TRAVERSE_STMT(ObjCIsaExpr, {})
> +DEF_TRAVERSE_STMT(ObjCIvarRefExpr, {})
> DEF_TRAVERSE_STMT(ObjCMessageExpr, {
> if (TypeSourceInfo *TInfo = S->getClassReceiverTypeInfo())
> TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(ObjCPropertyRefExpr, { })
> -DEF_TRAVERSE_STMT(ObjCSubscriptRefExpr, { })
> -DEF_TRAVERSE_STMT(ObjCProtocolExpr, { })
> -DEF_TRAVERSE_STMT(ObjCSelectorExpr, { })
> -DEF_TRAVERSE_STMT(ObjCIndirectCopyRestoreExpr, { })
> +DEF_TRAVERSE_STMT(ObjCPropertyRefExpr, {})
> +DEF_TRAVERSE_STMT(ObjCSubscriptRefExpr, {})
> +DEF_TRAVERSE_STMT(ObjCProtocolExpr, {})
> +DEF_TRAVERSE_STMT(ObjCSelectorExpr, {})
> +DEF_TRAVERSE_STMT(ObjCIndirectCopyRestoreExpr, {})
> DEF_TRAVERSE_STMT(ObjCBridgedCastExpr, {
> TRY_TO(TraverseTypeLoc(S->getTypeInfoAsWritten()->getTypeLoc()));
> })
> -DEF_TRAVERSE_STMT(ParenExpr, { })
> -DEF_TRAVERSE_STMT(ParenListExpr, { })
> -DEF_TRAVERSE_STMT(PredefinedExpr, { })
> -DEF_TRAVERSE_STMT(ShuffleVectorExpr, { })
> -DEF_TRAVERSE_STMT(ConvertVectorExpr, { })
> -DEF_TRAVERSE_STMT(StmtExpr, { })
> +DEF_TRAVERSE_STMT(ParenExpr, {})
> +DEF_TRAVERSE_STMT(ParenListExpr, {})
> +DEF_TRAVERSE_STMT(PredefinedExpr, {})
> +DEF_TRAVERSE_STMT(ShuffleVectorExpr, {})
> +DEF_TRAVERSE_STMT(ConvertVectorExpr, {})
> +DEF_TRAVERSE_STMT(StmtExpr, {})
> DEF_TRAVERSE_STMT(UnresolvedLookupExpr, {
> TRY_TO(TraverseNestedNameSpecifierLoc(S->getQualifierLoc()));
> if (S->hasExplicitTemplateArgs()) {
> @@ -2320,87 +2239,90 @@ DEF_TRAVERSE_STMT(UnresolvedMemberExpr,
>
> DEF_TRAVERSE_STMT(SEHTryStmt, {})
> DEF_TRAVERSE_STMT(SEHExceptStmt, {})
> -DEF_TRAVERSE_STMT(SEHFinallyStmt,{})
> -DEF_TRAVERSE_STMT(CapturedStmt, {
> - TRY_TO(TraverseDecl(S->getCapturedDecl()));
> -})
> +DEF_TRAVERSE_STMT(SEHFinallyStmt, {})
> +DEF_TRAVERSE_STMT(CapturedStmt, {
> TRY_TO(TraverseDecl(S->getCapturedDecl())); })
>
> -DEF_TRAVERSE_STMT(CXXOperatorCallExpr, { })
> -DEF_TRAVERSE_STMT(OpaqueValueExpr, { })
> -DEF_TRAVERSE_STMT(CUDAKernelCallExpr, { })
> +DEF_TRAVERSE_STMT(CXXOperatorCallExpr, {})
> +DEF_TRAVERSE_STMT(OpaqueValueExpr, {})
> +DEF_TRAVERSE_STMT(CUDAKernelCallExpr, {})
>
> // These operators (all of them) do not need any action except
> // iterating over the children.
> -DEF_TRAVERSE_STMT(BinaryConditionalOperator, { })
> -DEF_TRAVERSE_STMT(ConditionalOperator, { })
> -DEF_TRAVERSE_STMT(UnaryOperator, { })
> -DEF_TRAVERSE_STMT(BinaryOperator, { })
> -DEF_TRAVERSE_STMT(CompoundAssignOperator, { })
> -DEF_TRAVERSE_STMT(CXXNoexceptExpr, { })
> -DEF_TRAVERSE_STMT(PackExpansionExpr, { })
> -DEF_TRAVERSE_STMT(SizeOfPackExpr, { })
> -DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmPackExpr, { })
> -DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmExpr, { })
> -DEF_TRAVERSE_STMT(FunctionParmPackExpr, { })
> -DEF_TRAVERSE_STMT(MaterializeTemporaryExpr, { })
> -DEF_TRAVERSE_STMT(AtomicExpr, { })
> +DEF_TRAVERSE_STMT(BinaryConditionalOperator, {})
> +DEF_TRAVERSE_STMT(ConditionalOperator, {})
> +DEF_TRAVERSE_STMT(UnaryOperator, {})
> +DEF_TRAVERSE_STMT(BinaryOperator, {})
> +DEF_TRAVERSE_STMT(CompoundAssignOperator, {})
> +DEF_TRAVERSE_STMT(CXXNoexceptExpr, {})
> +DEF_TRAVERSE_STMT(PackExpansionExpr, {})
> +DEF_TRAVERSE_STMT(SizeOfPackExpr, {})
> +DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmPackExpr, {})
> +DEF_TRAVERSE_STMT(SubstNonTypeTemplateParmExpr, {})
> +DEF_TRAVERSE_STMT(FunctionParmPackExpr, {})
> +DEF_TRAVERSE_STMT(MaterializeTemporaryExpr, {})
> +DEF_TRAVERSE_STMT(AtomicExpr, {})
>
> // These literals (all of them) do not need any action.
> -DEF_TRAVERSE_STMT(IntegerLiteral, { })
> -DEF_TRAVERSE_STMT(CharacterLiteral, { })
> -DEF_TRAVERSE_STMT(FloatingLiteral, { })
> -DEF_TRAVERSE_STMT(ImaginaryLiteral, { })
> -DEF_TRAVERSE_STMT(StringLiteral, { })
> -DEF_TRAVERSE_STMT(ObjCStringLiteral, { })
> -DEF_TRAVERSE_STMT(ObjCBoxedExpr, { })
> -DEF_TRAVERSE_STMT(ObjCArrayLiteral, { })
> -DEF_TRAVERSE_STMT(ObjCDictionaryLiteral, { })
> -
> +DEF_TRAVERSE_STMT(IntegerLiteral, {})
> +DEF_TRAVERSE_STMT(CharacterLiteral, {})
> +DEF_TRAVERSE_STMT(FloatingLiteral, {})
> +DEF_TRAVERSE_STMT(ImaginaryLiteral, {})
> +DEF_TRAVERSE_STMT(StringLiteral, {})
> +DEF_TRAVERSE_STMT(ObjCStringLiteral, {})
> +DEF_TRAVERSE_STMT(ObjCBoxedExpr, {})
> +DEF_TRAVERSE_STMT(ObjCArrayLiteral, {})
> +DEF_TRAVERSE_STMT(ObjCDictionaryLiteral, {})
> +
> // Traverse OpenCL: AsType, Convert.
> -DEF_TRAVERSE_STMT(AsTypeExpr, { })
> +DEF_TRAVERSE_STMT(AsTypeExpr, {})
>
> // OpenMP directives.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseOMPExecutableDirective(
> - OMPExecutableDirective *S) {
> + OMPExecutableDirective *S) {
> ArrayRef<OMPClause *> Clauses = S->clauses();
> for (ArrayRef<OMPClause *>::iterator I = Clauses.begin(), E =
> Clauses.end();
> I != E; ++I)
> - if (!TraverseOMPClause(*I)) return false;
> + if (!TraverseOMPClause(*I))
> + return false;
> return true;
> }
>
> DEF_TRAVERSE_STMT(OMPParallelDirective, {
> - if (!TraverseOMPExecutableDirective(S)) return false;
> + if (!TraverseOMPExecutableDirective(S))
> + return false;
> })
>
> DEF_TRAVERSE_STMT(OMPSimdDirective, {
> - if (!TraverseOMPExecutableDirective(S)) return false;
> + if (!TraverseOMPExecutableDirective(S))
> + return false;
> })
>
> // OpenMP clauses.
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {
> - if (!C) return true;
> + if (!C)
> + return true;
> switch (C->getClauseKind()) {
> -#define OPENMP_CLAUSE(Name, Class) \
> - case OMPC_##Name: \
> - return getDerived().Visit##Class(static_cast<Class*>(C));
> +#define OPENMP_CLAUSE(Name, Class)
> \
> + case OMPC_##Name:
> \
> + return getDerived().Visit##Class(static_cast<Class *>(C));
> #include "clang/Basic/OpenMPKinds.def"
> - default: break;
> + default:
> + break;
> }
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPIfClause(OMPIfClause *C) {
> TraverseStmt(C->getCondition());
> return true;
> }
>
> -template<typename Derived>
> -bool RecursiveASTVisitor<Derived>::VisitOMPNumThreadsClause(
> - OMPNumThreadsClause
> *C) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::VisitOMPNumThreadsClause(OMPNumThreadsClause
> *C) {
> TraverseStmt(C->getNumThreads());
> return true;
> }
> @@ -2411,50 +2333,51 @@ bool RecursiveASTVisitor<Derived>::Visit
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPDefaultClause(OMPDefaultClause
> *C) {
> return true;
> }
>
> -template<typename Derived>
> -bool
> RecursiveASTVisitor<Derived>::VisitOMPProcBindClause(OMPProcBindClause *C) {
> +template <typename Derived>
> +bool
> +RecursiveASTVisitor<Derived>::VisitOMPProcBindClause(OMPProcBindClause
> *C) {
> return true;
> }
>
> -template<typename Derived>
> -template<typename T>
> +template <typename Derived>
> +template <typename T>
> void RecursiveASTVisitor<Derived>::VisitOMPClauseList(T *Node) {
> for (auto *I : Node->varlists())
> TraverseStmt(I);
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPPrivateClause(OMPPrivateClause
> *C) {
> VisitOMPClauseList(C);
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPFirstprivateClause(
> - OMPFirstprivateClause
> *C) {
> + OMPFirstprivateClause *C) {
> VisitOMPClauseList(C);
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPSharedClause(OMPSharedClause
> *C) {
> VisitOMPClauseList(C);
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPLinearClause(OMPLinearClause
> *C) {
> VisitOMPClauseList(C);
> TraverseStmt(C->getStep());
> return true;
> }
>
> -template<typename Derived>
> +template <typename Derived>
> bool RecursiveASTVisitor<Derived>::VisitOMPCopyinClause(OMPCopyinClause
> *C) {
> VisitOMPClauseList(C);
> return true;
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140519/7783e937/attachment.html>
More information about the cfe-commits
mailing list