From 97de2cacf3e99bbfdd0fc8f2621f50b27b4c8f48 Mon Sep 17 00:00:00 2001 From: Reshma V Kumar Date: Fri, 6 Feb 2026 03:11:46 -0600 Subject: [PATCH 1/2] Rename TRUE AND FALSE --- lib/checkclass.cpp | 8 ++++---- lib/checkclass.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 30cc582651c..29016b0a382 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1876,8 +1876,8 @@ CheckClass::Bool CheckClass::isInverted(const Token *tok, const Token *rhs) } } if (res) - return Bool::TRUE; - return Bool::FALSE; + return Bool::True; + return Bool::False; } const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs) @@ -1887,9 +1887,9 @@ const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs) switch (isInverted(tok->astParent(), rhs)) { case Bool::BAILOUT: return nullptr; - case Bool::TRUE: + case Bool::True: return top->link()->next(); - case Bool::FALSE: + case Bool::False: return top->link()->linkAt(1); } } diff --git a/lib/checkclass.h b/lib/checkclass.h index 130f6ffd781..7bb15196867 100644 --- a/lib/checkclass.h +++ b/lib/checkclass.h @@ -228,7 +228,7 @@ class CPPCHECKLIB CheckClass : public Check { bool hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const; bool hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const; static bool hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart); - enum class Bool : std::uint8_t { TRUE, FALSE, BAILOUT }; + enum class Bool : std::uint8_t { True, False, BAILOUT }; static Bool isInverted(const Token *tok, const Token *rhs); static const Token * getIfStmtBodyStart(const Token *tok, const Token *rhs); From 2baf2d73dbc025e6ac8cae3e4aec6d9261d068c1 Mon Sep 17 00:00:00 2001 From: Reshma V Kumar Date: Fri, 6 Feb 2026 10:19:03 -0600 Subject: [PATCH 2/2] Rename BAILOUT to Bailout --- lib/checkclass.cpp | 4 ++-- lib/checkclass.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 29016b0a382..f56c799b247 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1872,7 +1872,7 @@ CheckClass::Bool CheckClass::isInverted(const Token *tok, const Token *rhs) || (Token::simpleMatch(itr->astOperand2(), "this") && Token::simpleMatch(itr->astOperand1(), "&") && Token::simpleMatch(itr->astOperand1()->next(), rhs->str().c_str(), rhs->str().size())))) { //Do nothing } else { - return Bool::BAILOUT; + return Bool::Bailout; } } if (res) @@ -1885,7 +1885,7 @@ const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs) const Token *top = tok->astTop(); if (Token::simpleMatch(top->link(), ") {")) { switch (isInverted(tok->astParent(), rhs)) { - case Bool::BAILOUT: + case Bool::Bailout: return nullptr; case Bool::True: return top->link()->next(); diff --git a/lib/checkclass.h b/lib/checkclass.h index 7bb15196867..3b49861126a 100644 --- a/lib/checkclass.h +++ b/lib/checkclass.h @@ -228,7 +228,7 @@ class CPPCHECKLIB CheckClass : public Check { bool hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const; bool hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const; static bool hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart); - enum class Bool : std::uint8_t { True, False, BAILOUT }; + enum class Bool : std::uint8_t { True, False, Bailout }; static Bool isInverted(const Token *tok, const Token *rhs); static const Token * getIfStmtBodyStart(const Token *tok, const Token *rhs);