diff --git a/clang/include/clang/Tooling/Syntax/BuildTree.h b/clang/include/clang/Tooling/Syntax/BuildTree.h --- a/clang/include/clang/Tooling/Syntax/BuildTree.h +++ b/clang/include/clang/Tooling/Syntax/BuildTree.h @@ -34,6 +34,11 @@ /// this token syntax::Leaf *createLeaf(syntax::Arena &A, tok::TokenKind K); +// Synthesis of Trees +syntax::Tree * +createTree(Arena &A, std::vector>, + syntax::NodeKind); + // Synthesis of Syntax Nodes clang::syntax::EmptyStatement *createEmptyStatement(clang::syntax::Arena &A); diff --git a/clang/lib/Tooling/Syntax/Synthesis.cpp b/clang/lib/Tooling/Syntax/Synthesis.cpp --- a/clang/lib/Tooling/Syntax/Synthesis.cpp +++ b/clang/lib/Tooling/Syntax/Synthesis.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "clang/Basic/TokenKinds.h" #include "clang/Tooling/Syntax/BuildTree.h" +#include "clang/Tooling/Syntax/Nodes.h" using namespace clang; @@ -50,6 +51,20 @@ return createLeaf(A, K, Spelling); } +syntax::Tree *clang::syntax::createTree( + syntax::Arena &A, + std::vector> Children, + syntax::NodeKind K) { + auto *T = new (A.getAllocator()) syntax::Tree(K); + FactoryImpl::setCanModify(T); + for (auto ChildIt = Children.rbegin(); ChildIt != Children.rend(); + std::advance(ChildIt, 1)) + FactoryImpl::prependChildLowLevel(T, ChildIt->first, ChildIt->second); + + T->assertInvariants(); + return T; +} + syntax::EmptyStatement *clang::syntax::createEmptyStatement(syntax::Arena &A) { auto *S = new (A.getAllocator()) syntax::EmptyStatement; FactoryImpl::setCanModify(S); diff --git a/clang/unittests/Tooling/Syntax/SynthesisTest.cpp b/clang/unittests/Tooling/Syntax/SynthesisTest.cpp --- a/clang/unittests/Tooling/Syntax/SynthesisTest.cpp +++ b/clang/unittests/Tooling/Syntax/SynthesisTest.cpp @@ -12,6 +12,7 @@ #include "TreeTestBase.h" #include "clang/Tooling/Syntax/BuildTree.h" +#include "clang/Tooling/Syntax/Nodes.h" #include "gtest/gtest.h" using namespace clang; @@ -80,6 +81,62 @@ )txt")); } +TEST_P(SynthesisTest, Tree_Empty) { + buildTree("", GetParam()); + + auto *Tree = createTree(*Arena, {}, NodeKind::UnknownExpression); + + EXPECT_TRUE(treeDumpEqual(Tree, R"txt( +UnknownExpression Detached synthesized + )txt")); +} + +TEST_P(SynthesisTest, Tree_Flat) { + buildTree("", GetParam()); + + auto *LeafLParen = createLeaf(*Arena, tok::l_paren); + auto *LeafRParen = createLeaf(*Arena, tok::r_paren); + auto *TreeParen = createTree(*Arena, + {{LeafLParen, NodeRole::LeftHandSide}, + {LeafRParen, NodeRole::RightHandSide}}, + NodeKind::ParenExpression); + + EXPECT_TRUE(treeDumpEqual(TreeParen, R"txt( +ParenExpression Detached synthesized +|-'(' LeftHandSide synthesized +`-')' RightHandSide synthesized + )txt")); +} + +TEST_P(SynthesisTest, Tree_OfTree) { + buildTree("", GetParam()); + + auto *Leaf1 = createLeaf(*Arena, tok::numeric_constant, "1"); + auto *Int1 = createTree(*Arena, {{Leaf1, NodeRole::LiteralToken}}, + NodeKind::IntegerLiteralExpression); + + auto *LeafPlus = createLeaf(*Arena, tok::plus); + + auto *Leaf2 = createLeaf(*Arena, tok::numeric_constant, "2"); + auto *Int2 = createTree(*Arena, {{Leaf2, NodeRole::LiteralToken}}, + NodeKind::IntegerLiteralExpression); + + auto *TreeBinaryOperator = createTree(*Arena, + {{Int1, NodeRole::LeftHandSide}, + {LeafPlus, NodeRole::OperatorToken}, + {Int2, NodeRole::RightHandSide}}, + NodeKind::BinaryOperatorExpression); + + EXPECT_TRUE(treeDumpEqual(TreeBinaryOperator, R"txt( +BinaryOperatorExpression Detached synthesized +|-IntegerLiteralExpression LeftHandSide synthesized +| `-'1' LiteralToken synthesized +|-'+' OperatorToken synthesized +`-IntegerLiteralExpression RightHandSide synthesized + `-'2' LiteralToken synthesized + )txt")); +} + TEST_P(SynthesisTest, Statement_EmptyStatement) { buildTree("", GetParam());