Skip to content

Commit ec27e21

Browse files
firewavefirewave
committed
testrunner: renamed SimpleTokenList members
1 parent b6f9037 commit ec27e21

File tree

2 files changed

+92
-92
lines changed

2 files changed

+92
-92
lines changed

‎test/helpers.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ class SimpleTokenList
7070
throw std::runtime_error("creating tokens failed");
7171
}
7272

73-
Token* tokens() {
73+
Token* front() {
7474
return list.front();
7575
}
7676

77-
const Token* tokens() const {
77+
const Token* front() const {
7878
return list.front();
7979
}
8080

‎test/testtoken.cpp‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class TestToken : public TestFixture {
235235
void multiCompare2() const { // #3294
236236
// Original pattern that failed: [[,(=<>+-*|&^] %num% [+-*/] %num% ]|,|)|;|=|%op%
237237
SimpleTokenList toks("a == 1");
238-
ASSERT_EQUALS(true, Token::Match(toks.tokens(), "a =|%op%"));
238+
ASSERT_EQUALS(true, Token::Match(toks.front(), "a =|%op%"));
239239
}
240240

241241
void multiCompare3() const {
@@ -244,50 +244,50 @@ class TestToken : public TestFixture {
244244

245245
// Note: Also test "reverse" alternative pattern, two different code paths to handle it
246246
SimpleTokenList toks("return a |= b ;");
247-
ASSERT_EQUALS(false, Token::Match(toks.tokens(), "return %name% xyz|%or% %name% ;"));
248-
ASSERT_EQUALS(false, Token::Match(toks.tokens(), "return %name% %or%|xyz %name% ;"));
247+
ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% xyz|%or% %name% ;"));
248+
ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% %or%|xyz %name% ;"));
249249

250250
SimpleTokenList toks2("return a | b ;");
251-
ASSERT_EQUALS(true, Token::Match(toks2.tokens(), "return %name% xyz|%or% %name% ;"));
252-
ASSERT_EQUALS(true, Token::Match(toks2.tokens(), "return %name% %or%|xyz %name% ;"));
251+
ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% xyz|%or% %name% ;"));
252+
ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% %or%|xyz %name% ;"));
253253

254254
SimpleTokenList toks3("return a || b ;");
255-
ASSERT_EQUALS(false, Token::Match(toks3.tokens(), "return %name% xyz|%or% %name% ;"));
256-
ASSERT_EQUALS(false, Token::Match(toks3.tokens(), "return %name% %or%|xyz %name% ;"));
255+
ASSERT_EQUALS(false, Token::Match(toks3.front(), "return %name% xyz|%or% %name% ;"));
256+
ASSERT_EQUALS(false, Token::Match(toks3.front(), "return %name% %or%|xyz %name% ;"));
257257

258-
ASSERT_EQUALS(true, Token::Match(toks3.tokens(), "return %name% xyz|%oror% %name% ;"));
259-
ASSERT_EQUALS(true, Token::Match(toks3.tokens(), "return %name% %oror%|xyz %name% ;"));
258+
ASSERT_EQUALS(true, Token::Match(toks3.front(), "return %name% xyz|%oror% %name% ;"));
259+
ASSERT_EQUALS(true, Token::Match(toks3.front(), "return %name% %oror%|xyz %name% ;"));
260260

261261
SimpleTokenList toks4("a % b ;");
262-
ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% >>|<<|&|%or%|^|% %name% ;"));
263-
ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% %|>>|<<|&|%or%|^ %name% ;"));
264-
ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% >>|<<|&|%or%|%|^ %name% ;"));
262+
ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% >>|<<|&|%or%|^|% %name% ;"));
263+
ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% %|>>|<<|&|%or%|^ %name% ;"));
264+
ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% >>|<<|&|%or%|%|^ %name% ;"));
265265

266266
//%name%|%num% support
267267
SimpleTokenList num("100");
268-
ASSERT_EQUALS(true, Token::Match(num.tokens(), "%num%|%name%"));
269-
ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%num%"));
270-
ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%num%|%bool%"));
271-
ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%bool%|%num%"));
272-
ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%bool%|%str%|%num%"));
273-
ASSERT_EQUALS(false, Token::Match(num.tokens(), "%bool%|%name%"));
274-
ASSERT_EQUALS(false, Token::Match(num.tokens(), "%type%|%bool%|%char%"));
275-
ASSERT_EQUALS(true, Token::Match(num.tokens(), "%type%|%bool%|100"));
268+
ASSERT_EQUALS(true, Token::Match(num.front(), "%num%|%name%"));
269+
ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%num%"));
270+
ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%num%|%bool%"));
271+
ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%bool%|%num%"));
272+
ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%bool%|%str%|%num%"));
273+
ASSERT_EQUALS(false, Token::Match(num.front(), "%bool%|%name%"));
274+
ASSERT_EQUALS(false, Token::Match(num.front(), "%type%|%bool%|%char%"));
275+
ASSERT_EQUALS(true, Token::Match(num.front(), "%type%|%bool%|100"));
276276

277277
SimpleTokenList numparen("( 100 )");
278-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %num%|%name% )|"));
279-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%num% )|"));
280-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%num%|%bool% )|"));
281-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%bool%|%num% )|"));
282-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%bool%|%str%|%num% )|"));
283-
ASSERT_EQUALS(false, Token::Match(numparen.tokens(), "(| %bool%|%name% )|"));
284-
285-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %num%|%name%| )|"));
286-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%num%| )|"));
287-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%num%|%bool%| )|"));
288-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%bool%|%num%| )|"));
289-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%bool%|%str%|%num%| )|"));
290-
ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %bool%|%name%| )|"));
278+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %num%|%name% )|"));
279+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%num% )|"));
280+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%num%|%bool% )|"));
281+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%bool%|%num% )|"));
282+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%bool%|%str%|%num% )|"));
283+
ASSERT_EQUALS(false, Token::Match(numparen.front(), "(| %bool%|%name% )|"));
284+
285+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %num%|%name%| )|"));
286+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%num%| )|"));
287+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%num%|%bool%| )|"));
288+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%bool%|%num%| )|"));
289+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%bool%|%str%|%num%| )|"));
290+
ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %bool%|%name%| )|"));
291291
}
292292

293293
void multiCompare4() {
@@ -563,23 +563,23 @@ class TestToken : public TestFixture {
563563

564564
void eraseTokens() const {
565565
SimpleTokenList code("begin ; { this code will be removed } end", true);
566-
Token::eraseTokens(code.tokens()->next(), code.tokens()->tokAt(9));
567-
ASSERT_EQUALS("begin ; end", code.tokens()->stringifyList(nullptr, false));
566+
Token::eraseTokens(code.front()->next(), code.front()->tokAt(9));
567+
ASSERT_EQUALS("begin ; end", code.front()->stringifyList(nullptr, false));
568568
}
569569

570570

571571
void matchAny() const {
572572
SimpleTokenList varBitOrVar("abc|def", true);
573-
ASSERT_EQUALS(true, Token::Match(varBitOrVar.tokens(), "%name% %or% %name%"));
573+
ASSERT_EQUALS(true, Token::Match(varBitOrVar.front(), "%name% %or% %name%"));
574574

575575
SimpleTokenList varLogOrVar("abc||def", true);
576-
ASSERT_EQUALS(true, Token::Match(varLogOrVar.tokens(), "%name% %oror% %name%"));
576+
ASSERT_EQUALS(true, Token::Match(varLogOrVar.front(), "%name% %oror% %name%"));
577577
}
578578

579579
void matchSingleChar() const {
580580
SimpleTokenList singleChar("a", true);
581-
ASSERT_EQUALS(true, Token::Match(singleChar.tokens(), "[a|bc]"));
582-
ASSERT_EQUALS(false, Token::Match(singleChar.tokens(), "[d|ef]"));
581+
ASSERT_EQUALS(true, Token::Match(singleChar.front(), "[a|bc]"));
582+
ASSERT_EQUALS(false, Token::Match(singleChar.front(), "[d|ef]"));
583583

584584
TokensFrontBack tokensFrontBack(list);
585585
Token multiChar(tokensFrontBack);
@@ -589,76 +589,76 @@ class TestToken : public TestFixture {
589589

590590
void matchNothingOrAnyNotElse() const {
591591
SimpleTokenList empty_String("");
592-
ASSERT_EQUALS(true, Token::Match(empty_String.tokens(), "!!else"));
593-
ASSERT_EQUALS(false, Token::Match(empty_String.tokens(), "!!else something"));
592+
ASSERT_EQUALS(true, Token::Match(empty_String.front(), "!!else"));
593+
ASSERT_EQUALS(false, Token::Match(empty_String.front(), "!!else something"));
594594

595595
SimpleTokenList ifSemicolon("if ;");
596-
ASSERT_EQUALS(true, Token::Match(ifSemicolon.tokens(), "if ; !!else"));
596+
ASSERT_EQUALS(true, Token::Match(ifSemicolon.front(), "if ; !!else"));
597597

598598
SimpleTokenList ifSemicolonSomething("if ; something", true);
599-
ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.tokens(), "if ; !!else"));
599+
ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.front(), "if ; !!else"));
600600

601601
SimpleTokenList justElse("else");
602-
ASSERT_EQUALS(false, Token::Match(justElse.tokens(), "!!else"));
602+
ASSERT_EQUALS(false, Token::Match(justElse.front(), "!!else"));
603603

604604
SimpleTokenList ifSemicolonElse("if ; else");
605-
ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.tokens(), "if ; !!else"));
605+
ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.front(), "if ; !!else"));
606606
}
607607

608608
void matchType() {
609609
SimpleTokenList type("abc");
610-
ASSERT_EQUALS(true, Token::Match(type.tokens(), "%type%"));
610+
ASSERT_EQUALS(true, Token::Match(type.front(), "%type%"));
611611

612612
SimpleTokenizer isVar(*this, "int a = 3 ;");
613613
ASSERT_EQUALS(true, Token::Match(isVar.tokens(), "%type%"));
614614
ASSERT_EQUALS(true, Token::Match(isVar.tokens(), "%type% %name%"));
615615
ASSERT_EQUALS(false, Token::Match(isVar.tokens(), "%type% %type%"));
616616

617617
SimpleTokenList noType1_cpp("delete");
618-
ASSERT_EQUALS(false, Token::Match(noType1_cpp.tokens(), "%type%"));
618+
ASSERT_EQUALS(false, Token::Match(noType1_cpp.front(), "%type%"));
619619

620620
SimpleTokenList noType1_c("delete", false);
621-
ASSERT_EQUALS(true, Token::Match(noType1_c.tokens(), "%type%"));
621+
ASSERT_EQUALS(true, Token::Match(noType1_c.front(), "%type%"));
622622

623623
SimpleTokenList noType2("void delete");
624-
ASSERT_EQUALS(false, Token::Match(noType2.tokens(), "!!foo %type%"));
624+
ASSERT_EQUALS(false, Token::Match(noType2.front(), "!!foo %type%"));
625625
}
626626

627627
void matchChar() const {
628628
SimpleTokenList chr1("'a'");
629-
ASSERT_EQUALS(true, Token::Match(chr1.tokens(), "%char%"));
629+
ASSERT_EQUALS(true, Token::Match(chr1.front(), "%char%"));
630630

631631
SimpleTokenList chr2("'1'");
632-
ASSERT_EQUALS(true, Token::Match(chr2.tokens(), "%char%"));
632+
ASSERT_EQUALS(true, Token::Match(chr2.front(), "%char%"));
633633

634634
SimpleTokenList noChr("\"10\"");
635-
ASSERT_EQUALS(false, Token::Match(noChr.tokens(), "%char%"));
635+
ASSERT_EQUALS(false, Token::Match(noChr.front(), "%char%"));
636636
}
637637

638638
void matchCompOp() const {
639639
SimpleTokenList comp1("<=");
640-
ASSERT_EQUALS(true, Token::Match(comp1.tokens(), "%comp%"));
640+
ASSERT_EQUALS(true, Token::Match(comp1.front(), "%comp%"));
641641

642642
SimpleTokenList comp2(">");
643-
ASSERT_EQUALS(true, Token::Match(comp2.tokens(), "%comp%"));
643+
ASSERT_EQUALS(true, Token::Match(comp2.front(), "%comp%"));
644644

645645
SimpleTokenList noComp("=");
646-
ASSERT_EQUALS(false, Token::Match(noComp.tokens(), "%comp%"));
646+
ASSERT_EQUALS(false, Token::Match(noComp.front(), "%comp%"));
647647
}
648648

649649
void matchStr() const {
650650
SimpleTokenList noStr1("abc");
651-
ASSERT_EQUALS(false, Token::Match(noStr1.tokens(), "%str%"));
651+
ASSERT_EQUALS(false, Token::Match(noStr1.front(), "%str%"));
652652

653653
SimpleTokenList noStr2("'a'");
654-
ASSERT_EQUALS(false, Token::Match(noStr2.tokens(), "%str%"));
654+
ASSERT_EQUALS(false, Token::Match(noStr2.front(), "%str%"));
655655

656656
SimpleTokenList str("\"abc\"");
657-
ASSERT_EQUALS(true, Token::Match(str.tokens(), "%str%"));
657+
ASSERT_EQUALS(true, Token::Match(str.front(), "%str%"));
658658

659659
// Empty string
660660
SimpleTokenList emptyStr("\"\"");
661-
ASSERT_EQUALS(true, Token::Match(emptyStr.tokens(), "%str%"));
661+
ASSERT_EQUALS(true, Token::Match(emptyStr.front(), "%str%"));
662662
}
663663

664664
void matchVarid() {
@@ -680,76 +680,76 @@ class TestToken : public TestFixture {
680680

681681
void matchNumeric() const {
682682
SimpleTokenList nonNumeric("abc");
683-
ASSERT_EQUALS(false, Token::Match(nonNumeric.tokens(), "%num%"));
683+
ASSERT_EQUALS(false, Token::Match(nonNumeric.front(), "%num%"));
684684

685685
SimpleTokenList msLiteral("5ms"); // #11438
686-
ASSERT_EQUALS(false, Token::Match(msLiteral.tokens(), "%num%"));
686+
ASSERT_EQUALS(false, Token::Match(msLiteral.front(), "%num%"));
687687

688688
SimpleTokenList sLiteral("3s");
689-
ASSERT_EQUALS(false, Token::Match(sLiteral.tokens(), "%num%"));
689+
ASSERT_EQUALS(false, Token::Match(sLiteral.front(), "%num%"));
690690

691691
SimpleTokenList octal("0123");
692-
ASSERT_EQUALS(true, Token::Match(octal.tokens(), "%num%"));
692+
ASSERT_EQUALS(true, Token::Match(octal.front(), "%num%"));
693693

694694
SimpleTokenList decimal("4567");
695-
ASSERT_EQUALS(true, Token::Match(decimal.tokens(), "%num%"));
695+
ASSERT_EQUALS(true, Token::Match(decimal.front(), "%num%"));
696696

697697
SimpleTokenList hexadecimal("0xDEADBEEF");
698-
ASSERT_EQUALS(true, Token::Match(hexadecimal.tokens(), "%num%"));
698+
ASSERT_EQUALS(true, Token::Match(hexadecimal.front(), "%num%"));
699699

700700
SimpleTokenList floatingPoint("0.0f");
701-
ASSERT_EQUALS(true, Token::Match(floatingPoint.tokens(), "%num%"));
701+
ASSERT_EQUALS(true, Token::Match(floatingPoint.front(), "%num%"));
702702

703703
SimpleTokenList signedLong("0L");
704-
ASSERT_EQUALS(true, Token::Match(signedLong.tokens(), "%num%"));
704+
ASSERT_EQUALS(true, Token::Match(signedLong.front(), "%num%"));
705705

706706
SimpleTokenList negativeSignedLong("-0L");
707-
ASSERT_EQUALS(true, Token::Match(negativeSignedLong.tokens(), "- %num%"));
707+
ASSERT_EQUALS(true, Token::Match(negativeSignedLong.front(), "- %num%"));
708708

709709
SimpleTokenList positiveSignedLong("+0L");
710-
ASSERT_EQUALS(true, Token::Match(positiveSignedLong.tokens(), "+ %num%"));
710+
ASSERT_EQUALS(true, Token::Match(positiveSignedLong.front(), "+ %num%"));
711711

712712
SimpleTokenList unsignedInt("0U");
713-
ASSERT_EQUALS(true, Token::Match(unsignedInt.tokens(), "%num%"));
713+
ASSERT_EQUALS(true, Token::Match(unsignedInt.front(), "%num%"));
714714

715715
SimpleTokenList unsignedLong("0UL");
716-
ASSERT_EQUALS(true, Token::Match(unsignedLong.tokens(), "%num%"));
716+
ASSERT_EQUALS(true, Token::Match(unsignedLong.front(), "%num%"));
717717

718718
SimpleTokenList unsignedLongLong("0ULL");
719-
ASSERT_EQUALS(true, Token::Match(unsignedLongLong.tokens(), "%num%"));
719+
ASSERT_EQUALS(true, Token::Match(unsignedLongLong.front(), "%num%"));
720720

721721
SimpleTokenList positive("+666");
722-
ASSERT_EQUALS(true, Token::Match(positive.tokens(), "+ %num%"));
722+
ASSERT_EQUALS(true, Token::Match(positive.front(), "+ %num%"));
723723

724724
SimpleTokenList negative("-42");
725-
ASSERT_EQUALS(true, Token::Match(negative.tokens(), "- %num%"));
725+
ASSERT_EQUALS(true, Token::Match(negative.front(), "- %num%"));
726726

727727
SimpleTokenList negativeNull("-.0");
728-
ASSERT_EQUALS(true, Token::Match(negativeNull.tokens(), "- %num%"));
728+
ASSERT_EQUALS(true, Token::Match(negativeNull.front(), "- %num%"));
729729

730730
SimpleTokenList positiveNull("+.0");
731-
ASSERT_EQUALS(true, Token::Match(positiveNull.tokens(), "+ %num%"));
731+
ASSERT_EQUALS(true, Token::Match(positiveNull.front(), "+ %num%"));
732732
}
733733

734734

735735
void matchBoolean() const {
736736
SimpleTokenList yes("YES");
737-
ASSERT_EQUALS(false, Token::Match(yes.tokens(), "%bool%"));
737+
ASSERT_EQUALS(false, Token::Match(yes.front(), "%bool%"));
738738

739739
SimpleTokenList positive("true");
740-
ASSERT_EQUALS(true, Token::Match(positive.tokens(), "%bool%"));
740+
ASSERT_EQUALS(true, Token::Match(positive.front(), "%bool%"));
741741

742742
SimpleTokenList negative("false");
743-
ASSERT_EQUALS(true, Token::Match(negative.tokens(), "%bool%"));
743+
ASSERT_EQUALS(true, Token::Match(negative.front(), "%bool%"));
744744
}
745745

746746
void matchOr() {
747747
SimpleTokenList bitwiseOr(";|;");
748748
// cppcheck-suppress simplePatternError - this is intentional
749-
ASSERT_EQUALS(true, Token::Match(bitwiseOr.tokens(), "; %or%"));
750-
ASSERT_EQUALS(true, Token::Match(bitwiseOr.tokens(), "; %op%"));
749+
ASSERT_EQUALS(true, Token::Match(bitwiseOr.front(), "; %or%"));
750+
ASSERT_EQUALS(true, Token::Match(bitwiseOr.front(), "; %op%"));
751751
// cppcheck-suppress simplePatternError - this is intentional
752-
ASSERT_EQUALS(false, Token::Match(bitwiseOr.tokens(), "; %oror%"));
752+
ASSERT_EQUALS(false, Token::Match(bitwiseOr.front(), "; %oror%"));
753753

754754
SimpleTokenizer bitwiseOrAssignment(*this, ";|=;");
755755
// cppcheck-suppress simplePatternError - this is intentional
@@ -760,17 +760,17 @@ class TestToken : public TestFixture {
760760

761761
SimpleTokenList logicalOr(";||;");
762762
// cppcheck-suppress simplePatternError - this is intentional
763-
ASSERT_EQUALS(false, Token::Match(logicalOr.tokens(), "; %or%"));
764-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; %op%"));
763+
ASSERT_EQUALS(false, Token::Match(logicalOr.front(), "; %or%"));
764+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; %op%"));
765765
// cppcheck-suppress simplePatternError - this is intentional
766-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; %oror%"));
767-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; &&|%oror%"));
768-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; %oror%|&&"));
766+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; %oror%"));
767+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; &&|%oror%"));
768+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; %oror%|&&"));
769769

770770
SimpleTokenList logicalAnd(";&&;");
771-
ASSERT_EQUALS(true, Token::simpleMatch(logicalAnd.tokens(), "; &&"));
772-
ASSERT_EQUALS(true, Token::Match(logicalAnd.tokens(), "; &&|%oror%"));
773-
ASSERT_EQUALS(true, Token::Match(logicalAnd.tokens(), "; %oror%|&&"));
771+
ASSERT_EQUALS(true, Token::simpleMatch(logicalAnd.front(), "; &&"));
772+
ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; &&|%oror%"));
773+
ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; %oror%|&&"));
774774
}
775775

776776
static void append_vector(std::vector<std::string> &dest, const std::vector<std::string> &src) {

0 commit comments

Comments
 (0)