From a3e717bea9ed19499e2bca75eced3587639710e0 Mon Sep 17 00:00:00 2001
From: rikardfalkeborn <rikard.falkeborn@gmail.com>
Date: Fri, 9 Nov 2018 06:30:41 +0100
Subject: [PATCH] Use functions instead of comparing with enum (#1471)

* Use isComparisonOp() instead of enum

* Use isAssignmentOp() instead of enum
---
 lib/checkassert.cpp    | 2 +-
 lib/checkbool.cpp      | 4 ++--
 lib/checkclass.cpp     | 6 +++---
 lib/checkcondition.cpp | 2 +-
 lib/checkstring.cpp    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
index 6cb066d50..20c3f4eb7 100644
--- a/lib/checkassert.cpp
+++ b/lib/checkassert.cpp
@@ -64,7 +64,7 @@ void CheckAssert::assertWithSideEffects()
             if (!scope) continue;
 
             for (const Token *tok2 = scope->bodyStart; tok2 != scope->bodyEnd; tok2 = tok2->next()) {
-                if (tok2->tokType() != Token::eAssignmentOp && tok2->tokType() != Token::eIncDecOp)
+                if (!tok2->isAssignmentOp() && tok2->tokType() != Token::eIncDecOp)
                     continue;
 
                 const Variable* var = tok2->previous()->variable();
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
index 3bf3ca017..30fbb06c0 100644
--- a/lib/checkbool.cpp
+++ b/lib/checkbool.cpp
@@ -189,7 +189,7 @@ void CheckBool::checkComparisonOfFuncReturningBool()
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
-            if (tok->tokType() != Token::eComparisonOp || tok->str() == "==" || tok->str() == "!=")
+            if (!tok->isComparisonOp() || tok->str() == "==" || tok->str() == "!=")
                 continue;
             const Token *firstToken = tok->previous();
             if (tok->strAt(-1) == ")") {
@@ -251,7 +251,7 @@ void CheckBool::checkComparisonOfBoolWithBool()
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
-            if (tok->tokType() != Token::eComparisonOp || tok->str() == "==" || tok->str() == "!=")
+            if (!tok->isComparisonOp() || tok->str() == "==" || tok->str() == "!=")
                 continue;
             bool firstTokenBool = false;
 
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 6f136bfd5..72a73d782 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -1988,7 +1988,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
             const Token* lhs = tok1->previous();
             if (lhs->str() == "&") {
                 lhs = lhs->previous();
-                if (lhs->tokType() == Token::eAssignmentOp && lhs->previous()->variable()) {
+                if (lhs->isAssignmentOp() && lhs->previous()->variable()) {
                     if (lhs->previous()->variable()->typeStartToken()->strAt(-1) != "const" && lhs->previous()->variable()->isPointer())
                         return false;
                 }
@@ -1997,7 +1997,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
                 if (lhs->astParent()->strAt(1) != "const")
                     return false;
             } else {
-                if (lhs->tokType() == Token::eAssignmentOp) {
+                if (lhs->isAssignmentOp()) {
                     const Variable* lhsVar = lhs->previous()->variable();
                     if (lhsVar && !lhsVar->isConst() && lhsVar->isReference() && lhs == lhsVar->nameToken()->next())
                         return false;
@@ -2039,7 +2039,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
             }
 
             // Assignment
-            else if (end->next()->tokType() == Token::eAssignmentOp)
+            else if (end->next()->isAssignmentOp())
                 return false;
 
             // Streaming
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index 0419b022b..b5f16329e 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -1194,7 +1194,7 @@ void CheckCondition::clarifyCondition()
                 for (const Token *tok2 = tok->tokAt(3); tok2; tok2 = tok2->next()) {
                     if (tok2->str() == "(" || tok2->str() == "[")
                         tok2 = tok2->link();
-                    else if (tok2->tokType() == Token::eComparisonOp) {
+                    else if (tok2->isComparisonOp()) {
                         // This might be a template
                         if (!isC && tok2->link())
                             break;
diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
index 3d4faa3a3..5afd02723 100644
--- a/lib/checkstring.cpp
+++ b/lib/checkstring.cpp
@@ -169,7 +169,7 @@ void CheckString::checkSuspiciousStringCompare()
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
-            if (tok->tokType() != Token::eComparisonOp)
+            if (!tok->isComparisonOp())
                 continue;
 
             const Token* varTok = tok->astOperand1();