[clang-tools-extra] 5ca97d0 - Revert "Allow newlines in AST Matchers in clang-query files" + 1
Evgenii Stepanov via cfe-commits
cfe-commits at lists.llvm.org
Thu Dec 26 18:08:47 PST 2019
Author: Evgenii Stepanov
Date: 2019-12-26T18:07:20-08:00
New Revision: 5ca97d0defeed38feec2352692f6bb80297d6712
URL: https://github.com/llvm/llvm-project/commit/5ca97d0defeed38feec2352692f6bb80297d6712
DIFF: https://github.com/llvm/llvm-project/commit/5ca97d0defeed38feec2352692f6bb80297d6712.diff
LOG: Revert "Allow newlines in AST Matchers in clang-query files" + 1
Revert "Fix -Wunused-lambda-capture warnings."
This reverts commit 2369560f4a7720b19edfbf9de14ef061307ff773.
This reverts commit 522ee29a4fb3814db604b585c8637247477ec057.
clang/lib/ASTMatchers/Dynamic/Parser.cpp:610:13: warning: implicit conversion turns string literal into bool: 'const char [35]' to 'bool' [-Wstring-conversion]
assert(!"Newline should never be found here");
Added:
Modified:
clang-tools-extra/clang-query/Query.cpp
clang-tools-extra/clang-query/Query.h
clang-tools-extra/clang-query/QueryParser.cpp
clang-tools-extra/clang-query/tool/ClangQuery.cpp
clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
clang/include/clang/ASTMatchers/Dynamic/Parser.h
clang/lib/ASTMatchers/Dynamic/Parser.cpp
clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/clang-query/Query.cpp b/clang-tools-extra/clang-query/Query.cpp
index 8eafc5eed750..675fd968f46e 100644
--- a/clang-tools-extra/clang-query/Query.cpp
+++ b/clang-tools-extra/clang-query/Query.cpp
@@ -101,24 +101,9 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
Finder.matchAST(AST->getASTContext());
if (QS.PrintMatcher) {
- SmallVector<StringRef, 4> Lines;
- Source.split(Lines, "\n");
- auto FirstLine = Lines[0];
- Lines.erase(Lines.begin(), Lines.begin() + 1);
- while (!Lines.empty() && Lines.back().empty()) {
- Lines.resize(Lines.size() - 1);
- }
- unsigned MaxLength = FirstLine.size();
- std::string PrefixText = "Matcher: ";
- OS << "\n " << PrefixText << FirstLine;
-
- for (auto Line : Lines) {
- OS << "\n" << std::string(PrefixText.size() + 2, ' ') << Line;
- MaxLength = std::max<int>(MaxLength, Line.rtrim().size());
- }
-
- OS << "\n"
- << " " << std::string(PrefixText.size() + MaxLength, '=') << "\n\n";
+ std::string prefixText = "Matcher: ";
+ OS << "\n " << prefixText << Source << "\n";
+ OS << " " << std::string(prefixText.size() + Source.size(), '=') << '\n';
}
for (auto MI = Matches.begin(), ME = Matches.end(); MI != ME; ++MI) {
diff --git a/clang-tools-extra/clang-query/Query.h b/clang-tools-extra/clang-query/Query.h
index 78bcbc79cdf8..56af486984ee 100644
--- a/clang-tools-extra/clang-query/Query.h
+++ b/clang-tools-extra/clang-query/Query.h
@@ -44,7 +44,6 @@ struct Query : llvm::RefCountedBase<Query> {
/// \return false if an error occurs, otherwise return true.
virtual bool run(llvm::raw_ostream &OS, QuerySession &QS) const = 0;
- StringRef RemainingContent;
const QueryKind Kind;
};
diff --git a/clang-tools-extra/clang-query/QueryParser.cpp b/clang-tools-extra/clang-query/QueryParser.cpp
index a980722de9e6..4da2f5da79d4 100644
--- a/clang-tools-extra/clang-query/QueryParser.cpp
+++ b/clang-tools-extra/clang-query/QueryParser.cpp
@@ -26,10 +26,7 @@ namespace query {
// is found before End, return StringRef(). Begin is adjusted to exclude the
// lexed region.
StringRef QueryParser::lexWord() {
- Line = Line.drop_while([](char c) {
- // Don't trim newlines.
- return StringRef(" \t\v\f\r").contains(c);
- });
+ Line = Line.ltrim();
if (Line.empty())
// Even though the Line is empty, it contains a pointer and
@@ -37,12 +34,12 @@ StringRef QueryParser::lexWord() {
// code completion.
return Line;
- StringRef Word;
- if (Line.front() == '#')
- Word = Line.substr(0, 1);
- else
- Word = Line.take_until(isWhitespace);
+ if (Line.front() == '#') {
+ Line = {};
+ return StringRef();
+ }
+ StringRef Word = Line.take_until(isWhitespace);
Line = Line.drop_front(Word.size());
return Word;
}
@@ -128,25 +125,9 @@ template <typename QueryType> QueryRef QueryParser::parseSetOutputKind() {
}
QueryRef QueryParser::endQuery(QueryRef Q) {
- StringRef Extra = Line;
- StringRef ExtraTrimmed = Extra.drop_while(
- [](char c) { return StringRef(" \t\v\f\r").contains(c); });
-
- if ((!ExtraTrimmed.empty() && ExtraTrimmed[0] == '\n') ||
- (ExtraTrimmed.size() >= 2 && ExtraTrimmed[0] == '\r' &&
- ExtraTrimmed[1] == '\n'))
- Q->RemainingContent = Extra;
- else {
- StringRef TrailingWord = lexWord();
- if (!TrailingWord.empty() && TrailingWord.front() == '#') {
- Line = Line.drop_until([](char c) { return c == '\n'; });
- Line = Line.drop_while([](char c) { return c == '\n'; });
- return endQuery(Q);
- }
- if (!TrailingWord.empty()) {
- return new InvalidQuery("unexpected extra input: '" + Extra + "'");
- }
- }
+ const StringRef Extra = Line;
+ if (!lexWord().empty())
+ return new InvalidQuery("unexpected extra input: '" + Extra + "'");
return Q;
}
@@ -212,11 +193,7 @@ QueryRef QueryParser::doParse() {
switch (QKind) {
case PQK_Comment:
case PQK_NoOp:
- Line = Line.drop_until([](char c) { return c == '\n'; });
- Line = Line.drop_while([](char c) { return c == '\n'; });
- if (Line.empty())
- return new NoOpQuery;
- return doParse();
+ return new NoOpQuery;
case PQK_Help:
return endQuery(new HelpQuery);
@@ -240,9 +217,7 @@ QueryRef QueryParser::doParse() {
return makeInvalidQueryFromDiagnostics(Diag);
}
- auto *Q = new LetQuery(Name, Value);
- Q->RemainingContent = Line;
- return Q;
+ return new LetQuery(Name, Value);
}
case PQK_Match: {
@@ -251,17 +226,12 @@ QueryRef QueryParser::doParse() {
Diagnostics Diag;
auto MatcherSource = Line.trim();
- auto OrigMatcherSource = MatcherSource;
Optional<DynTypedMatcher> Matcher = Parser::parseMatcherExpression(
MatcherSource, nullptr, &QS.NamedValues, &Diag);
if (!Matcher) {
return makeInvalidQueryFromDiagnostics(Diag);
}
- auto ActualSource = OrigMatcherSource.slice(0, OrigMatcherSource.size() -
- MatcherSource.size());
- auto *Q = new MatchQuery(ActualSource, *Matcher);
- Q->RemainingContent = MatcherSource;
- return Q;
+ return new MatchQuery(MatcherSource, *Matcher);
}
case PQK_Set: {
diff --git a/clang-tools-extra/clang-query/tool/ClangQuery.cpp b/clang-tools-extra/clang-query/tool/ClangQuery.cpp
index 5cfa0acf9120..80e1c602796c 100644
--- a/clang-tools-extra/clang-query/tool/ClangQuery.cpp
+++ b/clang-tools-extra/clang-query/tool/ClangQuery.cpp
@@ -69,16 +69,13 @@ bool runCommandsInFile(const char *ExeName, std::string const &FileName,
llvm::errs() << ExeName << ": cannot open " << FileName << "\n";
return 1;
}
+ while (Input.good()) {
+ std::string Line;
+ std::getline(Input, Line);
- std::string FileContent((std::istreambuf_iterator<char>(Input)),
- std::istreambuf_iterator<char>());
-
- StringRef FileContentRef(FileContent);
- while (!FileContentRef.empty()) {
- QueryRef Q = QueryParser::parse(FileContentRef, QS);
+ QueryRef Q = QueryParser::parse(Line, QS);
if (!Q->run(llvm::outs(), QS))
return true;
- FileContentRef = Q->RemainingContent;
}
return false;
}
diff --git a/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp b/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
index 4725789f29f2..01c65452b03f 100644
--- a/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
+++ b/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
@@ -230,104 +230,3 @@ TEST_F(QueryParserTest, Complete) {
EXPECT_EQ("et ", Comps[0].TypedText);
EXPECT_EQ("let", Comps[0].DisplayText);
}
-
-TEST_F(QueryParserTest, Multiline) {
-
- // Single string with multiple commands
- QueryRef Q = parse(R"matcher(
-set bind-root false
-set output dump
- )matcher");
-
- ASSERT_TRUE(isa<SetQuery<bool>>(Q));
-
- Q = parse(Q->RemainingContent);
- ASSERT_TRUE(isa<SetExclusiveOutputQuery>(Q));
-
- // Missing newline
- Q = parse(R"matcher(
-set bind-root false set output dump
- )matcher");
-
- ASSERT_TRUE(isa<InvalidQuery>(Q));
- EXPECT_EQ("unexpected extra input: ' set output dump\n '",
- cast<InvalidQuery>(Q)->ErrStr);
-
- // Commands which do their own parsing
- Q = parse(R"matcher(
-let fn functionDecl(hasName("foo"))
-match callExpr(callee(functionDecl()))
- )matcher");
-
- ASSERT_TRUE(isa<LetQuery>(Q));
-
- Q = parse(Q->RemainingContent);
- ASSERT_TRUE(isa<MatchQuery>(Q));
-
- // Multi-line matcher
- Q = parse(R"matcher(
-match callExpr(callee(
- functionDecl().bind("fn")
- ))
-
- )matcher");
-
- ASSERT_TRUE(isa<MatchQuery>(Q));
-
- // Comment locations
- Q = parse(R"matcher(
-#nospacecomment
-# Leading comment
-match callExpr ( # Trailing comment
- # Comment alone on line
-
- callee(
- functionDecl(
- ).bind(
- "fn"
- )
- )) # Comment trailing close
-# Comment after match
- )matcher");
-
- ASSERT_TRUE(isa<MatchQuery>(Q));
-
- // \r\n
- Q = parse("set bind-root false\r\nset output dump");
-
- ASSERT_TRUE(isa<SetQuery<bool>>(Q));
-
- Q = parse(Q->RemainingContent);
- ASSERT_TRUE(isa<SetExclusiveOutputQuery>(Q));
-
- // Leading and trailing space in lines
- Q = parse(" set bind-root false \r\n set output dump ");
-
- ASSERT_TRUE(isa<SetQuery<bool>>(Q));
-
- Q = parse(Q->RemainingContent);
- ASSERT_TRUE(isa<SetExclusiveOutputQuery>(Q));
-
- // Incomplete commands
- Q = parse("set\nbind-root false");
-
- ASSERT_TRUE(isa<InvalidQuery>(Q));
- EXPECT_EQ("expected variable name", cast<InvalidQuery>(Q)->ErrStr);
-
- Q = parse("set bind-root\nfalse");
-
- ASSERT_TRUE(isa<InvalidQuery>(Q));
- EXPECT_EQ("expected 'true' or 'false', got ''",
- cast<InvalidQuery>(Q)->ErrStr);
-
- Q = parse(R"matcher(
-match callExpr
-(
-)
- )matcher");
-
- ASSERT_TRUE(isa<InvalidQuery>(Q));
- EXPECT_EQ("1:9: Error parsing matcher. Found token <NewLine> "
- "while looking for '('.",
- cast<InvalidQuery>(Q)->ErrStr);
-}
diff --git a/clang/include/clang/ASTMatchers/Dynamic/Parser.h b/clang/include/clang/ASTMatchers/Dynamic/Parser.h
index 70bbe816accd..15e0aa7ecd27 100644
--- a/clang/include/clang/ASTMatchers/Dynamic/Parser.h
+++ b/clang/include/clang/ASTMatchers/Dynamic/Parser.h
@@ -164,14 +164,16 @@ class Parser {
/// description of the error.
/// The caller takes ownership of the DynTypedMatcher object returned.
static llvm::Optional<DynTypedMatcher>
- parseMatcherExpression(StringRef &MatcherCode, Sema *S,
- const NamedValueMap *NamedValues, Diagnostics *Error);
+ parseMatcherExpression(StringRef MatcherCode, Sema *S,
+ const NamedValueMap *NamedValues,
+ Diagnostics *Error);
static llvm::Optional<DynTypedMatcher>
- parseMatcherExpression(StringRef &MatcherCode, Sema *S, Diagnostics *Error) {
+ parseMatcherExpression(StringRef MatcherCode, Sema *S,
+ Diagnostics *Error) {
return parseMatcherExpression(MatcherCode, S, nullptr, Error);
}
static llvm::Optional<DynTypedMatcher>
- parseMatcherExpression(StringRef &MatcherCode, Diagnostics *Error) {
+ parseMatcherExpression(StringRef MatcherCode, Diagnostics *Error) {
return parseMatcherExpression(MatcherCode, nullptr, Error);
}
@@ -187,14 +189,14 @@ class Parser {
/// \param NamedValues A map of precomputed named values. This provides
/// the dictionary for the <NamedValue> rule of the grammar.
/// If null, it is ignored.
- static bool parseExpression(StringRef &Code, Sema *S,
+ static bool parseExpression(StringRef Code, Sema *S,
const NamedValueMap *NamedValues,
VariantValue *Value, Diagnostics *Error);
- static bool parseExpression(StringRef &Code, Sema *S, VariantValue *Value,
- Diagnostics *Error) {
+ static bool parseExpression(StringRef Code, Sema *S,
+ VariantValue *Value, Diagnostics *Error) {
return parseExpression(Code, S, nullptr, Value, Error);
}
- static bool parseExpression(StringRef &Code, VariantValue *Value,
+ static bool parseExpression(StringRef Code, VariantValue *Value,
Diagnostics *Error) {
return parseExpression(Code, nullptr, Value, Error);
}
@@ -211,14 +213,14 @@ class Parser {
/// \return The list of completions, which may be empty if there are no
/// available completions or if an error occurred.
static std::vector<MatcherCompletion>
- completeExpression(StringRef &Code, unsigned CompletionOffset, Sema *S,
+ completeExpression(StringRef Code, unsigned CompletionOffset, Sema *S,
const NamedValueMap *NamedValues);
static std::vector<MatcherCompletion>
- completeExpression(StringRef &Code, unsigned CompletionOffset, Sema *S) {
+ completeExpression(StringRef Code, unsigned CompletionOffset, Sema *S) {
return completeExpression(Code, CompletionOffset, S, nullptr);
}
static std::vector<MatcherCompletion>
- completeExpression(StringRef &Code, unsigned CompletionOffset) {
+ completeExpression(StringRef Code, unsigned CompletionOffset) {
return completeExpression(Code, CompletionOffset, nullptr);
}
diff --git a/clang/lib/ASTMatchers/Dynamic/Parser.cpp b/clang/lib/ASTMatchers/Dynamic/Parser.cpp
index 77c9629f6f85..e3b00b46832c 100644
--- a/clang/lib/ASTMatchers/Dynamic/Parser.cpp
+++ b/clang/lib/ASTMatchers/Dynamic/Parser.cpp
@@ -38,7 +38,6 @@ struct Parser::TokenInfo {
/// Different possible tokens.
enum TokenKind {
TK_Eof,
- TK_NewLine,
TK_OpenParen,
TK_CloseParen,
TK_Comma,
@@ -66,12 +65,12 @@ const char* const Parser::TokenInfo::ID_Bind = "bind";
/// Simple tokenizer for the parser.
class Parser::CodeTokenizer {
public:
- explicit CodeTokenizer(StringRef &MatcherCode, Diagnostics *Error)
+ explicit CodeTokenizer(StringRef MatcherCode, Diagnostics *Error)
: Code(MatcherCode), StartOfLine(MatcherCode), Error(Error) {
NextToken = getNextToken();
}
- CodeTokenizer(StringRef &MatcherCode, Diagnostics *Error,
+ CodeTokenizer(StringRef MatcherCode, Diagnostics *Error,
unsigned CodeCompletionOffset)
: Code(MatcherCode), StartOfLine(MatcherCode), Error(Error),
CodeCompletionLocation(MatcherCode.data() + CodeCompletionOffset) {
@@ -88,19 +87,6 @@ class Parser::CodeTokenizer {
return ThisToken;
}
- TokenInfo SkipNewlines() {
- while (NextToken.Kind == TokenInfo::TK_NewLine)
- NextToken = getNextToken();
- return NextToken;
- }
-
- TokenInfo consumeNextTokenIgnoreNewlines() {
- SkipNewlines();
- if (NextToken.Kind == TokenInfo::TK_Eof)
- return NextToken;
- return consumeNextToken();
- }
-
TokenInfo::TokenKind nextTokenKind() const { return NextToken.Kind; }
private:
@@ -124,8 +110,9 @@ class Parser::CodeTokenizer {
switch (Code[0]) {
case '#':
- Code = Code.drop_until([](char c) { return c == '\n'; });
- return getNextToken();
+ Result.Kind = TokenInfo::TK_Eof;
+ Result.Text = "";
+ return Result;
case ',':
Result.Kind = TokenInfo::TK_Comma;
Result.Text = Code.substr(0, 1);
@@ -136,13 +123,6 @@ class Parser::CodeTokenizer {
Result.Text = Code.substr(0, 1);
Code = Code.drop_front();
break;
- case '\n':
- ++Line;
- StartOfLine = Code.drop_front();
- Result.Kind = TokenInfo::TK_NewLine;
- Result.Text = Code.substr(0, 1);
- Code = Code.drop_front();
- break;
case '(':
Result.Kind = TokenInfo::TK_OpenParen;
Result.Text = Code.substr(0, 1);
@@ -297,10 +277,13 @@ class Parser::CodeTokenizer {
/// Consume all leading whitespace from \c Code.
void consumeWhitespace() {
- Code = Code.drop_while([](char c) {
- // Don't trim newlines.
- return StringRef(" \t\v\f\r").contains(c);
- });
+ while (!Code.empty() && isWhitespace(Code[0])) {
+ if (Code[0] == '\n') {
+ ++Line;
+ StartOfLine = Code.drop_front();
+ }
+ Code = Code.drop_front();
+ }
}
SourceLocation currentLocation() {
@@ -310,7 +293,7 @@ class Parser::CodeTokenizer {
return Location;
}
- StringRef &Code;
+ StringRef Code;
StringRef StartOfLine;
unsigned Line = 1;
Diagnostics *Error;
@@ -354,13 +337,6 @@ struct Parser::ScopedContextEntry {
bool Parser::parseIdentifierPrefixImpl(VariantValue *Value) {
const TokenInfo NameToken = Tokenizer->consumeNextToken();
- if (Tokenizer->nextTokenKind() == TokenInfo::TK_NewLine) {
- Error->addError(Tokenizer->peekNextToken().Range,
- Error->ET_ParserNoOpenParen)
- << "NewLine";
- return false;
- }
-
if (Tokenizer->nextTokenKind() != TokenInfo::TK_OpenParen) {
// Parse as a named value.
if (const VariantValue NamedValue =
@@ -392,7 +368,6 @@ bool Parser::parseIdentifierPrefixImpl(VariantValue *Value) {
// unknown named value.
if ((Tokenizer->nextTokenKind() == TokenInfo::TK_Comma ||
Tokenizer->nextTokenKind() == TokenInfo::TK_CloseParen ||
- Tokenizer->nextTokenKind() == TokenInfo::TK_NewLine ||
Tokenizer->nextTokenKind() == TokenInfo::TK_Eof) &&
!S->lookupMatcherCtor(NameToken.Text)) {
Error->addError(NameToken.Range, Error->ET_RegistryValueNotFound)
@@ -402,8 +377,6 @@ bool Parser::parseIdentifierPrefixImpl(VariantValue *Value) {
// Otherwise, fallback to the matcher parser.
}
- Tokenizer->SkipNewlines();
-
// Parse as a matcher expression.
return parseMatcherExpressionImpl(NameToken, Value);
}
@@ -419,8 +392,8 @@ bool Parser::parseBindID(std::string &BindID) {
}
const TokenInfo OpenToken = Tokenizer->consumeNextToken();
- const TokenInfo IDToken = Tokenizer->consumeNextTokenIgnoreNewlines();
- const TokenInfo CloseToken = Tokenizer->consumeNextTokenIgnoreNewlines();
+ const TokenInfo IDToken = Tokenizer->consumeNextToken();
+ const TokenInfo CloseToken = Tokenizer->consumeNextToken();
// TODO: We could use
diff erent error codes for each/some to be more
// explicit about the syntax error.
@@ -470,8 +443,6 @@ bool Parser::parseMatcherExpressionImpl(const TokenInfo &NameToken,
std::vector<ParserValue> Args;
TokenInfo EndToken;
- Tokenizer->SkipNewlines();
-
{
ScopedContextEntry SCE(this, Ctor ? *Ctor : nullptr);
@@ -495,14 +466,12 @@ bool Parser::parseMatcherExpressionImpl(const TokenInfo &NameToken,
NameToken.Text, NameToken.Range,
Args.size() + 1);
ParserValue ArgValue;
- Tokenizer->SkipNewlines();
ArgValue.Text = Tokenizer->peekNextToken().Text;
ArgValue.Range = Tokenizer->peekNextToken().Range;
if (!parseExpressionImpl(&ArgValue.Value)) {
return false;
}
- Tokenizer->SkipNewlines();
Args.push_back(ArgValue);
SCE.nextArg();
}
@@ -562,7 +531,7 @@ std::vector<MatcherCompletion> Parser::getNamedValueCompletions(
}
void Parser::addExpressionCompletions() {
- const TokenInfo CompToken = Tokenizer->consumeNextTokenIgnoreNewlines();
+ const TokenInfo CompToken = Tokenizer->consumeNextToken();
assert(CompToken.Kind == TokenInfo::TK_CodeCompletion);
// We cannot complete code if there is an invalid element on the context
@@ -606,9 +575,7 @@ bool Parser::parseExpressionImpl(VariantValue *Value) {
case TokenInfo::TK_Error:
// This error was already reported by the tokenizer.
return false;
- case TokenInfo::TK_NewLine:
- assert(!"Newline should never be found here");
- return false;
+
case TokenInfo::TK_OpenParen:
case TokenInfo::TK_CloseParen:
case TokenInfo::TK_Comma:
@@ -657,14 +624,13 @@ std::vector<MatcherCompletion> Parser::RegistrySema::getMatcherCompletions(
return Registry::getMatcherCompletions(AcceptedTypes);
}
-bool Parser::parseExpression(StringRef &Code, Sema *S,
+bool Parser::parseExpression(StringRef Code, Sema *S,
const NamedValueMap *NamedValues,
VariantValue *Value, Diagnostics *Error) {
CodeTokenizer Tokenizer(Code, Error);
if (!Parser(&Tokenizer, S, NamedValues, Error).parseExpressionImpl(Value))
return false;
- auto NT = Tokenizer.peekNextToken();
- if (NT.Kind != TokenInfo::TK_Eof && NT.Kind != TokenInfo::TK_NewLine) {
+ if (Tokenizer.peekNextToken().Kind != TokenInfo::TK_Eof) {
Error->addError(Tokenizer.peekNextToken().Range,
Error->ET_ParserTrailingCode);
return false;
@@ -673,7 +639,7 @@ bool Parser::parseExpression(StringRef &Code, Sema *S,
}
std::vector<MatcherCompletion>
-Parser::completeExpression(StringRef &Code, unsigned CompletionOffset, Sema *S,
+Parser::completeExpression(StringRef Code, unsigned CompletionOffset, Sema *S,
const NamedValueMap *NamedValues) {
Diagnostics Error;
CodeTokenizer Tokenizer(Code, &Error, CompletionOffset);
@@ -693,7 +659,7 @@ Parser::completeExpression(StringRef &Code, unsigned CompletionOffset, Sema *S,
}
llvm::Optional<DynTypedMatcher>
-Parser::parseMatcherExpression(StringRef &Code, Sema *S,
+Parser::parseMatcherExpression(StringRef Code, Sema *S,
const NamedValueMap *NamedValues,
Diagnostics *Error) {
VariantValue Value;
diff --git a/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp b/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
index 67fc70790296..db16ca418756 100644
--- a/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
+++ b/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
@@ -207,12 +207,10 @@ Parser::NamedValueMap getTestNamedValues() {
TEST(ParserTest, FullParserTest) {
Diagnostics Error;
-
- StringRef Code =
+ llvm::Optional<DynTypedMatcher> VarDecl(Parser::parseMatcherExpression(
"varDecl(hasInitializer(binaryOperator(hasLHS(integerLiteral()),"
- " hasOperatorName(\"+\"))))";
- llvm::Optional<DynTypedMatcher> VarDecl(
- Parser::parseMatcherExpression(Code, &Error));
+ " hasOperatorName(\"+\"))))",
+ &Error));
EXPECT_EQ("", Error.toStringFull());
Matcher<Decl> M = VarDecl->unconditionalConvertTo<Decl>();
EXPECT_TRUE(matches("int x = 1 + false;", M));
@@ -220,9 +218,8 @@ TEST(ParserTest, FullParserTest) {
EXPECT_FALSE(matches("int x = 1 - false;", M));
EXPECT_FALSE(matches("int x = true - 1;", M));
- Code = "functionDecl(hasParameter(1, hasName(\"x\")))";
- llvm::Optional<DynTypedMatcher> HasParameter(
- Parser::parseMatcherExpression(Code, &Error));
+ llvm::Optional<DynTypedMatcher> HasParameter(Parser::parseMatcherExpression(
+ "functionDecl(hasParameter(1, hasName(\"x\")))", &Error));
EXPECT_EQ("", Error.toStringFull());
M = HasParameter->unconditionalConvertTo<Decl>();
@@ -231,18 +228,20 @@ TEST(ParserTest, FullParserTest) {
// Test named values.
auto NamedValues = getTestNamedValues();
-
- Code = "functionDecl(hasParamA, hasParameter(1, hasName(nameX)))";
llvm::Optional<DynTypedMatcher> HasParameterWithNamedValues(
- Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error));
+ Parser::parseMatcherExpression(
+ "functionDecl(hasParamA, hasParameter(1, hasName(nameX)))",
+ nullptr, &NamedValues, &Error));
EXPECT_EQ("", Error.toStringFull());
M = HasParameterWithNamedValues->unconditionalConvertTo<Decl>();
EXPECT_TRUE(matches("void f(int a, int x);", M));
EXPECT_FALSE(matches("void f(int x, int a);", M));
- Code = "hasInitializer(\n binaryOperator(hasLHS(\"A\")))";
- EXPECT_TRUE(!Parser::parseMatcherExpression(Code, &Error).hasValue());
+
+ EXPECT_TRUE(!Parser::parseMatcherExpression(
+ "hasInitializer(\n binaryOperator(hasLHS(\"A\")))",
+ &Error).hasValue());
EXPECT_EQ("1:1: Error parsing argument 1 for matcher hasInitializer.\n"
"2:5: Error parsing argument 1 for matcher binaryOperator.\n"
"2:20: Error building matcher hasLHS.\n"
@@ -253,11 +252,9 @@ TEST(ParserTest, FullParserTest) {
TEST(ParserTest, VariadicMatchTest) {
Diagnostics Error;
-
- StringRef Code =
- "stmt(objcMessageExpr(hasAnySelector(\"methodA\", \"methodB:\")))";
- llvm::Optional<DynTypedMatcher> OM(
- Parser::parseMatcherExpression(Code, &Error));
+ llvm::Optional<DynTypedMatcher> OM(Parser::parseMatcherExpression(
+ "stmt(objcMessageExpr(hasAnySelector(\"methodA\", \"methodB:\")))",
+ &Error));
EXPECT_EQ("", Error.toStringFull());
auto M = OM->unconditionalConvertTo<Stmt>();
EXPECT_TRUE(matchesObjC("@interface I @end "
@@ -327,132 +324,15 @@ TEST(ParserTest, OverloadErrors) {
ParseWithError("callee(\"A\")"));
}
-TEST(ParserTest, ParseMultiline) {
- StringRef Code;
-
- llvm::Optional<DynTypedMatcher> M;
- {
- Code = R"matcher(varDecl(
- hasName("foo")
- )
-)matcher";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Code = R"matcher(varDecl(
- # Internal comment
- hasName("foo") # Internal comment
-# Internal comment
- )
-)matcher";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Code = R"matcher(decl().bind(
- "paramName")
-)matcher";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Code = R"matcher(decl().bind(
- "paramName"
- )
-)matcher";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Code = R"matcher(decl(decl()
-, decl()))matcher";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Code = R"matcher(decl(decl(),
-decl()))matcher";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Code = "namedDecl(hasName(\"n\"\n))";
- Diagnostics Error;
- EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
- }
-
- {
- Diagnostics Error;
-
- auto NamedValues = getTestNamedValues();
-
- Code = R"matcher(hasParamA.bind
- ("paramName")
-)matcher";
- M = Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error);
- EXPECT_FALSE(M.hasValue());
- EXPECT_EQ("1:15: Malformed bind() expression.", Error.toStringFull());
- }
-
- {
- Diagnostics Error;
-
- auto NamedValues = getTestNamedValues();
-
- Code = R"matcher(hasParamA.
- bind("paramName")
-)matcher";
- M = Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error);
- EXPECT_FALSE(M.hasValue());
- EXPECT_EQ("1:11: Malformed bind() expression.", Error.toStringFull());
- }
-
- {
- Diagnostics Error;
-
- Code = R"matcher(varDecl
-()
-)matcher";
- M = Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error);
- EXPECT_FALSE(M.hasValue());
- EXPECT_EQ("1:8: Error parsing matcher. Found token "
- "<NewLine> while looking for '('.",
- Error.toStringFull());
- }
-
- // Correct line/column numbers
- {
- Diagnostics Error;
-
- Code = R"matcher(varDecl(
- doesNotExist()
- )
-)matcher";
- M = Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error);
- EXPECT_FALSE(M.hasValue());
- EXPECT_EQ(R"error(1:1: Error parsing argument 1 for matcher varDecl.
-2:3: Matcher not found: doesNotExist)error",
- Error.toStringFull());
- }
-}
-
TEST(ParserTest, CompletionRegistry) {
- StringRef Code = "while";
- std::vector<MatcherCompletion> Comps = Parser::completeExpression(Code, 5);
+ std::vector<MatcherCompletion> Comps =
+ Parser::completeExpression("while", 5);
ASSERT_EQ(1u, Comps.size());
EXPECT_EQ("Stmt(", Comps[0].TypedText);
EXPECT_EQ("Matcher<Stmt> whileStmt(Matcher<WhileStmt>...)",
Comps[0].MatcherDecl);
- Code = "whileStmt().";
- Comps = Parser::completeExpression(Code, 12);
+ Comps = Parser::completeExpression("whileStmt().", 12);
ASSERT_EQ(1u, Comps.size());
EXPECT_EQ("bind(\"", Comps[0].TypedText);
EXPECT_EQ("bind", Comps[0].MatcherDecl);
@@ -500,9 +380,9 @@ TEST(ParserTest, ParseBindOnLet) {
Diagnostics Error;
{
- StringRef Code = "hasParamA.bind(\"parmABinding\")";
llvm::Optional<DynTypedMatcher> TopLevelLetBinding(
- Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error));
+ Parser::parseMatcherExpression("hasParamA.bind(\"parmABinding\")",
+ nullptr, &NamedValues, &Error));
EXPECT_EQ("", Error.toStringFull());
auto M = TopLevelLetBinding->unconditionalConvertTo<Decl>();
@@ -515,9 +395,10 @@ TEST(ParserTest, ParseBindOnLet) {
}
{
- StringRef Code = "functionDecl(hasParamA.bind(\"parmABinding\"))";
llvm::Optional<DynTypedMatcher> NestedLetBinding(
- Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error));
+ Parser::parseMatcherExpression(
+ "functionDecl(hasParamA.bind(\"parmABinding\"))", nullptr,
+ &NamedValues, &Error));
EXPECT_EQ("", Error.toStringFull());
auto M = NestedLetBinding->unconditionalConvertTo<Decl>();
More information about the cfe-commits
mailing list