fixed #1059 - extract configurations for compound preprocessor checks with operators

Author: firewave

lib/preprocessor.cpp

@@ -22,6 +22,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
@@ -420,17 +421,21 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
 
     if (len == 3 && cond->name && (next1->str() == "==" || next1->str() == "<=" || next1->str() == ">=") && next2->number) {
         if (defined.find(cond->str()) == defined.end())
-            return cond->str() + '=' + cond->next->next->str();
+            return cond->str() + '=' + next1->next->str();
     }
 
+    const auto lessGreaterThanConfig = [](const simplecpp::Token* dtok, const simplecpp::Token* ctok) {
+        int v = MathLib::toBigNumber(ctok->next->str());
+        if (ctok->op == '<')
+            v -= 1;
+        else
+            v += 1;
+        return dtok->str() + '=' + std::to_string(v);
+    };
+
     if (len == 3 && cond->name && (next1->op == '<' || next1->op == '>') && next2->number) {
         if (defined.find(cond->str()) == defined.end()) {
-            int v = strToInt<int>(cond->next->next->str());
-            if (next1->op == '<')
-                v -= 1;
-            else
-                v += 1;
-            return cond->str() + '=' + std::to_string(v);
+            return lessGreaterThanConfig(cond, next1);
         }
     }
 
@@ -447,22 +452,40 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
             configset.insert(cond->next->str() + "=0");
             continue;
         }
-        if (cond->str() != "defined")
+        if (cond->str() == "==" || cond->str() == "<=" || cond->str() == ">=") {
+            if (cond->next->number) {
+                const simplecpp::Token *dtok = cond->previous;
+                if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end())
+                    configset.insert(dtok->str() + '=' + cond->next->str());
+            }
             continue;
-        const simplecpp::Token *dtok = cond->next;
-        if (!dtok)
-            break;
-        if (dtok->op == '(')
-            dtok = dtok->next;
-
-        if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
-            if (!isNotDefinedMacro) {
-                configset.insert(dtok->str() + "=" + dtok->str()); // if defined is set to itself.
-            } else {
-                configset.insert(dtok->str());
+        }
+        if (cond->op == '<' || cond->op == '>') {
+            if (cond->next->number) {
+                const simplecpp::Token *dtok = cond->previous;
+                if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
+                    configset.insert(lessGreaterThanConfig(dtok, cond));
+                }
             }
+            continue;
+        }
+        if (cond->str() == "defined") {
+            const simplecpp::Token *dtok = cond->next;
+            if (!dtok)
+                break;
+            if (dtok->op == '(')
+                dtok = dtok->next;
+
+            if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
+                if (!isNotDefinedMacro) {
+                    configset.insert(dtok->str() + "=" + dtok->str()); // if defined is set to itself.
+                } else {
+                    configset.insert(dtok->str());
+                }
+                isNotDefinedMacro = false;
+            }
+            continue;
         }
-        isNotDefinedMacro = false;
     }
     std::string cfgStr;
     for (const std::string &s : configset) {

test/testpreprocessor.cpp

@@ -323,6 +323,11 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(getConfigs15); // #1059
         TEST_CASE(getConfigs16); // #1059
         TEST_CASE(getConfigs17); // #1059
+        TEST_CASE(getConfigs18); // #1059
+        TEST_CASE(getConfigs19); // #1059
+        TEST_CASE(getConfigs20); // #1059
+        TEST_CASE(getConfigs21); // #1059
+        TEST_CASE(getConfigs22); // #1059
         TEST_CASE(getConfigsError);
 
         TEST_CASE(getConfigsD1);
@@ -2359,6 +2364,41 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
     }
 
+    void getConfigs18() { // #1059
+        const char filedata[] = "#if A == 1 && defined(B)\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1;B\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs19() { // #1059
+        const char filedata[] = "#if A >= 1 && defined(B)\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1;B\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs20() { // #1059
+        const char filedata[] = "#if A <= 1 && defined(B)\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1;B\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs21() { // #1059
+        const char filedata[] = "#if A > 1 && defined(B)\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=2;B\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs22() { // #1059
+        const char filedata[] = "#if A < 1 && defined(B)\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=0;B\n", getConfigsStr(filedata));
+    }
+
     void getConfigsError() {
         const char filedata1[] = "#ifndef X\n"
                                  "#error \"!X\"\n"