refs #1059 - extract configurations for #if x <= y and #if x >= y (#8037)

Author: firewave

lib/preprocessor.cpp

@@ -410,7 +410,7 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
             return next1->str();
     }
 
-    if (len == 3 && cond->name && next1->str() == "==" && next2->number) {
+    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();
     }

test/testpreprocessor.cpp

@@ -317,6 +317,8 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(getConfigs11); // #9832 - include guards
         TEST_CASE(getConfigs12); // #14222
         TEST_CASE(getConfigs13); // #14222
+        TEST_CASE(getConfigs14); // #1059
+        TEST_CASE(getConfigs15); // #1059
         TEST_CASE(getConfigsError);
 
         TEST_CASE(getConfigsD1);
@@ -2288,6 +2290,20 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS("\n", getConfigsStr(filedata, nullptr, "gnu.cfg"));
     }
 
+    void getConfigs14() { // #1059
+        const char filedata[] = "#if A >= 1\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs15() { // #1059
+        const char filedata[] = "#if A <= 1\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+    }
+
     void getConfigsError() {
         const char filedata1[] = "#ifndef X\n"
                                  "#error \"!X\"\n"