Fix formatting in previous commits

This commit is contained in:
Stephen Kelly 2019-12-29 19:41:07 +00:00
parent 0007f9da7c
commit f7d9584c56
2 changed files with 12 additions and 7 deletions

View File

@ -334,7 +334,8 @@ match callExpr
Q = parse("let someMatcher\nm parmVarDecl()"); Q = parse("let someMatcher\nm parmVarDecl()");
ASSERT_TRUE(isa<InvalidQuery>(Q)); ASSERT_TRUE(isa<InvalidQuery>(Q));
EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.", cast<InvalidQuery>(Q)->ErrStr); EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.",
cast<InvalidQuery>(Q)->ErrStr);
Q = parse("\nm parmVarDecl()\nlet someMatcher\nm parmVarDecl()"); Q = parse("\nm parmVarDecl()\nlet someMatcher\nm parmVarDecl()");
@ -342,12 +343,14 @@ match callExpr
Q = parse(Q->RemainingContent); Q = parse(Q->RemainingContent);
ASSERT_TRUE(isa<InvalidQuery>(Q)); ASSERT_TRUE(isa<InvalidQuery>(Q));
EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.", cast<InvalidQuery>(Q)->ErrStr); EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.",
cast<InvalidQuery>(Q)->ErrStr);
Q = parse("\nlet someMatcher\n"); Q = parse("\nlet someMatcher\n");
ASSERT_TRUE(isa<InvalidQuery>(Q)); ASSERT_TRUE(isa<InvalidQuery>(Q));
EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.", cast<InvalidQuery>(Q)->ErrStr); EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.",
cast<InvalidQuery>(Q)->ErrStr);
Q = parse("\nm parmVarDecl()\nlet someMatcher\n"); Q = parse("\nm parmVarDecl()\nlet someMatcher\n");
@ -355,7 +358,8 @@ match callExpr
Q = parse(Q->RemainingContent); Q = parse(Q->RemainingContent);
ASSERT_TRUE(isa<InvalidQuery>(Q)); ASSERT_TRUE(isa<InvalidQuery>(Q));
EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.", cast<InvalidQuery>(Q)->ErrStr); EXPECT_EQ("1:1: Invalid token <NewLine> found when looking for a value.",
cast<InvalidQuery>(Q)->ErrStr);
Q = parse(R"matcher( Q = parse(R"matcher(
@ -368,8 +372,8 @@ m parmVarDecl(
ASSERT_TRUE(isa<LetQuery>(Q)); ASSERT_TRUE(isa<LetQuery>(Q));
{ {
llvm::raw_null_ostream NullOutStream; llvm::raw_null_ostream NullOutStream;
dyn_cast<LetQuery>(Q)->run(NullOutStream, QS); dyn_cast<LetQuery>(Q)->run(NullOutStream, QS);
} }
Q = parse(Q->RemainingContent); Q = parse(Q->RemainingContent);

View File

@ -614,7 +614,8 @@ bool Parser::parseExpressionImpl(VariantValue *Value) {
case TokenInfo::TK_Period: case TokenInfo::TK_Period:
case TokenInfo::TK_InvalidChar: case TokenInfo::TK_InvalidChar:
const TokenInfo Token = Tokenizer->consumeNextToken(); const TokenInfo Token = Tokenizer->consumeNextToken();
Error->addError(Token.Range, Error->ET_ParserInvalidToken) << (Token.Kind == TokenInfo::TK_NewLine ? "NewLine" : Token.Text); Error->addError(Token.Range, Error->ET_ParserInvalidToken)
<< (Token.Kind == TokenInfo::TK_NewLine ? "NewLine" : Token.Text);
return false; return false;
} }