Commit f7d9584c authored by Stephen Kelly's avatar Stephen Kelly
Browse files

Fix formatting in previous commits

parent 0007f9da

clang-tools-extra/unittests/clang-query/QueryParserTest.cpp

+10 −6
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ match callExpr 
  Q = parse("let someMatcher\nm parmVarDecl()");



  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()");
@@ -342,12 +343,14 @@ match callExpr 
  Q = parse(Q->RemainingContent);



  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");



  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");
@@ -355,7 +358,8 @@ match callExpr 
  Q = parse(Q->RemainingContent);



  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(

clang/lib/ASTMatchers/Dynamic/Parser.cpp

+2 −1
Original line number Diff line number Diff line
@@ -614,7 +614,8 @@ bool Parser::parseExpressionImpl(VariantValue *Value) { 
  case TokenInfo::TK_Period:

  case TokenInfo::TK_InvalidChar:

    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;

  }