Skip to content

Commit 5fcfd61

Browse files
firewavefirewave
committed
testrunner: renamed SimpleTokenList members
1 parent dafe678 commit 5fcfd61

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
@@ -234,7 +234,7 @@ class TestToken : public TestFixture {
234234
void multiCompare2() const { // #3294
235235
// Original pattern that failed: [[,(=<>+-*|&^] %num% [+-*/] %num% ]|,|)|;|=|%op%
236236
SimpleTokenList toks("a == 1");
237-
ASSERT_EQUALS(true, Token::Match(toks.tokens(), "a =|%op%"));
237+
ASSERT_EQUALS(true, Token::Match(toks.front(), "a =|%op%"));
238238
}
239239

240240
void multiCompare3() const {
@@ -243,50 +243,50 @@ class TestToken : public TestFixture {
243243

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

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

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

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

260260
SimpleTokenList toks4("a % b ;");
261-
ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% >>|<<|&|%or%|^|% %name% ;"));
262-
ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% %|>>|<<|&|%or%|^ %name% ;"));
263-
ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% >>|<<|&|%or%|%|^ %name% ;"));
261+
ASSERT_EQUALS(true, Token::Match(toks4.front(), "%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% ;"));
264264

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

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

292292
void multiCompare4() {
@@ -562,23 +562,23 @@ class TestToken : public TestFixture {
562562

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

569569

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

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

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

583583
TokensFrontBack tokensFrontBack(list);
584584
Token multiChar(tokensFrontBack);
@@ -588,76 +588,76 @@ class TestToken : public TestFixture {
588588

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

594594
SimpleTokenList ifSemicolon("if ;");
595-
ASSERT_EQUALS(true, Token::Match(ifSemicolon.tokens(), "if ; !!else"));
595+
ASSERT_EQUALS(true, Token::Match(ifSemicolon.front(), "if ; !!else"));
596596

597597
SimpleTokenList ifSemicolonSomething("if ; something", true);
598-
ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.tokens(), "if ; !!else"));
598+
ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.front(), "if ; !!else"));
599599

600600
SimpleTokenList justElse("else");
601-
ASSERT_EQUALS(false, Token::Match(justElse.tokens(), "!!else"));
601+
ASSERT_EQUALS(false, Token::Match(justElse.front(), "!!else"));
602602

603603
SimpleTokenList ifSemicolonElse("if ; else");
604-
ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.tokens(), "if ; !!else"));
604+
ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.front(), "if ; !!else"));
605605
}
606606

607607
void matchType() {
608608
SimpleTokenList type("abc");
609-
ASSERT_EQUALS(true, Token::Match(type.tokens(), "%type%"));
609+
ASSERT_EQUALS(true, Token::Match(type.front(), "%type%"));
610610

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

616616
SimpleTokenList noType1_cpp("delete");
617-
ASSERT_EQUALS(false, Token::Match(noType1_cpp.tokens(), "%type%"));
617+
ASSERT_EQUALS(false, Token::Match(noType1_cpp.front(), "%type%"));
618618

619619
SimpleTokenList noType1_c("delete", false);
620-
ASSERT_EQUALS(true, Token::Match(noType1_c.tokens(), "%type%"));
620+
ASSERT_EQUALS(true, Token::Match(noType1_c.front(), "%type%"));
621621

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

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

630630
SimpleTokenList chr2("'1'");
631-
ASSERT_EQUALS(true, Token::Match(chr2.tokens(), "%char%"));
631+
ASSERT_EQUALS(true, Token::Match(chr2.front(), "%char%"));
632632

633633
SimpleTokenList noChr("\"10\"");
634-
ASSERT_EQUALS(false, Token::Match(noChr.tokens(), "%char%"));
634+
ASSERT_EQUALS(false, Token::Match(noChr.front(), "%char%"));
635635
}
636636

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

641641
SimpleTokenList comp2(">");
642-
ASSERT_EQUALS(true, Token::Match(comp2.tokens(), "%comp%"));
642+
ASSERT_EQUALS(true, Token::Match(comp2.front(), "%comp%"));
643643

644644
SimpleTokenList noComp("=");
645-
ASSERT_EQUALS(false, Token::Match(noComp.tokens(), "%comp%"));
645+
ASSERT_EQUALS(false, Token::Match(noComp.front(), "%comp%"));
646646
}
647647

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

652652
SimpleTokenList noStr2("'a'");
653-
ASSERT_EQUALS(false, Token::Match(noStr2.tokens(), "%str%"));
653+
ASSERT_EQUALS(false, Token::Match(noStr2.front(), "%str%"));
654654

655655
SimpleTokenList str("\"abc\"");
656-
ASSERT_EQUALS(true, Token::Match(str.tokens(), "%str%"));
656+
ASSERT_EQUALS(true, Token::Match(str.front(), "%str%"));
657657

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

663663
void matchVarid() {
@@ -679,76 +679,76 @@ class TestToken : public TestFixture {
679679

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

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

687687
SimpleTokenList sLiteral("3s");
688-
ASSERT_EQUALS(false, Token::Match(sLiteral.tokens(), "%num%"));
688+
ASSERT_EQUALS(false, Token::Match(sLiteral.front(), "%num%"));
689689

690690
SimpleTokenList octal("0123");
691-
ASSERT_EQUALS(true, Token::Match(octal.tokens(), "%num%"));
691+
ASSERT_EQUALS(true, Token::Match(octal.front(), "%num%"));
692692

693693
SimpleTokenList decimal("4567");
694-
ASSERT_EQUALS(true, Token::Match(decimal.tokens(), "%num%"));
694+
ASSERT_EQUALS(true, Token::Match(decimal.front(), "%num%"));
695695

696696
SimpleTokenList hexadecimal("0xDEADBEEF");
697-
ASSERT_EQUALS(true, Token::Match(hexadecimal.tokens(), "%num%"));
697+
ASSERT_EQUALS(true, Token::Match(hexadecimal.front(), "%num%"));
698698

699699
SimpleTokenList floatingPoint("0.0f");
700-
ASSERT_EQUALS(true, Token::Match(floatingPoint.tokens(), "%num%"));
700+
ASSERT_EQUALS(true, Token::Match(floatingPoint.front(), "%num%"));
701701

702702
SimpleTokenList signedLong("0L");
703-
ASSERT_EQUALS(true, Token::Match(signedLong.tokens(), "%num%"));
703+
ASSERT_EQUALS(true, Token::Match(signedLong.front(), "%num%"));
704704

705705
SimpleTokenList negativeSignedLong("-0L");
706-
ASSERT_EQUALS(true, Token::Match(negativeSignedLong.tokens(), "- %num%"));
706+
ASSERT_EQUALS(true, Token::Match(negativeSignedLong.front(), "- %num%"));
707707

708708
SimpleTokenList positiveSignedLong("+0L");
709-
ASSERT_EQUALS(true, Token::Match(positiveSignedLong.tokens(), "+ %num%"));
709+
ASSERT_EQUALS(true, Token::Match(positiveSignedLong.front(), "+ %num%"));
710710

711711
SimpleTokenList unsignedInt("0U");
712-
ASSERT_EQUALS(true, Token::Match(unsignedInt.tokens(), "%num%"));
712+
ASSERT_EQUALS(true, Token::Match(unsignedInt.front(), "%num%"));
713713

714714
SimpleTokenList unsignedLong("0UL");
715-
ASSERT_EQUALS(true, Token::Match(unsignedLong.tokens(), "%num%"));
715+
ASSERT_EQUALS(true, Token::Match(unsignedLong.front(), "%num%"));
716716

717717
SimpleTokenList unsignedLongLong("0ULL");
718-
ASSERT_EQUALS(true, Token::Match(unsignedLongLong.tokens(), "%num%"));
718+
ASSERT_EQUALS(true, Token::Match(unsignedLongLong.front(), "%num%"));
719719

720720
SimpleTokenList positive("+666");
721-
ASSERT_EQUALS(true, Token::Match(positive.tokens(), "+ %num%"));
721+
ASSERT_EQUALS(true, Token::Match(positive.front(), "+ %num%"));
722722

723723
SimpleTokenList negative("-42");
724-
ASSERT_EQUALS(true, Token::Match(negative.tokens(), "- %num%"));
724+
ASSERT_EQUALS(true, Token::Match(negative.front(), "- %num%"));
725725

726726
SimpleTokenList negativeNull("-.0");
727-
ASSERT_EQUALS(true, Token::Match(negativeNull.tokens(), "- %num%"));
727+
ASSERT_EQUALS(true, Token::Match(negativeNull.front(), "- %num%"));
728728

729729
SimpleTokenList positiveNull("+.0");
730-
ASSERT_EQUALS(true, Token::Match(positiveNull.tokens(), "+ %num%"));
730+
ASSERT_EQUALS(true, Token::Match(positiveNull.front(), "+ %num%"));
731731
}
732732

733733

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

738738
SimpleTokenList positive("true");
739-
ASSERT_EQUALS(true, Token::Match(positive.tokens(), "%bool%"));
739+
ASSERT_EQUALS(true, Token::Match(positive.front(), "%bool%"));
740740

741741
SimpleTokenList negative("false");
742-
ASSERT_EQUALS(true, Token::Match(negative.tokens(), "%bool%"));
742+
ASSERT_EQUALS(true, Token::Match(negative.front(), "%bool%"));
743743
}
744744

745745
void matchOr() {
746746
SimpleTokenList bitwiseOr(";|;");
747747
// cppcheck-suppress simplePatternError - this is intentional
748-
ASSERT_EQUALS(true, Token::Match(bitwiseOr.tokens(), "; %or%"));
749-
ASSERT_EQUALS(true, Token::Match(bitwiseOr.tokens(), "; %op%"));
748+
ASSERT_EQUALS(true, Token::Match(bitwiseOr.front(), "; %or%"));
749+
ASSERT_EQUALS(true, Token::Match(bitwiseOr.front(), "; %op%"));
750750
// cppcheck-suppress simplePatternError - this is intentional
751-
ASSERT_EQUALS(false, Token::Match(bitwiseOr.tokens(), "; %oror%"));
751+
ASSERT_EQUALS(false, Token::Match(bitwiseOr.front(), "; %oror%"));
752752

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

760760
SimpleTokenList logicalOr(";||;");
761761
// cppcheck-suppress simplePatternError - this is intentional
762-
ASSERT_EQUALS(false, Token::Match(logicalOr.tokens(), "; %or%"));
763-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; %op%"));
762+
ASSERT_EQUALS(false, Token::Match(logicalOr.front(), "; %or%"));
763+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; %op%"));
764764
// cppcheck-suppress simplePatternError - this is intentional
765-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; %oror%"));
766-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; &&|%oror%"));
767-
ASSERT_EQUALS(true, Token::Match(logicalOr.tokens(), "; %oror%|&&"));
765+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; %oror%"));
766+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; &&|%oror%"));
767+
ASSERT_EQUALS(true, Token::Match(logicalOr.front(), "; %oror%|&&"));
768768

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

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

0 commit comments

Comments
 (0)