From 04bc58d9c6ea006059121fb83d3b09fa7c96c1bb Mon Sep 17 00:00:00 2001
From: firewave <firewave@users.noreply.github.com>
Date: Thu, 9 Oct 2025 18:11:53 +0200
Subject: [PATCH] enabled and fixed `readability-simplify-boolean-expr`
 clang-tidy warnings

---
 .clang-tidy   | 1 -
 simplecpp.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 182f1a55..8dc64681 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -42,7 +42,6 @@ Checks: >
         -readability-isolate-declaration,
         -readability-magic-numbers,
         -readability-redundant-inline-specifier,
-        -readability-simplify-boolean-expr,
         -readability-use-concise-preprocessor-directives,
         -readability-uppercase-literal-suffix,
         -performance-avoid-endl,
diff --git a/simplecpp.cpp b/simplecpp.cpp
index 7774fd29..077e44c0 100644
--- a/simplecpp.cpp
+++ b/simplecpp.cpp
@@ -859,7 +859,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                     return;
                 }
                 const std::string endOfRawString(')' + delim + currentToken);
-                while (stream.good() && !(endsWith(currentToken, endOfRawString) && currentToken.size() > 1))
+                while (stream.good() && (!endsWith(currentToken, endOfRawString) || currentToken.size() <= 1))
                     currentToken += stream.readChar();
                 if (!endsWith(currentToken, endOfRawString)) {
                     if (outputList) {
@@ -2053,7 +2053,7 @@ namespace simplecpp {
         }
 
         const Token *recursiveExpandToken(TokenList &output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
-            if (!(temp.cback() && temp.cback()->name && tok->next && tok->next->op == '(')) {
+            if (!temp.cback() || !temp.cback()->name || !tok->next || tok->next->op != '(') {
                 output.takeTokens(temp);
                 return tok->next;
             }