summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Vikstrom <jvikstrom@google.com>2019-08-20 13:34:01 +0000
committerJohan Vikstrom <jvikstrom@google.com>2019-08-20 13:34:01 +0000
commit6687fde07aeaea958d9f9b385949dbde769b20f7 (patch)
tree8433952735f0397550eda19de0449f19861e37f4
parentcec028fc14dda68c80e489b861adcf28944151f6 (diff)
downloadbcm5719-llvm-6687fde07aeaea958d9f9b385949dbde769b20f7.tar.gz
bcm5719-llvm-6687fde07aeaea958d9f9b385949dbde769b20f7.zip
[Syntax] Added function to get macro expansion tokens to TokenBuffer.
Summary: Returns the first token in every mapping where the token is an identifier. This API is required to be able to highlight macro expansions in clangd. Reviewers: hokein, ilya-biryukov Subscribers: kadircet, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D66470 llvm-svn: 369385
-rw-r--r--clang/include/clang/Tooling/Syntax/Tokens.h10
-rw-r--r--clang/lib/Tooling/Syntax/Tokens.cpp15
-rw-r--r--clang/unittests/Tooling/Syntax/TokensTest.cpp23
3 files changed, 48 insertions, 0 deletions
diff --git a/clang/include/clang/Tooling/Syntax/Tokens.h b/clang/include/clang/Tooling/Syntax/Tokens.h
index 4640ccb2d30..301432d3888 100644
--- a/clang/include/clang/Tooling/Syntax/Tokens.h
+++ b/clang/include/clang/Tooling/Syntax/Tokens.h
@@ -236,6 +236,16 @@ public:
/// #pragma, etc.
llvm::ArrayRef<syntax::Token> spelledTokens(FileID FID) const;
+ /// Get all tokens that expand a macro in \p FID. For the following input
+ /// #define FOO B
+ /// #define FOO2(X) int X
+ /// FOO2(XY)
+ /// int B;
+ /// FOO;
+ /// macroExpansions() returns {"FOO2", "FOO"} (from line 3 and 5
+ /// respecitvely).
+ std::vector<const syntax::Token *> macroExpansions(FileID FID) const;
+
const SourceManager &sourceManager() const { return *SourceMgr; }
std::string dumpForTests() const;
diff --git a/clang/lib/Tooling/Syntax/Tokens.cpp b/clang/lib/Tooling/Syntax/Tokens.cpp
index 3852e71c37f..a2c3bc137d6 100644
--- a/clang/lib/Tooling/Syntax/Tokens.cpp
+++ b/clang/lib/Tooling/Syntax/Tokens.cpp
@@ -232,6 +232,21 @@ TokenBuffer::expansionStartingAt(const syntax::Token *Spelled) const {
return E;
}
+std::vector<const syntax::Token *>
+TokenBuffer::macroExpansions(FileID FID) const {
+ auto FileIt = Files.find(FID);
+ assert(FileIt != Files.end() && "file not tracked by token buffer");
+ auto &File = FileIt->second;
+ std::vector<const syntax::Token *> Expansions;
+ auto &Spelled = File.SpelledTokens;
+ for (auto Mapping : File.Mappings) {
+ const syntax::Token *Token = &Spelled[Mapping.BeginSpelled];
+ if (Token->kind() == tok::TokenKind::identifier)
+ Expansions.push_back(Token);
+ }
+ return Expansions;
+}
+
std::vector<syntax::Token> syntax::tokenize(FileID FID, const SourceManager &SM,
const LangOptions &LO) {
std::vector<syntax::Token> Tokens;
diff --git a/clang/unittests/Tooling/Syntax/TokensTest.cpp b/clang/unittests/Tooling/Syntax/TokensTest.cpp
index 78f0d2fdd87..6ffe2c43dd0 100644
--- a/clang/unittests/Tooling/Syntax/TokensTest.cpp
+++ b/clang/unittests/Tooling/Syntax/TokensTest.cpp
@@ -755,4 +755,27 @@ TEST_F(TokenBufferTest, TokensToFileRange) {
// We don't test assertion failures because death tests are slow.
}
+TEST_F(TokenBufferTest, macroExpansions) {
+ llvm::Annotations Code(R"cpp(
+ #define FOO B
+ #define FOO2 BA
+ #define CALL(X) int X
+ #define G CALL(FOO2)
+ int B;
+ $macro[[FOO]];
+ $macro[[CALL]](A);
+ $macro[[G]];
+ )cpp");
+ recordTokens(Code.code());
+ auto &SM = *SourceMgr;
+ auto Expansions = Buffer.macroExpansions(SM.getMainFileID());
+ std::vector<FileRange> ExpectedMacroRanges;
+ for (auto Range : Code.ranges("macro"))
+ ExpectedMacroRanges.push_back(
+ FileRange(SM.getMainFileID(), Range.Begin, Range.End));
+ std::vector<FileRange> ActualMacroRanges;
+ for (auto Expansion : Expansions)
+ ActualMacroRanges.push_back(Expansion->range(SM));
+ EXPECT_EQ(ExpectedMacroRanges, ActualMacroRanges);
+}
} // namespace
OpenPOWER on IntegriCloud