Author: Ilya Biryukov Date: 2019-11-29T09:45:06+01:00 New Revision: def65bb4f5bc87588fa6f849225397c21dcefb2b
URL: https://github.com/llvm/llvm-project/commit/def65bb4f5bc87588fa6f849225397c21dcefb2b DIFF: https://github.com/llvm/llvm-project/commit/def65bb4f5bc87588fa6f849225397c21dcefb2b.diff LOG: [Syntax] Remove unused parameter from `TreeBuilder::markChildToken`. NFC Added: Modified: clang/lib/Tooling/Syntax/BuildTree.cpp Removed: ################################################################################ diff --git a/clang/lib/Tooling/Syntax/BuildTree.cpp b/clang/lib/Tooling/Syntax/BuildTree.cpp index dddc265c8c41..b36b8e00f7c1 100644 --- a/clang/lib/Tooling/Syntax/BuildTree.cpp +++ b/clang/lib/Tooling/Syntax/BuildTree.cpp @@ -66,7 +66,7 @@ class syntax::TreeBuilder { void markExprChild(Expr *Child, NodeRole Role); /// Set role for a token starting at \p Loc. - void markChildToken(SourceLocation Loc, tok::TokenKind Kind, NodeRole R); + void markChildToken(SourceLocation Loc, NodeRole R); /// Finish building the tree and consume the root node. syntax::TranslationUnit *finalize() && { @@ -255,11 +255,10 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { bool WalkUpFromCompoundStmt(CompoundStmt *S) { using NodeRole = syntax::NodeRole; - Builder.markChildToken(S->getLBracLoc(), tok::l_brace, NodeRole::OpenParen); + Builder.markChildToken(S->getLBracLoc(), NodeRole::OpenParen); for (auto *Child : S->body()) Builder.markStmtChild(Child, NodeRole::CompoundStatement_statement); - Builder.markChildToken(S->getRBracLoc(), tok::r_brace, - NodeRole::CloseParen); + Builder.markChildToken(S->getRBracLoc(), NodeRole::CloseParen); Builder.foldNode(Builder.getStmtRange(S), new (allocator()) syntax::CompoundStatement); @@ -323,7 +322,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromSwitchStmt(SwitchStmt *S) { - Builder.markChildToken(S->getSwitchLoc(), tok::kw_switch, + Builder.markChildToken(S->getSwitchLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markStmtChild(S->getBody(), syntax::NodeRole::BodyStatement); Builder.foldNode(Builder.getStmtRange(S), @@ -332,7 +331,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromCaseStmt(CaseStmt *S) { - Builder.markChildToken(S->getKeywordLoc(), tok::kw_case, + Builder.markChildToken(S->getKeywordLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markExprChild(S->getLHS(), syntax::NodeRole::CaseStatement_value); Builder.markStmtChild(S->getSubStmt(), syntax::NodeRole::BodyStatement); @@ -342,7 +341,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromDefaultStmt(DefaultStmt *S) { - Builder.markChildToken(S->getKeywordLoc(), tok::kw_default, + Builder.markChildToken(S->getKeywordLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markStmtChild(S->getSubStmt(), syntax::NodeRole::BodyStatement); Builder.foldNode(Builder.getStmtRange(S), @@ -351,11 +350,10 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromIfStmt(IfStmt *S) { - Builder.markChildToken(S->getIfLoc(), tok::kw_if, - syntax::NodeRole::IntroducerKeyword); + Builder.markChildToken(S->getIfLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markStmtChild(S->getThen(), syntax::NodeRole::IfStatement_thenStatement); - Builder.markChildToken(S->getElseLoc(), tok::kw_else, + Builder.markChildToken(S->getElseLoc(), syntax::NodeRole::IfStatement_elseKeyword); Builder.markStmtChild(S->getElse(), syntax::NodeRole::IfStatement_elseStatement); @@ -365,8 +363,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromForStmt(ForStmt *S) { - Builder.markChildToken(S->getForLoc(), tok::kw_for, - syntax::NodeRole::IntroducerKeyword); + Builder.markChildToken(S->getForLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markStmtChild(S->getBody(), syntax::NodeRole::BodyStatement); Builder.foldNode(Builder.getStmtRange(S), new (allocator()) syntax::ForStatement); @@ -374,7 +371,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromWhileStmt(WhileStmt *S) { - Builder.markChildToken(S->getWhileLoc(), tok::kw_while, + Builder.markChildToken(S->getWhileLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markStmtChild(S->getBody(), syntax::NodeRole::BodyStatement); Builder.foldNode(Builder.getStmtRange(S), @@ -383,7 +380,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromContinueStmt(ContinueStmt *S) { - Builder.markChildToken(S->getContinueLoc(), tok::kw_continue, + Builder.markChildToken(S->getContinueLoc(), syntax::NodeRole::IntroducerKeyword); Builder.foldNode(Builder.getStmtRange(S), new (allocator()) syntax::ContinueStatement); @@ -391,7 +388,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromBreakStmt(BreakStmt *S) { - Builder.markChildToken(S->getBreakLoc(), tok::kw_break, + Builder.markChildToken(S->getBreakLoc(), syntax::NodeRole::IntroducerKeyword); Builder.foldNode(Builder.getStmtRange(S), new (allocator()) syntax::BreakStatement); @@ -399,7 +396,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromReturnStmt(ReturnStmt *S) { - Builder.markChildToken(S->getReturnLoc(), tok::kw_return, + Builder.markChildToken(S->getReturnLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markExprChild(S->getRetValue(), syntax::NodeRole::ReturnStatement_value); @@ -409,8 +406,7 @@ class BuildTreeVisitor : public RecursiveASTVisitor<BuildTreeVisitor> { } bool WalkUpFromCXXForRangeStmt(CXXForRangeStmt *S) { - Builder.markChildToken(S->getForLoc(), tok::kw_for, - syntax::NodeRole::IntroducerKeyword); + Builder.markChildToken(S->getForLoc(), syntax::NodeRole::IntroducerKeyword); Builder.markStmtChild(S->getBody(), syntax::NodeRole::BodyStatement); Builder.foldNode(Builder.getStmtRange(S), new (allocator()) syntax::RangeBasedForStatement); @@ -431,8 +427,7 @@ void syntax::TreeBuilder::foldNode(llvm::ArrayRef<syntax::Token> Range, Pending.foldChildren(Range, New); } -void syntax::TreeBuilder::markChildToken(SourceLocation Loc, - tok::TokenKind Kind, NodeRole Role) { +void syntax::TreeBuilder::markChildToken(SourceLocation Loc, NodeRole Role) { if (Loc.isInvalid()) return; Pending.assignRole(*findToken(Loc), Role); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
